From b84785cc82af36461c6fef6f81a611d3c5e09a43 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 24 Jul 2011 00:41:54 +0200 Subject: [PATCH 01/13] If add-prefix-suffix is not set in config and EssentialsChat is installed, it will default to true now for backwards compatibility. --- Essentials/src/com/earth2me/essentials/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 63e017bf5..1700dec3a 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -471,6 +471,6 @@ public class Settings implements ISettings public boolean addPrefixSuffix() { - return config.getBoolean("add-prefix-suffix", false); + return config.getBoolean("add-prefix-suffix", ess.getServer().getPluginManager().isPluginEnabled("EssentialsChat")); } } From 864e6085828cde391f69e5d027fe0560fa4848b1 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 24 Jul 2011 04:07:28 +0200 Subject: [PATCH 02/13] Added code guidelines to all projects, so we don't need them globally. Compress jar files Don't copy lib files into dist folders Removed vendor names Changed all java versions to 1.6 to make it consistent. --- BuildAll/nbproject/project.properties | 45 +++- Essentials/nbproject/project.properties | 56 ++++- EssentialsChat/nbproject/project.properties | 45 +++- EssentialsGeoIP/nbproject/project.properties | 41 +++- .../nbproject/project.properties | 168 +++++++------- .../nbproject/project.properties | 147 ++++++------ .../nbproject/project.properties | 52 ++++- .../nbproject/project.properties | 210 ++++++++++-------- EssentialsSpawn/nbproject/project.properties | 45 +++- EssentialsXMPP/nbproject/project.properties | 52 ++++- 10 files changed, 594 insertions(+), 267 deletions(-) diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties index fa00f6f0c..78667df7f 100644 --- a/BuildAll/nbproject/project.properties +++ b/BuildAll/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=BuildAll -application.vendor=Paul +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -27,7 +62,7 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= includes=** -jar.compress=false +jar.compress=true javac.classpath=\ ${reference.Essentials.jar}:\ ${reference.EssentialsChat.jar}:\ @@ -35,16 +70,16 @@ javac.classpath=\ ${reference.EssentialsPermissionsCommands.jar}:\ ${reference.EssentialsSpawn.jar}:\ ${reference.EssentialsGeoIP.jar}:\ - ${reference.EssentialsXMPP.jar}:\ ${reference.EssentialsGroupBridge.jar}:\ + ${reference.EssentialsXMPP.jar}:\ ${reference.EssentialsGroupManager.jar} # Space-separated list of extra javac options 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}:\ diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties index b10c5e5b4..f6fb2770f 100644 --- a/Essentials/nbproject/project.properties +++ b/Essentials/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=Essentials -application.vendor=Paul +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -34,7 +69,9 @@ file.reference.junit-4.5.jar=..\\lib\\junit_4\\junit-4.5.jar file.reference.Permissions3.jar=../lib/Permissions3.jar file.reference.PermissionsEx.jar=../lib/PermissionsEx.jar includes=** -jar.compress=false +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} javac.classpath=\ ${file.reference.Permissions3.jar}:\ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ @@ -47,8 +84,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}:\ @@ -66,8 +103,17 @@ 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 +mkdist.disabled=true platform.active=default_platform run.classpath=\ ${javac.classpath}:\ diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties index 08df72abc..867228a92 100644 --- a/EssentialsChat/nbproject/project.properties +++ b/EssentialsChat/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=EssentialsChat -application.vendor=Paul +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -28,7 +63,7 @@ endorsed.classpath= excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar includes=** -jar.compress=false +jar.compress=true javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} @@ -37,8 +72,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}:\ @@ -58,7 +93,7 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false +mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties index 8eb099985..80cd8778f 100644 --- a/EssentialsGeoIP/nbproject/project.properties +++ b/EssentialsGeoIP/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=EssentialsGeoIP -application.vendor=snowleo +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -28,7 +63,7 @@ endorsed.classpath= excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar includes=** -jar.compress=false +jar.compress=true javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} @@ -60,7 +95,7 @@ javadoc.windowtitle= main.class= manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false +mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar diff --git a/EssentialsGroupBridge/nbproject/project.properties b/EssentialsGroupBridge/nbproject/project.properties index 0649cc58f..30137e428 100644 --- a/EssentialsGroupBridge/nbproject/project.properties +++ b/EssentialsGroupBridge/nbproject/project.properties @@ -1,78 +1,90 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=EssentialsGroupBridge -application.vendor=gabrielcouto -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/EssentialsGroupBridge.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar -file.reference.Permissions.jar=..\\lib\\Permissions.jar -includes=** -jar.compress=false -javac.classpath=\ - ${reference.EssentialsGroupManager.jar}:\ - ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ - ${file.reference.Permissions.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -main.class= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -project.EssentialsGroupManager=../EssentialsGroupManager -reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=EssentialsGroupBridge +application.vendor=gabrielcouto +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/EssentialsGroupBridge.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar +file.reference.Permissions.jar=..\\lib\\Permissions.jar +includes=** +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} +javac.classpath=\ + ${reference.EssentialsGroupManager.jar}:\ + ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ + ${file.reference.Permissions.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +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= +main.class= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=true +platform.active=default_platform +project.EssentialsGroupManager=../EssentialsGroupManager +reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/EssentialsGroupManager/nbproject/project.properties b/EssentialsGroupManager/nbproject/project.properties index c3e38f7a8..0470fe406 100644 --- a/EssentialsGroupManager/nbproject/project.properties +++ b/EssentialsGroupManager/nbproject/project.properties @@ -1,73 +1,74 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=EssentialsGroupManager -application.vendor=gabrielcouto -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/EssentialsGroupManager.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar -includes=** -jar.compress=false -javac.classpath=\ - ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.6 -javac.target=1.6 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle= -main.class= -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=EssentialsGroupManager +application.vendor=gabrielcouto +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/EssentialsGroupManager.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar +includes=** +jar.compress=true +javac.classpath=\ + ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +main.class= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=true +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/EssentialsPermissionsCommands/nbproject/project.properties b/EssentialsPermissionsCommands/nbproject/project.properties index d92776f5b..0a74a6dea 100644 --- a/EssentialsPermissionsCommands/nbproject/project.properties +++ b/EssentialsPermissionsCommands/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=EssentialsPermissionsCommands -application.vendor=snowleo +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -29,7 +64,9 @@ excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar file.reference.Permissions3.jar=../lib/Permissions3.jar includes=** -jar.compress=false +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.Permissions3.jar}:\ @@ -57,10 +94,19 @@ 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= main.class= manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false +mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties index e5b38df2f..dd5d0fd22 100644 --- a/EssentialsProtect/nbproject/project.properties +++ b/EssentialsProtect/nbproject/project.properties @@ -1,87 +1,123 @@ -annotation.processing.enabled=true -annotation.processing.enabled.in.editor=false -annotation.processing.run.all.processors=true -annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output -application.title=EssentialsProtect -application.vendor=devhome -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/original-EssentialsProtect.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar -file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=false -jar.index=${jnlp.enabled} -javac.classpath=\ - ${reference.Essentials.jar}:\ - ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ - ${file.reference.c3p0-0.9.1.2.jar} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit.classpath}:\ - ${libs.junit_4.classpath} -javac.test.processorpath=\ - ${javac.test.classpath} -javadoc.additionalparam= -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -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=defaut -jnlp.offline-allowed=false -jnlp.signed=false -manifest.file=manifest.mf -meta.inf.dir=${src.dir}/META-INF -platform.active=default_platform -project.Essentials=../Essentials -reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} -# Space-separated list of JVM arguments used when running the project -# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value -# or test-sys-prop.name=value to set system properties for unit tests): -run.jvmargs= -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.dir=src -test.src.dir=test +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +application.title=EssentialsProtect +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/original-EssentialsProtect.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar +file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar +includes=** +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} +javac.classpath=\ + ${reference.Essentials.jar}:\ + ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ + ${file.reference.c3p0-0.9.1.2.jar} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.6 +javac.target=1.6 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +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=defaut +jnlp.offline-allowed=false +jnlp.signed=false +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=true +platform.active=default_platform +project.Essentials=../Essentials +reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value +# or test-sys-prop.name=value to set system properties for unit tests): +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/EssentialsSpawn/nbproject/project.properties b/EssentialsSpawn/nbproject/project.properties index 524c40357..27fa91493 100644 --- a/EssentialsSpawn/nbproject/project.properties +++ b/EssentialsSpawn/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=EssentialsSpawn -application.vendor=Paul +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -28,7 +63,7 @@ endorsed.classpath= excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar includes=** -jar.compress=false +jar.compress=true javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} @@ -37,8 +72,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}:\ @@ -58,7 +93,7 @@ javadoc.use=true javadoc.version=false javadoc.windowtitle= meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false +mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar diff --git a/EssentialsXMPP/nbproject/project.properties b/EssentialsXMPP/nbproject/project.properties index 6c1b475e6..d2ed6daf3 100644 --- a/EssentialsXMPP/nbproject/project.properties +++ b/EssentialsXMPP/nbproject/project.properties @@ -3,7 +3,42 @@ annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output application.title=EssentialsXMPP -application.vendor=snowleo +application.vendor= +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=2 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=120 +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none +auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAnnotationArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineArrayInit=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineAssignment=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineBinaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineCallArgs=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineDisjunctiveCatchTypes=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineFor=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineImplements=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineMethodParams=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineParenthesized=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTernaryOp=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineThrows=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.alignMultilineTryResources=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesAfterClassHeader=0 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.blankLinesBeforeClass=2 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.classDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.expand-tabs=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indent-shift-width=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.indentCasesFromSwitch=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.methodDeclBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.otherBracePlacement=NEW_LINE +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeCatchOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeElseOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeFinallyOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.placeWhileOnNewLine=true +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceAfterTypeCast=false +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaces-per-tab=4 +auxiliary.org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.tab-size=4 build.classes.dir=${build.dir}/classes build.classes.excludes=**/*.java,**/*.form # This directory is removed when the project is cleaned: @@ -29,7 +64,9 @@ excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar file.reference.smack-3.2.0.jar=../lib/smack-3.2.0.jar includes=** -jar.compress=false +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} javac.classpath=\ ${reference.Essentials.jar}:\ ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\ @@ -59,10 +96,19 @@ 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= main.class= manifest.file=manifest.mf meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false +mkdist.disabled=true platform.active=default_platform project.Essentials=../Essentials reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar From 19ba6e519582196886ea6a2240b130e8b776db83 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 24 Jul 2011 12:47:59 -0700 Subject: [PATCH 03/13] Added plural alias for kit & warp --- Essentials/src/plugin.yml | 705 +++++++++++++++++++------------------- 1 file changed, 353 insertions(+), 352 deletions(-) diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 39dd25a45..7616ca4c7 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -1,353 +1,354 @@ -# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) -name: Essentials -main: com.earth2me.essentials.Essentials -# Note to developers: This next line cannot change, or the automatic versioning system will break. -version: TeamCity -website: http://www.earth2me.net:8001/ -description: Provides an essential, core set of commands for Bukkit. -authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] -commands: - afk: - description: Marks you as away-from-keyboard. - usage: / - aliases: [eafk] - antioch: - description: 'A little surprise for operators.' - usage: / - aliases: [eantioch] - back: - description: Teleports you to your location prior to tp/spawn/warp. - usage: / - aliases: [eback] - backup: - description: Runs the backup command - usage: / - aliases: [ebackup] - balance: - description: States the current balance of a player. - usage: / - aliases: [bal,emoney,ebalance,ebal] - balancetop: - description: Gets the top x balance values. (max 10) - usage: / - aliases: [baltop,ebaltop,ebalancetop] - ban: - description: Bans a player. - usage: / [player] - aliases: [eban] - banip: - description: Bans an IP address. - usage: / [address] - aliases: [ebanip] - broadcast: - description: Broadcasts a message to the entire server. - usage: / [msg] - aliases: [ebroadcast,bcast] - bigtree: - description: Spawn a big tree where you are looking. - usage: / [tree|redwood] - aliases: [ebigtree] - burn: - description: Set a player on fire. - usage: / [player] [seconds] - aliases: [eburn] - clearinventory: - description: Clear all items in your inventory. - usage: / - aliases: [ci,eci,eclearinventory] - compass: - description: Describes your current bearing. - usage: / - aliases: [ecompass] - deljail: - description: Removes a jail - usage: / [jailname] - aliases: [edeljail] - delwarp: - description: Deletes the specified warp. - usage: / [warp] - aliases: [edelwarp,remwarp,rmwarp] - depth: - description: States current depth, relative to sea level. - usage: /depth - aliases: [edepth] - eco: - description: Manages the server economy. - usage: / [give|take|reset] [player] [amount] - aliases: economy - essentials: - description: Reloads essentials. - usage: / - ext: - description: Extinguish players. - usage: / - aliases: [extinguish,eext,eextinguish] - fireball: - description: Throw a fireball. - usage: / - aliases: [efireball] - getpos: - description: Get your current coordinates. - usage: / - aliases: [coords,egetpos] - gc: - description: Reports garbage collection info; useful to developers. - usage: / - aliases: [mem,memory,egc] - give: - description: Give a player an item. - usage: / [player] [item|numeric] - aliases: [egive] - god: - description: Enables your godly powers. - usage: / - aliases: [tgm,godmode,egod] - heal: - description: Heals you or the given player. - usage: / - aliases: [eheal] - help: - description: Views a list of available commands. - usage: / [search term] [page] - aliases: [ehelp] - helpop: - description: Request help from online operators. - usage: / [message] - home: - description: Teleport to your home. - usage: / - aliases: [ehome] - ignore: - description: Ignore other players. - usage: / - aliases: [eignore] - info: - description: Shows information set by the server owner - usage: / [chapter] [page] - aliases: [ifo,einfo,eabout,news] - invsee: - description: See the inventory of other players. - usage: / - aliases: [einvsee] - item: - description: Spawn an item. - usage: / [item|numeric] - aliases: [i,eitem] - jails: - description: List all jails. - usage: / - aliases: [ejails] - jump: - description: Jumps to the nearest block in the line of sight. - usage: / - aliases: [j,ejump] - kick: - description: Kicks a specified player with a reason. - usage: / - aliases: [ekick] - kickall: - description: Kicks all players off the server except the issuer. - usage: / - aliases: [ekickall] - kit: - description: Obtains the specified kit or views all available kits. - usage: / - kill: - description: Kills specified player. - usage: / - aliases: [ekill] - list: - description: List all online players. - usage: / - aliases: [playerlist,who,online,elist] - lightning: - description: The power of Thor. Strike at cursor or player. - usage: / [player] - aliases: [strike,elightning,estrike] - mail: - description: Manages inter-player, intra-server mail. - usage: / [read|clear|send [to] [message]] - aliases: [email] - me: - description: Describes an action in the context of the player. - usage: / [description] - aliases: [eme] - motd: - description: Views the Message Of The Day. - usage: / - aliases: [emotd] - msg: - description: Sends a private message to the specified player. - usage: / - aliases: [m,t,emsg,tell] - mute: - description: Mutes or unmutes a player. - usage: / [player] - aliases: [emute] - nick: - description: Change your nickname or that of another player. - usage: / [nickname|off] - aliases: [enick] - nuke: - description: May death rain upon them. - usage: / - aliases: [enuke] - pay: - description: Pays another player from your balance - usage: / [player] [amount] - aliases: [epay] - ping: - description: Pong! - usage: / - aliases: [pong,eping] - powertool: - description: Assigns a command to the item in hand, {player} will be replaced by the name of the player that you click. - usage: / [command] - aliases: [pt,epowertool,ept] - r: - description: Quickly reply to the last player to message you. - usage: / [message] - aliases: [er,reply,ereply] - realname: - description: Displays the username of a user based on nickname. - usage: / [nickname] - aliases: [erealname] - reloadall: - description: Reloads all plugins. - usage: / - aliases: [rel,ereloadall,ereload,erel] - rules: - description: Views the server rules. - usage: / - aliases: [erules] - seen: - description: Shows the last logout time of a player - usage: / [playername] - aliases: [eseen] - sell: - description: Sells the item currently in your hand. - usage: / [itemname|id|hand|inventory|blocks] [-][amount] - aliases: [esell] - sethome: - description: Set your home to your current location. - usage: / - aliases: [esethome] - setjail: - description: Creates a jail where you specified named [jailname] - usage: / [jailname] - aliases: [esetjail] - setwarp: - description: Creates a new warp. - usage: / [warp] - aliases: [createwarp,esetwarp] - setworth: - description: Set the sell value of an item. - usage: / [itemname|id] [price] - aliases: [esetworth] - socialspy: - description: Toggles if you can see msg/mail commands in chat. - usage: / - aliases: [esocialspy] - spawner: - description: Change the mob type of a spawner - usage: / [mob] - aliases: [espawner] - spawnmob: - description: Spawns a mob. - usage: / [mob]<:data><,mount<:data>> - aliases: [espawnmob] - suicide: - description: Causes you to perish. - usage: / - aliases: [esuicide] - tempban: - description: Temporary ban a user. - usage: / [playername] [datediff] - aliases: [etempban] - thunder: - description: Enable/disable thunder. - usage: / [duration] - aliases: [ethunder] - time: - description: Change the time to day or night of the player (default) or world (essentials.time.world permission). - usage: / [day|night|reset] - aliases: [etime] - togglejail: - description: Prevents a player from interacting with the world and teleports him/her to the the jail specified - usage: / [player] [jailname] - aliases: [tjail,etogglejail] - top: - description: Teleport to the highest block at your current position. - usage: / - aliases: [etop] - tp: - description: Teleport to a player. - usage: / [player] - aliases: [etp] - tpa: - description: Request to teleport to the specified player. - usage: / - tpaccept: - description: Accepts a teleport request. - usage: / - tpahere: - description: Request that the specified player teleport to you. - usage: / - tpall: - description: Teleport all online players to another player. - usage: / - tpdeny: - description: Reject a teleport request. - usage: / - tphere: - description: Teleport a player to you. - usage: / [player] - aliases: [s] - tpo: - description: Teleport override for tptoggle. - usage: / - tpohere: - description: Teleport here override for tptoggle. - usage: / - tppos: - description: Teleport to coordinates. - usage: / - tptoggle: - description: Blocks all forms of teleportation. - usage: / - tree: - description: Spawn a tree where you are looking. - usage: / [tree|birch|redwood] - aliases: [etree] - unban: - description: Unbans the specified player. - usage: / [player] - aliases: [pardon,eunban] - unbanip: - description: Unbans the specified IP address. - usage: / [address] - aliases: [eunbanip,pardonip] - unlimited: - description: Allows the unlimited placing of items. - usage: / [list|item] - aliases: [eunlimited] - warp: - description: List all warps or warp to the specified location. - usage: / - aliases: [ewarp] - weather: - description: Setting the weather. - usage: / [duration] - aliases: [sky,sun,storm,eweather] - whois: - description: Determine the username behind a nickname. - usage: / [nickname] - aliases: [ewhois] - world: - description: Switch between worlds. - usage: / [world] - aliases: [eworld] - worth: - description: Calculates the worth of items in hand or as specified. - usage: / +# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) +name: Essentials +main: com.earth2me.essentials.Essentials +# Note to developers: This next line cannot change, or the automatic versioning system will break. +version: TeamCity +website: http://www.earth2me.net:8001/ +description: Provides an essential, core set of commands for Bukkit. +authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] +commands: + afk: + description: Marks you as away-from-keyboard. + usage: / + aliases: [eafk] + antioch: + description: 'A little surprise for operators.' + usage: / + aliases: [eantioch] + back: + description: Teleports you to your location prior to tp/spawn/warp. + usage: / + aliases: [eback] + backup: + description: Runs the backup command + usage: / + aliases: [ebackup] + balance: + description: States the current balance of a player. + usage: / + aliases: [bal,emoney,ebalance,ebal] + balancetop: + description: Gets the top x balance values. (max 10) + usage: / + aliases: [baltop,ebaltop,ebalancetop] + ban: + description: Bans a player. + usage: / [player] + aliases: [eban] + banip: + description: Bans an IP address. + usage: / [address] + aliases: [ebanip] + broadcast: + description: Broadcasts a message to the entire server. + usage: / [msg] + aliases: [ebroadcast,bcast] + bigtree: + description: Spawn a big tree where you are looking. + usage: / [tree|redwood] + aliases: [ebigtree] + burn: + description: Set a player on fire. + usage: / [player] [seconds] + aliases: [eburn] + clearinventory: + description: Clear all items in your inventory. + usage: / + aliases: [ci,eci,eclearinventory] + compass: + description: Describes your current bearing. + usage: / + aliases: [ecompass] + deljail: + description: Removes a jail + usage: / [jailname] + aliases: [edeljail] + delwarp: + description: Deletes the specified warp. + usage: / [warp] + aliases: [edelwarp,remwarp,rmwarp] + depth: + description: States current depth, relative to sea level. + usage: /depth + aliases: [edepth] + eco: + description: Manages the server economy. + usage: / [give|take|reset] [player] [amount] + aliases: economy + essentials: + description: Reloads essentials. + usage: / + ext: + description: Extinguish players. + usage: / + aliases: [extinguish,eext,eextinguish] + fireball: + description: Throw a fireball. + usage: / + aliases: [efireball] + getpos: + description: Get your current coordinates. + usage: / + aliases: [coords,egetpos] + gc: + description: Reports garbage collection info; useful to developers. + usage: / + aliases: [mem,memory,egc] + give: + description: Give a player an item. + usage: / [player] [item|numeric] + aliases: [egive] + god: + description: Enables your godly powers. + usage: / + aliases: [tgm,godmode,egod] + heal: + description: Heals you or the given player. + usage: / + aliases: [eheal] + help: + description: Views a list of available commands. + usage: / [search term] [page] + aliases: [ehelp] + helpop: + description: Request help from online operators. + usage: / [message] + home: + description: Teleport to your home. + usage: / + aliases: [ehome] + ignore: + description: Ignore other players. + usage: / + aliases: [eignore] + info: + description: Shows information set by the server owner + usage: / [chapter] [page] + aliases: [ifo,einfo,eabout,news] + invsee: + description: See the inventory of other players. + usage: / + aliases: [einvsee] + item: + description: Spawn an item. + usage: / [item|numeric] + aliases: [i,eitem] + jails: + description: List all jails. + usage: / + aliases: [ejails] + jump: + description: Jumps to the nearest block in the line of sight. + usage: / + aliases: [j,ejump] + kick: + description: Kicks a specified player with a reason. + usage: / + aliases: [ekick] + kickall: + description: Kicks all players off the server except the issuer. + usage: / + aliases: [ekickall] + kit: + description: Obtains the specified kit or views all available kits. + usage: / + aliases: [ekit,kits] + kill: + description: Kills specified player. + usage: / + aliases: [ekill] + list: + description: List all online players. + usage: / + aliases: [playerlist,who,online,elist] + lightning: + description: The power of Thor. Strike at cursor or player. + usage: / [player] + aliases: [strike,elightning,estrike] + mail: + description: Manages inter-player, intra-server mail. + usage: / [read|clear|send [to] [message]] + aliases: [email] + me: + description: Describes an action in the context of the player. + usage: / [description] + aliases: [eme] + motd: + description: Views the Message Of The Day. + usage: / + aliases: [emotd] + msg: + description: Sends a private message to the specified player. + usage: / + aliases: [m,t,emsg,tell] + mute: + description: Mutes or unmutes a player. + usage: / [player] + aliases: [emute] + nick: + description: Change your nickname or that of another player. + usage: / [nickname|off] + aliases: [enick] + nuke: + description: May death rain upon them. + usage: / + aliases: [enuke] + pay: + description: Pays another player from your balance + usage: / [player] [amount] + aliases: [epay] + ping: + description: Pong! + usage: / + aliases: [pong,eping] + powertool: + description: Assigns a command to the item in hand, {player} will be replaced by the name of the player that you click. + usage: / [command] + aliases: [pt,epowertool,ept] + r: + description: Quickly reply to the last player to message you. + usage: / [message] + aliases: [er,reply,ereply] + realname: + description: Displays the username of a user based on nickname. + usage: / [nickname] + aliases: [erealname] + reloadall: + description: Reloads all plugins. + usage: / + aliases: [rel,ereloadall,ereload,erel] + rules: + description: Views the server rules. + usage: / + aliases: [erules] + seen: + description: Shows the last logout time of a player + usage: / [playername] + aliases: [eseen] + sell: + description: Sells the item currently in your hand. + usage: / [itemname|id|hand|inventory|blocks] [-][amount] + aliases: [esell] + sethome: + description: Set your home to your current location. + usage: / + aliases: [esethome] + setjail: + description: Creates a jail where you specified named [jailname] + usage: / [jailname] + aliases: [esetjail] + setwarp: + description: Creates a new warp. + usage: / [warp] + aliases: [createwarp,esetwarp] + setworth: + description: Set the sell value of an item. + usage: / [itemname|id] [price] + aliases: [esetworth] + socialspy: + description: Toggles if you can see msg/mail commands in chat. + usage: / + aliases: [esocialspy] + spawner: + description: Change the mob type of a spawner + usage: / [mob] + aliases: [espawner] + spawnmob: + description: Spawns a mob. + usage: / [mob]<:data><,mount<:data>> + aliases: [espawnmob] + suicide: + description: Causes you to perish. + usage: / + aliases: [esuicide] + tempban: + description: Temporary ban a user. + usage: / [playername] [datediff] + aliases: [etempban] + thunder: + description: Enable/disable thunder. + usage: / [duration] + aliases: [ethunder] + time: + description: Change the time to day or night of the player (default) or world (essentials.time.world permission). + usage: / [day|night|reset] + aliases: [etime] + togglejail: + description: Prevents a player from interacting with the world and teleports him/her to the the jail specified + usage: / [player] [jailname] + aliases: [tjail,etogglejail] + top: + description: Teleport to the highest block at your current position. + usage: / + aliases: [etop] + tp: + description: Teleport to a player. + usage: / [player] + aliases: [etp] + tpa: + description: Request to teleport to the specified player. + usage: / + tpaccept: + description: Accepts a teleport request. + usage: / + tpahere: + description: Request that the specified player teleport to you. + usage: / + tpall: + description: Teleport all online players to another player. + usage: / + tpdeny: + description: Reject a teleport request. + usage: / + tphere: + description: Teleport a player to you. + usage: / [player] + aliases: [s] + tpo: + description: Teleport override for tptoggle. + usage: / + tpohere: + description: Teleport here override for tptoggle. + usage: / + tppos: + description: Teleport to coordinates. + usage: / + tptoggle: + description: Blocks all forms of teleportation. + usage: / + tree: + description: Spawn a tree where you are looking. + usage: / [tree|birch|redwood] + aliases: [etree] + unban: + description: Unbans the specified player. + usage: / [player] + aliases: [pardon,eunban] + unbanip: + description: Unbans the specified IP address. + usage: / [address] + aliases: [eunbanip,pardonip] + unlimited: + description: Allows the unlimited placing of items. + usage: / [list|item] + aliases: [eunlimited] + warp: + description: List all warps or warp to the specified location. + usage: / + aliases: [ewarp,warps] + weather: + description: Setting the weather. + usage: / [duration] + aliases: [sky,sun,storm,eweather] + whois: + description: Determine the username behind a nickname. + usage: / [nickname] + aliases: [ewhois] + world: + description: Switch between worlds. + usage: / [world] + aliases: [eworld] + worth: + description: Calculates the worth of items in hand or as specified. + usage: / aliases: [eworth] \ No newline at end of file From bc1c252dca0a1d2ecc54eda1fba233c972b0f389 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 24 Jul 2011 23:19:12 +0200 Subject: [PATCH 04/13] Correcting all line endings to LF --- Essentials/build.xml | 168 +- .../essentials/commands/Commandmute.java | 104 +- Essentials/src/items.csv | 4102 ++++++++--------- Essentials/src/worth.yml | 398 +- Essentials/workdir/server.log | 384 +- Essentials/workdir/server.properties | 26 +- EssentialsChat/build.xml | 152 +- EssentialsGroupBridge/build.xml | 148 +- EssentialsGroupBridge/nbproject/project.xml | 50 +- EssentialsGroupManager/build.xml | 148 +- EssentialsProtect/MANIFEST.MF | 4 +- EssentialsProtect/build.xml | 168 +- .../EssentialsProtectEntityListener.java | 696 +-- EssentialsProtect/src/plugin.yml | 16 +- EssentialsSpawn/build.xml | 152 +- EssentialsSpawn/src/plugin.yml | 30 +- build.inc.xml | 14 +- lib/nblibraries.properties | 24 +- 18 files changed, 3392 insertions(+), 3392 deletions(-) diff --git a/Essentials/build.xml b/Essentials/build.xml index abd4ebe55..a0a5a2fa2 100644 --- a/Essentials/build.xml +++ b/Essentials/build.xml @@ -1,84 +1,84 @@ - - - - - - - - - - - - Builds, tests, and runs the project Essentials. - - - - + + + + + + + + + + + + Builds, tests, and runs the project Essentials. + + + + diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java index c6022cc5c..e56ddc42c 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandmute.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandmute.java @@ -1,52 +1,52 @@ -package com.earth2me.essentials.commands; - -import org.bukkit.Server; -import org.bukkit.command.CommandSender; -import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; - - -public class Commandmute extends EssentialsCommand -{ - public Commandmute() - { - super("mute"); - } - - @Override - public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception - { - if (args.length < 1) - { - throw new NotEnoughArgumentsException(); - } - - User p = getPlayer(server, args, 0, true); - if (!p.isMuted() && p.isAuthorized("essentials.mute.exempt")) - { - sender.sendMessage(Util.i18n("muteExempt")); - return; - } - long muteTimestamp = 0; - if (args.length > 1) - { - String time = getFinalArg(args, 1); - muteTimestamp = Util.parseDateDiff(time, true); - } - p.setMuteTimeout(muteTimestamp); - charge(sender); - boolean muted = p.toggleMuted(); - sender.sendMessage( - muted - ? (muteTimestamp > 0 - ? Util.format("mutedPlayerFor", p.getDisplayName(), Util.formatDateDiff(muteTimestamp)) - : Util.format("mutedPlayer", p.getDisplayName())) - : Util.format("unmutedPlayer", p.getDisplayName())); - p.sendMessage( - muted - ? (muteTimestamp > 0 - ? Util.format("playerMutedFor", Util.formatDateDiff(muteTimestamp)) - : Util.i18n("playerMuted")) - : Util.i18n("playerUnmuted")); - } -} +package com.earth2me.essentials.commands; + +import org.bukkit.Server; +import org.bukkit.command.CommandSender; +import com.earth2me.essentials.User; +import com.earth2me.essentials.Util; + + +public class Commandmute extends EssentialsCommand +{ + public Commandmute() + { + super("mute"); + } + + @Override + public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception + { + if (args.length < 1) + { + throw new NotEnoughArgumentsException(); + } + + User p = getPlayer(server, args, 0, true); + if (!p.isMuted() && p.isAuthorized("essentials.mute.exempt")) + { + sender.sendMessage(Util.i18n("muteExempt")); + return; + } + long muteTimestamp = 0; + if (args.length > 1) + { + String time = getFinalArg(args, 1); + muteTimestamp = Util.parseDateDiff(time, true); + } + p.setMuteTimeout(muteTimestamp); + charge(sender); + boolean muted = p.toggleMuted(); + sender.sendMessage( + muted + ? (muteTimestamp > 0 + ? Util.format("mutedPlayerFor", p.getDisplayName(), Util.formatDateDiff(muteTimestamp)) + : Util.format("mutedPlayer", p.getDisplayName())) + : Util.format("unmutedPlayer", p.getDisplayName())); + p.sendMessage( + muted + ? (muteTimestamp > 0 + ? Util.format("playerMutedFor", Util.formatDateDiff(muteTimestamp)) + : Util.i18n("playerMuted")) + : Util.i18n("playerUnmuted")); + } +} diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv index d06da42fd..579042e18 100644 --- a/Essentials/src/items.csv +++ b/Essentials/src/items.csv @@ -1,2052 +1,2052 @@ -#Last updated on 7/9/2011 21:37 (gmt +3) for minecraft version 1.7.3 -#item,id,metadata -stone,1,0 -sstone,1,0 -smoothstone,1,0 -rock,1,0 -grass,2,0 -dirt,3,0 -cobblestone,4,0 -cstone,4,0 -cobble,4,0 -plank,5,0 -woodenplank,5,0 -woodplank,5,0 -wplank,5,0 -plankwooden,5,0 -plankwood,5,0 -plankw,5,0 -sapling,6,0 -treesapling,6,0 -logsapling,6,0 -trunksapling,6,0 -woodsapling,6,0 -oaktreesapling,6,0 -oaklogsapling,6,0 -oaktrunksapling,6,0 -oakwoodsapling,6,0 -normaltreesapling,6,0 -normallogsapling,6,0 -normaltrunksapling,6,0 -normalwoodsapling,6,0 -osapling,6,0 -otreesapling,6,0 -ologsapling,6,0 -otrunksapling,6,0 -owoodsapling,6,0 -nsapling,6,0 -ntreesapling,6,0 -nlogsapling,6,0 -ntrunksapling,6,0 -nwoodsapling,6,0 -treesap,6,0 -logsap,6,0 -trunksap,6,0 -woodsap,6,0 -oaktreesap,6,0 -oaklogsap,6,0 -oaktrunksap,6,0 -oakwoodsap,6,0 -normaltreesap,6,0 -normallogsap,6,0 -normaltrunksap,6,0 -normalwoodsap,6,0 -osap,6,0 -otreesap,6,0 -ologsap,6,0 -otrunksap,6,0 -owoodsap,6,0 -nsap,6,0 -ntreesap,6,0 -nlogsap,6,0 -ntrunksap,6,0 -nwoodsap,6,0 -redsapling,6,1 -redtreesapling,6,1 -redlogsapling,6,1 -redtrunksapling,6,1 -redwoodsapling,6,1 -darksapling,6,1 -darktreesapling,6,1 -darklogsapling,6,1 -darktrunksapling,6,1 -darkwoodsapling,6,1 -blacksapling,6,1 -blacktreesapling,6,1 -blacklogsapling,6,1 -blacktrunksapling,6,1 -blackwoodsapling,6,1 -pinesapling,6,1 -pinetreesapling,6,1 -pinelogsapling,6,1 -pinetrunksapling,6,1 -pinewoodsapling,6,1 -sprucesapling,6,1 -sprucetreesapling,6,1 -sprucelogsapling,6,1 -sprucetrunksapling,6,1 -sprucewoodsapling,6,1 -rsapling,6,1 -rtreesapling,6,1 -rlogsapling,6,1 -rtrunksapling,6,1 -rwoodsapling,6,1 -dsapling,6,1 -dtreesapling,6,1 -dlogsapling,6,1 -dtrunksapling,6,1 -dwoodsapling,6,1 -blsapling,6,1 -bltreesapling,6,1 -bllogsapling,6,1 -bltrunksapling,6,1 -blwoodsapling,6,1 -psapling,6,1 -ptreesapling,6,1 -plogsapling,6,1 -ptrunksapling,6,1 -pwoodsapling,6,1 -ssapling,6,1 -streesapling,6,1 -slogsapling,6,1 -strunksapling,6,1 -swoodsapling,6,1 -redsap,6,1 -redtreesap,6,1 -redlogsap,6,1 -redtrunksap,6,1 -redwoodsap,6,1 -darksap,6,1 -darktreesap,6,1 -darklogsap,6,1 -darktrunksap,6,1 -darkwoodsap,6,1 -blacksap,6,1 -blacktreesap,6,1 -blacklogsap,6,1 -blacktrunksap,6,1 -blackwoodsap,6,1 -pinesap,6,1 -pinetreesap,6,1 -pinelogsap,6,1 -pinetrunksap,6,1 -pinewoodsap,6,1 -sprucesap,6,1 -sprucetreesap,6,1 -sprucelogsap,6,1 -sprucetrunksap,6,1 -sprucewoodsap,6,1 -rsap,6,1 -rtreesap,6,1 -rlogsap,6,1 -rtrunksap,6,1 -rwoodsap,6,1 -dsap,6,1 -dtreesap,6,1 -dlogsap,6,1 -dtrunksap,6,1 -dwoodsap,6,1 -blsap,6,1 -bltreesap,6,1 -bllogsap,6,1 -bltrunksap,6,1 -blwoodsap,6,1 -psap,6,1 -ptreesap,6,1 -plogsap,6,1 -ptrunksap,6,1 -pwoodsap,6,1 -ssap,6,1 -streesap,6,1 -slogsap,6,1 -strunksap,6,1 -swoodsap,6,1 -birchsapling,6,2 -birchtreesapling,6,2 -birchlogsapling,6,2 -birchtrunksapling,6,2 -birchwoodsapling,6,2 -pandasapling,6,2 -pandatreesapling,6,2 -pandalogsapling,6,2 -pandatrunksapling,6,2 -pandawoodsapling,6,2 -whitesapling,6,2 -whitetreesapling,6,2 -whitelogsapling,6,2 -whitetrunksapling,6,2 -whitewoodsapling,6,2 -bisapling,6,2 -bitreesapling,6,2 -bilogsapling,6,2 -bitrunksapling,6,2 -biwoodsapling,6,2 -bsapling,6,2 -btreesapling,6,2 -blogsapling,6,2 -btrunksapling,6,2 -bwoodsapling,6,2 -pasapling,6,2 -patreesapling,6,2 -palogsapling,6,2 -patrunksapling,6,2 -pawoodsapling,6,2 -wsapling,6,2 -wtreesapling,6,2 -wlogsapling,6,2 -wtrunksapling,6,2 -wwoodsapling,6,2 -birchsap,6,2 -birchtreesap,6,2 -birchlogsap,6,2 -birchtrunksap,6,2 -birchwoodsap,6,2 -pandasap,6,2 -pandatreesap,6,2 -pandalogsap,6,2 -pandatrunksap,6,2 -pandawoodsap,6,2 -whitesap,6,2 -whitetreesap,6,2 -whitelogsap,6,2 -whitetrunksap,6,2 -whitewoodsap,6,2 -bisap,6,2 -bitreesap,6,2 -bilogsap,6,2 -bitrunksap,6,2 -biwoodsap,6,2 -bsap,6,2 -btreesap,6,2 -blogsap,6,2 -btrunksap,6,2 -bwoodsap,6,2 -pasap,6,2 -patreesap,6,2 -palogsap,6,2 -patrunksap,6,2 -pawoodsap,6,2 -wsap,6,2 -wtreesap,6,2 -wlogsap,6,2 -wtrunksap,6,2 -wwoodsap,6,2 -bedrock,7,0 -oprock,7,0 -opblock,7,0 -adminblock,7,0 -adminrock,7,0 -adminium,7,0 -water,8,0 -stationarywater,9,0 -swater,9,0 -lava,10,0 -stationarylava,11,0 -slava,11,0 -sand,12,0 -gravel,13,0 -goldore,14,0 -oregold,14,0 -goldo,14,0 -ogold,14,0 -gore,14,0 -oreg,14,0 -ironore,15,0 -oreiron,15,0 -irono,15,0 -oiron,15,0 -steelore,15,0 -oresteel,15,0 -steelo,15,0 -osteel,15,0 -iore,15,0 -orei,15,0 -sore,15,0 -ores,15,0 -coalore,16,0 -orecoal,16,0 -coalo,16,0 -ocoal,16,0 -core,16,0 -tree,17,0 -log,17,0 -trunk,17,0 -wood,17,0 -oaktree,17,0 -oaklog,17,0 -oaktrunk,17,0 -oakwood,17,0 -normaltree,17,0 -normallog,17,0 -normaltrunk,17,0 -normalwood,17,0 -otree,17,0 -olog,17,0 -otrunk,17,0 -owood,17,0 -ntree,17,0 -nlog,17,0 -ntrunk,17,0 -nwood,17,0 -redtree,17,1 -redlog,17,1 -redtrunk,17,1 -redwood,17,1 -darktree,17,1 -darklog,17,1 -darktrunk,17,1 -darkwood,17,1 -blacktree,17,1 -blacklog,17,1 -blacktrunk,17,1 -blackwood,17,1 -pine,17,1 -pinetree,17,1 -pinelog,17,1 -pinetrunk,17,1 -pinewood,17,1 -spruce,17,1 -sprucetree,17,1 -sprucelog,17,1 -sprucetrunk,17,1 -sprucewood,17,1 -rtree,17,1 -rlog,17,1 -rtrunk,17,1 -rwood,17,1 -dtree,17,1 -dlog,17,1 -dtrunk,17,1 -dwood,17,1 -bltree,17,1 -bllog,17,1 -bltrunk,17,1 -blwood,17,1 -ptree,17,1 -plog,17,1 -ptrunk,17,1 -pwood,17,1 -stree,17,1 -slog,17,1 -strunk,17,1 -swood,17,1 -birch,17,2 -birchtree,17,2 -birchlog,17,2 -birchtrunk,17,2 -birchwood,17,2 -pandatree,17,2 -pandalog,17,2 -pandatrunk,17,2 -pandawood,17,2 -whitetree,17,2 -whitelog,17,2 -whitetrunk,17,2 -whitewood,17,2 -bitree,17,2 -bilog,17,2 -bitrunk,17,2 -biwood,17,2 -btree,17,2 -blog,17,2 -btrunk,17,2 -bwood,17,2 -patree,17,2 -palog,17,2 -patrunk,17,2 -pawood,17,2 -wtree,17,2 -wlog,17,2 -wtrunk,17,2 -wwood,17,2 -leaves,18,0 -leaf,18,0 -treeleaves,18,0 -logleaves,18,0 -trunkleaves,18,0 -woodleaves,18,0 -oaktreeleaves,18,0 -oaklogleaves,18,0 -oaktrunkleaves,18,0 -oakwoodleaves,18,0 -normaltreeleaves,18,0 -normallogleaves,18,0 -normaltrunkleaves,18,0 -normalwoodleaves,18,0 -otreeleaves,18,0 -ologleaves,18,0 -otrunkleaves,18,0 -owoodleaves,18,0 -ntreeleaves,18,0 -nlogleaves,18,0 -ntrunkleaves,18,0 -nwoodleaves,18,0 -treeleaf,18,0 -logleaf,18,0 -trunkleaf,18,0 -woodleaf,18,0 -oaktreeleaf,18,0 -oaklogleaf,18,0 -oaktrunkleaf,18,0 -oakwoodleaf,18,0 -normaltreeleaf,18,0 -normallogleaf,18,0 -normaltrunkleaf,18,0 -normalwoodleaf,18,0 -otreeleaf,18,0 -ologleaf,18,0 -otrunkleaf,18,0 -owoodleaf,18,0 -ntreeleaf,18,0 -nlogleaf,18,0 -ntrunkleaf,18,0 -nwoodleaf,18,0 -sponge,19,0 -glass,20,0 -lapislazuliore,21,0 -lapislazulio,21,0 -orelapislazuli,21,0 -olapislazuli,21,0 -lapisore,21,0 -lapiso,21,0 -orelapis,21,0 -olapis,21,0 -lore,21,0 -orel,21,0 -lapislazuliblock,22,0 -blocklapislazuli,22,0 -lapisblock,22,0 -blocklapis,22,0 -lblock,22,0 -blockl,22,9 -dispenser,23,0 -dispense,23,0 -sandstone,24,0 -sastone,24,0 -noteblock,25,0 -musicblock,25,0 -nblock,25,0 -mblock,25,0 -bedblock,26,0 -poweredtrack,27,0 -poweredrail,27,0 -boostertrack,27,0 -boosterrail,27,0 -powertrack,27,0 -powerrail,27,0 -boosttrack,27,0 -boostrail,27,0 -ptrack,27,0 -prail,27,0 -btrack,27,0 -brail,27,0 -detectortrack,28,0 -detectorrail,28,0 -detectingtrack,28,0 -detectingrail,28,0 -detecttrack,28,0 -detectrail,28,0 -dtrack,28,0 -drail,28,0 -stickypistonbase,29,0 -stickypiston,29,0 -stickpistonbase,29,0 -stickpiston,29,0 -stickyp,29,0 -spistonbase,29,0 -spiston,29,0 -pistonstickybase,29,0 -pistonsticky,29,0 -pistonstickbase,29,0 -pistonstick,29,0 -pistonsbase,29,0 -pistons,29,0 -psticky,29,0 -spiderweb,30,0 -sweb,30,0 -web,30,0 -longgrass,31,0 -tallgrass,31,0 -wildgrass,31,0 -grasslong,31,0 -grasstall,31,0 -grasswild,31,0 -lgrass,31,0 -tgrass,31,0 -wgrass,31,0 -grassl,31,0 -grasst,31,0 -grassw,31,0 -deadshrub,32,0 -shrubdead,32,0 -dshrub,32,0 -shrubd,32,0 -normalpistonbase,33,0 -normalpiston,33,0 -normpistonbase,33,0 -normpiston,33,0 -npistonbase,33,0 -npiston,33,0 -pistonnormalbase,33,0 -pistonnormal,33,0 -pistonnormbase,33,0 -pistonnorm,33,0 -pistonnbase,33,0 -pistonn,33,0 -pistonbase,33,0 -piston,33,0 -pistonblock,33,0 -pistonextensionnormal,34,0 -pistonextensionnorm,34,0 -pistonextensionn,34,0 -pistonextension,34,0 -pistonextnormal,34,0 -pistonextnorm,34,0 -pistonextn,34,0 -pistonext,34,0 -pistonenormal,34,0 -pistonenorm,34,0 -pistonen,34,0 -pistone,34,0 -extensionpistonnormal,34,0 -extensionpistonnorm,34,0 -extensionpistonn,34,0 -extensionpiston,34,0 -extpistonnormal,34,0 -extpistonnorm,34,0 -extpistonn,34,0 -extpiston,34,0 -epistonnormal,34,0 -epistonnorm,34,0 -epistonn,34,0 -episton,34,0 -whitecloth,35,0 -whitewool,35,0 -whitecotton,35,0 -wcloth,35,0 -wwool,35,0 -wcotton,35,0 -cloth,35,0 -wool,35,0 -cotton,35,0 -orangecloth,35,1 -orangewool,35,1 -orangecotton,35,1 -ocloth,35,1 -owool,35,1 -ocotton,35,1 -magentacloth,35,2 -magentawool,35,2 -magentacotton,35,2 -mcloth,35,2 -mwool,35,2 -mcotton,35,2 -lightbluecloth,35,3 -lightbluewool,35,3 -lightbluecotton,35,3 -lbluecloth,35,3 -lbluewool,35,3 -lbluecotton,35,3 -lightblucloth,35,3 -lightbluwool,35,3 -lightblucotton,35,3 -lblucloth,35,3 -lbluwool,35,3 -lblucotton,35,3 -yellowcloth,35,4 -yellowwool,35,4 -yellowcotton,35,4 -ycloth,35,4 -ywool,35,4 -ycotton,35,4 -lightgreencloth,35,5 -lightgreenwool,35,5 -lightgreencotton,35,5 -lgreencloth,35,5 -lgreenwool,35,5 -lgreencotton,35,5 -lightgrecloth,35,5 -lightgrewool,35,5 -lightgrecotton,35,5 -lgrecloth,35,5 -lgrewool,35,5 -lgrecotton,35,5 -pinkcloth,35,6 -pinkwool,35,6 -pinkcotton,35,6 -picloth,35,6 -piwool,35,6 -picotton,35,6 -graycloth,35,7 -graywool,35,7 -graycotton,35,7 -gracloth,35,7 -grawool,35,7 -gracotton,35,7 -lightgraycloth,35,8 -lightgraywool,35,8 -lightgraycotton,35,8 -lgraycloth,35,8 -lgraywool,35,8 -lgraycotton,35,8 -lightgracloth,35,8 -lightgrawool,35,8 -lightgracotton,35,8 -lgracloth,35,8 -lgrawool,35,8 -lgracotton,35,8 -cyancloth,35,9 -cyanwool,35,9 -cyancotton,35,9 -ccloth,35,9 -cwool,35,9 -ccotton,35,9 -purplecloth,35,10 -purplewool,35,10 -purplecotton,35,10 -pucloth,35,10 -puwool,35,10 -pucotton,35,10 -bluecloth,35,11 -bluewool,35,11 -bluecotton,35,11 -blucloth,35,11 -bluwool,35,11 -blucotton,35,11 -browncloth,35,12 -brownwool,35,12 -browncotton,35,12 -brocloth,35,12 -browool,35,12 -brocotton,35,12 -darkgreencloth,35,13 -darkgreenwool,35,13 -darkgreencotton,35,13 -dgreencloth,35,13 -dgreenwool,35,13 -dgreencotton,35,13 -greencloth,35,13 -greenwool,35,13 -greencotton,35,13 -darkgrecloth,35,13 -darkgrewool,35,13 -darkgrecotton,35,13 -dgrecloth,35,13 -dgrewool,35,13 -dgrecotton,35,13 -grecloth,35,13 -grewool,35,13 -grecotton,35,13 -redcloth,35,14 -redwool,35,14 -redcotton,35,14 -rcloth,35,14 -rwool,35,14 -rcotton,35,14 -blackcloth,35,15 -blackwool,35,15 -blackcotton,35,15 -blacloth,35,15 -blawool,35,15 -blacotton,35,15 -pistonmovingpiece,36,0 -pistonmp,36,0 -yellowflower,37,0 -yflower,37,0 -flower,37,0 -redrose,38,0 -rrose,38,0 -rose,38,0 -redflower,38,0 -rflower,38,0 -brownmushroom,39,0 -brownmush,39,0 -bmushroom,39,0 -bmush,39,0 -redmushroom,40,0 -redmush,40,0 -rmushroom,40,0 -rmush,40,0 -goldblock,41,0 -blockgold,41,0 -gblock,41,0 -blockg,41,0 -ironblock,42,0 -steelblock,42,0 -blockiron,42,0 -blocksteel,42,0 -iblock,42,0 -stblock,42,0 -blocki,42,0 -blockst,42,0 -smoothstonedoublestep,43,0 -smoothstonedstep,43,0 -stonedoublestep,43,0 -stonedstep,43,0 -sdoublestep,43,0 -sdstep,43,0 -doublesmoothstonestep,43,0 -dsmoothstonestep,43,0 -doublestonestep,43,0 -dstonestep,43,0 -doublesstep,43,0 -doublestep,43,0 -dstep,43,0 -smoothstonedoubleslab,43,0 -smoothstonedslab,43,0 -stonedoubleslab,43,0 -stonedslab,43,0 -sdoubleslab,43,0 -sdslab,43,0 -doublesmoothstoneslab,43,0 -dsmoothstoneslab,43,0 -doublestoneslab,43,0 -dstoneslab,43,0 -doublesslab,43,0 -doubleslab,43,0 -dslab,43,0 -sandstonedoublestep,43,1 -sandstonedstep,43,1 -sstonedoublestep,43,1 -sstonedstep,43,1 -ssdoublestep,43,1 -ssdstep,43,1 -doublesandstonestep,43,1 -dsandstonestep,43,1 -doublesstonestep,43,1 -dsstonestep,43,1 -doublessstep,43,1 -dsstep,43,1 -sandstonedoubleslab,43,1 -sandstonedslab,43,1 -sstonedoubleslab,43,1 -sstonedslab,43,1 -ssdoubleslab,43,1 -ssdslab,43,1 -doublesandstoneslab,43,1 -dsandstoneslab,43,1 -doublesstoneslab,43,1 -dsstoneslab,43,1 -doublessslab,43,1 -dsslab,43,1 -woodenplankdoublestep,43,2 -woodenplankdstep,43,2 -woodplankdoublestep,43,2 -woodplankdstep,43,2 -wplankdoublestep,43,2 -wplankdstep,43,2 -plankdoublestep,43,2 -plankdstep,43,2 -wpdoublestep,43,2 -pdoublestep,43,2 -wpdstep,43,2 -pdstep,43,2 -doublewoodenplankstep,43,2 -dwoodenplankstep,43,2 -doublewoodplankstep,43,2 -dwoodplankstep,43,2 -doublewplankstep,43,2 -dwplankstep,43,2 -doubleplankstep,43,2 -dplankstep,43,2 -doublewpstep,43,2 -dwpstep,43,2 -doublepstep,43,2 -dpstep,43,2 -woodenplankdoubleslab,43,2 -woodenplankdslab,43,2 -woodplankdoubleslab,43,2 -woodplankdslab,43,2 -wplankdoubleslab,43,2 -wplankdslab,43,2 -plankdoubleslab,43,2 -plankdslab,43,2 -wpdoubleslab,43,2 -pdoubleslab,43,2 -wpdslab,43,2 -pdslab,43,2 -doublewoodenplankslab,43,2 -dwoodenplankslab,43,2 -doublewoodplankslab,43,2 -dwoodplankslab,43,2 -doublewplankslab,43,2 -dwplankslab,43,2 -doubleplankslab,43,2 -dplankslab,43,2 -doublewpslab,43,2 -dwpslab,43,2 -doublepslab,43,2 -dpslab,43,2 -cobblestonedoublestep,43,3 -cobblestonedstep,43,3 -cobbledoublestep,43,3 -cobbledstep,43,3 -cstonedoublestep,43,3 -cstonedstep,43,3 -csdoublestep,43,3 -csdstep,43,3 -doublecobblestonestep,43,3 -dcobblestonestep,43,3 -doublecobblestep,43,3 -dcobblestep,43,3 -doublecstonestep,43,3 -dcstonestep,43,3 -doublecsstep,43,3 -dcsstep,43,3 -cobblestonedoubleslab,43,3 -cobblestonedslab,43,3 -cobbledoubleslab,43,3 -cobbledslab,43,3 -cstonedoubleslab,43,3 -cstonedslab,43,3 -csdoubleslab,43,3 -csdslab,43,3 -doublecobblestoneslab,43,3 -dcobblestoneslab,43,3 -doublecobbleslab,43,3 -dcobbleslab,43,3 -doublecstoneslab,43,3 -dcstoneslab,43,3 -doublecsslab,43,3 -dcsslab,43,3 -smoothstonestep,44,0 -stonestep,44,0 -sstep,44,0 -step,44,0 -smoothstoneslab,44,0 -stoneslab,44,0 -sslab,44,0 -slab,44,0 -sanddstonestep,44,1 -sstonestep,44,1 -ssstep,44,1 -sanddstoneslab,44,1 -sstoneslab,44,1 -ssslab,44,1 -woodplankstep,44,2 -wplankstep,44,2 -plankstep,44,2 -wpstep,44,2 -pstep,44,2 -woodplankslab,44,2 -wplankslab,44,2 -plankslab,44,2 -wpslab,44,2 -pslab,44,2 -cobblestonestep,44,3 -cobblestep,44,3 -cstonestep,44,3 -csstep,44,3 -cobblestoneslab,44,3 -cobbleslab,44,3 -cstoneslab,44,3 -csslab,44,3 -brickblock,45,0 -blockbrick,45,0 -bblock,45,0 -blockb,45,0 -tntblock,46,0 -blocktnt,46,0 -bombblock,46,0 -blockbomb,46,0 -dynamiteblock,46,0 -blockdynamite,46,0 -tnt,46,0 -bomb,46,0 -dynamite,46,0 -bookcase,47,0 -casebook,47,0 -bookshelf,47,0 -shelfbook,47,0 -bookblock,47,0 -blockbook,47,0 -mossycobblestone,48,0 -mosscobblestone,48,0 -mcobblestone,48,0 -mossycobble,48,0 -mosscobble,48,0 -mcobble,48,0 -obsidian,49,0 -obsi,49,0 -obby,49,0 -torch,50,0 -fire,51,0 -flame,51,0 -flames,51,0 -mobspawner,52,0 -monsterspawner,52,0 -mspawner,52,0 -spawner,52,0 -woodenstairs,53,0 -woodstairs,53,0 -wstairs,53,0 -woodenstair,53,0 -woodstair,53,0 -wstair,53,0 -stairswooden,53,0 -stairswood,53,0 -stairsw,53,0 -stairwooden,53,0 -stairwood,53,0 -stairw,53,0 -chest,54,0 -redstonewireblock,55,0 -rstonewireblock,55,0 -redswireblock,55,0 -redwireblock,55,0 -rswireblock,55,0 -rwireblock,55,0 -redstonewire,55,0 -rstonewire,55,0 -redswire,55,0 -redwire,55,0 -rswire,55,0 -rwire,55,0 -wire,55,0 -diamondore,56,0 -crystalore,56,0 -diamondo,56,0 -crystalo,56,0 -orediamond,56,0 -odiamond,56,0 -orecrystal,56,0 -ocrystal,56,0 -dore,56,0 -ored,56,0 -diamondblock,57,0 -blockdiamond,57,0 -crystalblock,57,0 -blockcrystal,57,0 -dblock,57,0 -blockd,57,0 -workbench,58,0 -craftingbench,58,0 -crafterbench,58,0 -craftbench,58,0 -worktable,58,0 -craftingtable,58,0 -craftertable,58,0 -crafttable,58,0 -wbench,58,0 -cbench,58,0 -crops,59,0 -crop,59,0 -soil,60,0 -furnace,61,0 -burningfurnace,62,0 -bfurnace,62,0 -signpost,63,0 -spost,63,0 -woodendoorhalf,64,0 -wooddoorhalf,64,0 -wdoorhalf,64,0 -woodendoorbottom,64,0 -wooddoorbottom,64,0 -wdoorbottom,64,0 -woodendoorblock,64,0 -wooddoorblock,64,0 -wdoorblock,64,0 -ladder,65,0 -minecarttrack,66,0 -minecartrail,66,0 -mcarttrack,66,0 -mcartrail,66,0 -mctrack,66,0 -mcrail,66,0 -track,66,0 -rail,66,0 -cobblestonestairs,67,0 -cstonestairs,67,0 -stonestairs,67,0 -cobblestairs,67,0 -csstairs,67,0 -sstairs,67,0 -cstairs,67,0 -cobblestonestair,67,0 -cstonestair,67,0 -stonestair,67,0 -cobblestair,67,0 -csstair,67,0 -sstair,67,0 -cstair,67,0 -stairscobblestone,67,0 -stairscstone,67,0 -stairsstone,67,0 -stairscobble,67,0 -stairscs,67,0 -stairss,67,0 -stairsc,67,0 -staircobblestone,67,0 -staircstone,67,0 -stairstone,67,0 -staircobble,67,0 -staircs,67,0 -stairs,67,0 -stairc,67,0 -wallsign,68,0 -wsign,68,0 -lever,69,0 -smoothstonepressureplate,70,0 -smoothstonepressplate,70,0 -smoothstonepplate,70,0 -smoothstoneplate,70,0 -sstonepressureplate,70,0 -sstonepressplate,70,0 -sstonepplate,70,0 -sstoneplate,70,0 -stonepressureplate,70,0 -stonepressplate,70,0 -stonepplate,70,0 -stoneplate,70,0 -spressureplate,70,0 -spressplate,70,0 -spplate,70,0 -splate,70,0 -irondoorhalf,71,0 -idoorhalf,71,0 -irondoorbottom,71,0 -idoorbottom,71,0 -irondoorblock,71,0 -idoorblock,71,0 -steeldoorhalf,71,0 -sdoorhalf,71,0 -steeldoorbottom,71,0 -sdoorbottom,71,0 -steeldoorblock,71,0 -sdoorblock,71,0 -woodenpressureplate,72,0 -woodenpressplate,72,0 -woodenpplate,72,0 -woodenplate,72,0 -woodpressureplate,72,0 -woodpressplate,72,0 -woodpplate,72,0 -woodplate,72,0 -wpressureplate,72,0 -wpressplate,72,0 -wpplate,72,0 -wplate,72,0 -redstoneore,73,0 -redsore,73,0 -redore,73,0 -rstoneore,73,0 -rsore,73,0 -rore,73,0 -oreredstone,73,0 -orereds,73,0 -orered,73,0 -orerstone,73,0 -orers,73,0 -orer,73,0 -glowingredstoneore,74,0 -glowredstoneore,74,0 -gredstoneore,74,0 -glowingrstoneore,74,0 -glowrstoneore,74,0 -grstoneore,74,0 -glowingredsore,74,0 -glowredsore,74,0 -gredsore,74,0 -glowingredore,74,0 -glowredore,74,0 -gredore,74,0 -glowingrsore,74,0 -glowrsore,74,0 -grsore,74,0 -grore,74,0 -oreglowingredstone,74,0 -oreglowredstone,74,0 -oregredstone,74,0 -oreglowingrstone,74,0 -oreglowrstone,74,0 -oregrstone,74,0 -oreglowingreds,74,0 -oreglowreds,74,0 -oregreds,74,0 -oreglowingred,74,0 -oreglowred,74,0 -oregred,74,0 -oreglowingrs,74,0 -oreglowrs,74,0 -oregrs,74,0 -oregr,74,0 -redstonetorchoff,75,0 -rstonetorchoff,75,0 -redstorchoff,75,0 -redtorchoff,75,0 -rstorchoff,75,0 -redstonetorchon,76,0 -redstonetorch,76,0 -rstonetorchon,76,0 -rstonetorch,76,0 -redstorchon,76,0 -redstorch,76,0 -redtorchon,76,0 -redtorch,76,0 -rstorchon,76,0 -rstorch,76,0 -smoothstonebutton,77,0 -sstonebutton,77,0 -stonebutton,77,0 -sbutton,77,0 -button,77,0 -snowcovering,78,0 -snowcover,78,0 -scover,78,0 -ice,79,0 -snowblock,80,0 -blocksnow,80,0 -sblock,80,0 -blocks,80,0 -cactus,81,0 -cactuses,81,0 -cacti,81,0 -clayblock,82,0 -blockclay,82,0 -cblock,82,0 -blockc,82,0 -reedblock,83,0 -reedsblock,83,0 -sugarcaneblock,83,0 -scaneblock,83,0 -bambooblock,83,0 -blockreed,83,0 -blockreeds,83,0 -blocksugarcane,83,0 -blockscane,83,0 -blockbamboo,83,0 -jukebox,84,0 -jbox,84,0 -fence,85,0 -pumpkin,86,0 -netherrack,87,0 -netherrock,87,0 -netherstone,87,0 -hellstone,87,0 -nstone,87,0 -hstone,87,0 -soulsand,88,0 -slowsand,88,0 -slowmud,88,0 -ssand,88,0 -smud,88,0 -mud,88,0 -glowingstoneblock,89,0 -lightstoneblock,89,0 -glowstoneblock,89,0 -blockglowingstone,89,0 -blocklightstone,89,0 -blockglowstone,89,0 -glowingstoneb,89,0 -lightstoneb,89,0 -glowstoneb,89,0 -bglowingstone,89,0 -blightstone,89,0 -bglowstone,89,0 -glowingstone,89,0 -lightstone,89,0 -glowstone,89,0 -glowingblock,89,0 -lightblock,89,0 -glowblock,89,0 -lstone,89,0 -gstone,89,0 -portal,90,0 -jackolantern,91,0 -pumpkinlantern,91,0 -glowingpumpkin,91,0 -lightpumpkin,91,0 -jpumpkin,91,0 -plantren,91,0 -glowpumpkin,91,0 -gpumpkin,91,0 -lpumpkin,91,0 -cakeblock,92,0 -repeateroff,93,0 -repeatoff,93,0 -delayeroff,93,0 -delayoff,93,0 -dioderoff,93,0 -diodeoff,93,0 -repeaterblockoff,93,0 -repeatblockoff,93,0 -delayerblockoff,93,0 -delayblockoff,93,0 -dioderblockoff,93,0 -diodeblockoff,93,0 -repeateron,94,0 -repeaton,94,0 -delayeron,94,0 -delayon,94,0 -dioderon,94,0 -diodeon,94,0 -repeaterblockon,94,0 -repeatblockon,94,0 -delayerblockon,94,0 -delayblockon,94,0 -dioderblockon,94,0 -diodeblockon,94,0 -lockedchest,95,0 -lockchest,95,0 -jokechest,95,0 -aprilfoolschest,95,0 -aprilchest,95,0 -lootchest,95,0 -trapdoor,96,0 -doortrap,96,0 -hatch,96,0 -tdoor,96,0 -doort,96,0 -trapd,96,0 -dtrap,96,0 -ironshovel,256,0 -ironspade,256,0 -ishovel,256,0 -ispade,256,0 -steelshovel,256,0 -steelspade,256,0 -ironpickaxe,257,0 -ironpick,257,0 -steelpickaxe,257,0 -steelpick,257,0 -ipickaxe,257,0 -ipick,257,0 -ironaxe,258,0 -iaxe,258,0 -steelaxe,258,0 -flintandsteel,259,0 -flintandiron,259,0 -flintandtinder,259,0 -flintnsteel,259,0 -flintniron,259,0 -flintntinder,259,0 -flintsteel,259,0 -flintiron,259,0 -flinttinder,259,0 -lighter,259,0 -apple,260,0 -bow,261,0 -arrow,262,0 -coal,263,0 -charcoal,263,1 -ccoal,263,1 -diamond,264,0 -crystal,264,0 -ironingot,265,0 -ironbar,265,0 -ironi,265,0 -steelingot,265,0 -steelbar,265,0 -steeli,265,0 -iingot,265,0 -ibar,265,0 -ingotiron,265,0 -bariron,265,0 -iiron,265,0 -ingotsteel,265,0 -barsteel,265,0 -isteel,265,0 -ingoti,265,0 -bari,265,0 -goldingot,266,0 -goldbar,266,0 -goldi,266,0 -gingot,266,0 -gbar,266,0 -ingotgold,266,0 -bargold,266,0 -igold,266,0 -ingotg,266,0 -barg,266,0 -ironsword,267,0 -steelsword,267,0 -isword,267,0 -woodensword,268,0 -woodsword,268,0 -wsword,268,0 -woodenshovel,269,0 -woodenspade,269,0 -woodshovel,269,0 -woodspade,269,0 -wshovel,269,0 -wspade,269,0 -woodenpickaxe,270,0 -woodenpick,270,0 -woodpickaxe,270,0 -woodpick,270,0 -wpickaxe,270,0 -wpick,270,0 -woodenaxe,271,0 -woodaxe,271,0 -waxe,271,0 -smoothstonesword,272,0 -cobblestonesword,272,0 -sstonesword,272,0 -cstonesword,272,0 -stonesword,272,0 -sssword,272,0 -cssword,272,0 -ssword,272,0 -smoothstoneshovel,273,0 -smoothstonespade,273,0 -cobblestoneshovel,273,0 -cobblestonespade,273,0 -sstoneshovel,273,0 -sstonespade,273,0 -cstoneshovel,273,0 -cstonespade,273,0 -stoneshovel,273,0 -stonespade,273,0 -ssshovel,273,0 -csshovel,273,0 -ssspade,273,0 -csspade,273,0 -sshovel,273,0 -sspade,273,0 -smoothstonepickaxe,274,0 -cobblestonepickaxe,274,0 -smoothstonepick,274,0 -cobblestonepick,274,0 -sstonepickaxe,274,0 -sstonepick,274,0 -cstonepickaxe,274,0 -cstonepick,274,0 -stonepickaxe,274,0 -stonepick,274,0 -sspickaxe,274,0 -sspick,274,0 -cspickaxe,274,0 -cspick,274,0 -spickaxe,274,0 -spick,274,0 -smoothstoneaxe,275,0 -cobblestoneaxe,275,0 -sstoneaxe,275,0 -cstoneaxe,275,0 -stoneaxe,275,0 -ssaxe,275,0 -csaxe,275,0 -saxe,275,0 -diamondsword,276,0 -crystalsword,276,0 -dsword,276,0 -diamondshovel,277,0 -diamondspade,277,0 -crystalshovel,277,0 -crystalspade,277,0 -dshovel,277,0 -dspade,277,0 -diamondpickaxe,278,0 -diamondpick,278,0 -crystalpickaxe,278,0 -crystalpick,278,0 -dpickaxe,278,0 -dpick,278,0 -diamondaxe,279,0 -crystalaxe,279,0 -daxe,279,0 -stick,280,0 -bowl,281,0 -mushroomsoup,282,0 -mrsoup,282,0 -soup,282,0 -goldsword,283,0 -gsword,283,0 -goldshovel,284,0 -goldspade,284,0 -gshovel,284,0 -gspade,284,0 -goldpickaxe,285,0 -goldpick,285,0 -gpickaxe,285,0 -gpick,285,0 -goldaxe,286,0 -gaxe,286,0 -string,287,0 -rope,287,0 -feather,288,0 -gunpowder,289,0 -sulfur,289,0 -woodenhoe,290,0 -woodhoe,290,0 -whoe,290,0 -smoothstonehoe,291,0 -cobblestonehoe,291,0 -sstonehoe,291,0 -cstonehoe,291,0 -stonehoe,291,0 -sshoe,291,0 -cshoe,291,0 -shoe,291,0 -ironhoe,292,0 -steelhoe,292,0 -ihoe,292,0 -diamondhoe,293,0 -crystalhoe,293,0 -dhoe,293,0 -goldhoe,294,0 -ghoe,294,0 -seeds,295,0 -seed,295,0 -wheat,296,0 -bread,297,0 -leatherhelmet,298,0 -leatherhelm,298,0 -leatherhat,298,0 -lhelmet,298,0 -lhelm,298,0 -lhat,298,0 -leatherchestplate,299,0 -leatherplatebody,299,0 -leatherplate,299,0 -leathershirt,299,0 -lchestplate,299,0 -lplatebody,299,0 -lplate,299,0 -lshirt,299,0 -leatherleggings,300,0 -leatherlegs,300,0 -leatherpants,300,0 -lleggings,300,0 -llegs,300,0 -lpants,300,0 -leatherboots,301,0 -leathershoes,301,0 -lboots,301,0 -lshoes,301,0 -chainmailhelmet,302,0 -chainmailhelm,302,0 -chainmailhat,302,0 -chainmhelmet,302,0 -chainmhelm,302,0 -chainmhat,302,0 -cmailhelmet,302,0 -cmailhelm,302,0 -cmailhat,302,0 -chainhelmet,302,0 -chainhelm,302,0 -chainhat,302,0 -cmhelmet,302,0 -cmhelm,302,0 -cmhat,302,0 -chainmailchestplate,303,0 -chainmailplatebody,303,0 -chainmailplate,303,0 -chainmailshirt,303,0 -chainmchestplate,303,0 -chainmplatebody,303,0 -chainmplate,303,0 -chainmshirt,303,0 -cmailchestplate,303,0 -cmailplatebody,303,0 -cmailplate,303,0 -cmailshirt,303,0 -chainchestplate,303,0 -chainplatebody,303,0 -chainplate,303,0 -chainshirt,303,0 -cmchestplate,303,0 -cmplatebody,303,0 -cmplate,303,0 -cmshirt,303,0 -chainmailleggings,304,0 -chainmaillegs,304,0 -chainmailpants,304,0 -chainmleggings,304,0 -chainmlegs,304,0 -chainmpants,304,0 -cmailleggings,304,0 -cmaillegs,304,0 -cmailpants,304,0 -chainleggings,304,0 -chainlegs,304,0 -chainpants,304,0 -cmleggings,304,0 -cmlegs,304,0 -cmpants,304,0 -chainmailboots,305,0 -chainmailshoes,305,0 -chainmboots,305,0 -chainmshoes,305,0 -cmailboots,305,0 -cmailshoes,305,0 -chainboots,305,0 -chainshoes,305,0 -cmboots,305,0 -cmshoes,305,0 -ironhelmet,306,0 -ironhelm,306,0 -ironhat,306,0 -ihelmet,306,0 -ihelm,306,0 -ihat,306,0 -steelhelmet,306,0 -steelhelm,306,0 -steelhat,306,0 -shelmet,306,0 -shelm,306,0 -shat,306,0 -ironchestplate,307,0 -ironplatebody,307,0 -ironplate,307,0 -ironshirt,307,0 -ichestplate,307,0 -iplatebody,307,0 -iplate,307,0 -ishirt,307,0 -steelchestplate,307,0 -steelplatebody,307,0 -steelplate,307,0 -steelshirt,307,0 -schestplate,307,0 -splatebody,307,0 -sshirt,307,0 -ironleggings,308,0 -ironlegs,308,0 -ironpants,308,0 -ileggings,308,0 -ilegs,308,0 -ipants,308,0 -steelleggings,308,0 -steellegs,308,0 -steelpants,308,0 -sleggings,308,0 -slegs,308,0 -spants,308,0 -ironboots,309,0 -ironshoes,309,0 -iboots,309,0 -ishoes,309,0 -steelboots,309,0 -steelshoes,309,0 -sboots,309,0 -sshoes,309,0 -diamondhelmet,310,0 -diamondhelm,310,0 -diamondhat,310,0 -dhelmet,310,0 -dhelm,310,0 -dhat,310,0 -crystalhelmet,310,0 -crystalhelm,310,0 -crystalhat,310,0 -chelmet,310,0 -chelm,310,0 -chat,310,0 -diamondchestplate,311,0 -diamondplatebody,311,0 -diamondplate,311,0 -diamondshirt,311,0 -dchestplate,311,0 -dplatebody,311,0 -dplate,311,0 -dshirt,311,0 -crystalchestplate,311,0 -crystalplatebody,311,0 -crystalplate,311,0 -crystalshirt,311,0 -cchestplate,311,0 -cplatebody,311,0 -cplate,311,0 -cshirt,311,0 -diamondleggings,312,0 -diamondlegs,312,0 -diamondpants,312,0 -dleggings,312,0 -dlegs,312,0 -dpants,312,0 -crystalleggings,312,0 -crystallegs,312,0 -crystalpants,312,0 -cleggings,312,0 -clegs,312,0 -cpants,312,0 -diamondboots,313,0 -diamondshoes,313,0 -dboots,313,0 -dshoes,313,0 -crystalboots,313,0 -crystalshoes,313,0 -cboots,313,0 -cshoes,313,0 -goldhelmet,314,0 -goldhelm,314,0 -goldhat,314,0 -ghelmet,314,0 -ghelm,314,0 -ghat,314,0 -goldchestplate,315,0 -goldplatebody,315,0 -goldplate,315,0 -goldshirt,315,0 -gchestplate,315,0 -gplatebody,315,0 -gplateplate,315,0 -gshirt,315,0 -goldleggings,316,0 -goldlegs,316,0 -goldpants,316,0 -gleggings,316,0 -glegs,316,0 -gpants,316,0 -goldboots,317,0 -goldshoes,317,0 -gboots,317,0 -gshoes,317,0 -flint,318,0 -pork,319,0 -rawpork,319,0 -rpork,319,0 -grilledpork,320,0 -grillpork,320,0 -gpork,320,0 -cookedpork,320,0 -bacon,320,0 -painting,321,0 -picture,321,0 -goldenapple,322,0 -goldapple,322,0 -gapple,322,0 -sign,323,0 -woodendoor,324,0 -wooddoor,324,0 -wdoor,324,0 -bucket,325,0 -bukkit,325,0 -waterbucket,326,0 -waterbukkit,326,0 -wbucket,326,0 -wbukkit,326,0 -magmabucket,327,0 -magmabukkit,327,0 -lavabucket,327,0 -lavabukkit,327,0 -lbucket,327,0 -lbukkit,327,0 -minecart,328,0 -mcart,328,0 -cart,328,0 -saddle,329,0 -irondoor,330,0 -idoor,330,0 -steeldoor,330,0 -sdoor,330,0 -dooriron,330,0 -doori,330,0 -doorsteel,330,0 -doors,330,0 -redstonedust,331,0 -redstone,331,0 -rstonedust,331,0 -rstone,331,0 -redsdust,331,0 -reddust,331,0 -rsdust,331,0 -rdust,331,0 -snowball,332,0 -snball,332,0 -boat,333,0 -leather,334,0 -milkbucket,335,0 -milkbukkit,335,0 -mbucket,335,0 -mbukkit,335,0 -claybrick,336,0 -brick,336,0 -clayball,337,0 -cball,337,0 -clay,337,0 -reeds,338,0 -reed,338,0 -sugarcane,338,0 -scane,338,0 -bamboo,338,0 -paper,339,0 -papyrus,339,0 -book,340,0 -slimeball,341,0 -slball,341,0 -storageminecart,342,0 -chestminecart,342,0 -storagemcart,342,0 -chestmcart,342,0 -storagecart,342,0 -chestcart,342,0 -sminecart,342,0 -cminecart,342,0 -smcart,342,0 -cmcart,342,0 -scart,342,0 -ccart,342,0 -engineminecart,343,0 -poweredminecart,343,0 -powerminecart,343,0 -furnaceminecart,343,0 -enginemcart,343,0 -poweredmcart,343,0 -powermcart,343,0 -furnacemcart,343,0 -enginecart,343,0 -poweredcart,343,0 -powercart,343,0 -furnacecart,343,0 -eminecart,343,0 -pminecart,343,0 -fminecart,343,0 -emcart,343,0 -pmcart,343,0 -fmcart,343,0 -ecart,343,0 -pcart,343,0 -fcart,343,0 -egg,344,0 -compass,345,0 -fishingrod,346,0 -fishrod,346,0 -frod,346,0 -rod,346,0 -goldwatch,347,0 -goldclock,347,0 -gwatch,347,0 -gclock,347,0 -watch,347,0 -clock,347,0 -glowingstoneblockdust,348,0 -lightstoneblockdust,348,0 -glowstoneblockdust,348,0 -blockglowingstonedust,348,0 -blocklightstonedust,348,0 -blockglowstonedust,348,0 -glowingstonebdust,348,0 -lightstonebdust,348,0 -glowstonebdust,348,0 -bglowingstonedust,348,0 -blightstonedust,348,0 -bglowstonedust,348,0 -glowingstonedust,348,0 -lightstonedust,348,0 -glowstonedust,348,0 -glowingblockdust,348,0 -lightblockdust,348,0 -glowblockdust,348,0 -lbdust,348,0 -gbdust,348,0 -lsdust,348,0 -gsdust,348,0 -rawfish,349,0 -rafish,349,0 -fish,349,0 -cookedfish,350,0 -cookfish,350,0 -cfish,350,0 -grilledfish,350,0 -grillfish,350,0 -gfish,350,0 -roastedfish,350,0 -roastfish,350,0 -rofish,350,0 -inksack,351,0 -inksac,351,0 -isack,351,0 -isac,351,0 -sack,351,0 -sac,351,0 -blackinksack,351,0 -blackinksac,351,0 -blackisack,351,0 -blackisac,351,0 -blacksack,351,0 -blacksac,351,0 -inksackblack,351,0 -inksacblack,351,0 -isackblack,351,0 -isacclack,351,0 -sackblack,351,0 -sacblack,351,0 -blackinksackcolour,351,0 -blackinksaccolour,351,0 -blackisackcolour,351,0 -blackisaccolour,351,0 -blacksackcolour,351,0 -blacksaccolour,351,0 -inksackblackcolour,351,0 -inksacblackcolour,351,0 -isackblackcolour,351,0 -isacclackcolour,351,0 -sackblackcolour,351,0 -sacblackcolour,351,0 -blackinksackcolor,351,0 -blackinksaccolor,351,0 -blackisackcolor,351,0 -blackisaccolor,351,0 -blacksackcolor,351,0 -blacksaccolor,351,0 -inksackblackcolor,351,0 -inksacblackcolor,351,0 -isackblackcolor,351,0 -isacblackcolor,351,0 -sackblackcolor,351,0 -sacblackcolor,351,0 -blackinksackdye,351,0 -blackinksacdye,351,0 -blackisackdye,351,0 -blackisacdye,351,0 -blacksackdye,351,0 -blacksacdye,351,0 -inksackblackdye,351,0 -inksacblackdye,351,0 -isackblackdye,351,0 -isacclackdye,351,0 -sackblackdye,351,0 -sacblackdye,351,0 -blackcolor,351,0 -blackdye,351,0 -rosered,351,1 -roseredcolor,351,1 -roseredcolour,351,1 -rosereddye,351,1 -redrosecolor,351,1 -redrosecolour,351,1 -redrosedye,351,1 -redr,351,1 -redrcolor,351,1 -redrcolour,351,1 -redrdye,351,1 -redcolor,351,1 -redcolour,351,1 -reddye,351,1 -cactusgreen,351,2 -greencactus,351,2 -cactusgreencolour,351,2 -greencactuscolour,351,2 -cactusgreencolor,351,2 -greencactuscolor,351,2 -cactusgreendye,351,2 -greencactusdye,351,2 -greencolour,351,2 -greencolor,351,2 -greendye,351,2 -cocobeans,351,3 -cocobean,351,3 -cbeans,351,3 -cbean,351,3 -beans,351,3 -bean,351,3 -browncocobeans,351,3 -browncocobean,351,3 -browncbeans,351,3 -browncbean,351,3 -brownbeans,351,3 -brownbean,351,3 -brownb,351,3 -cocobeanscolour,351,3 -cocobeancolour,351,3 -cbeanscolour,351,3 -cbeancolour,351,3 -beanscolour,351,3 -beancolour,351,3 -browncocobeanscolour,351,3 -browncocobeancolour,351,3 -browncbeanscolour,351,3 -browncbeancolour,351,3 -brownbeanscolour,351,3 -brownbeancolour,351,3 -brownbcolour,351,3 -cocobeanscolor,351,3 -cocobeancolor,351,3 -cbeanscolor,351,3 -cbeancolor,351,3 -beanscolor,351,3 -beancolor,351,3 -browncocobeanscolor,351,3 -browncocobeancolor,351,3 -browncbeanscolor,351,3 -browncbeancolor,351,3 -brownbeanscolor,351,3 -brownbeancolor,351,3 -brownbcolor,351,3 -cocobeansdye,351,3 -cocobeandye,351,3 -cbeansdye,351,3 -cbeandye,351,3 -beansdye,351,3 -beandye,351,3 -browncocobeansdye,351,3 -browncocobeandye,351,3 -browncbeansdye,351,3 -browncbeandye,351,3 -brownbeansdye,351,3 -brownbeandye,351,3 -brownbdye,351,3 -browncolour,351,3 -browncolor,351,3 -browndye,351,3 -bluelapislzuli,351,4 -bluelapisl,351,4 -bluelapis,351,4 -bluel,351,4 -lapislazuliblue,351,4 -lapislblue,351,4 -lapisblue,351,4 -lapislazuli,351,4 -lapisl,351,4 -lapis,351,4 -bluelapislazulicolour,351,4 -bluelapislcolour,351,4 -bluelapiscolour,351,4 -lapislazulibluecolour,351,4 -lapislbluecolour,351,4 -lapisbluecolour,351,4 -lapislazulicolour,351,4 -lapislcolour,351,4 -lapiscolour,351,4 -bluelapislazulicolor,351,4 -bluelapislcolor,351,4 -bluelapiscolor,351,4 -lapislazulibluecolor,351,4 -lapislbluecolor,351,4 -lapisbluecolor,351,4 -lapislazulicolor,351,4 -lapislcolor,351,4 -lapiscolor,351,4 -bluelapislazulidye,351,4 -bluelapisldye,351,4 -bluelapisdye,351,4 -lapislazulibluedye,351,4 -lapislbluedye,351,4 -lapisbluedye,351,4 -lapislazulidye,351,4 -lapisldye,351,4 -lapisdye,351,4 -bluecolour,351,4 -bluecolor,351,4 -bluedye,351,4 -purplecolour,351,5 -purplecolor,351,5 -purpledye,351,5 -cyancolour,351,6 -cyancolor,351,6 -cyandye,351,6 -lightgraycolour,351,7 -lightgraycolor,351,7 -lightgraydye,351,7 -lgraycolour,351,7 -lgraycolor,351,7 -lgraydye,351,7 -graycolour,351,8 -graycolor,351,8 -graydye,351,8 -pinkcolour,351,9 -pinkcolor,351,9 -pinkdye,351,9 -limecolour,351,10 -limecolor,351,10 -limedye,351,10 -dandelionyellow,351,11 -dandelionyellowcolour,351,11 -dandelionyellowcolor,351,11 -dandelionyellowdye,351,11 -yellowdandelion,351,11 -yellowdandelioncolour,351,11 -yellowdandelioncolor,351,11 -yellowdandeliondye,351,11 -yellowd,351,11 -yellowdcolour,351,11 -yellowdcolor,351,11 -yellowddye,351,11 -dyellow,351,11 -dyellowcolour,351,11 -dyellowcolor,351,11 -dyellowdye,351,11 -yellowcolour,351,11 -yellowcolor,351,11 -yellowdye,351,11 -lightbluecolour,351,12 -lightbluecolor,351,12 -lightbluedye,351,12 -lbluecolour,351,12 -lbluecolor,351,12 -lbluedye,351,12 -magentacolour,351,13 -magentacolor,351,13 -magentadye,351,13 -orangecolour,351,14 -orangecolor,351,14 -orangedye,351,14 -whitebonemeal,351,15 -whitebonemealcolour,351,15 -whitebonemealcolor,351,15 -whitebonemealdye,351,15 -bonemealwhite,351,15 -bonemealwhitecolour,351,15 -bonemealwhitecolor,351,15 -bonemealwhitedye,351,15 -whitebonem,351,15 -whitebonemcolour,351,15 -whitebonemcolor,351,15 -whitebonemdye,351,15 -bonemwhite,351,15 -bonemwhitecolour,351,15 -bonemwhitecolor,351,15 -bonemwhitedye,351,15 -bonemeal,351,15 -bonemealcolour,351,15 -bonemealcolor,351,15 -bonemealdye,351,15 -bonem,351,15 -bonemcolour,351,15 -bonemcolor,351,15 -bonemdye,351,15 -whitecolour,351,15 -whitecolor,351,15 -whitedye,351,15 -bone,352,0 -sugar,353,0 -cake,354,0 -bed,355,0 -repeater,356,0 -repeat,356,0 -delayer,356,0 -delay,356,0 -dioder,356,0 -diode,356,0 -cookie,357,0 -map,358,0 -chart,358,0 -shears,359,0 -goldmusicrecord,2256,0 -goldmusicdisk,2256,0 -goldmusiccd,2256,0 -gomusicrecord,2256,0 -gomusicdisk,2256,0 -gomusiccd,2256,0 -goldmrecord,2256,0 -goldmdisk,2256,0 -goldmcd,2256,0 -gomrecord,2256,0 -gomdisk,2256,0 -gomcd,2256,0 -goldrecord,2256,0 -golddisk,2256,0 -goldcd,2256,0 -gorecord,2256,0 -godisk,2256,0 -gocd,2256,0 -greenmusicrecord,2257,0 -greenmusicdisk,2257,0 -greenmusiccd,2257,0 -grmusicrecord,2257,0 -grmusicdisk,2257,0 -grmusiccd,2257,0 -greenmrecord,2257,0 -greenmdisk,2257,0 -greenmcd,2257,0 -grmrecord,2257,0 -grmdisk,2257,0 -grmcd,2257,0 -greenrecord,2257,0 -greendisk,2257,0 -greencd,2257,0 -grrecord,2257,0 -grdisk,2257,0 +#Last updated on 7/9/2011 21:37 (gmt +3) for minecraft version 1.7.3 +#item,id,metadata +stone,1,0 +sstone,1,0 +smoothstone,1,0 +rock,1,0 +grass,2,0 +dirt,3,0 +cobblestone,4,0 +cstone,4,0 +cobble,4,0 +plank,5,0 +woodenplank,5,0 +woodplank,5,0 +wplank,5,0 +plankwooden,5,0 +plankwood,5,0 +plankw,5,0 +sapling,6,0 +treesapling,6,0 +logsapling,6,0 +trunksapling,6,0 +woodsapling,6,0 +oaktreesapling,6,0 +oaklogsapling,6,0 +oaktrunksapling,6,0 +oakwoodsapling,6,0 +normaltreesapling,6,0 +normallogsapling,6,0 +normaltrunksapling,6,0 +normalwoodsapling,6,0 +osapling,6,0 +otreesapling,6,0 +ologsapling,6,0 +otrunksapling,6,0 +owoodsapling,6,0 +nsapling,6,0 +ntreesapling,6,0 +nlogsapling,6,0 +ntrunksapling,6,0 +nwoodsapling,6,0 +treesap,6,0 +logsap,6,0 +trunksap,6,0 +woodsap,6,0 +oaktreesap,6,0 +oaklogsap,6,0 +oaktrunksap,6,0 +oakwoodsap,6,0 +normaltreesap,6,0 +normallogsap,6,0 +normaltrunksap,6,0 +normalwoodsap,6,0 +osap,6,0 +otreesap,6,0 +ologsap,6,0 +otrunksap,6,0 +owoodsap,6,0 +nsap,6,0 +ntreesap,6,0 +nlogsap,6,0 +ntrunksap,6,0 +nwoodsap,6,0 +redsapling,6,1 +redtreesapling,6,1 +redlogsapling,6,1 +redtrunksapling,6,1 +redwoodsapling,6,1 +darksapling,6,1 +darktreesapling,6,1 +darklogsapling,6,1 +darktrunksapling,6,1 +darkwoodsapling,6,1 +blacksapling,6,1 +blacktreesapling,6,1 +blacklogsapling,6,1 +blacktrunksapling,6,1 +blackwoodsapling,6,1 +pinesapling,6,1 +pinetreesapling,6,1 +pinelogsapling,6,1 +pinetrunksapling,6,1 +pinewoodsapling,6,1 +sprucesapling,6,1 +sprucetreesapling,6,1 +sprucelogsapling,6,1 +sprucetrunksapling,6,1 +sprucewoodsapling,6,1 +rsapling,6,1 +rtreesapling,6,1 +rlogsapling,6,1 +rtrunksapling,6,1 +rwoodsapling,6,1 +dsapling,6,1 +dtreesapling,6,1 +dlogsapling,6,1 +dtrunksapling,6,1 +dwoodsapling,6,1 +blsapling,6,1 +bltreesapling,6,1 +bllogsapling,6,1 +bltrunksapling,6,1 +blwoodsapling,6,1 +psapling,6,1 +ptreesapling,6,1 +plogsapling,6,1 +ptrunksapling,6,1 +pwoodsapling,6,1 +ssapling,6,1 +streesapling,6,1 +slogsapling,6,1 +strunksapling,6,1 +swoodsapling,6,1 +redsap,6,1 +redtreesap,6,1 +redlogsap,6,1 +redtrunksap,6,1 +redwoodsap,6,1 +darksap,6,1 +darktreesap,6,1 +darklogsap,6,1 +darktrunksap,6,1 +darkwoodsap,6,1 +blacksap,6,1 +blacktreesap,6,1 +blacklogsap,6,1 +blacktrunksap,6,1 +blackwoodsap,6,1 +pinesap,6,1 +pinetreesap,6,1 +pinelogsap,6,1 +pinetrunksap,6,1 +pinewoodsap,6,1 +sprucesap,6,1 +sprucetreesap,6,1 +sprucelogsap,6,1 +sprucetrunksap,6,1 +sprucewoodsap,6,1 +rsap,6,1 +rtreesap,6,1 +rlogsap,6,1 +rtrunksap,6,1 +rwoodsap,6,1 +dsap,6,1 +dtreesap,6,1 +dlogsap,6,1 +dtrunksap,6,1 +dwoodsap,6,1 +blsap,6,1 +bltreesap,6,1 +bllogsap,6,1 +bltrunksap,6,1 +blwoodsap,6,1 +psap,6,1 +ptreesap,6,1 +plogsap,6,1 +ptrunksap,6,1 +pwoodsap,6,1 +ssap,6,1 +streesap,6,1 +slogsap,6,1 +strunksap,6,1 +swoodsap,6,1 +birchsapling,6,2 +birchtreesapling,6,2 +birchlogsapling,6,2 +birchtrunksapling,6,2 +birchwoodsapling,6,2 +pandasapling,6,2 +pandatreesapling,6,2 +pandalogsapling,6,2 +pandatrunksapling,6,2 +pandawoodsapling,6,2 +whitesapling,6,2 +whitetreesapling,6,2 +whitelogsapling,6,2 +whitetrunksapling,6,2 +whitewoodsapling,6,2 +bisapling,6,2 +bitreesapling,6,2 +bilogsapling,6,2 +bitrunksapling,6,2 +biwoodsapling,6,2 +bsapling,6,2 +btreesapling,6,2 +blogsapling,6,2 +btrunksapling,6,2 +bwoodsapling,6,2 +pasapling,6,2 +patreesapling,6,2 +palogsapling,6,2 +patrunksapling,6,2 +pawoodsapling,6,2 +wsapling,6,2 +wtreesapling,6,2 +wlogsapling,6,2 +wtrunksapling,6,2 +wwoodsapling,6,2 +birchsap,6,2 +birchtreesap,6,2 +birchlogsap,6,2 +birchtrunksap,6,2 +birchwoodsap,6,2 +pandasap,6,2 +pandatreesap,6,2 +pandalogsap,6,2 +pandatrunksap,6,2 +pandawoodsap,6,2 +whitesap,6,2 +whitetreesap,6,2 +whitelogsap,6,2 +whitetrunksap,6,2 +whitewoodsap,6,2 +bisap,6,2 +bitreesap,6,2 +bilogsap,6,2 +bitrunksap,6,2 +biwoodsap,6,2 +bsap,6,2 +btreesap,6,2 +blogsap,6,2 +btrunksap,6,2 +bwoodsap,6,2 +pasap,6,2 +patreesap,6,2 +palogsap,6,2 +patrunksap,6,2 +pawoodsap,6,2 +wsap,6,2 +wtreesap,6,2 +wlogsap,6,2 +wtrunksap,6,2 +wwoodsap,6,2 +bedrock,7,0 +oprock,7,0 +opblock,7,0 +adminblock,7,0 +adminrock,7,0 +adminium,7,0 +water,8,0 +stationarywater,9,0 +swater,9,0 +lava,10,0 +stationarylava,11,0 +slava,11,0 +sand,12,0 +gravel,13,0 +goldore,14,0 +oregold,14,0 +goldo,14,0 +ogold,14,0 +gore,14,0 +oreg,14,0 +ironore,15,0 +oreiron,15,0 +irono,15,0 +oiron,15,0 +steelore,15,0 +oresteel,15,0 +steelo,15,0 +osteel,15,0 +iore,15,0 +orei,15,0 +sore,15,0 +ores,15,0 +coalore,16,0 +orecoal,16,0 +coalo,16,0 +ocoal,16,0 +core,16,0 +tree,17,0 +log,17,0 +trunk,17,0 +wood,17,0 +oaktree,17,0 +oaklog,17,0 +oaktrunk,17,0 +oakwood,17,0 +normaltree,17,0 +normallog,17,0 +normaltrunk,17,0 +normalwood,17,0 +otree,17,0 +olog,17,0 +otrunk,17,0 +owood,17,0 +ntree,17,0 +nlog,17,0 +ntrunk,17,0 +nwood,17,0 +redtree,17,1 +redlog,17,1 +redtrunk,17,1 +redwood,17,1 +darktree,17,1 +darklog,17,1 +darktrunk,17,1 +darkwood,17,1 +blacktree,17,1 +blacklog,17,1 +blacktrunk,17,1 +blackwood,17,1 +pine,17,1 +pinetree,17,1 +pinelog,17,1 +pinetrunk,17,1 +pinewood,17,1 +spruce,17,1 +sprucetree,17,1 +sprucelog,17,1 +sprucetrunk,17,1 +sprucewood,17,1 +rtree,17,1 +rlog,17,1 +rtrunk,17,1 +rwood,17,1 +dtree,17,1 +dlog,17,1 +dtrunk,17,1 +dwood,17,1 +bltree,17,1 +bllog,17,1 +bltrunk,17,1 +blwood,17,1 +ptree,17,1 +plog,17,1 +ptrunk,17,1 +pwood,17,1 +stree,17,1 +slog,17,1 +strunk,17,1 +swood,17,1 +birch,17,2 +birchtree,17,2 +birchlog,17,2 +birchtrunk,17,2 +birchwood,17,2 +pandatree,17,2 +pandalog,17,2 +pandatrunk,17,2 +pandawood,17,2 +whitetree,17,2 +whitelog,17,2 +whitetrunk,17,2 +whitewood,17,2 +bitree,17,2 +bilog,17,2 +bitrunk,17,2 +biwood,17,2 +btree,17,2 +blog,17,2 +btrunk,17,2 +bwood,17,2 +patree,17,2 +palog,17,2 +patrunk,17,2 +pawood,17,2 +wtree,17,2 +wlog,17,2 +wtrunk,17,2 +wwood,17,2 +leaves,18,0 +leaf,18,0 +treeleaves,18,0 +logleaves,18,0 +trunkleaves,18,0 +woodleaves,18,0 +oaktreeleaves,18,0 +oaklogleaves,18,0 +oaktrunkleaves,18,0 +oakwoodleaves,18,0 +normaltreeleaves,18,0 +normallogleaves,18,0 +normaltrunkleaves,18,0 +normalwoodleaves,18,0 +otreeleaves,18,0 +ologleaves,18,0 +otrunkleaves,18,0 +owoodleaves,18,0 +ntreeleaves,18,0 +nlogleaves,18,0 +ntrunkleaves,18,0 +nwoodleaves,18,0 +treeleaf,18,0 +logleaf,18,0 +trunkleaf,18,0 +woodleaf,18,0 +oaktreeleaf,18,0 +oaklogleaf,18,0 +oaktrunkleaf,18,0 +oakwoodleaf,18,0 +normaltreeleaf,18,0 +normallogleaf,18,0 +normaltrunkleaf,18,0 +normalwoodleaf,18,0 +otreeleaf,18,0 +ologleaf,18,0 +otrunkleaf,18,0 +owoodleaf,18,0 +ntreeleaf,18,0 +nlogleaf,18,0 +ntrunkleaf,18,0 +nwoodleaf,18,0 +sponge,19,0 +glass,20,0 +lapislazuliore,21,0 +lapislazulio,21,0 +orelapislazuli,21,0 +olapislazuli,21,0 +lapisore,21,0 +lapiso,21,0 +orelapis,21,0 +olapis,21,0 +lore,21,0 +orel,21,0 +lapislazuliblock,22,0 +blocklapislazuli,22,0 +lapisblock,22,0 +blocklapis,22,0 +lblock,22,0 +blockl,22,9 +dispenser,23,0 +dispense,23,0 +sandstone,24,0 +sastone,24,0 +noteblock,25,0 +musicblock,25,0 +nblock,25,0 +mblock,25,0 +bedblock,26,0 +poweredtrack,27,0 +poweredrail,27,0 +boostertrack,27,0 +boosterrail,27,0 +powertrack,27,0 +powerrail,27,0 +boosttrack,27,0 +boostrail,27,0 +ptrack,27,0 +prail,27,0 +btrack,27,0 +brail,27,0 +detectortrack,28,0 +detectorrail,28,0 +detectingtrack,28,0 +detectingrail,28,0 +detecttrack,28,0 +detectrail,28,0 +dtrack,28,0 +drail,28,0 +stickypistonbase,29,0 +stickypiston,29,0 +stickpistonbase,29,0 +stickpiston,29,0 +stickyp,29,0 +spistonbase,29,0 +spiston,29,0 +pistonstickybase,29,0 +pistonsticky,29,0 +pistonstickbase,29,0 +pistonstick,29,0 +pistonsbase,29,0 +pistons,29,0 +psticky,29,0 +spiderweb,30,0 +sweb,30,0 +web,30,0 +longgrass,31,0 +tallgrass,31,0 +wildgrass,31,0 +grasslong,31,0 +grasstall,31,0 +grasswild,31,0 +lgrass,31,0 +tgrass,31,0 +wgrass,31,0 +grassl,31,0 +grasst,31,0 +grassw,31,0 +deadshrub,32,0 +shrubdead,32,0 +dshrub,32,0 +shrubd,32,0 +normalpistonbase,33,0 +normalpiston,33,0 +normpistonbase,33,0 +normpiston,33,0 +npistonbase,33,0 +npiston,33,0 +pistonnormalbase,33,0 +pistonnormal,33,0 +pistonnormbase,33,0 +pistonnorm,33,0 +pistonnbase,33,0 +pistonn,33,0 +pistonbase,33,0 +piston,33,0 +pistonblock,33,0 +pistonextensionnormal,34,0 +pistonextensionnorm,34,0 +pistonextensionn,34,0 +pistonextension,34,0 +pistonextnormal,34,0 +pistonextnorm,34,0 +pistonextn,34,0 +pistonext,34,0 +pistonenormal,34,0 +pistonenorm,34,0 +pistonen,34,0 +pistone,34,0 +extensionpistonnormal,34,0 +extensionpistonnorm,34,0 +extensionpistonn,34,0 +extensionpiston,34,0 +extpistonnormal,34,0 +extpistonnorm,34,0 +extpistonn,34,0 +extpiston,34,0 +epistonnormal,34,0 +epistonnorm,34,0 +epistonn,34,0 +episton,34,0 +whitecloth,35,0 +whitewool,35,0 +whitecotton,35,0 +wcloth,35,0 +wwool,35,0 +wcotton,35,0 +cloth,35,0 +wool,35,0 +cotton,35,0 +orangecloth,35,1 +orangewool,35,1 +orangecotton,35,1 +ocloth,35,1 +owool,35,1 +ocotton,35,1 +magentacloth,35,2 +magentawool,35,2 +magentacotton,35,2 +mcloth,35,2 +mwool,35,2 +mcotton,35,2 +lightbluecloth,35,3 +lightbluewool,35,3 +lightbluecotton,35,3 +lbluecloth,35,3 +lbluewool,35,3 +lbluecotton,35,3 +lightblucloth,35,3 +lightbluwool,35,3 +lightblucotton,35,3 +lblucloth,35,3 +lbluwool,35,3 +lblucotton,35,3 +yellowcloth,35,4 +yellowwool,35,4 +yellowcotton,35,4 +ycloth,35,4 +ywool,35,4 +ycotton,35,4 +lightgreencloth,35,5 +lightgreenwool,35,5 +lightgreencotton,35,5 +lgreencloth,35,5 +lgreenwool,35,5 +lgreencotton,35,5 +lightgrecloth,35,5 +lightgrewool,35,5 +lightgrecotton,35,5 +lgrecloth,35,5 +lgrewool,35,5 +lgrecotton,35,5 +pinkcloth,35,6 +pinkwool,35,6 +pinkcotton,35,6 +picloth,35,6 +piwool,35,6 +picotton,35,6 +graycloth,35,7 +graywool,35,7 +graycotton,35,7 +gracloth,35,7 +grawool,35,7 +gracotton,35,7 +lightgraycloth,35,8 +lightgraywool,35,8 +lightgraycotton,35,8 +lgraycloth,35,8 +lgraywool,35,8 +lgraycotton,35,8 +lightgracloth,35,8 +lightgrawool,35,8 +lightgracotton,35,8 +lgracloth,35,8 +lgrawool,35,8 +lgracotton,35,8 +cyancloth,35,9 +cyanwool,35,9 +cyancotton,35,9 +ccloth,35,9 +cwool,35,9 +ccotton,35,9 +purplecloth,35,10 +purplewool,35,10 +purplecotton,35,10 +pucloth,35,10 +puwool,35,10 +pucotton,35,10 +bluecloth,35,11 +bluewool,35,11 +bluecotton,35,11 +blucloth,35,11 +bluwool,35,11 +blucotton,35,11 +browncloth,35,12 +brownwool,35,12 +browncotton,35,12 +brocloth,35,12 +browool,35,12 +brocotton,35,12 +darkgreencloth,35,13 +darkgreenwool,35,13 +darkgreencotton,35,13 +dgreencloth,35,13 +dgreenwool,35,13 +dgreencotton,35,13 +greencloth,35,13 +greenwool,35,13 +greencotton,35,13 +darkgrecloth,35,13 +darkgrewool,35,13 +darkgrecotton,35,13 +dgrecloth,35,13 +dgrewool,35,13 +dgrecotton,35,13 +grecloth,35,13 +grewool,35,13 +grecotton,35,13 +redcloth,35,14 +redwool,35,14 +redcotton,35,14 +rcloth,35,14 +rwool,35,14 +rcotton,35,14 +blackcloth,35,15 +blackwool,35,15 +blackcotton,35,15 +blacloth,35,15 +blawool,35,15 +blacotton,35,15 +pistonmovingpiece,36,0 +pistonmp,36,0 +yellowflower,37,0 +yflower,37,0 +flower,37,0 +redrose,38,0 +rrose,38,0 +rose,38,0 +redflower,38,0 +rflower,38,0 +brownmushroom,39,0 +brownmush,39,0 +bmushroom,39,0 +bmush,39,0 +redmushroom,40,0 +redmush,40,0 +rmushroom,40,0 +rmush,40,0 +goldblock,41,0 +blockgold,41,0 +gblock,41,0 +blockg,41,0 +ironblock,42,0 +steelblock,42,0 +blockiron,42,0 +blocksteel,42,0 +iblock,42,0 +stblock,42,0 +blocki,42,0 +blockst,42,0 +smoothstonedoublestep,43,0 +smoothstonedstep,43,0 +stonedoublestep,43,0 +stonedstep,43,0 +sdoublestep,43,0 +sdstep,43,0 +doublesmoothstonestep,43,0 +dsmoothstonestep,43,0 +doublestonestep,43,0 +dstonestep,43,0 +doublesstep,43,0 +doublestep,43,0 +dstep,43,0 +smoothstonedoubleslab,43,0 +smoothstonedslab,43,0 +stonedoubleslab,43,0 +stonedslab,43,0 +sdoubleslab,43,0 +sdslab,43,0 +doublesmoothstoneslab,43,0 +dsmoothstoneslab,43,0 +doublestoneslab,43,0 +dstoneslab,43,0 +doublesslab,43,0 +doubleslab,43,0 +dslab,43,0 +sandstonedoublestep,43,1 +sandstonedstep,43,1 +sstonedoublestep,43,1 +sstonedstep,43,1 +ssdoublestep,43,1 +ssdstep,43,1 +doublesandstonestep,43,1 +dsandstonestep,43,1 +doublesstonestep,43,1 +dsstonestep,43,1 +doublessstep,43,1 +dsstep,43,1 +sandstonedoubleslab,43,1 +sandstonedslab,43,1 +sstonedoubleslab,43,1 +sstonedslab,43,1 +ssdoubleslab,43,1 +ssdslab,43,1 +doublesandstoneslab,43,1 +dsandstoneslab,43,1 +doublesstoneslab,43,1 +dsstoneslab,43,1 +doublessslab,43,1 +dsslab,43,1 +woodenplankdoublestep,43,2 +woodenplankdstep,43,2 +woodplankdoublestep,43,2 +woodplankdstep,43,2 +wplankdoublestep,43,2 +wplankdstep,43,2 +plankdoublestep,43,2 +plankdstep,43,2 +wpdoublestep,43,2 +pdoublestep,43,2 +wpdstep,43,2 +pdstep,43,2 +doublewoodenplankstep,43,2 +dwoodenplankstep,43,2 +doublewoodplankstep,43,2 +dwoodplankstep,43,2 +doublewplankstep,43,2 +dwplankstep,43,2 +doubleplankstep,43,2 +dplankstep,43,2 +doublewpstep,43,2 +dwpstep,43,2 +doublepstep,43,2 +dpstep,43,2 +woodenplankdoubleslab,43,2 +woodenplankdslab,43,2 +woodplankdoubleslab,43,2 +woodplankdslab,43,2 +wplankdoubleslab,43,2 +wplankdslab,43,2 +plankdoubleslab,43,2 +plankdslab,43,2 +wpdoubleslab,43,2 +pdoubleslab,43,2 +wpdslab,43,2 +pdslab,43,2 +doublewoodenplankslab,43,2 +dwoodenplankslab,43,2 +doublewoodplankslab,43,2 +dwoodplankslab,43,2 +doublewplankslab,43,2 +dwplankslab,43,2 +doubleplankslab,43,2 +dplankslab,43,2 +doublewpslab,43,2 +dwpslab,43,2 +doublepslab,43,2 +dpslab,43,2 +cobblestonedoublestep,43,3 +cobblestonedstep,43,3 +cobbledoublestep,43,3 +cobbledstep,43,3 +cstonedoublestep,43,3 +cstonedstep,43,3 +csdoublestep,43,3 +csdstep,43,3 +doublecobblestonestep,43,3 +dcobblestonestep,43,3 +doublecobblestep,43,3 +dcobblestep,43,3 +doublecstonestep,43,3 +dcstonestep,43,3 +doublecsstep,43,3 +dcsstep,43,3 +cobblestonedoubleslab,43,3 +cobblestonedslab,43,3 +cobbledoubleslab,43,3 +cobbledslab,43,3 +cstonedoubleslab,43,3 +cstonedslab,43,3 +csdoubleslab,43,3 +csdslab,43,3 +doublecobblestoneslab,43,3 +dcobblestoneslab,43,3 +doublecobbleslab,43,3 +dcobbleslab,43,3 +doublecstoneslab,43,3 +dcstoneslab,43,3 +doublecsslab,43,3 +dcsslab,43,3 +smoothstonestep,44,0 +stonestep,44,0 +sstep,44,0 +step,44,0 +smoothstoneslab,44,0 +stoneslab,44,0 +sslab,44,0 +slab,44,0 +sanddstonestep,44,1 +sstonestep,44,1 +ssstep,44,1 +sanddstoneslab,44,1 +sstoneslab,44,1 +ssslab,44,1 +woodplankstep,44,2 +wplankstep,44,2 +plankstep,44,2 +wpstep,44,2 +pstep,44,2 +woodplankslab,44,2 +wplankslab,44,2 +plankslab,44,2 +wpslab,44,2 +pslab,44,2 +cobblestonestep,44,3 +cobblestep,44,3 +cstonestep,44,3 +csstep,44,3 +cobblestoneslab,44,3 +cobbleslab,44,3 +cstoneslab,44,3 +csslab,44,3 +brickblock,45,0 +blockbrick,45,0 +bblock,45,0 +blockb,45,0 +tntblock,46,0 +blocktnt,46,0 +bombblock,46,0 +blockbomb,46,0 +dynamiteblock,46,0 +blockdynamite,46,0 +tnt,46,0 +bomb,46,0 +dynamite,46,0 +bookcase,47,0 +casebook,47,0 +bookshelf,47,0 +shelfbook,47,0 +bookblock,47,0 +blockbook,47,0 +mossycobblestone,48,0 +mosscobblestone,48,0 +mcobblestone,48,0 +mossycobble,48,0 +mosscobble,48,0 +mcobble,48,0 +obsidian,49,0 +obsi,49,0 +obby,49,0 +torch,50,0 +fire,51,0 +flame,51,0 +flames,51,0 +mobspawner,52,0 +monsterspawner,52,0 +mspawner,52,0 +spawner,52,0 +woodenstairs,53,0 +woodstairs,53,0 +wstairs,53,0 +woodenstair,53,0 +woodstair,53,0 +wstair,53,0 +stairswooden,53,0 +stairswood,53,0 +stairsw,53,0 +stairwooden,53,0 +stairwood,53,0 +stairw,53,0 +chest,54,0 +redstonewireblock,55,0 +rstonewireblock,55,0 +redswireblock,55,0 +redwireblock,55,0 +rswireblock,55,0 +rwireblock,55,0 +redstonewire,55,0 +rstonewire,55,0 +redswire,55,0 +redwire,55,0 +rswire,55,0 +rwire,55,0 +wire,55,0 +diamondore,56,0 +crystalore,56,0 +diamondo,56,0 +crystalo,56,0 +orediamond,56,0 +odiamond,56,0 +orecrystal,56,0 +ocrystal,56,0 +dore,56,0 +ored,56,0 +diamondblock,57,0 +blockdiamond,57,0 +crystalblock,57,0 +blockcrystal,57,0 +dblock,57,0 +blockd,57,0 +workbench,58,0 +craftingbench,58,0 +crafterbench,58,0 +craftbench,58,0 +worktable,58,0 +craftingtable,58,0 +craftertable,58,0 +crafttable,58,0 +wbench,58,0 +cbench,58,0 +crops,59,0 +crop,59,0 +soil,60,0 +furnace,61,0 +burningfurnace,62,0 +bfurnace,62,0 +signpost,63,0 +spost,63,0 +woodendoorhalf,64,0 +wooddoorhalf,64,0 +wdoorhalf,64,0 +woodendoorbottom,64,0 +wooddoorbottom,64,0 +wdoorbottom,64,0 +woodendoorblock,64,0 +wooddoorblock,64,0 +wdoorblock,64,0 +ladder,65,0 +minecarttrack,66,0 +minecartrail,66,0 +mcarttrack,66,0 +mcartrail,66,0 +mctrack,66,0 +mcrail,66,0 +track,66,0 +rail,66,0 +cobblestonestairs,67,0 +cstonestairs,67,0 +stonestairs,67,0 +cobblestairs,67,0 +csstairs,67,0 +sstairs,67,0 +cstairs,67,0 +cobblestonestair,67,0 +cstonestair,67,0 +stonestair,67,0 +cobblestair,67,0 +csstair,67,0 +sstair,67,0 +cstair,67,0 +stairscobblestone,67,0 +stairscstone,67,0 +stairsstone,67,0 +stairscobble,67,0 +stairscs,67,0 +stairss,67,0 +stairsc,67,0 +staircobblestone,67,0 +staircstone,67,0 +stairstone,67,0 +staircobble,67,0 +staircs,67,0 +stairs,67,0 +stairc,67,0 +wallsign,68,0 +wsign,68,0 +lever,69,0 +smoothstonepressureplate,70,0 +smoothstonepressplate,70,0 +smoothstonepplate,70,0 +smoothstoneplate,70,0 +sstonepressureplate,70,0 +sstonepressplate,70,0 +sstonepplate,70,0 +sstoneplate,70,0 +stonepressureplate,70,0 +stonepressplate,70,0 +stonepplate,70,0 +stoneplate,70,0 +spressureplate,70,0 +spressplate,70,0 +spplate,70,0 +splate,70,0 +irondoorhalf,71,0 +idoorhalf,71,0 +irondoorbottom,71,0 +idoorbottom,71,0 +irondoorblock,71,0 +idoorblock,71,0 +steeldoorhalf,71,0 +sdoorhalf,71,0 +steeldoorbottom,71,0 +sdoorbottom,71,0 +steeldoorblock,71,0 +sdoorblock,71,0 +woodenpressureplate,72,0 +woodenpressplate,72,0 +woodenpplate,72,0 +woodenplate,72,0 +woodpressureplate,72,0 +woodpressplate,72,0 +woodpplate,72,0 +woodplate,72,0 +wpressureplate,72,0 +wpressplate,72,0 +wpplate,72,0 +wplate,72,0 +redstoneore,73,0 +redsore,73,0 +redore,73,0 +rstoneore,73,0 +rsore,73,0 +rore,73,0 +oreredstone,73,0 +orereds,73,0 +orered,73,0 +orerstone,73,0 +orers,73,0 +orer,73,0 +glowingredstoneore,74,0 +glowredstoneore,74,0 +gredstoneore,74,0 +glowingrstoneore,74,0 +glowrstoneore,74,0 +grstoneore,74,0 +glowingredsore,74,0 +glowredsore,74,0 +gredsore,74,0 +glowingredore,74,0 +glowredore,74,0 +gredore,74,0 +glowingrsore,74,0 +glowrsore,74,0 +grsore,74,0 +grore,74,0 +oreglowingredstone,74,0 +oreglowredstone,74,0 +oregredstone,74,0 +oreglowingrstone,74,0 +oreglowrstone,74,0 +oregrstone,74,0 +oreglowingreds,74,0 +oreglowreds,74,0 +oregreds,74,0 +oreglowingred,74,0 +oreglowred,74,0 +oregred,74,0 +oreglowingrs,74,0 +oreglowrs,74,0 +oregrs,74,0 +oregr,74,0 +redstonetorchoff,75,0 +rstonetorchoff,75,0 +redstorchoff,75,0 +redtorchoff,75,0 +rstorchoff,75,0 +redstonetorchon,76,0 +redstonetorch,76,0 +rstonetorchon,76,0 +rstonetorch,76,0 +redstorchon,76,0 +redstorch,76,0 +redtorchon,76,0 +redtorch,76,0 +rstorchon,76,0 +rstorch,76,0 +smoothstonebutton,77,0 +sstonebutton,77,0 +stonebutton,77,0 +sbutton,77,0 +button,77,0 +snowcovering,78,0 +snowcover,78,0 +scover,78,0 +ice,79,0 +snowblock,80,0 +blocksnow,80,0 +sblock,80,0 +blocks,80,0 +cactus,81,0 +cactuses,81,0 +cacti,81,0 +clayblock,82,0 +blockclay,82,0 +cblock,82,0 +blockc,82,0 +reedblock,83,0 +reedsblock,83,0 +sugarcaneblock,83,0 +scaneblock,83,0 +bambooblock,83,0 +blockreed,83,0 +blockreeds,83,0 +blocksugarcane,83,0 +blockscane,83,0 +blockbamboo,83,0 +jukebox,84,0 +jbox,84,0 +fence,85,0 +pumpkin,86,0 +netherrack,87,0 +netherrock,87,0 +netherstone,87,0 +hellstone,87,0 +nstone,87,0 +hstone,87,0 +soulsand,88,0 +slowsand,88,0 +slowmud,88,0 +ssand,88,0 +smud,88,0 +mud,88,0 +glowingstoneblock,89,0 +lightstoneblock,89,0 +glowstoneblock,89,0 +blockglowingstone,89,0 +blocklightstone,89,0 +blockglowstone,89,0 +glowingstoneb,89,0 +lightstoneb,89,0 +glowstoneb,89,0 +bglowingstone,89,0 +blightstone,89,0 +bglowstone,89,0 +glowingstone,89,0 +lightstone,89,0 +glowstone,89,0 +glowingblock,89,0 +lightblock,89,0 +glowblock,89,0 +lstone,89,0 +gstone,89,0 +portal,90,0 +jackolantern,91,0 +pumpkinlantern,91,0 +glowingpumpkin,91,0 +lightpumpkin,91,0 +jpumpkin,91,0 +plantren,91,0 +glowpumpkin,91,0 +gpumpkin,91,0 +lpumpkin,91,0 +cakeblock,92,0 +repeateroff,93,0 +repeatoff,93,0 +delayeroff,93,0 +delayoff,93,0 +dioderoff,93,0 +diodeoff,93,0 +repeaterblockoff,93,0 +repeatblockoff,93,0 +delayerblockoff,93,0 +delayblockoff,93,0 +dioderblockoff,93,0 +diodeblockoff,93,0 +repeateron,94,0 +repeaton,94,0 +delayeron,94,0 +delayon,94,0 +dioderon,94,0 +diodeon,94,0 +repeaterblockon,94,0 +repeatblockon,94,0 +delayerblockon,94,0 +delayblockon,94,0 +dioderblockon,94,0 +diodeblockon,94,0 +lockedchest,95,0 +lockchest,95,0 +jokechest,95,0 +aprilfoolschest,95,0 +aprilchest,95,0 +lootchest,95,0 +trapdoor,96,0 +doortrap,96,0 +hatch,96,0 +tdoor,96,0 +doort,96,0 +trapd,96,0 +dtrap,96,0 +ironshovel,256,0 +ironspade,256,0 +ishovel,256,0 +ispade,256,0 +steelshovel,256,0 +steelspade,256,0 +ironpickaxe,257,0 +ironpick,257,0 +steelpickaxe,257,0 +steelpick,257,0 +ipickaxe,257,0 +ipick,257,0 +ironaxe,258,0 +iaxe,258,0 +steelaxe,258,0 +flintandsteel,259,0 +flintandiron,259,0 +flintandtinder,259,0 +flintnsteel,259,0 +flintniron,259,0 +flintntinder,259,0 +flintsteel,259,0 +flintiron,259,0 +flinttinder,259,0 +lighter,259,0 +apple,260,0 +bow,261,0 +arrow,262,0 +coal,263,0 +charcoal,263,1 +ccoal,263,1 +diamond,264,0 +crystal,264,0 +ironingot,265,0 +ironbar,265,0 +ironi,265,0 +steelingot,265,0 +steelbar,265,0 +steeli,265,0 +iingot,265,0 +ibar,265,0 +ingotiron,265,0 +bariron,265,0 +iiron,265,0 +ingotsteel,265,0 +barsteel,265,0 +isteel,265,0 +ingoti,265,0 +bari,265,0 +goldingot,266,0 +goldbar,266,0 +goldi,266,0 +gingot,266,0 +gbar,266,0 +ingotgold,266,0 +bargold,266,0 +igold,266,0 +ingotg,266,0 +barg,266,0 +ironsword,267,0 +steelsword,267,0 +isword,267,0 +woodensword,268,0 +woodsword,268,0 +wsword,268,0 +woodenshovel,269,0 +woodenspade,269,0 +woodshovel,269,0 +woodspade,269,0 +wshovel,269,0 +wspade,269,0 +woodenpickaxe,270,0 +woodenpick,270,0 +woodpickaxe,270,0 +woodpick,270,0 +wpickaxe,270,0 +wpick,270,0 +woodenaxe,271,0 +woodaxe,271,0 +waxe,271,0 +smoothstonesword,272,0 +cobblestonesword,272,0 +sstonesword,272,0 +cstonesword,272,0 +stonesword,272,0 +sssword,272,0 +cssword,272,0 +ssword,272,0 +smoothstoneshovel,273,0 +smoothstonespade,273,0 +cobblestoneshovel,273,0 +cobblestonespade,273,0 +sstoneshovel,273,0 +sstonespade,273,0 +cstoneshovel,273,0 +cstonespade,273,0 +stoneshovel,273,0 +stonespade,273,0 +ssshovel,273,0 +csshovel,273,0 +ssspade,273,0 +csspade,273,0 +sshovel,273,0 +sspade,273,0 +smoothstonepickaxe,274,0 +cobblestonepickaxe,274,0 +smoothstonepick,274,0 +cobblestonepick,274,0 +sstonepickaxe,274,0 +sstonepick,274,0 +cstonepickaxe,274,0 +cstonepick,274,0 +stonepickaxe,274,0 +stonepick,274,0 +sspickaxe,274,0 +sspick,274,0 +cspickaxe,274,0 +cspick,274,0 +spickaxe,274,0 +spick,274,0 +smoothstoneaxe,275,0 +cobblestoneaxe,275,0 +sstoneaxe,275,0 +cstoneaxe,275,0 +stoneaxe,275,0 +ssaxe,275,0 +csaxe,275,0 +saxe,275,0 +diamondsword,276,0 +crystalsword,276,0 +dsword,276,0 +diamondshovel,277,0 +diamondspade,277,0 +crystalshovel,277,0 +crystalspade,277,0 +dshovel,277,0 +dspade,277,0 +diamondpickaxe,278,0 +diamondpick,278,0 +crystalpickaxe,278,0 +crystalpick,278,0 +dpickaxe,278,0 +dpick,278,0 +diamondaxe,279,0 +crystalaxe,279,0 +daxe,279,0 +stick,280,0 +bowl,281,0 +mushroomsoup,282,0 +mrsoup,282,0 +soup,282,0 +goldsword,283,0 +gsword,283,0 +goldshovel,284,0 +goldspade,284,0 +gshovel,284,0 +gspade,284,0 +goldpickaxe,285,0 +goldpick,285,0 +gpickaxe,285,0 +gpick,285,0 +goldaxe,286,0 +gaxe,286,0 +string,287,0 +rope,287,0 +feather,288,0 +gunpowder,289,0 +sulfur,289,0 +woodenhoe,290,0 +woodhoe,290,0 +whoe,290,0 +smoothstonehoe,291,0 +cobblestonehoe,291,0 +sstonehoe,291,0 +cstonehoe,291,0 +stonehoe,291,0 +sshoe,291,0 +cshoe,291,0 +shoe,291,0 +ironhoe,292,0 +steelhoe,292,0 +ihoe,292,0 +diamondhoe,293,0 +crystalhoe,293,0 +dhoe,293,0 +goldhoe,294,0 +ghoe,294,0 +seeds,295,0 +seed,295,0 +wheat,296,0 +bread,297,0 +leatherhelmet,298,0 +leatherhelm,298,0 +leatherhat,298,0 +lhelmet,298,0 +lhelm,298,0 +lhat,298,0 +leatherchestplate,299,0 +leatherplatebody,299,0 +leatherplate,299,0 +leathershirt,299,0 +lchestplate,299,0 +lplatebody,299,0 +lplate,299,0 +lshirt,299,0 +leatherleggings,300,0 +leatherlegs,300,0 +leatherpants,300,0 +lleggings,300,0 +llegs,300,0 +lpants,300,0 +leatherboots,301,0 +leathershoes,301,0 +lboots,301,0 +lshoes,301,0 +chainmailhelmet,302,0 +chainmailhelm,302,0 +chainmailhat,302,0 +chainmhelmet,302,0 +chainmhelm,302,0 +chainmhat,302,0 +cmailhelmet,302,0 +cmailhelm,302,0 +cmailhat,302,0 +chainhelmet,302,0 +chainhelm,302,0 +chainhat,302,0 +cmhelmet,302,0 +cmhelm,302,0 +cmhat,302,0 +chainmailchestplate,303,0 +chainmailplatebody,303,0 +chainmailplate,303,0 +chainmailshirt,303,0 +chainmchestplate,303,0 +chainmplatebody,303,0 +chainmplate,303,0 +chainmshirt,303,0 +cmailchestplate,303,0 +cmailplatebody,303,0 +cmailplate,303,0 +cmailshirt,303,0 +chainchestplate,303,0 +chainplatebody,303,0 +chainplate,303,0 +chainshirt,303,0 +cmchestplate,303,0 +cmplatebody,303,0 +cmplate,303,0 +cmshirt,303,0 +chainmailleggings,304,0 +chainmaillegs,304,0 +chainmailpants,304,0 +chainmleggings,304,0 +chainmlegs,304,0 +chainmpants,304,0 +cmailleggings,304,0 +cmaillegs,304,0 +cmailpants,304,0 +chainleggings,304,0 +chainlegs,304,0 +chainpants,304,0 +cmleggings,304,0 +cmlegs,304,0 +cmpants,304,0 +chainmailboots,305,0 +chainmailshoes,305,0 +chainmboots,305,0 +chainmshoes,305,0 +cmailboots,305,0 +cmailshoes,305,0 +chainboots,305,0 +chainshoes,305,0 +cmboots,305,0 +cmshoes,305,0 +ironhelmet,306,0 +ironhelm,306,0 +ironhat,306,0 +ihelmet,306,0 +ihelm,306,0 +ihat,306,0 +steelhelmet,306,0 +steelhelm,306,0 +steelhat,306,0 +shelmet,306,0 +shelm,306,0 +shat,306,0 +ironchestplate,307,0 +ironplatebody,307,0 +ironplate,307,0 +ironshirt,307,0 +ichestplate,307,0 +iplatebody,307,0 +iplate,307,0 +ishirt,307,0 +steelchestplate,307,0 +steelplatebody,307,0 +steelplate,307,0 +steelshirt,307,0 +schestplate,307,0 +splatebody,307,0 +sshirt,307,0 +ironleggings,308,0 +ironlegs,308,0 +ironpants,308,0 +ileggings,308,0 +ilegs,308,0 +ipants,308,0 +steelleggings,308,0 +steellegs,308,0 +steelpants,308,0 +sleggings,308,0 +slegs,308,0 +spants,308,0 +ironboots,309,0 +ironshoes,309,0 +iboots,309,0 +ishoes,309,0 +steelboots,309,0 +steelshoes,309,0 +sboots,309,0 +sshoes,309,0 +diamondhelmet,310,0 +diamondhelm,310,0 +diamondhat,310,0 +dhelmet,310,0 +dhelm,310,0 +dhat,310,0 +crystalhelmet,310,0 +crystalhelm,310,0 +crystalhat,310,0 +chelmet,310,0 +chelm,310,0 +chat,310,0 +diamondchestplate,311,0 +diamondplatebody,311,0 +diamondplate,311,0 +diamondshirt,311,0 +dchestplate,311,0 +dplatebody,311,0 +dplate,311,0 +dshirt,311,0 +crystalchestplate,311,0 +crystalplatebody,311,0 +crystalplate,311,0 +crystalshirt,311,0 +cchestplate,311,0 +cplatebody,311,0 +cplate,311,0 +cshirt,311,0 +diamondleggings,312,0 +diamondlegs,312,0 +diamondpants,312,0 +dleggings,312,0 +dlegs,312,0 +dpants,312,0 +crystalleggings,312,0 +crystallegs,312,0 +crystalpants,312,0 +cleggings,312,0 +clegs,312,0 +cpants,312,0 +diamondboots,313,0 +diamondshoes,313,0 +dboots,313,0 +dshoes,313,0 +crystalboots,313,0 +crystalshoes,313,0 +cboots,313,0 +cshoes,313,0 +goldhelmet,314,0 +goldhelm,314,0 +goldhat,314,0 +ghelmet,314,0 +ghelm,314,0 +ghat,314,0 +goldchestplate,315,0 +goldplatebody,315,0 +goldplate,315,0 +goldshirt,315,0 +gchestplate,315,0 +gplatebody,315,0 +gplateplate,315,0 +gshirt,315,0 +goldleggings,316,0 +goldlegs,316,0 +goldpants,316,0 +gleggings,316,0 +glegs,316,0 +gpants,316,0 +goldboots,317,0 +goldshoes,317,0 +gboots,317,0 +gshoes,317,0 +flint,318,0 +pork,319,0 +rawpork,319,0 +rpork,319,0 +grilledpork,320,0 +grillpork,320,0 +gpork,320,0 +cookedpork,320,0 +bacon,320,0 +painting,321,0 +picture,321,0 +goldenapple,322,0 +goldapple,322,0 +gapple,322,0 +sign,323,0 +woodendoor,324,0 +wooddoor,324,0 +wdoor,324,0 +bucket,325,0 +bukkit,325,0 +waterbucket,326,0 +waterbukkit,326,0 +wbucket,326,0 +wbukkit,326,0 +magmabucket,327,0 +magmabukkit,327,0 +lavabucket,327,0 +lavabukkit,327,0 +lbucket,327,0 +lbukkit,327,0 +minecart,328,0 +mcart,328,0 +cart,328,0 +saddle,329,0 +irondoor,330,0 +idoor,330,0 +steeldoor,330,0 +sdoor,330,0 +dooriron,330,0 +doori,330,0 +doorsteel,330,0 +doors,330,0 +redstonedust,331,0 +redstone,331,0 +rstonedust,331,0 +rstone,331,0 +redsdust,331,0 +reddust,331,0 +rsdust,331,0 +rdust,331,0 +snowball,332,0 +snball,332,0 +boat,333,0 +leather,334,0 +milkbucket,335,0 +milkbukkit,335,0 +mbucket,335,0 +mbukkit,335,0 +claybrick,336,0 +brick,336,0 +clayball,337,0 +cball,337,0 +clay,337,0 +reeds,338,0 +reed,338,0 +sugarcane,338,0 +scane,338,0 +bamboo,338,0 +paper,339,0 +papyrus,339,0 +book,340,0 +slimeball,341,0 +slball,341,0 +storageminecart,342,0 +chestminecart,342,0 +storagemcart,342,0 +chestmcart,342,0 +storagecart,342,0 +chestcart,342,0 +sminecart,342,0 +cminecart,342,0 +smcart,342,0 +cmcart,342,0 +scart,342,0 +ccart,342,0 +engineminecart,343,0 +poweredminecart,343,0 +powerminecart,343,0 +furnaceminecart,343,0 +enginemcart,343,0 +poweredmcart,343,0 +powermcart,343,0 +furnacemcart,343,0 +enginecart,343,0 +poweredcart,343,0 +powercart,343,0 +furnacecart,343,0 +eminecart,343,0 +pminecart,343,0 +fminecart,343,0 +emcart,343,0 +pmcart,343,0 +fmcart,343,0 +ecart,343,0 +pcart,343,0 +fcart,343,0 +egg,344,0 +compass,345,0 +fishingrod,346,0 +fishrod,346,0 +frod,346,0 +rod,346,0 +goldwatch,347,0 +goldclock,347,0 +gwatch,347,0 +gclock,347,0 +watch,347,0 +clock,347,0 +glowingstoneblockdust,348,0 +lightstoneblockdust,348,0 +glowstoneblockdust,348,0 +blockglowingstonedust,348,0 +blocklightstonedust,348,0 +blockglowstonedust,348,0 +glowingstonebdust,348,0 +lightstonebdust,348,0 +glowstonebdust,348,0 +bglowingstonedust,348,0 +blightstonedust,348,0 +bglowstonedust,348,0 +glowingstonedust,348,0 +lightstonedust,348,0 +glowstonedust,348,0 +glowingblockdust,348,0 +lightblockdust,348,0 +glowblockdust,348,0 +lbdust,348,0 +gbdust,348,0 +lsdust,348,0 +gsdust,348,0 +rawfish,349,0 +rafish,349,0 +fish,349,0 +cookedfish,350,0 +cookfish,350,0 +cfish,350,0 +grilledfish,350,0 +grillfish,350,0 +gfish,350,0 +roastedfish,350,0 +roastfish,350,0 +rofish,350,0 +inksack,351,0 +inksac,351,0 +isack,351,0 +isac,351,0 +sack,351,0 +sac,351,0 +blackinksack,351,0 +blackinksac,351,0 +blackisack,351,0 +blackisac,351,0 +blacksack,351,0 +blacksac,351,0 +inksackblack,351,0 +inksacblack,351,0 +isackblack,351,0 +isacclack,351,0 +sackblack,351,0 +sacblack,351,0 +blackinksackcolour,351,0 +blackinksaccolour,351,0 +blackisackcolour,351,0 +blackisaccolour,351,0 +blacksackcolour,351,0 +blacksaccolour,351,0 +inksackblackcolour,351,0 +inksacblackcolour,351,0 +isackblackcolour,351,0 +isacclackcolour,351,0 +sackblackcolour,351,0 +sacblackcolour,351,0 +blackinksackcolor,351,0 +blackinksaccolor,351,0 +blackisackcolor,351,0 +blackisaccolor,351,0 +blacksackcolor,351,0 +blacksaccolor,351,0 +inksackblackcolor,351,0 +inksacblackcolor,351,0 +isackblackcolor,351,0 +isacblackcolor,351,0 +sackblackcolor,351,0 +sacblackcolor,351,0 +blackinksackdye,351,0 +blackinksacdye,351,0 +blackisackdye,351,0 +blackisacdye,351,0 +blacksackdye,351,0 +blacksacdye,351,0 +inksackblackdye,351,0 +inksacblackdye,351,0 +isackblackdye,351,0 +isacclackdye,351,0 +sackblackdye,351,0 +sacblackdye,351,0 +blackcolor,351,0 +blackdye,351,0 +rosered,351,1 +roseredcolor,351,1 +roseredcolour,351,1 +rosereddye,351,1 +redrosecolor,351,1 +redrosecolour,351,1 +redrosedye,351,1 +redr,351,1 +redrcolor,351,1 +redrcolour,351,1 +redrdye,351,1 +redcolor,351,1 +redcolour,351,1 +reddye,351,1 +cactusgreen,351,2 +greencactus,351,2 +cactusgreencolour,351,2 +greencactuscolour,351,2 +cactusgreencolor,351,2 +greencactuscolor,351,2 +cactusgreendye,351,2 +greencactusdye,351,2 +greencolour,351,2 +greencolor,351,2 +greendye,351,2 +cocobeans,351,3 +cocobean,351,3 +cbeans,351,3 +cbean,351,3 +beans,351,3 +bean,351,3 +browncocobeans,351,3 +browncocobean,351,3 +browncbeans,351,3 +browncbean,351,3 +brownbeans,351,3 +brownbean,351,3 +brownb,351,3 +cocobeanscolour,351,3 +cocobeancolour,351,3 +cbeanscolour,351,3 +cbeancolour,351,3 +beanscolour,351,3 +beancolour,351,3 +browncocobeanscolour,351,3 +browncocobeancolour,351,3 +browncbeanscolour,351,3 +browncbeancolour,351,3 +brownbeanscolour,351,3 +brownbeancolour,351,3 +brownbcolour,351,3 +cocobeanscolor,351,3 +cocobeancolor,351,3 +cbeanscolor,351,3 +cbeancolor,351,3 +beanscolor,351,3 +beancolor,351,3 +browncocobeanscolor,351,3 +browncocobeancolor,351,3 +browncbeanscolor,351,3 +browncbeancolor,351,3 +brownbeanscolor,351,3 +brownbeancolor,351,3 +brownbcolor,351,3 +cocobeansdye,351,3 +cocobeandye,351,3 +cbeansdye,351,3 +cbeandye,351,3 +beansdye,351,3 +beandye,351,3 +browncocobeansdye,351,3 +browncocobeandye,351,3 +browncbeansdye,351,3 +browncbeandye,351,3 +brownbeansdye,351,3 +brownbeandye,351,3 +brownbdye,351,3 +browncolour,351,3 +browncolor,351,3 +browndye,351,3 +bluelapislzuli,351,4 +bluelapisl,351,4 +bluelapis,351,4 +bluel,351,4 +lapislazuliblue,351,4 +lapislblue,351,4 +lapisblue,351,4 +lapislazuli,351,4 +lapisl,351,4 +lapis,351,4 +bluelapislazulicolour,351,4 +bluelapislcolour,351,4 +bluelapiscolour,351,4 +lapislazulibluecolour,351,4 +lapislbluecolour,351,4 +lapisbluecolour,351,4 +lapislazulicolour,351,4 +lapislcolour,351,4 +lapiscolour,351,4 +bluelapislazulicolor,351,4 +bluelapislcolor,351,4 +bluelapiscolor,351,4 +lapislazulibluecolor,351,4 +lapislbluecolor,351,4 +lapisbluecolor,351,4 +lapislazulicolor,351,4 +lapislcolor,351,4 +lapiscolor,351,4 +bluelapislazulidye,351,4 +bluelapisldye,351,4 +bluelapisdye,351,4 +lapislazulibluedye,351,4 +lapislbluedye,351,4 +lapisbluedye,351,4 +lapislazulidye,351,4 +lapisldye,351,4 +lapisdye,351,4 +bluecolour,351,4 +bluecolor,351,4 +bluedye,351,4 +purplecolour,351,5 +purplecolor,351,5 +purpledye,351,5 +cyancolour,351,6 +cyancolor,351,6 +cyandye,351,6 +lightgraycolour,351,7 +lightgraycolor,351,7 +lightgraydye,351,7 +lgraycolour,351,7 +lgraycolor,351,7 +lgraydye,351,7 +graycolour,351,8 +graycolor,351,8 +graydye,351,8 +pinkcolour,351,9 +pinkcolor,351,9 +pinkdye,351,9 +limecolour,351,10 +limecolor,351,10 +limedye,351,10 +dandelionyellow,351,11 +dandelionyellowcolour,351,11 +dandelionyellowcolor,351,11 +dandelionyellowdye,351,11 +yellowdandelion,351,11 +yellowdandelioncolour,351,11 +yellowdandelioncolor,351,11 +yellowdandeliondye,351,11 +yellowd,351,11 +yellowdcolour,351,11 +yellowdcolor,351,11 +yellowddye,351,11 +dyellow,351,11 +dyellowcolour,351,11 +dyellowcolor,351,11 +dyellowdye,351,11 +yellowcolour,351,11 +yellowcolor,351,11 +yellowdye,351,11 +lightbluecolour,351,12 +lightbluecolor,351,12 +lightbluedye,351,12 +lbluecolour,351,12 +lbluecolor,351,12 +lbluedye,351,12 +magentacolour,351,13 +magentacolor,351,13 +magentadye,351,13 +orangecolour,351,14 +orangecolor,351,14 +orangedye,351,14 +whitebonemeal,351,15 +whitebonemealcolour,351,15 +whitebonemealcolor,351,15 +whitebonemealdye,351,15 +bonemealwhite,351,15 +bonemealwhitecolour,351,15 +bonemealwhitecolor,351,15 +bonemealwhitedye,351,15 +whitebonem,351,15 +whitebonemcolour,351,15 +whitebonemcolor,351,15 +whitebonemdye,351,15 +bonemwhite,351,15 +bonemwhitecolour,351,15 +bonemwhitecolor,351,15 +bonemwhitedye,351,15 +bonemeal,351,15 +bonemealcolour,351,15 +bonemealcolor,351,15 +bonemealdye,351,15 +bonem,351,15 +bonemcolour,351,15 +bonemcolor,351,15 +bonemdye,351,15 +whitecolour,351,15 +whitecolor,351,15 +whitedye,351,15 +bone,352,0 +sugar,353,0 +cake,354,0 +bed,355,0 +repeater,356,0 +repeat,356,0 +delayer,356,0 +delay,356,0 +dioder,356,0 +diode,356,0 +cookie,357,0 +map,358,0 +chart,358,0 +shears,359,0 +goldmusicrecord,2256,0 +goldmusicdisk,2256,0 +goldmusiccd,2256,0 +gomusicrecord,2256,0 +gomusicdisk,2256,0 +gomusiccd,2256,0 +goldmrecord,2256,0 +goldmdisk,2256,0 +goldmcd,2256,0 +gomrecord,2256,0 +gomdisk,2256,0 +gomcd,2256,0 +goldrecord,2256,0 +golddisk,2256,0 +goldcd,2256,0 +gorecord,2256,0 +godisk,2256,0 +gocd,2256,0 +greenmusicrecord,2257,0 +greenmusicdisk,2257,0 +greenmusiccd,2257,0 +grmusicrecord,2257,0 +grmusicdisk,2257,0 +grmusiccd,2257,0 +greenmrecord,2257,0 +greenmdisk,2257,0 +greenmcd,2257,0 +grmrecord,2257,0 +grmdisk,2257,0 +grmcd,2257,0 +greenrecord,2257,0 +greendisk,2257,0 +greencd,2257,0 +grrecord,2257,0 +grdisk,2257,0 grcd,2257,0 \ No newline at end of file diff --git a/Essentials/src/worth.yml b/Essentials/src/worth.yml index 47194af07..d0e9281b3 100644 --- a/Essentials/src/worth.yml +++ b/Essentials/src/worth.yml @@ -1,199 +1,199 @@ -worth: - stonebutton: - '0': 7.0 - wood: 1.0 - arrow: 10.0 - diamondpickaxe: 1000.0 - rawfish: 5.0 - minecart: 20.0 - leatherchestplate: 40.0 - storageminecart: 35.0 - leaves: - '0': 0.0 - feather: 3.0 - goldchestplate: 600.0 - mushroomsoup: 30.0 - bread: 20.0 - stationarywater: - '0': 1.0 - workbench: 20.0 - stonehoe: 40.0 - brownmushroom: 2.0 - wool: - '0': 8.0 - mossycobblestone: 90.0 - diamondhoe: 600.0 - woodsword: 10.0 - torch: - '0': 1.0 - grass: 1.0 - poweredminecart: 30.0 - snowball: 1.0 - goldenapple: 500.0 - leatherleggings: 20.0 - log: - '0': 2.0 - diamondaxe: 1000.0 - slimeball: 50.0 - fence: 10.0 - stonespade: 40.0 - claybrick: 10.0 - noteblock: 40.0 - ironaxe: 60.0 - coalore: 15.0 - clayball: 8.0 - fishingrod: 25.0 - ironhoe: 60.0 - goldrecord: 950.0 - ironpickaxe: 80.0 - irondoor: 35.0 - bucket: 10.0 - redrose: 2.0 - grilledpork: 6.0 - gravel: 1.0 - wooddoor: 30.0 - chainmailhelmet: 40.0 - ironchestplate: 300.0 - diamondblock: 1500.0 - diamondhelmet: 1500.0 - goldhelmet: 300.0 - redstonetorchon: - '0': 10.0 - ironspade: 40.0 - furnace: - '0': 10.0 - ironsword: 60.0 - dispenser: - '0': 9.0 - woodaxe: 10.0 - seeds: 5.0 - painting: 50.0 - woodplate: - '0': 10.0 - redstoneore: 30.0 - diamondspade: 350.0 - waterbucket: 10.0 - water: - '0': 1.0 - bedrock: 1000.0 - irondoorblock: - '0': 15.0 - goldhoe: 200.0 - sand: 1.0 - goldsword: 200.0 - stoneaxe: 40.0 - bookshelf: 20.0 - ironblock: 160.0 - jackolantern: - '0': 60.0 - boat: 5.0 - diamondchestplate: 3000.0 - redstonewire: - '0': 7.0 - redmushroom: 2.0 - string: 5.0 - stoneplate: - '0': 10.0 - wallsign: - '0': 1.0 - cactus: - '0': 10.0 - sulphur: 19.0 - rails: - '0': 40.0 - ironore: 18.0 - leatherhelmet: 20.0 - stone: 2.0 - egg: 1.0 - diamondore: 200.0 - woodhoe: 10.0 - goldleggings: 400.0 - chainmailleggings: 50.0 - yellowflower: 2.0 - ironhelmet: 120.0 - obsidian: 130.0 - dirt: 1.0 - leather: 10.0 - leatherboots: 17.0 - lever: - '0': 7.0 - cobblestone: 1.0 - cake: 100.0 - woodstairs: - '0': 8.0 - ironingot: 20.0 - goldore: 45.0 - pumpkin: - '0': 50.0 - bed: 25.0 - watch: 100.0 - ironleggings: 250.0 - sign: 10.0 - doublestep: - '0': 3.0 - woodpickaxe: 10.0 - stonepickaxe: 40.0 - chainmailboots: 30.0 - diamondleggings: 2200.0 - cookedfish: 20.0 - saddle: 100.0 - cobblestonestairs: - '0': 22.0 - tnt: 10000.0 - glowingredstoneore: 30.0 - apple: 10.0 - woodspade: 10.0 - goldingot: 50.0 - diode: 10.0 - soil: - '0': 3.0 - clay: 3.0 - goldblock: 400.0 - stick: 1.0 - paper: 30.0 - brick: 40.0 - stationarylava: - '0': 1.0 - chest: 15.0 - sandstone: 5.0 - goldpickaxe: 300.0 - compass: 50.0 - sugarcane: 10.0 - diamondsword: 700.0 - goldboots: 250.0 - sponge: 80.0 - stonesword: 40.0 - coal: - '0': 3.0 - goldaxe: 300.0 - bone: 10.0 - diamond: 230.0 - glass: 10.0 - goldspade: 220.0 - lapisblock: 500.0 - lavabucket: 30.0 - wheat: 9.0 - ladder: - '0': 10.0 - sugarcaneblock: - '0': 15.0 - bowl: 6.0 - chainmailchestplate: 40.0 - sapling: - '0': 2.0 - diamondboots: 1500.0 - lapisore: 100.0 - lava: - '0': 1.0 - milkbucket: 15.0 - redstone: 1.0 - greenrecord: 1000.0 - inksack: - '0': 10.0 - glowstonedust: 11.0 - book: 35.0 - bow: 75.0 - ironboots: 50.0 - step: - '0': 3.0 - sugar: 5.0 +worth: + stonebutton: + '0': 7.0 + wood: 1.0 + arrow: 10.0 + diamondpickaxe: 1000.0 + rawfish: 5.0 + minecart: 20.0 + leatherchestplate: 40.0 + storageminecart: 35.0 + leaves: + '0': 0.0 + feather: 3.0 + goldchestplate: 600.0 + mushroomsoup: 30.0 + bread: 20.0 + stationarywater: + '0': 1.0 + workbench: 20.0 + stonehoe: 40.0 + brownmushroom: 2.0 + wool: + '0': 8.0 + mossycobblestone: 90.0 + diamondhoe: 600.0 + woodsword: 10.0 + torch: + '0': 1.0 + grass: 1.0 + poweredminecart: 30.0 + snowball: 1.0 + goldenapple: 500.0 + leatherleggings: 20.0 + log: + '0': 2.0 + diamondaxe: 1000.0 + slimeball: 50.0 + fence: 10.0 + stonespade: 40.0 + claybrick: 10.0 + noteblock: 40.0 + ironaxe: 60.0 + coalore: 15.0 + clayball: 8.0 + fishingrod: 25.0 + ironhoe: 60.0 + goldrecord: 950.0 + ironpickaxe: 80.0 + irondoor: 35.0 + bucket: 10.0 + redrose: 2.0 + grilledpork: 6.0 + gravel: 1.0 + wooddoor: 30.0 + chainmailhelmet: 40.0 + ironchestplate: 300.0 + diamondblock: 1500.0 + diamondhelmet: 1500.0 + goldhelmet: 300.0 + redstonetorchon: + '0': 10.0 + ironspade: 40.0 + furnace: + '0': 10.0 + ironsword: 60.0 + dispenser: + '0': 9.0 + woodaxe: 10.0 + seeds: 5.0 + painting: 50.0 + woodplate: + '0': 10.0 + redstoneore: 30.0 + diamondspade: 350.0 + waterbucket: 10.0 + water: + '0': 1.0 + bedrock: 1000.0 + irondoorblock: + '0': 15.0 + goldhoe: 200.0 + sand: 1.0 + goldsword: 200.0 + stoneaxe: 40.0 + bookshelf: 20.0 + ironblock: 160.0 + jackolantern: + '0': 60.0 + boat: 5.0 + diamondchestplate: 3000.0 + redstonewire: + '0': 7.0 + redmushroom: 2.0 + string: 5.0 + stoneplate: + '0': 10.0 + wallsign: + '0': 1.0 + cactus: + '0': 10.0 + sulphur: 19.0 + rails: + '0': 40.0 + ironore: 18.0 + leatherhelmet: 20.0 + stone: 2.0 + egg: 1.0 + diamondore: 200.0 + woodhoe: 10.0 + goldleggings: 400.0 + chainmailleggings: 50.0 + yellowflower: 2.0 + ironhelmet: 120.0 + obsidian: 130.0 + dirt: 1.0 + leather: 10.0 + leatherboots: 17.0 + lever: + '0': 7.0 + cobblestone: 1.0 + cake: 100.0 + woodstairs: + '0': 8.0 + ironingot: 20.0 + goldore: 45.0 + pumpkin: + '0': 50.0 + bed: 25.0 + watch: 100.0 + ironleggings: 250.0 + sign: 10.0 + doublestep: + '0': 3.0 + woodpickaxe: 10.0 + stonepickaxe: 40.0 + chainmailboots: 30.0 + diamondleggings: 2200.0 + cookedfish: 20.0 + saddle: 100.0 + cobblestonestairs: + '0': 22.0 + tnt: 10000.0 + glowingredstoneore: 30.0 + apple: 10.0 + woodspade: 10.0 + goldingot: 50.0 + diode: 10.0 + soil: + '0': 3.0 + clay: 3.0 + goldblock: 400.0 + stick: 1.0 + paper: 30.0 + brick: 40.0 + stationarylava: + '0': 1.0 + chest: 15.0 + sandstone: 5.0 + goldpickaxe: 300.0 + compass: 50.0 + sugarcane: 10.0 + diamondsword: 700.0 + goldboots: 250.0 + sponge: 80.0 + stonesword: 40.0 + coal: + '0': 3.0 + goldaxe: 300.0 + bone: 10.0 + diamond: 230.0 + glass: 10.0 + goldspade: 220.0 + lapisblock: 500.0 + lavabucket: 30.0 + wheat: 9.0 + ladder: + '0': 10.0 + sugarcaneblock: + '0': 15.0 + bowl: 6.0 + chainmailchestplate: 40.0 + sapling: + '0': 2.0 + diamondboots: 1500.0 + lapisore: 100.0 + lava: + '0': 1.0 + milkbucket: 15.0 + redstone: 1.0 + greenrecord: 1000.0 + inksack: + '0': 10.0 + glowstonedust: 11.0 + book: 35.0 + bow: 75.0 + ironboots: 50.0 + step: + '0': 3.0 + sugar: 5.0 diff --git a/Essentials/workdir/server.log b/Essentials/workdir/server.log index de34fdb17..737234a26 100644 --- a/Essentials/workdir/server.log +++ b/Essentials/workdir/server.log @@ -50,200 +50,200 @@ 2011-02-28 16:57:50 [INFO] §eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan 2011-02-28 16:57:50 [INFO] Preparing spawn area: 8% 2011-02-28 16:57:51 [INFO] > -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] 2011-02-28 16:57:51 [INFO] Starting minecraft server version Beta 1.3 2011-02-28 16:57:51 [INFO] Preparing spawn area: 12% -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:57:56 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:51 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:52 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:53 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:54 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:55 [INFO] +2011-02-28 16:57:56 [INFO] +2011-02-28 16:57:56 [INFO] +2011-02-28 16:57:56 [INFO] +2011-02-28 16:57:56 [INFO] 2011-02-28 16:59:07 [INFO] Starting minecraft server version Beta 1.3 2011-02-28 16:59:07 [INFO] Loading properties 2011-02-28 16:59:07 [INFO] Starting Minecraft server on *:25565 diff --git a/Essentials/workdir/server.properties b/Essentials/workdir/server.properties index c1f6fa8df..9c7f1b900 100644 --- a/Essentials/workdir/server.properties +++ b/Essentials/workdir/server.properties @@ -1,13 +1,13 @@ -#Minecraft server properties -#Mon Feb 28 16:56:01 EST 2011 -level-name=world -hellworld=false -spawn-monsters=true -online-mode=true -spawn-animals=true -max-players=20 -server-ip= -pvp=true -server-port=25565 -white-list=false -spawn-protection=16 +#Minecraft server properties +#Mon Feb 28 16:56:01 EST 2011 +level-name=world +hellworld=false +spawn-monsters=true +online-mode=true +spawn-animals=true +max-players=20 +server-ip= +pvp=true +server-port=25565 +white-list=false +spawn-protection=16 diff --git a/EssentialsChat/build.xml b/EssentialsChat/build.xml index ed22cfe0c..2babaa1ff 100644 --- a/EssentialsChat/build.xml +++ b/EssentialsChat/build.xml @@ -1,76 +1,76 @@ - - ]> - - - - - - - - - - Builds, tests, and runs the project EssentialsChat. - - &buildinc; - - + + ]> + + + + + + + + + + Builds, tests, and runs the project EssentialsChat. + + &buildinc; + + diff --git a/EssentialsGroupBridge/build.xml b/EssentialsGroupBridge/build.xml index 94dd95861..cf379e9c7 100644 --- a/EssentialsGroupBridge/build.xml +++ b/EssentialsGroupBridge/build.xml @@ -1,74 +1,74 @@ - - - - - - - - - - - Builds, tests, and runs the project EssentialsGroupBridge. - - - + + + + + + + + + + + Builds, tests, and runs the project EssentialsGroupBridge. + + + diff --git a/EssentialsGroupBridge/nbproject/project.xml b/EssentialsGroupBridge/nbproject/project.xml index f7234f600..e13713870 100644 --- a/EssentialsGroupBridge/nbproject/project.xml +++ b/EssentialsGroupBridge/nbproject/project.xml @@ -1,25 +1,25 @@ - - - org.netbeans.modules.java.j2seproject - - - EssentialsGroupBridge - - - - - - - - - - EssentialsGroupManager - jar - - jar - clean - jar - - - - + + + org.netbeans.modules.java.j2seproject + + + EssentialsGroupBridge + + + + + + + + + + EssentialsGroupManager + jar + + jar + clean + jar + + + + diff --git a/EssentialsGroupManager/build.xml b/EssentialsGroupManager/build.xml index 9eb86de21..aeec831d5 100644 --- a/EssentialsGroupManager/build.xml +++ b/EssentialsGroupManager/build.xml @@ -1,74 +1,74 @@ - - - - - - - - - - - Builds, tests, and runs the project EssentialsGroupManager. - - - + + + + + + + + + + + Builds, tests, and runs the project EssentialsGroupManager. + + + diff --git a/EssentialsProtect/MANIFEST.MF b/EssentialsProtect/MANIFEST.MF index b43aa699e..db70a3fda 100644 --- a/EssentialsProtect/MANIFEST.MF +++ b/EssentialsProtect/MANIFEST.MF @@ -1,2 +1,2 @@ -Manifest-Version: 1.0 -Class-Path: ../lib/mysql.jar ../lib/sqlite.jar +Manifest-Version: 1.0 +Class-Path: ../lib/mysql.jar ../lib/sqlite.jar diff --git a/EssentialsProtect/build.xml b/EssentialsProtect/build.xml index a09cc7333..1f88786d0 100644 --- a/EssentialsProtect/build.xml +++ b/EssentialsProtect/build.xml @@ -1,84 +1,84 @@ - - ]> - - - - - - - - - - Builds, tests, and runs the project EssentialsProtect. - - - - - - - - - - - - + + ]> + + + + + + + + + + Builds, tests, and runs the project EssentialsProtect. + + + + + + + + + + + + diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index a71bcbd09..d85d2b3d7 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -1,348 +1,348 @@ -package com.earth2me.essentials.protect; - -import com.earth2me.essentials.EssentialsBlockListener; -import com.earth2me.essentials.IEssentials; -import com.earth2me.essentials.User; -import java.util.HashSet; -import java.util.Set; -import net.minecraft.server.ChunkPosition; -import net.minecraft.server.Packet60Explosion; -import org.bukkit.Location; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.craftbukkit.CraftServer; -import org.bukkit.craftbukkit.CraftWorld; -import org.bukkit.craftbukkit.entity.CraftFireball; -import org.bukkit.craftbukkit.entity.CraftPlayer; -import org.bukkit.craftbukkit.entity.CraftTNTPrimed; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Fireball; -import org.bukkit.entity.LivingEntity; -import org.bukkit.entity.Player; -import org.bukkit.entity.TNTPrimed; -import org.bukkit.event.entity.CreatureSpawnEvent; -import org.bukkit.event.entity.EntityDamageByBlockEvent; -import org.bukkit.event.entity.EntityDamageByEntityEvent; -import org.bukkit.event.entity.EntityDamageByProjectileEvent; -import org.bukkit.event.entity.EntityDamageEvent; -import org.bukkit.event.entity.EntityDamageEvent.DamageCause; -import org.bukkit.event.entity.EntityExplodeEvent; -import org.bukkit.event.entity.EntityListener; -import org.bukkit.event.entity.EntityTargetEvent; -import org.bukkit.event.entity.EntityTargetEvent.TargetReason; -import org.bukkit.event.entity.ExplosionPrimeEvent; - - -public class EssentialsProtectEntityListener extends EntityListener -{ - private final transient IProtect prot; - private final transient IEssentials ess; - - public EssentialsProtectEntityListener(final IProtect prot) - { - this.prot = prot; - this.ess = prot.getEssentials(); - } - - @Override - public void onEntityDamage(EntityDamageEvent event) - { - if (event.isCancelled()) - { - return; - } - final Entity target = event.getEntity(); - final User user = ess.getUser(target); - if (event instanceof EntityDamageByBlockEvent) - { - final DamageCause cause = event.getCause(); - - if (prot.getSettingBool(ProtectConfig.disable_contactdmg) - && cause == DamageCause.CONTACT - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.contact") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - if (prot.getSettingBool(ProtectConfig.disable_lavadmg) - && cause == DamageCause.LAVA - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.lava") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - if (prot.getSettingBool(ProtectConfig.prevent_tnt_explosion) - && cause == DamageCause.BLOCK_EXPLOSION - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.tnt") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - } - - if (event instanceof EntityDamageByEntityEvent) - { - final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event; - final Entity eAttack = edEvent.getDamager(); - final User attacker = ess.getUser(eAttack); - - // PVP Settings - if (target instanceof Player && eAttack instanceof Player - && prot.getSettingBool(ProtectConfig.disable_pvp) - && (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp"))) - { - event.setCancelled(true); - return; - } - - //Creeper explode prevention - if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_explosion) - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.creeper") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - - if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg) - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.creeper") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - - if (eAttack instanceof Fireball && prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg) - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.fireball") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - - if (eAttack instanceof TNTPrimed && prot.getSettingBool(ProtectConfig.prevent_tnt_playerdmg) - && !(target instanceof Player - && user.isAuthorized("essentials.protect.damage.tnt") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - } - - if (event instanceof EntityDamageByProjectileEvent - && target instanceof Player - && prot.getSettingBool(ProtectConfig.disable_projectiles) - && !(user.isAuthorized("essentials.protect.damage.projectiles") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - ((EntityDamageByProjectileEvent)event).setBounce(true); - return; - } - - final DamageCause cause = event.getCause(); - if (target instanceof Player) - { - if (cause == DamageCause.FALL - && prot.getSettingBool(ProtectConfig.disable_fall) - && !(user.isAuthorized("essentials.protect.damage.fall") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - - if (cause == DamageCause.SUFFOCATION - && prot.getSettingBool(ProtectConfig.disable_suffocate) - && !(user.isAuthorized("essentials.protect.damage.suffocation") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - if ((cause == DamageCause.FIRE - || cause == DamageCause.FIRE_TICK) - && prot.getSettingBool(ProtectConfig.disable_firedmg) - && !(user.isAuthorized("essentials.protect.damage.fire") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - if (cause == DamageCause.DROWNING - && prot.getSettingBool(ProtectConfig.disable_drown) - && !(user.isAuthorized("essentials.protect.damage.drowning") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - if (cause == DamageCause.LIGHTNING - && prot.getSettingBool(ProtectConfig.disable_lightning) - && !(user.isAuthorized("essentials.protect.damage.lightning") - && !user.isAuthorized("essentials.protect.damage.disable"))) - { - event.setCancelled(true); - return; - } - } - } - - @Override - public void onEntityExplode(EntityExplodeEvent event) - { - if (event.isCancelled()) - { - return; - } - final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight(); - //Nicccccccccce plaaacccccccccce.. - if (event.getEntity() instanceof LivingEntity - && (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion) - || prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg) - || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))) - { - final Set set = new HashSet(event.blockList().size()); - final Player[] players = ess.getServer().getOnlinePlayers(); - final Set blocksUnderPlayers = new HashSet(players.length); - final Location loc = event.getLocation(); - for (Player player : players) - { - if (player.getWorld().equals(loc.getWorld())) - { - blocksUnderPlayers.add( - new ChunkPosition( - player.getLocation().getBlockX(), - player.getLocation().getBlockY() - 1, - player.getLocation().getBlockZ())); - } - } - ChunkPosition cp; - for (Block block : event.blockList()) - { - cp = new ChunkPosition(block.getX(), block.getY(), block.getZ()); - if (!blocksUnderPlayers.contains(cp)) - { - set.add(cp); - } - } - - ((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension, - new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set)); - event.setCancelled(true); - return; - } - else if (event.getEntity() instanceof CraftTNTPrimed - && prot.getSettingBool(ProtectConfig.prevent_tnt_explosion)) - { - event.setCancelled(true); - return; - } - else if (event.getEntity() instanceof CraftFireball - && prot.getSettingBool(ProtectConfig.prevent_fireball_explosion)) - { - event.setCancelled(true); - return; - } - // This code will prevent explosions near protected rails, signs or protected chests - // TODO: Use protect db instead of this code - - for (Block block : event.blockList()) - { - if ((block.getType() == Material.RAILS || block.getRelative(BlockFace.UP).getType() == Material.RAILS) - && prot.getSettingBool(ProtectConfig.protect_rails)) - { - event.setCancelled(true); - return; - } - if ((block.getType() == Material.WALL_SIGN - || block.getRelative(BlockFace.NORTH).getType() == Material.WALL_SIGN - || block.getRelative(BlockFace.EAST).getType() == Material.WALL_SIGN - || block.getRelative(BlockFace.SOUTH).getType() == Material.WALL_SIGN - || block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN - || block.getType() == Material.SIGN_POST - || block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST) - && prot.getSettingBool(ProtectConfig.protect_signs)) - { - event.setCancelled(true); - return; - } - /*if (EssentialsBlockListener.protectedBlocks.contains(block.getType()) - && EssentialsBlockListener.isBlockProtected(block)) - { - event.setCancelled(true); - return; - }*/ - } - } - - @Override - public void onCreatureSpawn(final CreatureSpawnEvent event) - { - if (event.getEntity() instanceof CraftPlayer) - { - return; - } - if (event.isCancelled()) - { - return; - } - final String creatureName = event.getCreatureType().toString().toLowerCase(); - if (creatureName == null || creatureName.isEmpty()) - { - return; - } - if (ess.getSettings().getProtectPreventSpawn(creatureName)) - { - event.setCancelled(true); - } - } - - @Override - public void onEntityTarget(final EntityTargetEvent event) - { - if (event.isCancelled()) - { - return; - } - if (!(event.getTarget() instanceof Player)) - { - return; - } - final User user = ess.getUser(event.getTarget()); - if ((event.getReason() == TargetReason.CLOSEST_PLAYER - || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY - || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET - || event.getReason() == TargetReason.RANDOM_TARGET - || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER - || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET) - && prot.getSettingBool(ProtectConfig.prevent_entitytarget) - && !user.isAuthorized("essentials.protect.entitytarget.bypass")) - { - event.setCancelled(true); - return; - } - } - - @Override - public void onExplosionPrime(ExplosionPrimeEvent event) - { - if (event.getEntity() instanceof CraftFireball - && prot.getSettingBool(ProtectConfig.prevent_fireball_fire)) - { - event.setFire(false); - } - } -} +package com.earth2me.essentials.protect; + +import com.earth2me.essentials.EssentialsBlockListener; +import com.earth2me.essentials.IEssentials; +import com.earth2me.essentials.User; +import java.util.HashSet; +import java.util.Set; +import net.minecraft.server.ChunkPosition; +import net.minecraft.server.Packet60Explosion; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.craftbukkit.entity.CraftFireball; +import org.bukkit.craftbukkit.entity.CraftPlayer; +import org.bukkit.craftbukkit.entity.CraftTNTPrimed; +import org.bukkit.entity.Creeper; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Fireball; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.TNTPrimed; +import org.bukkit.event.entity.CreatureSpawnEvent; +import org.bukkit.event.entity.EntityDamageByBlockEvent; +import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityDamageByProjectileEvent; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.EntityDamageEvent.DamageCause; +import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.entity.EntityListener; +import org.bukkit.event.entity.EntityTargetEvent; +import org.bukkit.event.entity.EntityTargetEvent.TargetReason; +import org.bukkit.event.entity.ExplosionPrimeEvent; + + +public class EssentialsProtectEntityListener extends EntityListener +{ + private final transient IProtect prot; + private final transient IEssentials ess; + + public EssentialsProtectEntityListener(final IProtect prot) + { + this.prot = prot; + this.ess = prot.getEssentials(); + } + + @Override + public void onEntityDamage(EntityDamageEvent event) + { + if (event.isCancelled()) + { + return; + } + final Entity target = event.getEntity(); + final User user = ess.getUser(target); + if (event instanceof EntityDamageByBlockEvent) + { + final DamageCause cause = event.getCause(); + + if (prot.getSettingBool(ProtectConfig.disable_contactdmg) + && cause == DamageCause.CONTACT + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.contact") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + if (prot.getSettingBool(ProtectConfig.disable_lavadmg) + && cause == DamageCause.LAVA + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.lava") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + if (prot.getSettingBool(ProtectConfig.prevent_tnt_explosion) + && cause == DamageCause.BLOCK_EXPLOSION + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.tnt") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + } + + if (event instanceof EntityDamageByEntityEvent) + { + final EntityDamageByEntityEvent edEvent = (EntityDamageByEntityEvent)event; + final Entity eAttack = edEvent.getDamager(); + final User attacker = ess.getUser(eAttack); + + // PVP Settings + if (target instanceof Player && eAttack instanceof Player + && prot.getSettingBool(ProtectConfig.disable_pvp) + && (!user.isAuthorized("essentials.protect.pvp") || !attacker.isAuthorized("essentials.protect.pvp"))) + { + event.setCancelled(true); + return; + } + + //Creeper explode prevention + if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_explosion) + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.creeper") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + + if (eAttack instanceof Creeper && prot.getSettingBool(ProtectConfig.prevent_creeper_playerdmg) + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.creeper") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + + if (eAttack instanceof Fireball && prot.getSettingBool(ProtectConfig.prevent_fireball_playerdmg) + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.fireball") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + + if (eAttack instanceof TNTPrimed && prot.getSettingBool(ProtectConfig.prevent_tnt_playerdmg) + && !(target instanceof Player + && user.isAuthorized("essentials.protect.damage.tnt") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + } + + if (event instanceof EntityDamageByProjectileEvent + && target instanceof Player + && prot.getSettingBool(ProtectConfig.disable_projectiles) + && !(user.isAuthorized("essentials.protect.damage.projectiles") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + ((EntityDamageByProjectileEvent)event).setBounce(true); + return; + } + + final DamageCause cause = event.getCause(); + if (target instanceof Player) + { + if (cause == DamageCause.FALL + && prot.getSettingBool(ProtectConfig.disable_fall) + && !(user.isAuthorized("essentials.protect.damage.fall") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + + if (cause == DamageCause.SUFFOCATION + && prot.getSettingBool(ProtectConfig.disable_suffocate) + && !(user.isAuthorized("essentials.protect.damage.suffocation") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + if ((cause == DamageCause.FIRE + || cause == DamageCause.FIRE_TICK) + && prot.getSettingBool(ProtectConfig.disable_firedmg) + && !(user.isAuthorized("essentials.protect.damage.fire") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + if (cause == DamageCause.DROWNING + && prot.getSettingBool(ProtectConfig.disable_drown) + && !(user.isAuthorized("essentials.protect.damage.drowning") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + if (cause == DamageCause.LIGHTNING + && prot.getSettingBool(ProtectConfig.disable_lightning) + && !(user.isAuthorized("essentials.protect.damage.lightning") + && !user.isAuthorized("essentials.protect.damage.disable"))) + { + event.setCancelled(true); + return; + } + } + } + + @Override + public void onEntityExplode(EntityExplodeEvent event) + { + if (event.isCancelled()) + { + return; + } + final int maxHeight = ess.getSettings().getProtectCreeperMaxHeight(); + //Nicccccccccce plaaacccccccccce.. + if (event.getEntity() instanceof LivingEntity + && (prot.getSettingBool(ProtectConfig.prevent_creeper_explosion) + || prot.getSettingBool(ProtectConfig.prevent_creeper_blockdmg) + || (maxHeight >= 0 && event.getLocation().getBlockY() > maxHeight))) + { + final Set set = new HashSet(event.blockList().size()); + final Player[] players = ess.getServer().getOnlinePlayers(); + final Set blocksUnderPlayers = new HashSet(players.length); + final Location loc = event.getLocation(); + for (Player player : players) + { + if (player.getWorld().equals(loc.getWorld())) + { + blocksUnderPlayers.add( + new ChunkPosition( + player.getLocation().getBlockX(), + player.getLocation().getBlockY() - 1, + player.getLocation().getBlockZ())); + } + } + ChunkPosition cp; + for (Block block : event.blockList()) + { + cp = new ChunkPosition(block.getX(), block.getY(), block.getZ()); + if (!blocksUnderPlayers.contains(cp)) + { + set.add(cp); + } + } + + ((CraftServer)ess.getServer()).getHandle().sendPacketNearby(loc.getX(), loc.getY(), loc.getZ(), 64.0D, ((CraftWorld)loc.getWorld()).getHandle().worldProvider.dimension, + new Packet60Explosion(loc.getX(), loc.getY(), loc.getZ(), 3.0f, set)); + event.setCancelled(true); + return; + } + else if (event.getEntity() instanceof CraftTNTPrimed + && prot.getSettingBool(ProtectConfig.prevent_tnt_explosion)) + { + event.setCancelled(true); + return; + } + else if (event.getEntity() instanceof CraftFireball + && prot.getSettingBool(ProtectConfig.prevent_fireball_explosion)) + { + event.setCancelled(true); + return; + } + // This code will prevent explosions near protected rails, signs or protected chests + // TODO: Use protect db instead of this code + + for (Block block : event.blockList()) + { + if ((block.getType() == Material.RAILS || block.getRelative(BlockFace.UP).getType() == Material.RAILS) + && prot.getSettingBool(ProtectConfig.protect_rails)) + { + event.setCancelled(true); + return; + } + if ((block.getType() == Material.WALL_SIGN + || block.getRelative(BlockFace.NORTH).getType() == Material.WALL_SIGN + || block.getRelative(BlockFace.EAST).getType() == Material.WALL_SIGN + || block.getRelative(BlockFace.SOUTH).getType() == Material.WALL_SIGN + || block.getRelative(BlockFace.WEST).getType() == Material.WALL_SIGN + || block.getType() == Material.SIGN_POST + || block.getRelative(BlockFace.UP).getType() == Material.SIGN_POST) + && prot.getSettingBool(ProtectConfig.protect_signs)) + { + event.setCancelled(true); + return; + } + /*if (EssentialsBlockListener.protectedBlocks.contains(block.getType()) + && EssentialsBlockListener.isBlockProtected(block)) + { + event.setCancelled(true); + return; + }*/ + } + } + + @Override + public void onCreatureSpawn(final CreatureSpawnEvent event) + { + if (event.getEntity() instanceof CraftPlayer) + { + return; + } + if (event.isCancelled()) + { + return; + } + final String creatureName = event.getCreatureType().toString().toLowerCase(); + if (creatureName == null || creatureName.isEmpty()) + { + return; + } + if (ess.getSettings().getProtectPreventSpawn(creatureName)) + { + event.setCancelled(true); + } + } + + @Override + public void onEntityTarget(final EntityTargetEvent event) + { + if (event.isCancelled()) + { + return; + } + if (!(event.getTarget() instanceof Player)) + { + return; + } + final User user = ess.getUser(event.getTarget()); + if ((event.getReason() == TargetReason.CLOSEST_PLAYER + || event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY + || event.getReason() == TargetReason.PIG_ZOMBIE_TARGET + || event.getReason() == TargetReason.RANDOM_TARGET + || event.getReason() == TargetReason.TARGET_ATTACKED_OWNER + || event.getReason() == TargetReason.OWNER_ATTACKED_TARGET) + && prot.getSettingBool(ProtectConfig.prevent_entitytarget) + && !user.isAuthorized("essentials.protect.entitytarget.bypass")) + { + event.setCancelled(true); + return; + } + } + + @Override + public void onExplosionPrime(ExplosionPrimeEvent event) + { + if (event.getEntity() instanceof CraftFireball + && prot.getSettingBool(ProtectConfig.prevent_fireball_fire)) + { + event.setFire(false); + } + } +} diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml index e5212599d..31fc1ae99 100644 --- a/EssentialsProtect/src/plugin.yml +++ b/EssentialsProtect/src/plugin.yml @@ -1,9 +1,9 @@ -# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) -name: EssentialsProtect -main: com.earth2me.essentials.protect.EssentialsProtect -# Note to developers: This next line cannot change, or the automatic versioning system will break. -version: TeamCity -website: http://www.earth2me.net:8001/ -description: Provides protection for various parts of the world. -authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] +# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) +name: EssentialsProtect +main: com.earth2me.essentials.protect.EssentialsProtect +# Note to developers: This next line cannot change, or the automatic versioning system will break. +version: TeamCity +website: http://www.earth2me.net:8001/ +description: Provides protection for various parts of the world. +authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] depend: [Essentials] \ No newline at end of file diff --git a/EssentialsSpawn/build.xml b/EssentialsSpawn/build.xml index 7dfcbb707..d44f2cc97 100644 --- a/EssentialsSpawn/build.xml +++ b/EssentialsSpawn/build.xml @@ -1,76 +1,76 @@ - - ]> - - - - - - - - - - Builds, tests, and runs the project EssentialsSpawn. - - &buildinc; - - + + ]> + + + + + + + + + + Builds, tests, and runs the project EssentialsSpawn. + + &buildinc; + + diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml index a9e2895d0..1e01eebd9 100644 --- a/EssentialsSpawn/src/plugin.yml +++ b/EssentialsSpawn/src/plugin.yml @@ -1,16 +1,16 @@ -# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) -name: EssentialsSpawn -main: com.earth2me.essentials.spawn.EssentialsSpawn -# Note to developers: This next line cannot change, or the automatic versioning system will break. -version: TeamCity -website: http://www.earth2me.net:8001/ -description: Provides spawn control commands, utilizing Essentials. -authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] -depend: [Essentials] -commands: - setspawn: - description: Set the spawnpoint to your current position. - usage: / - spawn: - description: Teleport to the spawnpoint. +# This determines the command prefix when there are conflicts (/name:home, /name:help, etc.) +name: EssentialsSpawn +main: com.earth2me.essentials.spawn.EssentialsSpawn +# Note to developers: This next line cannot change, or the automatic versioning system will break. +version: TeamCity +website: http://www.earth2me.net:8001/ +description: Provides spawn control commands, utilizing Essentials. +authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology] +depend: [Essentials] +commands: + setspawn: + description: Set the spawnpoint to your current position. + usage: / + spawn: + description: Teleport to the spawnpoint. usage: / \ No newline at end of file diff --git a/build.inc.xml b/build.inc.xml index 2d6c69944..5541f2ce5 100644 --- a/build.inc.xml +++ b/build.inc.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties index c3c14c09e..9137b06bd 100644 --- a/lib/nblibraries.properties +++ b/lib/nblibraries.properties @@ -1,12 +1,12 @@ -libs.CopyLibs.classpath=\ - ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar -libs.junit.classpath=\ - ${base}/junit/junit-3.8.2.jar -libs.junit.javadoc=\ - ${base}/junit/junit-3.8.2-api.zip -libs.junit_4.classpath=\ - ${base}/junit_4/junit-4.5.jar -libs.junit_4.javadoc=\ - ${base}/junit_4/junit-4.5-api.zip -libs.junit_4.src=\ - ${base}/junit_4/junit-4.5-src.jar +libs.CopyLibs.classpath=\ + ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar +libs.junit.classpath=\ + ${base}/junit/junit-3.8.2.jar +libs.junit.javadoc=\ + ${base}/junit/junit-3.8.2-api.zip +libs.junit_4.classpath=\ + ${base}/junit_4/junit-4.5.jar +libs.junit_4.javadoc=\ + ${base}/junit_4/junit-4.5-api.zip +libs.junit_4.src=\ + ${base}/junit_4/junit-4.5-src.jar From dd5bcb876236f949ddc8c5c24a09571252b20248 Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 24 Jul 2011 14:25:12 -0700 Subject: [PATCH 05/13] Edited README.markdown via GitHub --- README.markdown | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index dd0cf38d2..cfd6629d6 100644 --- a/README.markdown +++ b/README.markdown @@ -11,7 +11,10 @@ Recommended NetBeans plugins: * Git * PMD & FindBugs ( http://kenai.com/projects/sqe/pages/Home ) -In the root folder of the repository is a file called settings.zip. It contains the code guidelines settings. Open the preferences of NetBeans and import the zip file. Use "Source > Format" before each commit please. +You don't need to import settings.zip anymore, since the format guidelines have been added to the project properties. + +Windows users, please read this: http://help.github.com/line-endings/ +The default line ending is LF. To build all jars, select the BuildAll project and build that. You'll find all jars inside the dist/lib folder of the BuildAll project. From c9028623acbc8b4565861bfd08ab2ac4e7537a2e Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 24 Jul 2011 23:29:46 +0200 Subject: [PATCH 06/13] Removed useless files --- .../workdir/EssentialsGroupManager/config.yml | 0 Essentials/workdir/banned-ips.txt | 0 Essentials/workdir/banned-players.txt | 0 Essentials/workdir/ops.txt | 0 .../workdir/plugins/Permissions/default.yml | 0 Essentials/workdir/server.log | 264 ------------------ Essentials/workdir/server.log.1 | 0 Essentials/workdir/server.log.1.lck | 0 Essentials/workdir/server.properties | 13 - Essentials/workdir/userdata/TestPlayer1.yml | 2 - Essentials/workdir/white-list.txt | 0 11 files changed, 279 deletions(-) delete mode 100644 Essentials/workdir/EssentialsGroupManager/config.yml delete mode 100644 Essentials/workdir/banned-ips.txt delete mode 100644 Essentials/workdir/banned-players.txt delete mode 100644 Essentials/workdir/ops.txt delete mode 100644 Essentials/workdir/plugins/Permissions/default.yml delete mode 100644 Essentials/workdir/server.log delete mode 100644 Essentials/workdir/server.log.1 delete mode 100644 Essentials/workdir/server.log.1.lck delete mode 100644 Essentials/workdir/server.properties delete mode 100644 Essentials/workdir/userdata/TestPlayer1.yml delete mode 100644 Essentials/workdir/white-list.txt diff --git a/Essentials/workdir/EssentialsGroupManager/config.yml b/Essentials/workdir/EssentialsGroupManager/config.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/banned-ips.txt b/Essentials/workdir/banned-ips.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/banned-players.txt b/Essentials/workdir/banned-players.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/ops.txt b/Essentials/workdir/ops.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/plugins/Permissions/default.yml b/Essentials/workdir/plugins/Permissions/default.yml deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/server.log b/Essentials/workdir/server.log deleted file mode 100644 index 737234a26..000000000 --- a/Essentials/workdir/server.log +++ /dev/null @@ -1,264 +0,0 @@ -2011-02-28 16:56:00 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:56:00 [INFO] Loading properties -2011-02-28 16:56:00 [WARNING] server.properties does not exist -2011-02-28 16:56:00 [INFO] Generating new properties file -2011-02-28 16:56:00 [INFO] Starting Minecraft server on *:25565 -2011-02-28 16:56:00 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3) -2011-02-28 16:56:00 [WARNING] Failed to load ban list: java.io.FileNotFoundException: banned-players.txt (The system cannot find the file specified) -2011-02-28 16:56:00 [WARNING] Failed to load ip ban list: java.io.FileNotFoundException: banned-ips.txt (The system cannot find the file specified) -2011-02-28 16:56:00 [WARNING] Failed to load ops: java.io.FileNotFoundException: ops.txt (The system cannot find the file specified) -2011-02-28 16:56:00 [WARNING] Failed to load white-list: java.io.FileNotFoundException: white-list.txt (The system cannot find the file specified) -2011-02-28 16:56:00 [INFO] Preparing level "world" -2011-02-28 16:56:00 [INFO] Preparing start region -2011-02-28 16:56:01 [INFO] §eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan -2011-02-28 16:56:02 [INFO] Preparing spawn area: 4% -2011-02-28 16:56:03 [INFO] Preparing spawn area: 8% -2011-02-28 16:56:04 [INFO] Preparing spawn area: 20% -2011-02-28 16:56:05 [INFO] Preparing spawn area: 32% -2011-02-28 16:56:06 [INFO] Preparing spawn area: 40% -2011-02-28 16:56:07 [INFO] Preparing spawn area: 48% -2011-02-28 16:56:08 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:56:08 [INFO] Loading properties -2011-02-28 16:56:08 [INFO] Starting Minecraft server on *:25565 -2011-02-28 16:56:08 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3) -2011-02-28 16:56:09 [INFO] Preparing level "world" -2011-02-28 16:56:09 [INFO] Preparing start region -2011-02-28 16:56:10 [INFO] §eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan -2011-02-28 16:56:10 [INFO] Preparing spawn area: 4% -2011-02-28 16:56:10 [INFO] Should update an existing player with the same name, rather than creating a new player -2011-02-28 16:56:11 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:56:11 [INFO] > -2011-02-28 16:56:11 [INFO] Preparing spawn area: 8% -2011-02-28 16:57:39 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:57:39 [INFO] Loading properties -2011-02-28 16:57:39 [INFO] Starting Minecraft server on *:25565 -2011-02-28 16:57:39 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3) -2011-02-28 16:57:39 [INFO] Preparing level "world" -2011-02-28 16:57:39 [INFO] Preparing start region -2011-02-28 16:57:41 [INFO] §eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan -2011-02-28 16:57:41 [INFO] Preparing spawn area: 4% -2011-02-28 16:57:42 [INFO] Preparing spawn area: 8% -2011-02-28 16:57:43 [INFO] Preparing spawn area: 16% -2011-02-28 16:57:44 [INFO] Preparing spawn area: 24% -2011-02-28 16:57:45 [INFO] Preparing spawn area: 24% -2011-02-28 16:57:48 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:57:48 [INFO] Loading properties -2011-02-28 16:57:48 [INFO] Starting Minecraft server on *:25565 -2011-02-28 16:57:48 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3) -2011-02-28 16:57:49 [INFO] Preparing level "world" -2011-02-28 16:57:49 [INFO] Preparing start region -2011-02-28 16:57:50 [INFO] §eLoaded Essentials build TeamCity maintained by Zenexer, ementalo, Aelux, and Brettflan -2011-02-28 16:57:50 [INFO] Preparing spawn area: 8% -2011-02-28 16:57:51 [INFO] > -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:57:51 [INFO] Preparing spawn area: 12% -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:51 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:52 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:53 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:54 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:55 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:57:56 [INFO] -2011-02-28 16:59:07 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:59:07 [INFO] Loading properties -2011-02-28 16:59:07 [INFO] Starting Minecraft server on *:25565 -2011-02-28 16:59:07 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3) -2011-02-28 16:59:07 [INFO] Preparing level "world" -2011-02-28 16:59:07 [INFO] Preparing start region -2011-02-28 16:59:08 [INFO] Done (0.060s)! For help, type "help" or "?" -2011-02-28 16:59:08 [INFO] Stopping server -2011-02-28 16:59:08 [INFO] Saving chunks -2011-02-28 16:59:09 [INFO] Starting minecraft server version Beta 1.3 -2011-02-28 16:59:09 [INFO] Loading properties -2011-02-28 16:59:09 [INFO] Starting Minecraft server on *:25565 -2011-02-28 16:59:09 [INFO] This server is running Craftbukkit version git-Bukkit-0.0.0-468-ga3bf56c-b450jnks (MC: 1.3) -2011-02-28 16:59:09 [INFO] Preparing level "world" -2011-02-28 16:59:09 [INFO] Preparing start region -2011-02-28 16:59:10 [INFO] Done (0.011s)! For help, type "help" or "?" -2011-02-28 16:59:10 [INFO] Stopping server -2011-02-28 16:59:10 [INFO] Saving chunks diff --git a/Essentials/workdir/server.log.1 b/Essentials/workdir/server.log.1 deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/server.log.1.lck b/Essentials/workdir/server.log.1.lck deleted file mode 100644 index e69de29bb..000000000 diff --git a/Essentials/workdir/server.properties b/Essentials/workdir/server.properties deleted file mode 100644 index 9c7f1b900..000000000 --- a/Essentials/workdir/server.properties +++ /dev/null @@ -1,13 +0,0 @@ -#Minecraft server properties -#Mon Feb 28 16:56:01 EST 2011 -level-name=world -hellworld=false -spawn-monsters=true -online-mode=true -spawn-animals=true -max-players=20 -server-ip= -pvp=true -server-port=25565 -white-list=false -spawn-protection=16 diff --git a/Essentials/workdir/userdata/TestPlayer1.yml b/Essentials/workdir/userdata/TestPlayer1.yml deleted file mode 100644 index c419a1196..000000000 --- a/Essentials/workdir/userdata/TestPlayer1.yml +++ /dev/null @@ -1,2 +0,0 @@ -home: [1.0, 2.0, 3.0, 4.0, 5.0, world] -money: 75.5 diff --git a/Essentials/workdir/white-list.txt b/Essentials/workdir/white-list.txt deleted file mode 100644 index e69de29bb..000000000 From edd6adc78f650ead835afcfdc4fa092f7127848f Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 24 Jul 2011 23:33:48 +0200 Subject: [PATCH 07/13] Another obsolete file --- .gitignore | 5 ++++- Essentials/.gitignore | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 Essentials/.gitignore diff --git a/.gitignore b/.gitignore index 2170d897b..7152ec996 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,7 @@ /EssentialsProtect/build/ /EssentialsPermissionsCommands/nbproject/private/ /EssentialsPermissionsCommands/build/ -/EssentialsPermissionsCommands/dist/ \ No newline at end of file +/EssentialsPermissionsCommands/dist/ +/Essentials/nbproject/private/ +/Essentials/dist/ +/Essentials/build/ \ No newline at end of file diff --git a/Essentials/.gitignore b/Essentials/.gitignore deleted file mode 100644 index 437c8c683..000000000 --- a/Essentials/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# NetBeans cruft -/build -/dist -/nbproject/private - -# Mac cruft -.DS_Store From 23eeb82ac4bc885d7795de32afb4747dd0bda08b Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 25 Jul 2011 19:20:42 -0700 Subject: [PATCH 08/13] Edited Essentials/src/messages_nl.properties via GitHub --- Essentials/src/messages_nl.properties | 94 +++++++++++++-------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 658897b2a..544d31f14 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -2,30 +2,30 @@ # Single quotes have to be doubled: '' # Translations start here # by Geertje123 -addedToAccount = \u00a7a{0} is aan je bankrekening toegevoegd. -addedToOthersAccount = \u00a7a{0} is toegevoegd aan {1} rekening +addedToAccount = \u00a7a{0} is gestort op je account. +addedToOthersAccount = \u00a7a{0} is overgemaakt naar {1}'s rekening alertBroke = gebroken: alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3} alertPlaced = geplaatst: alertUsed = gebruikt: -backAfterDeath = \u00a77Gebruik de /back command om terug te keren naar het punt waar je dood ging. -backUsageMsg = \u00a77Bezig met terugkeren naar vorige locatie. +backAfterDeath = \u00a77Gebruik het /back command om terug te keren naar je sterfplaats. +backUsageMsg = \u00a77Naar de vorige locatie aan het gaan. backupFinished = Backup voltooid -backupStarted = Backup wordt nu gemaakt +backupStarted = Backup gestart balance = \u00a77Saldo: {0} balanceTop = \u00a77 Top {0} saldi -banIpAddress = \u00a77Verboden IP-adres -banExempt = \u00a77Je kunt niet verbieden die speler. +banIpAddress = \u00a77Verbannen IP-adres +banExempt = \u00a77Je kunt deze speler niet verbannen. bannedIpsFileError = Fout bij het lezen van banned-ips.txt bannedIpsFileNotFound = banned-ips.txt werd niet gevonden bannedPlayersFileError = Fout bij het lezen van banned-players.txt bannedPlayersFileNotFound = banned-players.txt werd niet gevonden -bigTreeFailure = \u00a7cCre\u00ebren van grote boom fout gegaan. Probeer het opnieuw op gras of dirt. -bigTreeSuccess = \u00a77Grote boom gespawnd. +bigTreeFailure = \u00a7cMaken van een grote boom is mislukt. Probeer het opnieuw op gras of dirt. +bigTreeSuccess = \u00a77Grote boom gemaakt. broadcast = [\u00a7cBroadcast\u00a7f]\u00a7a {0} buildAlert = \u00a7cJe bent niet bevoegd om te bouwen bukkitFormatChanged = Bukkit versie formaat veranderd. Versie niet nagekeken. -burnMsg = \u00a77Je hebt voor {1} seconden {0} in de fik gezet. +burnMsg = \u00a77Je hebt {0} voor {1} seconde(n) in de fik gezet. canTalkAgain = \u00a77Je kan weer praten. cantFindGeoIpDB = De GeoIP database kon niet gevonden worden! cantReadGeoIpDB = Fout bij het lezen van de GeoIP database! @@ -36,13 +36,13 @@ commandNotLoaded = \u00a7cOpdracht {0} is fout geladen. compassBearing = \u00a77Ligging: {0} ({1} graden). configFileMoveError = Het verplaatsen van config.yml naar de backup locatie is mislukt. configFileRenameError = Fout bij het hernoemen van de tijdelijke map naar config.yml -connectedPlayers = Verbonden spelers: +connectedPlayers = Spelers online: connectionFailed = Fout bij het verbinden. cooldownWithMessage = \u00a7cAfkoeltijd: {0} -corruptNodeInConfig = \u00a74Waarschuwing: Het configuratie bestand bevat een fout {0}. -couldNotFindTemplate = Het sjabloon kon niet gevonden worden {0} -creatingConfigFromTemplate = Bezig met aanmaken van config vanaf sjabloon: {0} -creatingEmptyConfig = Bezig met lege config aanmaken: {0} +corruptNodeInConfig = \u00a74Waarschuwing: Het configuratiebestand bevat een fout {0}. +couldNotFindTemplate = Het sjabloon kon niet worden gevonden {0} +creatingConfigFromTemplate = Bezig met aanmaken van een config vanaf sjabloon: {0} +creatingEmptyConfig = Bezig met een lege config aanmaken: {0} creatingPortal = Bezig met cre\u00ebren van portal bij {0},{1},{2}. day = dag days = dagen @@ -50,10 +50,10 @@ defaultBanReason = De Ban Hamer heeft gesproken! deleteFileError = Het bestand kon niet verwijderd worden: {0} deleteJail = \u00a77Gevangenis {0} is verwijderd. deleteWarp = \u00a77Warp {0} is verwijderd. -deniedAccessCommand = {0} werd de toegang geweigerd tot de opdracht. -dependancyDownloaded = [Essentials] Dependancy {0} downloaded successfully. -dependancyException = [Essentials] An error occured when trying to download a dependacy -dependancyNotFound = [Essentials] A required dependancy was not found, downloading now. +deniedAccessCommand = {0} was de toegang verboden tot het commando. +dependancyDownloaded = [Essentials] Afhankelijkheid {0} succesvol gedownload. +dependancyException = [Essentials] Er is een fout opgetreden bij het downloaden van de afhankelijkheid +dependancyNotFound = [Essentials] Een afhankelijkheid is niet gevonden. Start downloaden. depth = \u00a77Je zit op zeeniveau. depthAboveSea = \u00a77Je zit {0} blok(ken) boven zeeniveau. depthBelowSea = \u00a77Je zit {0} blok(ken) onder zeeniveau. @@ -62,15 +62,15 @@ disableUnlimited = \u00a77Oneindig plaatsen van {0} uitgeschakeld voor {1}. disabled = uitgeschakeld dontMoveMessage = \u00a77Beginnen met teleporteren in {0}. Niet bewegen. downloadingGeoIp = Bezig met downloaden van GeoIP database ... Dit kan een tijdje duren (country: 0.6 MB, city: 20MB) -duplicatedUserdata = Verdubbelde userdata: {0} en {1}. +duplicatedUserdata = Dubbele userdata: {0} en {1}. emptyWorldName = Set Home: Naam van wereld is leeg. -enableUnlimited = \u00a77Oneindig van {0} gegeven aan {1}. +enableUnlimited = \u00a77Oneindig aantal {0} aan {1} gegeven. enabled = ingeschakeld errorCallingCommand = Fout bij het aanroepen van de opdracht /{0} errorWithMessage = \u00a7cFout: {0} -essentialsReload = \u00a77Essentials herlaadde {0} -extinguish = \u00a77Je hebt jezelf uitgeblust. -extinguishOthers = \u00a77Je hebt {0} uitgeblust. +essentialsReload = \u00a77Essentials is herladen {0} +extinguish = \u00a77Je hebt jezelf geblust. +extinguishOthers = \u00a77Je hebt {0} geblust. failedToCloseConfig = Fout bij het sluiten van config {0} failedToCreateConfig = Fout tijdens het aanmaken van config {0} failedToWriteConfig = Fout bij het cre\u00ebren van config {0} @@ -79,9 +79,9 @@ foreverAlone = \u00a7cJe hebt niemand waarnaar je kan reageren. freedMemory = {0} MB gelost. gcchunks = chunks, gcentities = entities -gcfree = Free memory: {0} MB +gcfree = Vrij geheugen: {0} MB gcmax = Maximaal geheugen: {0} MB -gctotal = Allocated memory: {0} MB +gctotal = Gealloceerd geheugen: {0} MB generatingPortal = \u00a77Uitgangs portal aan het cre\u00ebren. geoIpUrlEmpty = GeoIP download url is leeg. geoIpUrlInvalid = GeoIP download url is ongeldig. @@ -90,9 +90,9 @@ godDisabledFor = uitgeschakeld voor {0} godEnabledFor = ingeschakeld voor {0} godMode = \u00a77God mode {0}. haveBeenReleased = \u00a77Je bent bevrijdt -heal = \u00a77Je bent gehealed. -healOther = \u00a77Je healde {0}. -helpConsole = type ?, Om help vanaf de console te bekijken. +heal = \u00a77Je bent genezen. +healOther = \u00a77Je geneezde {0}. +helpConsole = type ? om de consolehelp weer te geven. helpOp = \u00a7c[HelpOp]\u00a7f \u00a77{0}:\u00a7f {1} helpPages = Pagina \u00a7c{0}\u00a7f van de \u00a7c{1}\u00a7f: holeInFloor = Gat in de vloer @@ -134,7 +134,7 @@ jailNotExist = Die gevangenis bestaat niet. jailSet = \u00a77Gevangenis {0} is ingesteld jumpError = Dat zou je computers hersenen beschadigen. kickDefault = Gekicked van de server -kickExempt = \u00a77Je kunt niet schoppen die speler. +kickExempt = \u00a77Je kunt die speler niet schoppen. kill = \u00a77Jij doodde {0}. kitError = \u00a7cEr zijn geen geldige kits. kitError2 = \u00a7cDie kit bestaat niet of is verkeerde beschreven. @@ -168,9 +168,9 @@ moneySentTo = \u00a7a{0} is verzonden naar {1} moneyTaken = {0} van je bankrekening afgehaald. month = maand months = maanden -moreThanZero = Aantal moet groter zijn dan 0. +moreThanZero = Het aantal moet groter zijn dan 0. msgFormat = \u00a77[{0}\u00a77 -> {1}\u00a77] \u00a7f{2} -muteExempt = \u00a7cYou may not mute that player. +muteExempt = \u00a7cJe kan deze speler niet muten. mutedPlayer = Speler {0} gemute. mutedPlayerFor = Speler {0} is gemute voor {1}. mutedUserSpeaks = {0} probeerde te praten, maar is gemute. @@ -195,7 +195,7 @@ noMailSendPerm = \u00a7cJe hebt de \u00a7fessentials.mail.send\u00a7c toestemmin noMotd = \u00a7cEr is geen bericht van de dag. noNewMail = \u00a77Je hebt geen nieuwe berichten. noPendingRequest = Je hebt geen aanvragen. -noPlacePermission = \u00a7cYou do not have permission to place a block near that sign. +noPlacePermission = \u00a7cJe hebt geen toestemming om een blok naast die sign te plaatsen. noRules = \u00a7cEr zijn nog geen regels gegeven. noWarpsDefined = Geen warps gedefinieerd none = geen @@ -206,29 +206,29 @@ notRecommendedBukkit = De Bukkit versie is niet de aangeraden build voor Essenti notSupportedYet = Nog niet ondersteund. now = nu numberRequired = Er moet daar een nummer, grapjas. -onlyDayNight = /time oondersteund alleen day/night. +onlyDayNight = /time ondersteund alleen day/night. onlyPlayers = Alleen in-game spelers kunnen {0} gebruiken. onlySunStorm = /weather only supports sun/storm. parseError = Fout bij ontleding {0} op regel {1} pendingTeleportCancelled = \u00a7cAangevraagde teleportatie afgelast. -permissionsError = Vermisde Permissions/GroupManager; chat prefixes/suffixes worden uitgeschakeld. +permissionsError = Permissions/GroupManager ontbreekt; chat prefixes/suffixes worden uitgeschakeld. playerBanned = \u00a7cSpeler {0} is geband: {1} playerInJail = \u00a7cSpeler zit al in de gevangenis {0}. playerJailed = \u00a77Speler {0} is in de gevangenis gezet. playerJailedFor = \u00a77Speler {0} is in de gevangenis gezet voor {1}. playerKicked = \u00a7cPlayer {0} kicked: {1} -playerMuted = \u00a77You have been muted -playerMutedFor = \u00a77You have been muted for {0} +playerMuted = \u00a77Je kreeg het zwijgen opgelegd. +playerMutedFor = \u00a77Je kreeg het zwijgen opgelegd voor {0} playerNeverOnServer = \u00a7cSpeler {0} is nooit op deze server geweest. playerNotFound = \u00a7cSpeler niet gevonden. -playerUnmuted = \u00a77You have been unmuted +playerUnmuted = \u00a77Speler mag weer praten pong = Pong! possibleWorlds = \u00a77Mogelijk zijn de werelden de nummer 0 tot en met {0}. -powerToolAir = Command kan niet worden bevestigd aan de lucht. +powerToolAir = Command kan niet worden bevestigd aan lucht. powerToolAttach = Command toegewezen aan {0} powerToolRemove = Command verwijderd van {0} -protectionOwner = \u00a76[EssentialsProtect] Bescherming eigenaar: {0} -questionFormat = \u00a77[Question]\u00a7f {0} +protectionOwner = \u00a76[EssentialsProtect] Beschermingeigenaar: {0} +questionFormat = \u00a77[Vraag]\u00a7f {0} reloadAllPlugins = \u00a77Alle plugins zijn herladen. requestAccepted = \u00a77Teleporteer aanvraag geaccepteerd. requestDenied = \u00a77Teleporteer aanvraag geweigerd. @@ -263,7 +263,7 @@ teleportationEnabled = \u00a77Teleportatie ingeschakeld. teleporting = \u00a77Bezig met teleporteren... teleportingPortal = \u00a77Bezig met teleporteren via de portal. tempBanned = Tijdelijk geband voor {0} -tempbanExempt = \u00a77You may not tempban that player +tempbanExempt = \u00a77Je mag deze speler niet een tempban geven thunder = Je {0} onweert de wereld thunderDuration = Je {0} onweert de wereld voor {1} seconde. timeBeforeHeal = Afkoeltijd tot de volgende heal: {0} @@ -279,15 +279,15 @@ typeTpdeny = \u00a77Om te weigeren, type \u00a7c/tpdeny\u00a77. typeWorldName = \u00a77Je kan ook de exacte naam van de wereld typen. unableToSpawnMob = De mob kan niet gespawned worden. unableToSpawnMob = Mob kon niet gespawnd worden. -unbannedIP = IP adres unbanned. -unbannedPlayer = Speler unbanned. +unbannedIP = IP adres ontbannen. +unbannedPlayer = Speler ontbannen. unignorePlayer = Je negeert {0} niet meer. unknownItemId = Onbekend voorwerp id: {0} unknownItemInList = Onbekend voorwerp {0} in {1} lijst. unknownItemName = Onbekende voorwerp naam: {0} unlimitedItemPermission = \u00a7cOnbevoegd om oneindig {0} te hebben. unlimitedItems = Oneindige voorwerpen: -unmutedPlayer = Speler {0} ge-unmute. +unmutedPlayer = Speler {0} mag weer spreken. upgradingFilesError = Fout tijdens het upgraden van de bestanden userCreatedPortal = {0} gebruikte een portal en maakte een uitgangs portal. userDoesNotExist = Speler {0} bestaat niet. @@ -325,5 +325,5 @@ worthMeta = \u00a77Stapel {0} met een metadata van {1} met waarde \u00a7c{2}\u00 worthSet = Waarde ingesteld year = jaar years = jaren -youAreHealed = \u00a77Je bent gehealed. -youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken. +youAreHealed = \u00a77Je bent genezen. +youHaveNewMail = \u00a7cJe hebt {0} berichten!\u00a7f Type \u00a77/mail read\u00a7f om je berichten te bekijken. \ No newline at end of file From 0b681c3654bcddc9e850fe0e99659430eccc4203 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 25 Jul 2011 19:24:14 -0700 Subject: [PATCH 09/13] Edited Essentials/src/messages_nl.properties via GitHub --- Essentials/src/messages_nl.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index 544d31f14..a11abea8e 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -127,7 +127,7 @@ itemNotEnough3 = \u00a77/sell itemname -1 zorgt ervoor dat ze allemaal behalve 1 itemSellAir = Je wilde serieus lucht verkopen? Plaats een voorwerp in je hand. itemSold = \u00a77Verkocht voor \u00a7c {0} \u00a77 ({1} voorwerpen voor {2} per stuk) itemSoldConsole = {0} verkocht {1} voor \u00a77 {2} \u00a77 ({3} voorwerpen voor {4} per stuk) -itemSpawn = \u00a77Geven van {0} van de {1} +itemSpawn = \u00a77Geeft {0} {1} itemsCsvNotLoaded = De item kunnen niet geladen worden.csv. jailMessage = \u00a7cYou do the crime, you do the time. jailNotExist = Die gevangenis bestaat niet. From 7d7c686e6ab1585e77b58ce608ff82f678cd2bec Mon Sep 17 00:00:00 2001 From: KHobbits Date: Mon, 25 Jul 2011 23:25:07 -0700 Subject: [PATCH 10/13] Edited Essentials/src/plugin.yml via GitHub --- Essentials/src/plugin.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml index 7616ca4c7..d2608df7a 100644 --- a/Essentials/src/plugin.yml +++ b/Essentials/src/plugin.yml @@ -42,7 +42,7 @@ commands: broadcast: description: Broadcasts a message to the entire server. usage: / [msg] - aliases: [ebroadcast,bcast] + aliases: [ebroadcast,bcast,ebcast] bigtree: description: Spawn a big tree where you are looking. usage: / [tree|redwood] @@ -66,7 +66,7 @@ commands: delwarp: description: Deletes the specified warp. usage: / [warp] - aliases: [edelwarp,remwarp,rmwarp] + aliases: [edelwarp,remwarp,rmwarp,eremwarp,ermwarp] depth: description: States current depth, relative to sea level. usage: /depth @@ -93,7 +93,7 @@ commands: gc: description: Reports garbage collection info; useful to developers. usage: / - aliases: [mem,memory,egc] + aliases: [mem,memory,egc,emem,ememory] give: description: Give a player an item. usage: / [player] [item|numeric] @@ -101,7 +101,7 @@ commands: god: description: Enables your godly powers. usage: / - aliases: [tgm,godmode,egod] + aliases: [tgm,godmode,egod,egodmode,etgm] heal: description: Heals you or the given player. usage: / @@ -124,7 +124,7 @@ commands: info: description: Shows information set by the server owner usage: / [chapter] [page] - aliases: [ifo,einfo,eabout,news] + aliases: [ifo,einfo,eabout,news,enews,eifo] invsee: description: See the inventory of other players. usage: / @@ -160,7 +160,7 @@ commands: list: description: List all online players. usage: / - aliases: [playerlist,who,online,elist] + aliases: [playerlist,who,online,elist,ewho,eplayerlist,eonline] lightning: description: The power of Thor. Strike at cursor or player. usage: / [player] @@ -180,7 +180,7 @@ commands: msg: description: Sends a private message to the specified player. usage: / - aliases: [m,t,emsg,tell] + aliases: [m,t,emsg,tell,etell,whisper,ewhisper] mute: description: Mutes or unmutes a player. usage: / [player] @@ -200,7 +200,7 @@ commands: ping: description: Pong! usage: / - aliases: [pong,eping] + aliases: [pong,eping,epong] powertool: description: Assigns a command to the item in hand, {player} will be replaced by the name of the player that you click. usage: / [command] @@ -291,6 +291,7 @@ commands: tpaccept: description: Accepts a teleport request. usage: / + aliases: [tpyes] tpahere: description: Request that the specified player teleport to you. usage: / @@ -300,6 +301,7 @@ commands: tpdeny: description: Reject a teleport request. usage: / + aliases: [tpno] tphere: description: Teleport a player to you. usage: / [player] @@ -331,7 +333,7 @@ commands: unlimited: description: Allows the unlimited placing of items. usage: / [list|item] - aliases: [eunlimited] + aliases: [eunlimited,ul,eul] warp: description: List all warps or warp to the specified location. usage: / @@ -339,7 +341,7 @@ commands: weather: description: Setting the weather. usage: / [duration] - aliases: [sky,sun,storm,eweather] + aliases: [sky,sun,storm,eweather,esky,esun,estorm] whois: description: Determine the username behind a nickname. usage: / [nickname] From 8bb4067f061f1b2e449a670c2f7cacf3f89eda96 Mon Sep 17 00:00:00 2001 From: ementalo Date: Tue, 26 Jul 2011 10:35:55 +0200 Subject: [PATCH 11/13] double quoting ' --- Essentials/src/messages_nl.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/messages_nl.properties b/Essentials/src/messages_nl.properties index a11abea8e..1f3915f7f 100644 --- a/Essentials/src/messages_nl.properties +++ b/Essentials/src/messages_nl.properties @@ -3,7 +3,7 @@ # Translations start here # by Geertje123 addedToAccount = \u00a7a{0} is gestort op je account. -addedToOthersAccount = \u00a7a{0} is overgemaakt naar {1}'s rekening +addedToOthersAccount = \u00a7a{0} is overgemaakt naar {1}''s rekening alertBroke = gebroken: alertFormat = \u00a73[{0}] \u00a7f {1} \u00a76 {2} bij: {3} alertPlaced = geplaatst: From 0ac26265e21c49dc6614e3c9a289e97dad725051 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 27 Jul 2011 01:00:47 +0200 Subject: [PATCH 12/13] Fix for money exploit on trade signs --- .../src/com/earth2me/essentials/signs/SignTrade.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java index 6c0205d34..d9b5f7cc2 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java @@ -98,9 +98,14 @@ public class SignTrade extends EssentialsSign if (split.length == 2 && amountNeeded) { final Double money = getMoney(split[0]); - final Double amount = getDoublePositive(split[1]); + Double amount = getDoublePositive(split[1]); if (money != null && amount != null) { + amount -= amount % money; + if (amount < 1 || money < 1) + { + throw new SignException(Util.i18n("moreThanZero")); + } sign.setLine(index, Util.formatCurrency(money, ess) + ":" + Util.formatCurrency(amount, ess).substring(1)); return; } From beb34a7651d24d973b9ae1c99294cd10cf5bd94a Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 27 Jul 2011 01:04:21 +0200 Subject: [PATCH 13/13] Allow fractions of 1 --- Essentials/src/com/earth2me/essentials/signs/SignTrade.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java index d9b5f7cc2..37f56d9fb 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java @@ -102,7 +102,7 @@ public class SignTrade extends EssentialsSign if (money != null && amount != null) { amount -= amount % money; - if (amount < 1 || money < 1) + if (amount < 0.01 || money < 0.01) { throw new SignException(Util.i18n("moreThanZero")); }