diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index 3391803..01bf42c 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -646,12 +646,12 @@ public class MineTweakerImplementationAPI { MineTweakerAPI.tweaker.rollback(); if (MineTweakerAPI.server != null) { if (!MineTweakerAPI.server.isCommandAdded("minetweaker")) { - server.addCommand("minetweaker", "", new String[]{"mt"}, new ICommandFunction() { + server.addCommand("minetweaker", "", new String[]{"mt", "crafttweaker", "ct"}, new ICommandFunction() { @Override public void execute(String[] arguments, IPlayer player) { if (arguments.length == 0) { player.sendChat("Please provide a command. Use /mt help for more info."); - } else if (arguments[0].equals("help")) { + } else if (argum ents[0].equals("help")) { String[] keys = minetweakerCommands.keySet().toArray(new String[minetweakerCommands.size()]); Arrays.sort(keys); for (String key : keys) { diff --git a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java index d55fe7e..a4c7233 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java +++ b/MineTweaker3-API/src/main/java/minetweaker/runtime/MTTweaker.java @@ -107,6 +107,7 @@ public class MTTweaker implements ITweaker { @Override public void load() { + ZenModule.loadedClasses.clear(); System.out.println("Loading scripts"); scriptData = ScriptProviderMemory.collect(scriptProvider); diff --git a/ZenScript b/ZenScript index 56aca31..e714482 160000 --- a/ZenScript +++ b/ZenScript @@ -1 +1 @@ -Subproject commit 56aca313d10725627e38b96e483ff4c61d29bb2a +Subproject commit e71448251d386c7ab67316f89a9c5c15a6a23176 diff --git a/build.gradle b/build.gradle index 4127ea9..2c8dc1b 100644 --- a/build.gradle +++ b/build.gradle @@ -79,7 +79,7 @@ task assembleMC1710(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build'] + projects1710.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-1.7.10-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-1.7.10-${mineTweakerVersion}-legacy.jar" from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) @@ -93,7 +93,7 @@ task assembleMC18(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build'] + projects18.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-1.8.9-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-1.8.9-${mineTweakerVersion}-legacy.jar" from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) @@ -107,7 +107,7 @@ task assembleMC1102(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build'] + projects1102.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-1.10.2-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-1.10.2-${mineTweakerVersion}-legacy.jar" from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) @@ -121,7 +121,7 @@ task assembleMC1112(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build'] + projects1112.collect { ':' + it + ":build" }) { - archiveName = "CraftTweaker-1.11.2-${mineTweakerVersion}.jar" + archiveName = "CraftTweaker-1.11.2-${mineTweakerVersion}-legacy.jar" from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) @@ -135,7 +135,7 @@ task assembleDevBase1710(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build', ':MineTweaker3-MC1710-Main:build']) { - archiveName="CraftTweaker-Dev-1.7.10-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-Dev-1.7.10-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -146,7 +146,7 @@ task assembleDevBase18(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build', ':MineTweaker3-MC18-Main:build']) { - archiveName="CraftTweaker-Dev-1.8.9-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-Dev-1.8.9-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -157,7 +157,7 @@ task assembleDevBase1102(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build', ':MineTweaker3-MC1102-Main:build']) { - archiveName="CraftTweaker-Dev-1.10.2-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-Dev-1.10.2-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -168,7 +168,7 @@ task assembleDevBase1112(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build', ':MineTweaker3-MC1112-Main:build']) { - archiveName = "CraftTweaker-Dev-1.11.2-${mineTweakerVersion}.jar" + archiveName = "CraftTweaker-Dev-1.11.2-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -179,7 +179,7 @@ task assembleDevFull1710(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build'] + projects1710.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Dev-Full-1.7.10-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-Dev-Full-1.7.10-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -194,7 +194,7 @@ task assembleDevFull18(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build'] + projects18.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Dev-Full-1.8.9-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-Dev-Full-1.8.9-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -208,7 +208,7 @@ task assembleDevFull1102(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build'] + projects1102.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Dev-Full-1.10.2-${mineTweakerVersion}.jar" + archiveName="CraftTweaker-Dev-Full-1.10.2-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output @@ -222,7 +222,7 @@ task assembleDevFull1112(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build'] + projects1112.collect { ':' + it + ":build" }) { - archiveName = "CraftTweaker-Dev-Full-1.11.2-${mineTweakerVersion}.jar" + archiveName = "CraftTweaker-Dev-Full-1.11.2-${mineTweakerVersion}-legacy.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output diff --git a/configuration.gradle b/configuration.gradle index 4bdc75a..724f29d 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -4,7 +4,7 @@ import javax.tools.ToolProvider // ### Global settings ### // ####################### -ext.mineTweakerVersion = "3.1.0_legacy" +ext.mineTweakerVersion = "3.1.0" if (System.getenv('BUILD_NUMBER') != null) project.mineTweakerVersion += "."+System.getenv('BUILD_NUMBER') else {