From e5b27c19b7ecbaaa32fd35fdae8065d8c03b2223 Mon Sep 17 00:00:00 2001 From: Jared Date: Sun, 3 Jul 2016 18:20:54 +0200 Subject: [PATCH] Updated to 1.10.2 Removed 1.9 support --- .gitignore | 12 +++++ .../build.gradle | 6 +-- .../api/minecraft/MineTweakerMC.java | 20 +++---- .../minetweaker/mc1102}/FMLEventHandler.java | 6 +-- .../mc1102}/ForgeEventHandler.java | 4 +- .../mc1102}/GuiCannotRemodify.java | 2 +- .../mc1102}/MCPlatformFunctions.java | 10 ++-- .../minetweaker/mc1102}/MineTweakerMod.java | 49 +++++++++--------- .../mc1102}/MineTweakerRegistry.java | 2 +- .../actions/SetBlockHardnessAction.java | 2 +- .../mc1102}/actions/SetStackSizeAction.java | 2 +- .../actions/SetStackmaxDamageAction.java | 2 +- .../mc1102}/block/MCBlockDefinition.java | 2 +- .../mc1102}/block/MCItemBlock.java | 2 +- .../mc1102}/block/MCSpecificBlock.java | 2 +- .../mc1102}/block/MCWorldBlock.java | 2 +- .../mc1102}/brackets/ItemBracketHandler.java | 2 +- .../brackets/LiquidBracketHandler.java | 4 +- .../mc1102}/brackets/OreBracketHandler.java | 4 +- .../mc1102}/brewing/MCBrewingManager.java | 4 +- .../mc1102}/chat/MCChatMessage.java | 2 +- .../minetweaker/mc1102}/client/MCClient.java | 2 +- .../mc1102}/data/NBTConverter.java | 16 +++--- .../minetweaker/mc1102}/data/NBTUpdater.java | 2 +- .../mc1102}/entity/MCEntityDefinition.java | 2 +- .../formatting/FormattedMarkupString.java | 2 +- .../mc1102}/formatting/FormattedString.java | 2 +- .../formatting/FormattedStringJoin.java | 2 +- .../formatting/IMCFormattedString.java | 2 +- .../mc1102}/formatting/MCFormatter.java | 2 +- .../mc1102}/furnace/FuelTweaker.java | 2 +- .../mc1102}/furnace/MCFurnaceManager.java | 4 +- .../mc1102}/furnace/SetFuelPattern.java | 2 +- .../java/minetweaker/mc1102}/game/MCGame.java | 14 ++--- .../mc1102}/item/MCItemDefinition.java | 2 +- .../minetweaker/mc1102}/item/MCItemStack.java | 14 ++--- .../mc1102}/liquid/MCLiquidDefinition.java | 2 +- .../mc1102}/liquid/MCLiquidStack.java | 4 +- .../mc1102}/mods/MCLoadedMods.java | 2 +- .../java/minetweaker/mc1102}/mods/MCMod.java | 2 +- .../MineTweakerCopyClipboardHandler.java | 4 +- .../MineTweakerCopyClipboardPacket.java | 2 +- .../MineTweakerLoadScriptsHandler.java | 4 +- .../network/MineTweakerLoadScriptsPacket.java | 2 +- .../MineTweakerOpenBrowserHandler.java | 2 +- .../network/MineTweakerOpenBrowserPacket.java | 2 +- .../mc1102}/oredict/MCOreDict.java | 2 +- .../mc1102}/oredict/MCOreDictEntry.java | 4 +- .../mc1102}/player/CommandBlockPlayer.java | 2 +- .../minetweaker/mc1102}/player/MCPlayer.java | 10 ++-- .../mc1102}/player/RconPlayer.java | 2 +- .../mc1102}/recipes/MCCraftingInventory.java | 6 +-- .../mc1102}/recipes/MCRecipeManager.java | 4 +- .../mc1102}/recipes/RecipeConverter.java | 2 +- .../mc1102}/recipes/ShapedRecipeAdvanced.java | 2 +- .../mc1102}/recipes/ShapedRecipeBasic.java | 2 +- .../mc1102}/recipes/ShapedRecipeOre.java | 2 +- .../recipes/ShapelessRecipeAdvanced.java | 2 +- .../mc1102}/recipes/ShapelessRecipeBasic.java | 2 +- .../mc1102}/recipes/ShapelessRecipeOre.java | 2 +- .../minetweaker/mc1102}/server/MCServer.java | 8 +-- .../mc1102}/server/ServerPlayer.java | 2 +- .../mc1102}/util/MineTweakerHacks.java | 2 +- .../mc1102}/util/MineTweakerObfuscation.java | 2 +- .../util/MineTweakerPlatformUtils.java | 2 +- .../mc1102}/vanilla/MCLootRegistry.java | 4 +- .../mc1102}/vanilla/MCSeedRegistry.java | 4 +- .../mc1102}/vanilla/MCVanilla.java | 2 +- .../minetweaker/mc1102}/world/MCBiome.java | 2 +- .../mc1102}/world/MCDimension.java | 2 +- .../resources/assets/minetweaker/logo.png | Bin .../src/main/resources/mcmod.info | 0 .../build.gradle | 8 +-- .../main/java/minetweaker/mods/jei/JEI.java | 0 .../minetweaker/mods/jei/JEIAddonPlugin.java | 1 + .../minetweaker/mc1710/MineTweakerMod.java | 2 +- .../java/minetweaker/mc18/MineTweakerMod.java | 2 +- build.gradle | 34 ++++++------ configuration.gradle | 16 +++--- 79 files changed, 194 insertions(+), 180 deletions(-) rename {MineTweaker3-MC19-Main => MineTweaker3-MC1102-Main}/build.gradle (89%) rename {MineTweaker3-MC19-Main => MineTweaker3-MC1102-Main}/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/FMLEventHandler.java (93%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/ForgeEventHandler.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/GuiCannotRemodify.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/MCPlatformFunctions.java (83%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/MineTweakerMod.java (87%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/MineTweakerRegistry.java (93%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/actions/SetBlockHardnessAction.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/actions/SetStackSizeAction.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/actions/SetStackmaxDamageAction.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/block/MCBlockDefinition.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/block/MCItemBlock.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/block/MCSpecificBlock.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/block/MCWorldBlock.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/brackets/ItemBracketHandler.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/brackets/LiquidBracketHandler.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/brackets/OreBracketHandler.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/brewing/MCBrewingManager.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/chat/MCChatMessage.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/client/MCClient.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/data/NBTConverter.java (87%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/data/NBTUpdater.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/entity/MCEntityDefinition.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/formatting/FormattedMarkupString.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/formatting/FormattedString.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/formatting/FormattedStringJoin.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/formatting/IMCFormattedString.java (91%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/formatting/MCFormatter.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/furnace/FuelTweaker.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/furnace/MCFurnaceManager.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/furnace/SetFuelPattern.java (91%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/game/MCGame.java (94%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/item/MCItemDefinition.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/item/MCItemStack.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/liquid/MCLiquidDefinition.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/liquid/MCLiquidStack.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/mods/MCLoadedMods.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/mods/MCMod.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/network/MineTweakerCopyClipboardHandler.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/network/MineTweakerCopyClipboardPacket.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/network/MineTweakerLoadScriptsHandler.java (93%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/network/MineTweakerLoadScriptsPacket.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/network/MineTweakerOpenBrowserHandler.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/network/MineTweakerOpenBrowserPacket.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/oredict/MCOreDict.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/oredict/MCOreDictEntry.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/player/CommandBlockPlayer.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/player/MCPlayer.java (93%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/player/RconPlayer.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/MCCraftingInventory.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/MCRecipeManager.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/RecipeConverter.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/ShapedRecipeAdvanced.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/ShapedRecipeBasic.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/ShapedRecipeOre.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/ShapelessRecipeAdvanced.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/ShapelessRecipeBasic.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/recipes/ShapelessRecipeOre.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/server/MCServer.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/server/ServerPlayer.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/util/MineTweakerHacks.java (99%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/util/MineTweakerObfuscation.java (96%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/util/MineTweakerPlatformUtils.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/vanilla/MCLootRegistry.java (98%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/vanilla/MCSeedRegistry.java (97%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/vanilla/MCVanilla.java (95%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/world/MCBiome.java (93%) rename {MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19 => MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102}/world/MCDimension.java (96%) rename {MineTweaker3-MC19-Main => MineTweaker3-MC1102-Main}/src/main/resources/assets/minetweaker/logo.png (100%) rename {MineTweaker3-MC19-Main => MineTweaker3-MC1102-Main}/src/main/resources/mcmod.info (100%) rename {MineTweaker3-MC19-Mod-JEI => MineTweaker3-MC1102-Mod-JEI}/build.gradle (85%) rename {MineTweaker3-MC19-Mod-JEI => MineTweaker3-MC1102-Mod-JEI}/src/main/java/minetweaker/mods/jei/JEI.java (100%) rename {MineTweaker3-MC19-Mod-JEI => MineTweaker3-MC1102-Mod-JEI}/src/main/java/minetweaker/mods/jei/JEIAddonPlugin.java (95%) diff --git a/.gitignore b/.gitignore index 428a909..1d53c20 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,18 @@ /MineTweaker3-API/* !/MineTweaker3-API/src +!/MineTweaker3-MC1102-Main +/MineTweaker3-MC1102-Main/* +!/MineTweaker3-MC1102-Main/src +!/MineTweaker3-MC1102-Main/build.gradle +/MineTweaker3-MC1102-Main/bin + +!/MineTweaker3-MC1102-Mod-JEI +/MineTweaker3-MC1102-Mod-JEI/* +!/MineTweaker3-MC1102-Mod-JEI/src +!/MineTweaker3-MC1102-Mod-JEI/libs +!/MineTweaker3-MC1102-Mod-JEI/build.gradle + !/MineTweaker3-MC19-Main /MineTweaker3-MC19-Main/* !/MineTweaker3-MC19-Main/src diff --git a/MineTweaker3-MC19-Main/build.gradle b/MineTweaker3-MC1102-Main/build.gradle similarity index 89% rename from MineTweaker3-MC19-Main/build.gradle rename to MineTweaker3-MC1102-Main/build.gradle index ae0b6a7..e23f415 100644 --- a/MineTweaker3-MC19-Main/build.gradle +++ b/MineTweaker3-MC1102-Main/build.gradle @@ -14,11 +14,11 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.9-" + ext.mineTweakerVersion +version = "1.10.2-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name minecraft { - version = forgeVersion19 + version = forgeVersion1102 runDir = "eclipse" mappings = "snapshot_20160518" } @@ -31,7 +31,7 @@ dependencies { task makeRegistry(type: RegisterZenClassesTask) { inputDir = file('build/classes/main') outputDir = file('build/classes/main') - className = 'minetweaker.mc19.MineTweakerRegistry' + className = 'minetweaker.mc1102.MineTweakerRegistry' } tasks.jar.dependsOn(makeRegistry) diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java similarity index 96% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index 9ed1807..9a13670 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -12,16 +12,16 @@ import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; import minetweaker.api.world.IBiome; import minetweaker.api.world.IDimension; -import minetweaker.mc19.block.MCBlockDefinition; -import minetweaker.mc19.block.MCSpecificBlock; -import minetweaker.mc19.block.MCWorldBlock; -import minetweaker.mc19.data.NBTConverter; -import minetweaker.mc19.item.MCItemStack; -import minetweaker.mc19.liquid.MCLiquidStack; -import minetweaker.mc19.oredict.MCOreDictEntry; -import minetweaker.mc19.player.MCPlayer; -import minetweaker.mc19.world.MCBiome; -import minetweaker.mc19.world.MCDimension; +import minetweaker.mc1102.block.MCBlockDefinition; +import minetweaker.mc1102.block.MCSpecificBlock; +import minetweaker.mc1102.block.MCWorldBlock; +import minetweaker.mc1102.data.NBTConverter; +import minetweaker.mc1102.item.MCItemStack; +import minetweaker.mc1102.liquid.MCLiquidStack; +import minetweaker.mc1102.oredict.MCOreDictEntry; +import minetweaker.mc1102.player.MCPlayer; +import minetweaker.mc1102.world.MCBiome; +import minetweaker.mc1102.world.MCDimension; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/FMLEventHandler.java similarity index 93% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/FMLEventHandler.java index 34c8339..f68638e 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/FMLEventHandler.java @@ -1,4 +1,4 @@ -package minetweaker.mc19; +package minetweaker.mc1102; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -8,8 +8,8 @@ import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; -import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; -import minetweaker.mc19.recipes.MCCraftingInventory; +import minetweaker.mc1102.network.MineTweakerLoadScriptsPacket; +import minetweaker.mc1102.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java similarity index 95% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java index f52141b..0da3048 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/ForgeEventHandler.java @@ -4,14 +4,14 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1102; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.formatting.IFormattedText; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.tooltip.IngredientTooltips; -import minetweaker.mc19.formatting.IMCFormattedString; +import minetweaker.mc1102.formatting.IMCFormattedString; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/GuiCannotRemodify.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/GuiCannotRemodify.java index e5fcb72..3501450 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/GuiCannotRemodify.java @@ -1,4 +1,4 @@ -package minetweaker.mc19; +package minetweaker.mc1102; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MCPlatformFunctions.java similarity index 83% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MCPlatformFunctions.java index f13a456..0ede039 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MCPlatformFunctions.java @@ -4,18 +4,18 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1102; import minetweaker.IPlatformFunctions; import minetweaker.api.chat.IChatMessage; import minetweaker.api.item.IItemDefinition; -import minetweaker.mc19.chat.MCChatMessage; -import minetweaker.mc19.item.MCItemDefinition; -import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; +import minetweaker.mc1102.chat.MCChatMessage; +import minetweaker.mc1102.item.MCItemDefinition; +import minetweaker.mc1102.network.MineTweakerLoadScriptsPacket; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; -import static minetweaker.mc19.MineTweakerMod.NETWORK; +import static minetweaker.mc1102.MineTweakerMod.NETWORK; /** * @author Stan diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java similarity index 87% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java index d809d5a..661ebec 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerMod.java @@ -4,27 +4,27 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1102; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; -import minetweaker.mc19.brackets.ItemBracketHandler; -import minetweaker.mc19.brackets.LiquidBracketHandler; -import minetweaker.mc19.brackets.OreBracketHandler; -import minetweaker.mc19.client.MCClient; -import minetweaker.mc19.formatting.MCFormatter; -import minetweaker.mc19.furnace.FuelTweaker; -import minetweaker.mc19.furnace.MCFurnaceManager; -import minetweaker.mc19.game.MCGame; -import minetweaker.mc19.mods.MCLoadedMods; -import minetweaker.mc19.network.*; -import minetweaker.mc19.oredict.MCOreDict; -import minetweaker.mc19.recipes.MCRecipeManager; -import minetweaker.mc19.server.MCServer; -import minetweaker.mc19.util.MineTweakerHacks; -import minetweaker.mc19.util.MineTweakerPlatformUtils; -import minetweaker.mc19.vanilla.MCVanilla; +import minetweaker.mc1102.brackets.ItemBracketHandler; +import minetweaker.mc1102.brackets.LiquidBracketHandler; +import minetweaker.mc1102.brackets.OreBracketHandler; +import minetweaker.mc1102.client.MCClient; +import minetweaker.mc1102.formatting.MCFormatter; +import minetweaker.mc1102.furnace.FuelTweaker; +import minetweaker.mc1102.furnace.MCFurnaceManager; +import minetweaker.mc1102.game.MCGame; +import minetweaker.mc1102.mods.MCLoadedMods; +import minetweaker.mc1102.network.*; +import minetweaker.mc1102.oredict.MCOreDict; +import minetweaker.mc1102.recipes.MCRecipeManager; +import minetweaker.mc1102.server.MCServer; +import minetweaker.mc1102.util.MineTweakerHacks; +import minetweaker.mc1102.util.MineTweakerPlatformUtils; +import minetweaker.mc1102.vanilla.MCVanilla; import minetweaker.runtime.GlobalRegistry; import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; @@ -49,10 +49,10 @@ import java.io.File; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = "3.0.9") +@Mod(modid = MineTweakerMod.MODID, version = "3.0.10") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; - public static final String MCVERSION = "1.9.4"; + public static final String MCVERSION = "1.10.2"; public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(MODID); @@ -135,6 +135,12 @@ public class MineTweakerMod { @EventHandler public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { this.server = ev.getServer(); + + } + + @EventHandler + public void onServerStarting(FMLServerStartingEvent ev) { + this.server = ev.getServer(); // starts before loading worlds // perfect place to start MineTweaker! @@ -152,11 +158,6 @@ public class MineTweakerMod { MineTweakerImplementationAPI.setScriptProvider(cascaded); MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); - } - - @EventHandler - public void onServerStarting(FMLServerStartingEvent ev) { - this.server = ev.getServer(); } diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerRegistry.java similarity index 93% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerRegistry.java index 3ed826c..8c7b0ae 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/MineTweakerRegistry.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1102; import java.util.List; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetBlockHardnessAction.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetBlockHardnessAction.java index e75a0b1..cbf02cc 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetBlockHardnessAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1102.actions; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetStackSizeAction.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetStackSizeAction.java index 99b1684..81ca21e 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetStackSizeAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1102.actions; import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetStackmaxDamageAction.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetStackmaxDamageAction.java index 7e6a0ef..5642147 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/actions/SetStackmaxDamageAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1102.actions; import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCBlockDefinition.java similarity index 95% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCBlockDefinition.java index 914c2ab..72ae408 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCBlockDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1102.block; import minetweaker.api.block.IBlockDefinition; import net.minecraft.block.Block; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCItemBlock.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCItemBlock.java index 54425c3..ed463d9 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCItemBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1102.block; import minetweaker.api.block.BlockPatternOr; import minetweaker.api.block.IBlock; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCSpecificBlock.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCSpecificBlock.java index 691a05b..c79dc6f 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCSpecificBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1102.block; import minetweaker.api.block.BlockPatternOr; import minetweaker.api.block.IBlock; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCWorldBlock.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCWorldBlock.java index be336d0..5bdb64f 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/block/MCWorldBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1102.block; import minetweaker.api.block.BlockPatternOr; import minetweaker.api.block.IBlock; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/ItemBracketHandler.java similarity index 99% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/ItemBracketHandler.java index 8024bce..912bec6 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/ItemBracketHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.brackets; +package minetweaker.mc1102.brackets; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/LiquidBracketHandler.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/LiquidBracketHandler.java index 9b8653e..a1567c9 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/LiquidBracketHandler.java @@ -1,9 +1,9 @@ -package minetweaker.mc19.brackets; +package minetweaker.mc1102.brackets; import minetweaker.IBracketHandler; import minetweaker.annotations.BracketHandler; import minetweaker.api.liquid.ILiquidStack; -import minetweaker.mc19.liquid.MCLiquidStack; +import minetweaker.mc1102.liquid.MCLiquidStack; import minetweaker.runtime.GlobalRegistry; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/OreBracketHandler.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/OreBracketHandler.java index a49a34e..509e4f1 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brackets/OreBracketHandler.java @@ -4,13 +4,13 @@ * and open the template in the editor. */ -package minetweaker.mc19.brackets; +package minetweaker.mc1102.brackets; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; import minetweaker.api.oredict.IOreDictEntry; -import minetweaker.mc19.oredict.MCOreDictEntry; +import minetweaker.mc1102.oredict.MCOreDictEntry; import minetweaker.runtime.GlobalRegistry; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brewing/MCBrewingManager.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brewing/MCBrewingManager.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brewing/MCBrewingManager.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brewing/MCBrewingManager.java index e72f293..64ee279 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/brewing/MCBrewingManager.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/brewing/MCBrewingManager.java @@ -1,4 +1,4 @@ -package minetweaker.mc19.brewing; +package minetweaker.mc1102.brewing; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientItem; @@ -6,7 +6,7 @@ import minetweaker.api.item.IngredientOr; import minetweaker.api.recipes.BrewingRecipe; import minetweaker.api.recipes.IBrewingManager; import minetweaker.api.recipes.IBrewingRecipe; -import minetweaker.mc19.item.MCItemStack; +import minetweaker.mc1102.item.MCItemStack; import minetweaker.util.ArrayUtil; import net.minecraft.item.ItemStack; import net.minecraftforge.common.brewing.AbstractBrewingRecipe; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/chat/MCChatMessage.java similarity index 96% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/chat/MCChatMessage.java index 78e18ee..be26602 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/chat/MCChatMessage.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.chat; +package minetweaker.mc1102.chat; import minetweaker.api.chat.IChatMessage; import net.minecraft.util.text.ITextComponent; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/client/MCClient.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/client/MCClient.java similarity index 95% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/client/MCClient.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/client/MCClient.java index 036e3f9..ebbc875 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/client/MCClient.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/client/MCClient.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.client; +package minetweaker.mc1102.client; import minetweaker.api.client.IClient; import minetweaker.api.minecraft.MineTweakerMC; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/data/NBTConverter.java similarity index 87% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/data/NBTConverter.java index 13ea6d1..878b169 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/data/NBTConverter.java @@ -4,10 +4,10 @@ * and open the template in the editor. */ -package minetweaker.mc19.data; +package minetweaker.mc1102.data; import minetweaker.api.data.*; -import minetweaker.mc19.util.MineTweakerHacks; +import minetweaker.mc1102.util.MineTweakerHacks; import net.minecraft.nbt.*; import java.util.*; @@ -31,17 +31,17 @@ public class NBTConverter implements IDataConverter{ switch(nbt.getId()){ case 1: // byte - return new DataByte(((NBTBase.NBTPrimitive) nbt).getByte()); + return new DataByte(((NBTPrimitive) nbt).getByte()); case 2: // short - return new DataShort(((NBTBase.NBTPrimitive) nbt).getShort()); + return new DataShort(((NBTPrimitive) nbt).getShort()); case 3: // int - return new DataInt(((NBTBase.NBTPrimitive) nbt).getInt()); + return new DataInt(((NBTPrimitive) nbt).getInt()); case 4: // long - return new DataLong(((NBTBase.NBTPrimitive) nbt).getLong()); + return new DataLong(((NBTPrimitive) nbt).getLong()); case 5: // float - return new DataFloat(((NBTBase.NBTPrimitive) nbt).getFloat()); + return new DataFloat(((NBTPrimitive) nbt).getFloat()); case 6: // double - return new DataDouble(((NBTBase.NBTPrimitive) nbt).getDouble()); + return new DataDouble(((NBTPrimitive) nbt).getDouble()); case 7: // byte[] return new DataByteArray(((NBTTagByteArray) nbt).getByteArray(), immutable); case 8: // string diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/data/NBTUpdater.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/data/NBTUpdater.java index 2d75411..7a8cf60 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/data/NBTUpdater.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.data; +package minetweaker.mc1102.data; import minetweaker.api.data.IData; import minetweaker.api.data.IDataConverter; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/entity/MCEntityDefinition.java similarity index 95% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/entity/MCEntityDefinition.java index 1b477bf..60fdeba 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/entity/MCEntityDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.entity; +package minetweaker.mc1102.entity; import minetweaker.api.entity.IEntityDefinition; import net.minecraftforge.fml.common.registry.EntityRegistry; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedMarkupString.java similarity index 96% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedMarkupString.java index a5f2c8b..44a0a52 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedMarkupString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1102.formatting; import minetweaker.api.formatting.IFormattedText; import net.minecraft.util.text.TextFormatting; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedString.java similarity index 95% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedString.java index fa0ebce..58cdef0 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1102.formatting; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedStringJoin.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedStringJoin.java index 8ef7f77..1cac5e8 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/FormattedStringJoin.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1102.formatting; import minetweaker.api.formatting.IFormattedText; import net.minecraft.util.text.TextFormatting; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/IMCFormattedString.java similarity index 91% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/IMCFormattedString.java index f5ceb99..2eb5196 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/IMCFormattedString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1102.formatting; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/MCFormatter.java similarity index 99% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/MCFormatter.java index ec13977..535532c 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/formatting/MCFormatter.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1102.formatting; import minetweaker.api.formatting.IFormattedText; import minetweaker.api.formatting.IFormatter; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/FuelTweaker.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/FuelTweaker.java index 9ac7fc7..9e35f4b 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/FuelTweaker.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.furnace; +package minetweaker.mc1102.furnace; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/MCFurnaceManager.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/MCFurnaceManager.java index cfa0746..3696adf 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/MCFurnaceManager.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.furnace; +package minetweaker.mc1102.furnace; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; @@ -13,7 +13,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.recipes.FurnaceRecipe; import minetweaker.api.recipes.IFurnaceManager; import minetweaker.api.recipes.IFurnaceRecipe; -import minetweaker.mc19.item.MCItemStack; +import minetweaker.mc1102.item.MCItemStack; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.fml.common.registry.GameRegistry; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/SetFuelPattern.java similarity index 91% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/SetFuelPattern.java index bc245d6..f1dcdeb 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/furnace/SetFuelPattern.java @@ -1,4 +1,4 @@ -package minetweaker.mc19.furnace; +package minetweaker.mc1102.furnace; import minetweaker.api.item.IIngredient; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/game/MCGame.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/game/MCGame.java similarity index 94% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/game/MCGame.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/game/MCGame.java index c61d8dc..f9401cc 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/game/MCGame.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/game/MCGame.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.game; +package minetweaker.mc1102.game; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; @@ -15,11 +15,11 @@ import minetweaker.api.item.IItemDefinition; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; -import minetweaker.mc19.entity.MCEntityDefinition; -import minetweaker.mc19.item.MCItemDefinition; -import minetweaker.mc19.liquid.MCLiquidDefinition; -import minetweaker.mc19.util.MineTweakerHacks; -import minetweaker.mc19.util.MineTweakerPlatformUtils; +import minetweaker.mc1102.entity.MCEntityDefinition; +import minetweaker.mc1102.item.MCItemDefinition; +import minetweaker.mc1102.liquid.MCLiquidDefinition; +import minetweaker.mc1102.util.MineTweakerHacks; +import minetweaker.mc1102.util.MineTweakerPlatformUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; @@ -34,7 +34,7 @@ import java.util.Map; import java.util.Set; // TODO Find this -// import minetweaker.mc19.GuiCannotRemodify; +// import minetweaker.mc1102.GuiCannotRemodify; /** * @author Stan diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/item/MCItemDefinition.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/item/MCItemDefinition.java index 916da0f..ebaee7b 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/item/MCItemDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.item; +package minetweaker.mc1102.item; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemDefinition; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/item/MCItemStack.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/item/MCItemStack.java index bac34c3..b83dac9 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/item/MCItemStack.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.item; +package minetweaker.mc1102.item; import minetweaker.MineTweakerAPI; import minetweaker.api.block.IBlock; @@ -14,12 +14,12 @@ import minetweaker.api.item.*; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; -import minetweaker.mc19.actions.SetBlockHardnessAction; -import minetweaker.mc19.actions.SetStackSizeAction; -import minetweaker.mc19.actions.SetStackmaxDamageAction; -import minetweaker.mc19.block.MCItemBlock; -import minetweaker.mc19.data.NBTConverter; -import minetweaker.mc19.liquid.MCLiquidStack; +import minetweaker.mc1102.actions.SetBlockHardnessAction; +import minetweaker.mc1102.actions.SetStackSizeAction; +import minetweaker.mc1102.actions.SetStackmaxDamageAction; +import minetweaker.mc1102.block.MCItemBlock; +import minetweaker.mc1102.data.NBTConverter; +import minetweaker.mc1102.liquid.MCLiquidStack; import minetweaker.util.ArrayUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/liquid/MCLiquidDefinition.java similarity index 99% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/liquid/MCLiquidDefinition.java index 35ede81..1a2fedf 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/liquid/MCLiquidDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.liquid; +package minetweaker.mc1102.liquid; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/liquid/MCLiquidStack.java similarity index 98% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/liquid/MCLiquidStack.java index 2fb1e14..791711c 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/liquid/MCLiquidStack.java @@ -4,14 +4,14 @@ * and open the template in the editor. */ -package minetweaker.mc19.liquid; +package minetweaker.mc1102.liquid; import minetweaker.api.data.IData; import minetweaker.api.item.*; import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.player.IPlayer; -import minetweaker.mc19.data.NBTConverter; +import minetweaker.mc1102.data.NBTConverter; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/mods/MCLoadedMods.java similarity index 97% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/mods/MCLoadedMods.java index b97f3dc..d3a8409 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/mods/MCLoadedMods.java @@ -1,4 +1,4 @@ -package minetweaker.mc19.mods; +package minetweaker.mc1102.mods; import minetweaker.api.mods.ILoadedMods; import minetweaker.api.mods.IMod; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/mods/MCMod.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/mods/MCMod.java similarity index 95% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/mods/MCMod.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/mods/MCMod.java index e50c568..c423669 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/mods/MCMod.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/mods/MCMod.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.mods; +package minetweaker.mc1102.mods; import minetweaker.api.mods.IMod; import net.minecraftforge.fml.common.ModContainer; diff --git a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/network/MineTweakerCopyClipboardHandler.java similarity index 96% rename from MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java rename to MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/network/MineTweakerCopyClipboardHandler.java index e8d16b7..be5c668 100644 --- a/MineTweaker3-MC19-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java +++ b/MineTweaker3-MC1102-Main/src/main/java/minetweaker/mc1102/network/MineTweakerCopyClipboardHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.network; +package minetweaker.mc1102.network; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; @@ -28,4 +28,4 @@ public class MineTweakerCopyClipboardHandler implements IMessageHandler evaluationDependsOn( subproject.path ) } -task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" } + projects18.collect { ':' + it + ':setupDecompWorkspace'} +projects19.collect { ':' + it + ':setupDecompWorkspace'}) {} +task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" } + projects18.collect { ':' + it + ':setupDecompWorkspace'} + projects1102.collect { ':' + it + ':setupDecompWorkspace'}) {} -task setupCIWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupCIWorkspace" } + projects18.collect { ':' + it + ':setupCIWorkspace'} +projects19.collect { ':' + it + ':setupCIWorkspace'}) {} +task setupCIWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupCIWorkspace" } + projects18.collect { ':' + it + ':setupCIWorkspace'} + projects1102.collect { ':' + it + ':setupCIWorkspace'}) {} task assembleMC1710(type: Jar, dependsOn: [\ ':ZenScript:build', @@ -43,16 +43,16 @@ task assembleMC18(type: Jar, dependsOn: [\ } } -task assembleMC19(type: Jar, dependsOn: [\ +task assembleMC1102(type: Jar, dependsOn: [\ ':ZenScript:build', ':MineTweaker3-API:build'] - + projects19.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-1.9.4-${mineTweakerVersion}.jar" + + projects1102.collect { ':' + it + ":build" }) { + archiveName="CraftTweaker-1.10.2-${mineTweakerVersion}.jar" from zipTree(project(":ZenScript").jar.archivePath) from zipTree(project(':MineTweaker3-API').jar.archivePath) - for (p in projects19) { + for (p in projects1102) { from zipTree(project(p).jar.archivePath) } } @@ -79,15 +79,15 @@ task assembleDevBase18(type: Jar, dependsOn: [ from project(':MineTweaker3-MC18-Main').sourceSets.main.output } -task assembleDevBase19(type: Jar, dependsOn: [ +task assembleDevBase1102(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build', - ':MineTweaker3-MC19-Main:build']) { - archiveName="CraftTweaker-Dev-1.9.4-${mineTweakerVersion}.jar" + ':MineTweaker3-MC1102-Main:build']) { + archiveName="CraftTweaker-Dev-1.10.2-${mineTweakerVersion}.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output - from project(':MineTweaker3-MC19-Main').sourceSets.main.output + from project(':MineTweaker3-MC1102-Main').sourceSets.main.output } task assembleDevFull1710(type: Jar, dependsOn: [ @@ -119,16 +119,16 @@ task assembleDevFull18(type: Jar, dependsOn: [ } } -task assembleDevFull19(type: Jar, dependsOn: [ +task assembleDevFull1102(type: Jar, dependsOn: [ ':ZenScript:build', ':MineTweaker3-API:build'] - + projects19.collect { ':' + it + ":build" }) { - archiveName="CraftTweaker-Dev-Full-1.9.4-${mineTweakerVersion}.jar" + + projects1102.collect { ':' + it + ":build" }) { + archiveName="CraftTweaker-Dev-Full-1.10.2-${mineTweakerVersion}.jar" from project(':ZenScript').sourceSets.main.output from project(':MineTweaker3-API').sourceSets.main.output - for (p in projects19) { + for (p in projects1102) { from project(p).sourceSets.main.output } } @@ -136,13 +136,13 @@ task assembleDevFull19(type: Jar, dependsOn: [ task assembleAll(dependsOn: [ assembleMC1710, assembleMC18, - assembleMC19, + assembleMC1102, assembleDevBase1710, assembleDevBase18, - assembleDevBase19, + assembleDevBase1102, assembleDevFull1710, assembleDevFull18, - assembleDevFull19]) { + assembleDevFull1102]) { } configurations { diff --git a/configuration.gradle b/configuration.gradle index 3306d8c..3c71ac7 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -4,7 +4,7 @@ import javax.tools.ToolProvider // ### Global settings ### // ####################### -ext.mineTweakerVersion = "3.0.9" +ext.mineTweakerVersion = "3.0.10" if (System.getenv('BUILD_NUMBER') != null) project.mineTweakerVersion += "."+System.getenv('BUILD_NUMBER') else { @@ -42,12 +42,12 @@ ext.projects18 = [ 'MineTweaker3-MC18-Mod-JEI' ] -// #################### -// ### 1.9 settings ### -// #################### +// ####################### +// ### 1.10.2 settings ### +// ####################### -ext.forgeVersion19 = "1.9.4-12.17.0.1910-1.9.4" -ext.projects19 = [ - 'MineTweaker3-MC19-Main', - 'MineTweaker3-MC19-Mod-JEI' +ext.forgeVersion1102 = "1.10.2-12.18.0.2005-1.10.0" +ext.projects1102 = [ + 'MineTweaker3-MC1102-Main', + 'MineTweaker3-MC1102-Mod-JEI' ] \ No newline at end of file