From 89253cf84f957eae18c4ef1bbb2f27c00c0f8717 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Thu, 15 Nov 2012 18:09:32 -0500 Subject: [PATCH] Cleanup for v2.2 --- .gitignore | 2 +- README => README.markdown | 13 +- nbproject/build-impl.xml | 453 +++++++++++++++++++++++---- nbproject/genfiles.properties | 4 +- nbproject/private/config.properties | 0 nbproject/private/private.properties | 6 - nbproject/private/private.xml | 4 - nbproject/project.properties | 16 +- src/config.yml | 4 +- src/plugin.yml | 2 +- 10 files changed, 428 insertions(+), 76 deletions(-) rename README => README.markdown (75%) delete mode 100644 nbproject/private/config.properties delete mode 100644 nbproject/private/private.properties delete mode 100644 nbproject/private/private.xml diff --git a/.gitignore b/.gitignore index f904d2e..187bdfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /nbproject/private/ /build/ -/dist/ \ No newline at end of file +/dist/ diff --git a/README b/README.markdown similarity index 75% rename from README rename to README.markdown index 6bcaafa..34a6d4b 100644 --- a/README +++ b/README.markdown @@ -1,5 +1,8 @@ -BukkitTelnet is a Telnet server for Minecraft. It allows you to remotely administrate your server via any Telnet client. - -BukkitTelnet is a fork of MCTelnet that is designed for servers with multiple administrators who all have the same full permissions. It allows for login under any username provided that the proper password is supplied. - -MCTelnet was originally created by bekvon. I modified it heavily to be better suited to my TotalFreedomServer, and eventually renamed it. +BukkitTelnet +============ + +BukkitTelnet is a Telnet server for Minecraft. It allows you to remotely administrate your server via any Telnet client. + +BukkitTelnet is a fork of MCTelnet that is designed for servers with multiple administrators who all have the same full permissions. It allows for login under any username provided that the proper password is supplied. + +MCTelnet was originally created by bekvon. I modified it heavily to be better suited for the (TotalFreedomServer)[http://totalfreedom.me/], and eventually renamed it. diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index 93502d9..b03796b 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -12,9 +12,9 @@ is divided into following sections: - execution - debugging - javadoc - - junit compilation - - junit execution - - junit debugging + - test compilation + - test execution + - test debugging - applet - cleanup @@ -156,6 +156,7 @@ is divided into following sections: + @@ -200,6 +201,27 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + + + @@ -332,11 +354,52 @@ is divided into following sections: - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -345,32 +408,270 @@ is divided into following sections: - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -402,10 +703,13 @@ is divided into following sections: - + Must set JVM to use for profiling in profiler.info.jvm Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + @@ -463,6 +767,7 @@ is divided into following sections: + @@ -479,6 +784,7 @@ is divided into following sections: + @@ -486,6 +792,7 @@ is divided into following sections: + @@ -512,6 +819,9 @@ is divided into following sections: + + + @@ -557,7 +867,7 @@ is divided into following sections: - + - + + + This target only works when run from inside the NetBeans IDE. @@ -781,8 +1095,9 @@ is divided into following sections: - + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. @@ -790,12 +1105,8 @@ is divided into following sections: - - + + This target only works when run from inside the NetBeans IDE. @@ -807,12 +1118,8 @@ is divided into following sections: - - + + This target only works when run from inside the NetBeans IDE. @@ -834,6 +1141,42 @@ is divided into following sections: + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + @@ -920,14 +1263,14 @@ is divided into following sections: - + Some tests failed; see details above. @@ -940,39 +1283,40 @@ is divided into following sections: Must select some files in the IDE or set test.includes - + Some tests failed; see details above. + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + - + Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + @@ -1037,9 +1381,12 @@ is divided into following sections: - - - + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 477004c..d630969 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.50.2.46 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=b69966a4 -nbproject/build-impl.xml.script.CRC32=bb8f2f93 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.2.46 +nbproject/build-impl.xml.script.CRC32=b6b985b1 +nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46 diff --git a/nbproject/private/config.properties b/nbproject/private/config.properties deleted file mode 100644 index e69de29..0000000 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties deleted file mode 100644 index aa647a9..0000000 --- a/nbproject/private/private.properties +++ /dev/null @@ -1,6 +0,0 @@ -compile.on.save=true -do.depend=false -do.jar=true -javac.debug=true -javadoc.preview=true -user.properties.file=C:\\Users\\Steven\\.netbeans\\7.1.1\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml deleted file mode 100644 index cc2c0e5..0000000 --- a/nbproject/private/private.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nbproject/project.properties b/nbproject/project.properties index 4e521dc..0c5eab9 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,5 +1,6 @@ annotation.processing.enabled=true annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=BukkitTelnet @@ -27,7 +28,9 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= includes=** +jar.archive.disabled=${jnlp.enabled} jar.compress=false +jar.index=${jnlp.enabled} javac.classpath=\ ${libs.Bukkit.classpath} # Space-separated list of extra javac options @@ -35,8 +38,8 @@ javac.compilerargs= javac.deprecation=false javac.processorpath=\ ${javac.classpath} -javac.source=1.5 -javac.target=1.5 +javac.source=1.6 +javac.target=1.6 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir}:\ @@ -55,6 +58,15 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=false javadoc.windowtitle= +jnlp.codebase.type=no.codebase +jnlp.descriptor=application +jnlp.enabled=false +jnlp.mixed.code=default +jnlp.offline-allowed=false +jnlp.signed=false +jnlp.signing= +jnlp.signing.alias= +jnlp.signing.keystore= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false platform.active=default_platform diff --git a/src/config.yml b/src/config.yml index d5d149e..6904497 100644 --- a/src/config.yml +++ b/src/config.yml @@ -1,11 +1,11 @@ -# BukkitTelnet v2.0 Configuration File +# BukkitTelnet v2.2 Configuration File # Port to bind to: port: 8765 # Address to listen on, leave blank for all: address: - + # Main connection password, must be defined: password: diff --git a/src/plugin.yml b/src/plugin.yml index a79ed7e..9abab45 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,5 +1,5 @@ name: BukkitTelnet main: me.StevenLawson.BukkitTelnet.BukkitTelnet -version: 2.1 +version: 2.2 description: Telnet console access plugin. author: bekvon, Madgeek1450 / StevenLawson