diff --git a/gradle.properties b/gradle.properties index 471bb42..705d600 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ mc_version=1.7.10 -forge_version=10.13.2.1284 +forge_version=10.13.2.1286 mod_version=0.3.0 diff --git a/libs/Ex-Nihilo-1.37-dev.jar.d b/libs/Ex-Nihilo-1.37-dev.jar similarity index 51% rename from libs/Ex-Nihilo-1.37-dev.jar.d rename to libs/Ex-Nihilo-1.37-dev.jar index 8e0ee8f..e069031 100644 Binary files a/libs/Ex-Nihilo-1.37-dev.jar.d and b/libs/Ex-Nihilo-1.37-dev.jar differ diff --git a/libs/ForgeMultipart-1.7.10-1.1.1.320-src.jar b/libs/ForgeMultipart-1.7.10-1.1.1.320-src.jar deleted file mode 100644 index a86c229..0000000 Binary files a/libs/ForgeMultipart-1.7.10-1.1.1.320-src.jar and /dev/null differ diff --git a/libs/ForgeMultipart-1.7.10-1.1.1.322-dev.jar b/libs/ForgeMultipart-1.7.10-1.1.1.322-dev.jar new file mode 100644 index 0000000..ec8235a Binary files /dev/null and b/libs/ForgeMultipart-1.7.10-1.1.1.322-dev.jar differ diff --git a/libs/MekanismAll-1.7.10-7.1.2.homebaked-dev.jar b/libs/MekanismAll-1.7.10-7.1.2.homebaked-dev.jar index dadf1de..567d17c 100644 Binary files a/libs/MekanismAll-1.7.10-7.1.2.homebaked-dev.jar and b/libs/MekanismAll-1.7.10-7.1.2.homebaked-dev.jar differ diff --git a/libs/forestry_1.7.10-3.3.0.452-unstable-dev.jar b/libs/forestry_1.7.10-3.5.0.471-unstable-dev.jar similarity index 78% rename from libs/forestry_1.7.10-3.3.0.452-unstable-dev.jar rename to libs/forestry_1.7.10-3.5.0.471-unstable-dev.jar index 6088bee..f1488d9 100644 Binary files a/libs/forestry_1.7.10-3.3.0.452-unstable-dev.jar and b/libs/forestry_1.7.10-3.5.0.471-unstable-dev.jar differ diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java index 6a82c0e..f92a7de 100644 --- a/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java +++ b/src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java @@ -1,7 +1,6 @@ package thaumcraft.api.aspects; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; /** * diff --git a/src/api/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java index cceaf89..4de2404 100644 --- a/src/api/java/thaumcraft/api/package-info.java +++ b/src/api/java/thaumcraft/api/package-info.java @@ -2,3 +2,4 @@ package thaumcraft.api; import cpw.mods.fml.common.API; + diff --git a/src/main/java/modtweaker/ClientEvents.java b/src/main/java/modtweaker/ClientEvents.java deleted file mode 100644 index 1545106..0000000 --- a/src/main/java/modtweaker/ClientEvents.java +++ /dev/null @@ -1,35 +0,0 @@ -package modtweaker; - -import static modtweaker.helpers.LogHelper.print; -import minetweaker.api.item.IItemStack; -import minetweaker.api.minecraft.MineTweakerMC; -import minetweaker.api.player.IPlayer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.GameSettings; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class ClientEvents { - public static int cooldown; - public static boolean active; - - @SubscribeEvent - public void onDrawTooltip(ItemTooltipEvent event) { - if (active) { - IPlayer player = MineTweakerMC.getIPlayer(event.entityPlayer); - if (player != null) { - IItemStack hand = MineTweakerMC.getIItemStack(event.itemStack); - if (hand != null) { - String print = hand.toString(); - event.toolTip.add(print); - if (GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindSprint)) { - if (cooldown <= 0) { - cooldown = 30; - print(print + " -- " + hand.getDisplayName()); - } else cooldown--; - } else cooldown--; - } - } - } - } -} diff --git a/src/main/java/modtweaker/Commands.java b/src/main/java/modtweaker/Commands.java deleted file mode 100644 index 47e6c63..0000000 --- a/src/main/java/modtweaker/Commands.java +++ /dev/null @@ -1,61 +0,0 @@ -package modtweaker; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.ICommandFunction; -import modtweaker.commands.EntityMappingLogger; -import modtweaker.mods.botania.commands.BotaniaBrewLogger; -import modtweaker.mods.botania.commands.BotaniaOrechidLogger; -import modtweaker.mods.botania.lexicon.commands.LexiconCategoryLogger; -import modtweaker.mods.botania.lexicon.commands.LexiconEntryLogger; -import modtweaker.mods.botania.lexicon.commands.LexiconKnowledgeTypesLogger; -import modtweaker.mods.botania.lexicon.commands.LexiconPageLogger; -import modtweaker.mods.chisel.commands.ChiselGroupLogger; -import modtweaker.mods.chisel.commands.ChiselVariationLogger; -import modtweaker.mods.mekanism.gas.GasLogger; -import modtweaker.mods.tconstruct.MaterialLogger; -import modtweaker.mods.thaumcraft.commands.AspectLogger; -import modtweaker.mods.thaumcraft.research.commands.ResearchLogger; -import modtweaker.util.TweakerPlugin; - -public class Commands { - public static void registerCommands() { - MineTweakerAPI.server.addMineTweakerCommand("tooltips", new String[] { "/minetweaker tooltips", " Adds tooltips to all items ingame with their mt script name, press ctrl on an item to print to the log" }, new ICommandFunction() { - @Override - public void execute(String[] arguments, IPlayer player) { - ClientEvents.active = !ClientEvents.active; - } - }); - - MineTweakerAPI.server.addMineTweakerCommand("entities", new String[] { "/minetweaker entities", " Outputs a list of entities class mapping keys and the entity IDs" }, new EntityMappingLogger()); - - if (TweakerPlugin.isLoaded("Mekanism")) { - MineTweakerAPI.server.addMineTweakerCommand("gases", new String[] { "/minetweaker gases", " Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger()); - } - - if (TweakerPlugin.isLoaded("Thaumcraft")) { - MineTweakerAPI.server.addMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", " Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger()); - MineTweakerAPI.server.addMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", " Outputs a list of all aspects registered to entities and items"}, new AspectLogger()); - } - - if (TweakerPlugin.isLoaded("TConstruct")) { - MineTweakerAPI.server.addMineTweakerCommand("materials", new String[] { "/minetweaker materials", " Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger()); - } - - if (TweakerPlugin.isLoaded("Botania")) { - MineTweakerAPI.server.addMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", " Outputs a list of lexicon categories" }, new LexiconCategoryLogger()); - MineTweakerAPI.server.addMineTweakerCommand("lexiconEntries", new String[] { "/minetweaker lexiconEntries", "/minetweaker lexiconEntries [CATEGORY]", " Outputs a list of lexicon entries" }, new LexiconEntryLogger()); - MineTweakerAPI.server.addMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", " Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger()); - MineTweakerAPI.server.addMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", " Outputs a list of keys for botania brews" }, new BotaniaBrewLogger()); - MineTweakerAPI.server.addMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", " Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger()); - MineTweakerAPI.server.addMineTweakerCommand("botaniaOrchid", new String[] { "/minetweaker botaniaOrechid", " Outputs a list of keys for botania orechid weights" }, new BotaniaOrechidLogger()); - } - - - if (TweakerPlugin.isLoaded("chisel")) { - MineTweakerAPI.server.addMineTweakerCommand("chiselGroups", new String[] { "/minetweaker chiselGroups", " Outputs a list of chisel groups" }, new ChiselGroupLogger()); - MineTweakerAPI.server.addMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", " Outputs a list of chisel variations" }, new ChiselVariationLogger()); - } - - } -} diff --git a/src/main/java/modtweaker/mods/tconstruct/MaterialLogger.java b/src/main/java/modtweaker/mods/tconstruct/MaterialLogger.java deleted file mode 100644 index d8488e1..0000000 --- a/src/main/java/modtweaker/mods/tconstruct/MaterialLogger.java +++ /dev/null @@ -1,36 +0,0 @@ -package modtweaker.mods.tconstruct; - -import static modtweaker.helpers.LogHelper.logPrinted; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Map; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.player.IPlayer; -import minetweaker.api.server.ICommandFunction; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.tools.ToolMaterial; - -public class MaterialLogger implements ICommandFunction { - private static ArrayList materials = new ArrayList(); - static { - materials = new ArrayList(); - for (Map.Entry entry : TConstructRegistry.toolMaterialStrings.entrySet()) { - materials.add(entry.getKey()); - } - - Collections.sort(materials); - } - - @Override - public void execute(String[] arguments, IPlayer player) { - System.out.println("Materials: " + materials.size()); - for (String s : materials) { - System.out.println("Material " + s); - MineTweakerAPI.logCommand("<" + s + "> -- "); - } - - logPrinted(player); - } -} diff --git a/src/main/java/modtweaker/mods/thermalexpansion/ThermalExpansion.java b/src/main/java/modtweaker/mods/thermalexpansion/ThermalExpansion.java deleted file mode 100644 index 4ca5d85..0000000 --- a/src/main/java/modtweaker/mods/thermalexpansion/ThermalExpansion.java +++ /dev/null @@ -1,20 +0,0 @@ -package modtweaker.mods.thermalexpansion; - -import minetweaker.MineTweakerAPI; -import modtweaker.mods.thermalexpansion.handlers.Crucible; -import modtweaker.mods.thermalexpansion.handlers.Furnace; -import modtweaker.mods.thermalexpansion.handlers.Pulverizer; -import modtweaker.mods.thermalexpansion.handlers.Sawmill; -import modtweaker.mods.thermalexpansion.handlers.Smelter; -import modtweaker.mods.thermalexpansion.handlers.Transposer; - -public class ThermalExpansion { - public ThermalExpansion() { - MineTweakerAPI.registerClass(Crucible.class); - MineTweakerAPI.registerClass(Furnace.class); - MineTweakerAPI.registerClass(Pulverizer.class); - MineTweakerAPI.registerClass(Sawmill.class); - MineTweakerAPI.registerClass(Smelter.class); - MineTweakerAPI.registerClass(Transposer.class); - } -} diff --git a/src/main/java/modtweaker/util/ArrayUtils.java b/src/main/java/modtweaker/util/ArrayUtils.java deleted file mode 100644 index 10c4f40..0000000 --- a/src/main/java/modtweaker/util/ArrayUtils.java +++ /dev/null @@ -1,17 +0,0 @@ -package modtweaker.util; - -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; - -public class ArrayUtils { - - - public static ArrayList toArrayList(ItemStack[] array){ - ArrayList stacks = new ArrayList(); - for(ItemStack stack : array){ - stacks.add(stack); - } - return stacks; - } -} diff --git a/src/main/java/modtweaker2/ClientEvents.java b/src/main/java/modtweaker2/ClientEvents.java new file mode 100644 index 0000000..09fead1 --- /dev/null +++ b/src/main/java/modtweaker2/ClientEvents.java @@ -0,0 +1,43 @@ +package modtweaker2; + +import minetweaker.api.item.IItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import minetweaker.api.player.IPlayer; +import net.minecraft.client.Minecraft; +import net.minecraft.client.settings.GameSettings; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import static modtweaker2.helpers.LogHelper.*; + +public class ClientEvents { + public static int cooldown; + public static boolean active; + + + @SubscribeEvent + public void onDrawTooltip(ItemTooltipEvent event) { + IPlayer player = MineTweakerMC.getIPlayer(event.entityPlayer); + if (player != null) { + IItemStack hand = MineTweakerMC.getIItemStack(event.itemStack); + if (hand != null) { + + if (active) { + + String print = hand.toString(); + event.toolTip.add(print); + if (GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindSprint)) { + if (cooldown <= 0) { + cooldown = 30; + print(print + " -- " + hand.getDisplayName()); + } else + cooldown--; + } else + cooldown--; + } + + } + } + } + +} diff --git a/src/main/java/modtweaker2/Commands.java b/src/main/java/modtweaker2/Commands.java new file mode 100644 index 0000000..dfac97c --- /dev/null +++ b/src/main/java/modtweaker2/Commands.java @@ -0,0 +1,66 @@ +package modtweaker2; + +import minetweaker.MineTweakerAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import modtweaker2.commands.EntityMappingLogger; +import modtweaker2.mods.botania.commands.BotaniaBrewLogger; +import modtweaker2.mods.botania.commands.BotaniaOrechidLogger; +import modtweaker2.mods.botania.lexicon.commands.LexiconCategoryLogger; +import modtweaker2.mods.botania.lexicon.commands.LexiconEntryLogger; +import modtweaker2.mods.botania.lexicon.commands.LexiconKnowledgeTypesLogger; +import modtweaker2.mods.botania.lexicon.commands.LexiconPageLogger; +import modtweaker2.mods.chisel.commands.ChiselGroupLogger; +import modtweaker2.mods.chisel.commands.ChiselVariationLogger; +import modtweaker2.mods.mekanism.gas.GasLogger; +import modtweaker2.mods.tconstruct.MaterialLogger; +import modtweaker2.mods.thaumcraft.commands.AspectLogger; +import modtweaker2.mods.thaumcraft.research.commands.ResearchLogger; +import modtweaker2.util.TweakerPlugin; + +public class Commands { + public static void registerCommands() { + + registerMineTweakerCommand("tooltips", new String[] { "/minetweaker tooltips", " Adds tooltips to all items ingame with their mt script name, press ctrl on an item to print to the log" }, new ICommandFunction() { + @Override + public void execute(String[] arguments, IPlayer player) { + ClientEvents.active = !ClientEvents.active; + } + }); + + registerMineTweakerCommand("entities", new String[] { "/minetweaker entities", " Outputs a list of entities class mapping keys and the entity IDs" }, new EntityMappingLogger()); + + if (TweakerPlugin.isLoaded("Mekanism")) { + registerMineTweakerCommand("gases", new String[] { "/minetweaker gases", " Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger()); + } + + if (TweakerPlugin.isLoaded("Thaumcraft")) { + registerMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", " Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger()); + registerMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", " Outputs a list of all aspects registered to entities and items" }, new AspectLogger()); + } + + if (TweakerPlugin.isLoaded("TConstruct")) { + registerMineTweakerCommand("materials", new String[] { "/minetweaker materials", " Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger()); + } + + if (TweakerPlugin.isLoaded("Botania")) { + registerMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", " Outputs a list of lexicon categories" }, new LexiconCategoryLogger()); + registerMineTweakerCommand("lexiconEntries", new String[] { "/minetweaker lexiconEntries", "/minetweaker lexiconEntries [CATEGORY]", " Outputs a list of lexicon entries" }, new LexiconEntryLogger()); + registerMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", " Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger()); + registerMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", " Outputs a list of keys for botania brews" }, new BotaniaBrewLogger()); + registerMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", " Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger()); + registerMineTweakerCommand("botaniaOrchid", new String[] { "/minetweaker botaniaOrechid", " Outputs a list of keys for botania orechid weights" }, new BotaniaOrechidLogger()); + } + + if (TweakerPlugin.isLoaded("chisel")) { + registerMineTweakerCommand("chiselGroups", new String[] { "/minetweaker chiselGroups", " Outputs a list of chisel groups" }, new ChiselGroupLogger()); + registerMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", " Outputs a list of chisel variations" }, new ChiselVariationLogger()); + } + + } + + private static void registerMineTweakerCommand(String commandName, String[] usages, ICommandFunction commandFunction) { + MineTweakerAPI.server.addMineTweakerCommand(commandName, usages, commandFunction); + ModTweaker2.logger.info("Registering command " + commandName + "."); + } +} diff --git a/src/main/java/modtweaker/ModProps.java b/src/main/java/modtweaker2/ModProps.java similarity index 75% rename from src/main/java/modtweaker/ModProps.java rename to src/main/java/modtweaker2/ModProps.java index 2e37793..77c01d3 100644 --- a/src/main/java/modtweaker/ModProps.java +++ b/src/main/java/modtweaker2/ModProps.java @@ -1,9 +1,9 @@ -package modtweaker; +package modtweaker2; public class ModProps { public static final String NAME = "Mod Tweaker 2", name = NAME; public static final String MODID = "modtweaker2", modid = MODID; - public static final String VERSION = "0.0.1", version = VERSION; + public static final String VERSION = "0.7", version = VERSION; public static final String DEPENDENCIES = "required-after:MineTweaker3", dependencies = DEPENDENCIES; } diff --git a/src/main/java/modtweaker/ModTweaker.java b/src/main/java/modtweaker2/ModTweaker2.java similarity index 50% rename from src/main/java/modtweaker/ModTweaker.java rename to src/main/java/modtweaker2/ModTweaker2.java index 48aa117..5488478 100644 --- a/src/main/java/modtweaker/ModTweaker.java +++ b/src/main/java/modtweaker2/ModTweaker2.java @@ -1,50 +1,65 @@ -package modtweaker; +package modtweaker2; import java.io.File; -import modtweaker.mods.appeng.AppliedEnergistics; -import modtweaker.mods.botania.Botania; -import modtweaker.mods.chisel.Chisel; -import modtweaker.mods.exnihilo.ExNihilo; -import modtweaker.mods.extendedworkbench.ExtendedWorkbench; -import modtweaker.mods.factorization.Factorization; -import modtweaker.mods.forestry.Forestry; -import modtweaker.mods.fsp.Steamcraft; -import modtweaker.mods.hee.HardcoreEnderExpansion; -import modtweaker.mods.imc.handler.Message; -import modtweaker.mods.mariculture.Mariculture; -import modtweaker.mods.mekanism.Mekanism; -import modtweaker.mods.metallurgy.Metallurgy; -import modtweaker.mods.pneumaticcraft.PneumaticCraft; -import modtweaker.mods.railcraft.Railcraft; -import modtweaker.mods.tconstruct.TConstruct; -import modtweaker.mods.thaumcraft.Thaumcraft; -import modtweaker.mods.thermalexpansion.ThermalExpansion; -import modtweaker.util.TweakerPlugin; +import minetweaker.MineTweakerAPI; +import modtweaker2.mods.appeng.AppliedEnergistics; +import modtweaker2.mods.botania.Botania; +import modtweaker2.mods.chisel.Chisel; +import modtweaker2.mods.exnihilo.ExNihilo; +import modtweaker2.mods.extendedworkbench.ExtendedWorkbench; +import modtweaker2.mods.factorization.Factorization; +import modtweaker2.mods.forestry.Forestry; +import modtweaker2.mods.fsp.Steamcraft; +import modtweaker2.mods.hee.HardcoreEnderExpansion; +import modtweaker2.mods.imc.handler.Message; +import modtweaker2.mods.mariculture.Mariculture; +import modtweaker2.mods.mekanism.Mekanism; +import modtweaker2.mods.metallurgy.Metallurgy; +import modtweaker2.mods.pneumaticcraft.PneumaticCraft; +import modtweaker2.mods.railcraft.Railcraft; +import modtweaker2.mods.tconstruct.TConstruct; +import modtweaker2.mods.thaumcraft.Thaumcraft; +import modtweaker2.mods.thermalexpansion.ThermalExpansion; +import modtweaker2.util.TweakerPlugin; import net.minecraftforge.common.MinecraftForge; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; -@Mod(modid = ModProps.modid, name = ModProps.name, dependencies = ModProps.dependencies) -public class ModTweaker { +@Mod(modid = ModProps.modid, version = ModProps.version, dependencies = ModProps.dependencies) +public class ModTweaker2 { + + public static Logger logger = LogManager.getLogger(ModProps.modid); + + @Instance(ModProps.modid) + public ModTweaker2 instance; @EventHandler public void preInit(FMLPreInitializationEvent event) { + logger.info("Starting PreInitialization for " + ModProps.modid); File file = new File("scripts"); if (!file.exists()) { file.mkdir(); } new Message(file.getPath()); + } @EventHandler public void init(FMLInitializationEvent event) { + logger.info("Starting Initialization for " + ModProps.modid); TweakerPlugin.register("Botania", Botania.class); TweakerPlugin.register("exnihilo", ExNihilo.class); TweakerPlugin.register("extendedWorkbench", ExtendedWorkbench.class); @@ -62,15 +77,22 @@ public class ModTweaker { TweakerPlugin.register("Forestry", Forestry.class); TweakerPlugin.register("chisel", Chisel.class); TweakerPlugin.register("appliedenergistics2-core", AppliedEnergistics.class); - - + MinecraftForge.EVENT_BUS.register(new TweakEventHandler()); if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { MinecraftForge.EVENT_BUS.register(new ClientEvents()); } + } @EventHandler - public void onServerStart(FMLServerStartingEvent event) { + public void postInit(FMLPostInitializationEvent event) { + logger.info("Starting PostInitialization for " + ModProps.modid); + + } + + @EventHandler + public void serverStart(FMLServerStartingEvent event) { + logger.info("Starting ServerStart for " + ModProps.modid); Commands.registerCommands(); } } diff --git a/src/main/java/modtweaker2/TweakEventHandler.java b/src/main/java/modtweaker2/TweakEventHandler.java new file mode 100644 index 0000000..7d8cbba --- /dev/null +++ b/src/main/java/modtweaker2/TweakEventHandler.java @@ -0,0 +1,35 @@ +package modtweaker2; + +import java.util.ArrayList; + +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.entity.living.LivingDropsEvent; + +import org.apache.commons.lang3.tuple.MutablePair; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class TweakEventHandler { + + public static ArrayList>> drops = new ArrayList>>(); + public static ArrayList cancleDrops = new ArrayList(); + + @SubscribeEvent + public void handleDrops(LivingDropsEvent event) { + if (cancleDrops.contains(event.entityLiving)) { + event.setCanceled(true); + } + for (MutablePair> ent : drops) { + if (ent.left.isEntityEqual(event.entityLiving)) { + for (ItemStack stack : ent.right) { + event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, stack)); + } + } + } + } + +} diff --git a/src/main/java/modtweaker/commands/EntityMappingLogger.java b/src/main/java/modtweaker2/commands/EntityMappingLogger.java similarity index 79% rename from src/main/java/modtweaker/commands/EntityMappingLogger.java rename to src/main/java/modtweaker2/commands/EntityMappingLogger.java index 98fc0d7..2a9739e 100644 --- a/src/main/java/modtweaker/commands/EntityMappingLogger.java +++ b/src/main/java/modtweaker2/commands/EntityMappingLogger.java @@ -1,13 +1,12 @@ -package modtweaker.commands; +package modtweaker2.commands; import java.util.Set; -import cpw.mods.fml.common.registry.EntityRegistry; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import net.minecraft.entity.Entity; +import modtweaker2.ModTweaker2; import net.minecraft.entity.EntityList; public class EntityMappingLogger implements ICommandFunction { @@ -18,7 +17,7 @@ public class EntityMappingLogger implements ICommandFunction { Set keys = EntityList.stringToIDMapping.keySet(); System.out.println("Mob Keys: " + keys.size()); for (Integer key : keys) { - System.out.println("Mob Key " + EntityList.getStringFromID(key) + " : " + key); + ModTweaker2.logger.info("Mob Key " + EntityList.getStringFromID(key) + " : " + key); MineTweakerAPI.logCommand("Mob Key " + EntityList.getStringFromID(key) + " : " + key); } diff --git a/src/main/java/modtweaker/helpers/ForgeHelper.java b/src/main/java/modtweaker2/helpers/ForgeHelper.java similarity index 91% rename from src/main/java/modtweaker/helpers/ForgeHelper.java rename to src/main/java/modtweaker2/helpers/ForgeHelper.java index 02ab887..fc39853 100644 --- a/src/main/java/modtweaker/helpers/ForgeHelper.java +++ b/src/main/java/modtweaker2/helpers/ForgeHelper.java @@ -1,12 +1,11 @@ -package modtweaker.helpers; - -import static modtweaker.helpers.ReflectionHelper.getFinalObject; -import static modtweaker.helpers.ReflectionHelper.getStaticObject; +package modtweaker2.helpers; import java.lang.reflect.Constructor; import java.util.HashMap; import java.util.List; import java.util.Map; +import static modtweaker2.helpers.ReflectionHelper.*; + import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/modtweaker/helpers/InputHelper.java b/src/main/java/modtweaker2/helpers/InputHelper.java similarity index 94% rename from src/main/java/modtweaker/helpers/InputHelper.java rename to src/main/java/modtweaker2/helpers/InputHelper.java index f521c24..3891ce6 100644 --- a/src/main/java/modtweaker/helpers/InputHelper.java +++ b/src/main/java/modtweaker2/helpers/InputHelper.java @@ -1,12 +1,15 @@ -package modtweaker.helpers; +package modtweaker2.helpers; import java.util.ArrayList; import minetweaker.MineTweakerAPI; +import minetweaker.api.entity.IEntity; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; +import net.minecraft.entity.Entity; +import net.minecraft.entity.IEntityLivingData; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -25,6 +28,10 @@ public class InputHelper { public static boolean isABlock(ItemStack block) { return block.getItem() instanceof ItemBlock; } + + public static Entity toEntity(){ + return null; + } public static ItemStack toStack(IItemStack iStack) { if (iStack == null) diff --git a/src/main/java/modtweaker/helpers/LogHelper.java b/src/main/java/modtweaker2/helpers/LogHelper.java similarity index 96% rename from src/main/java/modtweaker/helpers/LogHelper.java rename to src/main/java/modtweaker2/helpers/LogHelper.java index cc536a5..f3adf57 100644 --- a/src/main/java/modtweaker/helpers/LogHelper.java +++ b/src/main/java/modtweaker2/helpers/LogHelper.java @@ -1,4 +1,4 @@ -package modtweaker.helpers; +package modtweaker2.helpers; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; diff --git a/src/main/java/modtweaker/helpers/ReflectionHelper.java b/src/main/java/modtweaker2/helpers/ReflectionHelper.java similarity index 98% rename from src/main/java/modtweaker/helpers/ReflectionHelper.java rename to src/main/java/modtweaker2/helpers/ReflectionHelper.java index b3b32fd..281dd86 100644 --- a/src/main/java/modtweaker/helpers/ReflectionHelper.java +++ b/src/main/java/modtweaker2/helpers/ReflectionHelper.java @@ -1,4 +1,4 @@ -package modtweaker.helpers; +package modtweaker2.helpers; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/modtweaker/helpers/StackHelper.java b/src/main/java/modtweaker2/helpers/StackHelper.java similarity index 82% rename from src/main/java/modtweaker/helpers/StackHelper.java rename to src/main/java/modtweaker2/helpers/StackHelper.java index dea561d..80eec53 100644 --- a/src/main/java/modtweaker/helpers/StackHelper.java +++ b/src/main/java/modtweaker2/helpers/StackHelper.java @@ -1,7 +1,7 @@ -package modtweaker.helpers; +package modtweaker2.helpers; -import modtweaker.mods.botania.Botania; -import modtweaker.util.TweakerPlugin; +import modtweaker2.mods.botania.Botania; +import modtweaker2.util.TweakerPlugin; import net.minecraft.item.ItemStack; public class StackHelper { diff --git a/src/main/java/modtweaker/mods/appeng/AppliedEnergistics.java b/src/main/java/modtweaker2/mods/appeng/AppliedEnergistics.java similarity index 64% rename from src/main/java/modtweaker/mods/appeng/AppliedEnergistics.java rename to src/main/java/modtweaker2/mods/appeng/AppliedEnergistics.java index fc8e3f4..2f1c637 100644 --- a/src/main/java/modtweaker/mods/appeng/AppliedEnergistics.java +++ b/src/main/java/modtweaker2/mods/appeng/AppliedEnergistics.java @@ -1,10 +1,12 @@ -package modtweaker.mods.appeng; +package modtweaker2.mods.appeng; import minetweaker.MineTweakerAPI; -import modtweaker.mods.appeng.handlers.Inscriber; +import modtweaker2.mods.appeng.handlers.Inscriber; public class AppliedEnergistics { + public AppliedEnergistics() { MineTweakerAPI.registerClass(Inscriber.class); } + } diff --git a/src/main/java/modtweaker/mods/appeng/handlers/Inscriber.java b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java similarity index 55% rename from src/main/java/modtweaker/mods/appeng/handlers/Inscriber.java rename to src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java index c701e82..202fdcb 100644 --- a/src/main/java/modtweaker/mods/appeng/handlers/Inscriber.java +++ b/src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java @@ -1,14 +1,17 @@ -package modtweaker.mods.appeng.handlers; +package modtweaker2.mods.appeng.handlers; + +import java.util.ArrayList; -import static modtweaker.helpers.InputHelper.*; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; +import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import stanhebben.zenscript.annotations.ZenMethodStatic; import appeng.recipes.handlers.Inscribe; import appeng.recipes.handlers.Inscribe.InscriberRecipe; +import static modtweaker2.helpers.InputHelper.*; @ZenClass("mods.appeng.inscriber") public class Inscriber { @@ -22,7 +25,6 @@ public class Inscriber { Inscribe.inputs.add(toStack(plateB)); Inscribe.plates.add(toStack(plateA)); Inscribe.plates.add(toStack(plateB)); - } public static class Add extends BaseListAddition { @@ -38,4 +40,30 @@ public class Inscriber { } + @ZenMethod + public static void removeRecipe(IItemStack output) { + MineTweakerAPI.apply(new Remove(toStack(output))); + } + + public static class Remove extends BaseListRemoval { + + public Remove(ItemStack stack) { + super(stack.getUnlocalizedName(), Inscribe.recipes, stack); + } + + @Override + public void apply() { + ArrayList recipesToRemove = new ArrayList(); + for (InscriberRecipe recipe : Inscribe.recipes) { + if (recipe.output.isItemEqual(stack)) { + recipesToRemove.add(recipe); + } + } + for (InscriberRecipe recipe : recipesToRemove) { + Inscribe.recipes.remove(recipe); + } + } + + } + } diff --git a/src/main/java/modtweaker/mods/botania/Botania.java b/src/main/java/modtweaker2/mods/botania/Botania.java similarity index 68% rename from src/main/java/modtweaker/mods/botania/Botania.java rename to src/main/java/modtweaker2/mods/botania/Botania.java index 825756b..83eea65 100644 --- a/src/main/java/modtweaker/mods/botania/Botania.java +++ b/src/main/java/modtweaker2/mods/botania/Botania.java @@ -1,13 +1,12 @@ -package modtweaker.mods.botania; +package modtweaker2.mods.botania; import minetweaker.MineTweakerAPI; -import modtweaker.mods.appeng.handlers.Inscriber; -import modtweaker.mods.botania.handlers.Apothecary; -import modtweaker.mods.botania.handlers.ElvenTrade; -import modtweaker.mods.botania.handlers.Lexicon; -import modtweaker.mods.botania.handlers.ManaInfusion; -import modtweaker.mods.botania.handlers.Orechid; -import modtweaker.mods.botania.handlers.RuneAltar; +import modtweaker2.mods.botania.handlers.Apothecary; +import modtweaker2.mods.botania.handlers.ElvenTrade; +import modtweaker2.mods.botania.handlers.Lexicon; +import modtweaker2.mods.botania.handlers.ManaInfusion; +import modtweaker2.mods.botania.handlers.Orechid; +import modtweaker2.mods.botania.handlers.RuneAltar; import net.minecraft.item.ItemStack; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; diff --git a/src/main/java/modtweaker/mods/botania/BotaniaHelper.java b/src/main/java/modtweaker2/mods/botania/BotaniaHelper.java similarity index 90% rename from src/main/java/modtweaker/mods/botania/BotaniaHelper.java rename to src/main/java/modtweaker2/mods/botania/BotaniaHelper.java index 2b654d9..124a523 100644 --- a/src/main/java/modtweaker/mods/botania/BotaniaHelper.java +++ b/src/main/java/modtweaker2/mods/botania/BotaniaHelper.java @@ -1,9 +1,7 @@ -package modtweaker.mods.botania; +package modtweaker2.mods.botania; -import java.util.ArrayList; import java.util.List; -import minetweaker.api.item.IIngredient; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconCategory; diff --git a/src/main/java/modtweaker/mods/botania/commands/BotaniaBrewLogger.java b/src/main/java/modtweaker2/mods/botania/commands/BotaniaBrewLogger.java similarity index 84% rename from src/main/java/modtweaker/mods/botania/commands/BotaniaBrewLogger.java rename to src/main/java/modtweaker2/mods/botania/commands/BotaniaBrewLogger.java index 7f9f0ec..43806ec 100644 --- a/src/main/java/modtweaker/mods/botania/commands/BotaniaBrewLogger.java +++ b/src/main/java/modtweaker2/mods/botania/commands/BotaniaBrewLogger.java @@ -1,15 +1,12 @@ -package modtweaker.mods.botania.commands; +package modtweaker2.mods.botania.commands; -import java.util.Collections; -import java.util.List; import java.util.Set; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; +import vazkii.botania.api.BotaniaAPI; public class BotaniaBrewLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/botania/commands/BotaniaOrechidLogger.java b/src/main/java/modtweaker2/mods/botania/commands/BotaniaOrechidLogger.java similarity index 83% rename from src/main/java/modtweaker/mods/botania/commands/BotaniaOrechidLogger.java rename to src/main/java/modtweaker2/mods/botania/commands/BotaniaOrechidLogger.java index e0827b8..402dd3a 100644 --- a/src/main/java/modtweaker/mods/botania/commands/BotaniaOrechidLogger.java +++ b/src/main/java/modtweaker2/mods/botania/commands/BotaniaOrechidLogger.java @@ -1,15 +1,12 @@ -package modtweaker.mods.botania.commands; +package modtweaker2.mods.botania.commands; import java.util.Set; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.common.Botania; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker.mods.botania.BotaniaHelper; -import net.minecraft.entity.EntityList; +import vazkii.botania.api.BotaniaAPI; public class BotaniaOrechidLogger implements ICommandFunction { diff --git a/src/main/java/modtweaker/mods/botania/handlers/Apothecary.java b/src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java similarity index 88% rename from src/main/java/modtweaker/mods/botania/handlers/Apothecary.java rename to src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java index 1afc0f9..9e8f97e 100644 --- a/src/main/java/modtweaker/mods/botania/handlers/Apothecary.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java @@ -1,19 +1,18 @@ -package modtweaker.mods.botania.handlers; +package modtweaker2.mods.botania.handlers; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipePetals; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.botania.Apothecary") public class Apothecary { diff --git a/src/main/java/modtweaker/mods/botania/handlers/ElvenTrade.java b/src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java similarity index 86% rename from src/main/java/modtweaker/mods/botania/handlers/ElvenTrade.java rename to src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java index 46cb499..39728cc 100644 --- a/src/main/java/modtweaker/mods/botania/handlers/ElvenTrade.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java @@ -1,18 +1,17 @@ -package modtweaker.mods.botania.handlers; +package modtweaker2.mods.botania.handlers; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeElvenTrade; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.botania.ElvenTrade") public class ElvenTrade { diff --git a/src/main/java/modtweaker/mods/botania/handlers/Lexicon.java b/src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java similarity index 94% rename from src/main/java/modtweaker/mods/botania/handlers/Lexicon.java rename to src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java index 7fcfc22..8204301 100644 --- a/src/main/java/modtweaker/mods/botania/handlers/Lexicon.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java @@ -1,35 +1,31 @@ -package modtweaker.mods.botania.handlers; +package modtweaker2.mods.botania.handlers; + +import static modtweaker2.helpers.InputHelper.toObject; +import static modtweaker2.helpers.InputHelper.toObjects; +import static modtweaker2.helpers.InputHelper.toStack; import java.util.ArrayList; import java.util.List; -import static modtweaker.helpers.InputHelper.toObject; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toShapedObjects; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.recipes.ShapedRecipe; import minetweaker.mc1710.recipes.RecipeConverter; -import modtweaker.mods.botania.BotaniaHelper; -import modtweaker.mods.botania.lexicon.AddCategory; -import modtweaker.mods.botania.lexicon.AddEntry; -import modtweaker.mods.botania.lexicon.AddPage; -import modtweaker.mods.botania.lexicon.AddRecipeMapping; -import modtweaker.mods.botania.lexicon.RemoveCategory; -import modtweaker.mods.botania.lexicon.RemoveEntry; -import modtweaker.mods.botania.lexicon.RemovePage; -import modtweaker.mods.botania.lexicon.RemoveRecipeMapping; -import modtweaker.mods.botania.lexicon.SetCategoryIcon; -import modtweaker.mods.botania.lexicon.SetCategoryPriority; -import modtweaker.mods.botania.lexicon.SetEntryKnowledgeType; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.botania.BotaniaHelper; +import modtweaker2.mods.botania.lexicon.AddCategory; +import modtweaker2.mods.botania.lexicon.AddEntry; +import modtweaker2.mods.botania.lexicon.AddPage; +import modtweaker2.mods.botania.lexicon.AddRecipeMapping; +import modtweaker2.mods.botania.lexicon.RemoveCategory; +import modtweaker2.mods.botania.lexicon.RemoveEntry; +import modtweaker2.mods.botania.lexicon.RemovePage; +import modtweaker2.mods.botania.lexicon.RemoveRecipeMapping; +import modtweaker2.mods.botania.lexicon.SetCategoryIcon; +import modtweaker2.mods.botania.lexicon.SetCategoryPriority; +import modtweaker2.mods.botania.lexicon.SetEntryKnowledgeType; import net.minecraft.entity.EntityList; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/modtweaker/mods/botania/handlers/ManaInfusion.java b/src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java similarity index 89% rename from src/main/java/modtweaker/mods/botania/handlers/ManaInfusion.java rename to src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java index 2dff771..c8e64fd 100644 --- a/src/main/java/modtweaker/mods/botania/handlers/ManaInfusion.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java @@ -1,18 +1,19 @@ -package modtweaker.mods.botania.handlers; +package modtweaker2.mods.botania.handlers; -import static modtweaker.helpers.InputHelper.toObject; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.helpers.InputHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeManaInfusion; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; + @ZenClass("mods.botania.ManaInfusion") public class ManaInfusion { diff --git a/src/main/java/modtweaker/mods/botania/handlers/Orechid.java b/src/main/java/modtweaker2/mods/botania/handlers/Orechid.java similarity index 98% rename from src/main/java/modtweaker/mods/botania/handlers/Orechid.java rename to src/main/java/modtweaker2/mods/botania/handlers/Orechid.java index df02faa..fa83f86 100644 --- a/src/main/java/modtweaker/mods/botania/handlers/Orechid.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/Orechid.java @@ -1,4 +1,4 @@ -package modtweaker.mods.botania.handlers; +package modtweaker2.mods.botania.handlers; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; diff --git a/src/main/java/modtweaker/mods/botania/handlers/RuneAltar.java b/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java similarity index 85% rename from src/main/java/modtweaker/mods/botania/handlers/RuneAltar.java rename to src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java index 896efab..e57d4ec 100644 --- a/src/main/java/modtweaker/mods/botania/handlers/RuneAltar.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java @@ -1,20 +1,19 @@ -package modtweaker.mods.botania.handlers; +package modtweaker2.mods.botania.handlers; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeRuneAltar; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; -@ZenClass("mods.botania.RuneAltar") +@ZenClass("") public class RuneAltar { @ZenMethod public static void addRecipe(IItemStack output, IIngredient[] input, int mana) { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/AddCategory.java b/src/main/java/modtweaker2/mods/botania/lexicon/AddCategory.java similarity index 86% rename from src/main/java/modtweaker/mods/botania/lexicon/AddCategory.java rename to src/main/java/modtweaker2/mods/botania/lexicon/AddCategory.java index 7e798f9..9747066 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/AddCategory.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/AddCategory.java @@ -1,10 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class AddCategory implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/AddEntry.java b/src/main/java/modtweaker2/mods/botania/lexicon/AddEntry.java similarity index 90% rename from src/main/java/modtweaker/mods/botania/lexicon/AddEntry.java rename to src/main/java/modtweaker2/mods/botania/lexicon/AddEntry.java index 73fc60d..b3c4068 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/AddEntry.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/AddEntry.java @@ -1,9 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class AddEntry implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/AddPage.java b/src/main/java/modtweaker2/mods/botania/lexicon/AddPage.java similarity index 95% rename from src/main/java/modtweaker/mods/botania/lexicon/AddPage.java rename to src/main/java/modtweaker2/mods/botania/lexicon/AddPage.java index 54bc68b..af5f0cf 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/AddPage.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/AddPage.java @@ -1,8 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class AddPage implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/AddRecipeMapping.java b/src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java similarity index 80% rename from src/main/java/modtweaker/mods/botania/lexicon/AddRecipeMapping.java rename to src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java index 2e69ef2..90b3f67 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/AddRecipeMapping.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java @@ -1,13 +1,9 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; -import net.minecraft.item.ItemStack; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; import minetweaker.IUndoableAction; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; public class AddRecipeMapping implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/RemoveCategory.java b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveCategory.java similarity index 86% rename from src/main/java/modtweaker/mods/botania/lexicon/RemoveCategory.java rename to src/main/java/modtweaker2/mods/botania/lexicon/RemoveCategory.java index c85c076..edbea43 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/RemoveCategory.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveCategory.java @@ -1,10 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class RemoveCategory implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/RemoveEntry.java b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveEntry.java similarity index 90% rename from src/main/java/modtweaker/mods/botania/lexicon/RemoveEntry.java rename to src/main/java/modtweaker2/mods/botania/lexicon/RemoveEntry.java index 798a3e0..4c6cf13 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/RemoveEntry.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveEntry.java @@ -1,9 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class RemoveEntry implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/RemovePage.java b/src/main/java/modtweaker2/mods/botania/lexicon/RemovePage.java similarity index 95% rename from src/main/java/modtweaker/mods/botania/lexicon/RemovePage.java rename to src/main/java/modtweaker2/mods/botania/lexicon/RemovePage.java index 61572d4..a971984 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/RemovePage.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/RemovePage.java @@ -1,8 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class RemovePage implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/RemoveRecipeMapping.java b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java similarity index 86% rename from src/main/java/modtweaker/mods/botania/lexicon/RemoveRecipeMapping.java rename to src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java index 27ec4d5..e1b7e2a 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/RemoveRecipeMapping.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java @@ -1,13 +1,10 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; +import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import vazkii.botania.api.lexicon.LexiconRecipeMappings; import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData; -import minetweaker.IUndoableAction; public class RemoveRecipeMapping implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/SetCategoryIcon.java b/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java similarity index 85% rename from src/main/java/modtweaker/mods/botania/lexicon/SetCategoryIcon.java rename to src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java index f7b3044..491d1af 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/SetCategoryIcon.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java @@ -1,11 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; -import net.minecraft.util.ResourceLocation; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import minetweaker.IUndoableAction; +import net.minecraft.util.ResourceLocation; +import vazkii.botania.api.lexicon.LexiconCategory; public class SetCategoryIcon implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/SetCategoryPriority.java b/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryPriority.java similarity index 84% rename from src/main/java/modtweaker/mods/botania/lexicon/SetCategoryPriority.java rename to src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryPriority.java index 5d67482..2c049c3 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/SetCategoryPriority.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryPriority.java @@ -1,10 +1,7 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import minetweaker.IUndoableAction; +import vazkii.botania.api.lexicon.LexiconCategory; public class SetCategoryPriority implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/SetEntryKnowledgeType.java b/src/main/java/modtweaker2/mods/botania/lexicon/SetEntryKnowledgeType.java similarity index 88% rename from src/main/java/modtweaker/mods/botania/lexicon/SetEntryKnowledgeType.java rename to src/main/java/modtweaker2/mods/botania/lexicon/SetEntryKnowledgeType.java index dbe4cdd..aa438c5 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/SetEntryKnowledgeType.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/SetEntryKnowledgeType.java @@ -1,10 +1,8 @@ -package modtweaker.mods.botania.lexicon; +package modtweaker2.mods.botania.lexicon; -import vazkii.botania.api.BotaniaAPI; +import minetweaker.IUndoableAction; import vazkii.botania.api.lexicon.KnowledgeType; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; -import minetweaker.IUndoableAction; public class SetEntryKnowledgeType implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconCategoryLogger.java b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconCategoryLogger.java similarity index 92% rename from src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconCategoryLogger.java rename to src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconCategoryLogger.java index ba75eee..64a502d 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconCategoryLogger.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconCategoryLogger.java @@ -1,14 +1,13 @@ -package modtweaker.mods.botania.lexicon.commands; +package modtweaker2.mods.botania.lexicon.commands; -import java.util.Collections; import java.util.List; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.LexiconCategory; public class LexiconCategoryLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconEntryLogger.java b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconEntryLogger.java similarity index 91% rename from src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconEntryLogger.java rename to src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconEntryLogger.java index 9e17b1a..4eb4534 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconEntryLogger.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconEntryLogger.java @@ -1,16 +1,15 @@ -package modtweaker.mods.botania.lexicon.commands; +package modtweaker2.mods.botania.lexicon.commands; -import java.util.Collections; import java.util.List; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker.mods.botania.BotaniaHelper; +import modtweaker2.mods.botania.BotaniaHelper; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.LexiconCategory; +import vazkii.botania.api.lexicon.LexiconEntry; public class LexiconEntryLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java similarity index 84% rename from src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java rename to src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java index f499863..60b67c0 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java @@ -1,15 +1,12 @@ -package modtweaker.mods.botania.lexicon.commands; +package modtweaker2.mods.botania.lexicon.commands; -import java.util.Collections; -import java.util.List; import java.util.Set; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; +import vazkii.botania.api.BotaniaAPI; public class LexiconKnowledgeTypesLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconPageLogger.java b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconPageLogger.java similarity index 89% rename from src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconPageLogger.java rename to src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconPageLogger.java index a4d3b0d..870ca9a 100644 --- a/src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconPageLogger.java +++ b/src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconPageLogger.java @@ -1,18 +1,16 @@ -package modtweaker.mods.botania.lexicon.commands; +package modtweaker2.mods.botania.lexicon.commands; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconCategory; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconPage; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker.mods.botania.BotaniaHelper; +import modtweaker2.mods.botania.BotaniaHelper; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; public class LexiconPageLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/chisel/Chisel.java b/src/main/java/modtweaker2/mods/chisel/Chisel.java similarity index 63% rename from src/main/java/modtweaker/mods/chisel/Chisel.java rename to src/main/java/modtweaker2/mods/chisel/Chisel.java index 797d226..e113be5 100644 --- a/src/main/java/modtweaker/mods/chisel/Chisel.java +++ b/src/main/java/modtweaker2/mods/chisel/Chisel.java @@ -1,7 +1,7 @@ -package modtweaker.mods.chisel; +package modtweaker2.mods.chisel; import minetweaker.MineTweakerAPI; -import modtweaker.mods.chisel.handlers.Groups; +import modtweaker2.mods.chisel.handlers.Groups; public class Chisel { public Chisel() { diff --git a/src/main/java/modtweaker/mods/chisel/ChiselHelper.java b/src/main/java/modtweaker2/mods/chisel/ChiselHelper.java similarity index 95% rename from src/main/java/modtweaker/mods/chisel/ChiselHelper.java rename to src/main/java/modtweaker2/mods/chisel/ChiselHelper.java index f853f2d..90215c4 100644 --- a/src/main/java/modtweaker/mods/chisel/ChiselHelper.java +++ b/src/main/java/modtweaker2/mods/chisel/ChiselHelper.java @@ -1,15 +1,13 @@ -package modtweaker.mods.chisel; +package modtweaker2.mods.chisel; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import java.util.Collections; import java.util.Comparator; import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import minetweaker.api.item.IItemStack; +import net.minecraft.block.Block; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.carving.ICarvingGroup; diff --git a/src/main/java/modtweaker/mods/chisel/commands/ChiselGroupLogger.java b/src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java similarity index 86% rename from src/main/java/modtweaker/mods/chisel/commands/ChiselGroupLogger.java rename to src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java index d847ae4..55dd684 100644 --- a/src/main/java/modtweaker/mods/chisel/commands/ChiselGroupLogger.java +++ b/src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java @@ -1,17 +1,14 @@ -package modtweaker.mods.chisel.commands; +package modtweaker2.mods.chisel.commands; -import java.util.Collections; import java.util.List; -import java.util.Set; -import com.cricketcraft.chisel.api.carving.CarvingUtils; - -import net.minecraft.entity.EntityList; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; +import com.cricketcraft.chisel.api.carving.CarvingUtils; + public class ChiselGroupLogger implements ICommandFunction{ @Override diff --git a/src/main/java/modtweaker/mods/chisel/commands/ChiselVariationLogger.java b/src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java similarity index 91% rename from src/main/java/modtweaker/mods/chisel/commands/ChiselVariationLogger.java rename to src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java index c1043a2..61817eb 100644 --- a/src/main/java/modtweaker/mods/chisel/commands/ChiselVariationLogger.java +++ b/src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java @@ -1,24 +1,20 @@ -package modtweaker.mods.chisel.commands; +package modtweaker2.mods.chisel.commands; -import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; -import com.cricketcraft.chisel.api.carving.CarvingUtils; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; - -import net.minecraft.entity.EntityList; -import net.minecraft.item.Item; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker.mods.chisel.ChiselHelper; +import modtweaker2.mods.chisel.ChiselHelper; +import net.minecraft.item.Item; + +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; public class ChiselVariationLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/chisel/handlers/Groups.java b/src/main/java/modtweaker2/mods/chisel/handlers/Groups.java similarity index 93% rename from src/main/java/modtweaker/mods/chisel/handlers/Groups.java rename to src/main/java/modtweaker2/mods/chisel/handlers/Groups.java index 0d201ec..e59eb5c 100644 --- a/src/main/java/modtweaker/mods/chisel/handlers/Groups.java +++ b/src/main/java/modtweaker2/mods/chisel/handlers/Groups.java @@ -1,24 +1,16 @@ -package modtweaker.mods.chisel.handlers; +package modtweaker2.mods.chisel.handlers; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import minetweaker.IUndoableAction; +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import modtweaker2.mods.chisel.ChiselHelper; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import minetweaker.IUndoableAction; -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import modtweaker.mods.chisel.ChiselHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; -import net.minecraft.item.ItemStack; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; - @ZenClass("mods.chisel.Groups") public class Groups { @ZenMethod diff --git a/src/main/java/modtweaker/mods/exnihilo/ExNihilo.java b/src/main/java/modtweaker2/mods/exnihilo/ExNihilo.java similarity index 56% rename from src/main/java/modtweaker/mods/exnihilo/ExNihilo.java rename to src/main/java/modtweaker2/mods/exnihilo/ExNihilo.java index 671bd53..62991ed 100644 --- a/src/main/java/modtweaker/mods/exnihilo/ExNihilo.java +++ b/src/main/java/modtweaker2/mods/exnihilo/ExNihilo.java @@ -1,10 +1,10 @@ -package modtweaker.mods.exnihilo; +package modtweaker2.mods.exnihilo; import minetweaker.MineTweakerAPI; -import modtweaker.mods.exnihilo.handlers.Compost; -import modtweaker.mods.exnihilo.handlers.Crucible; -import modtweaker.mods.exnihilo.handlers.Hammer; -import modtweaker.mods.exnihilo.handlers.Sieve; +import modtweaker2.mods.exnihilo.handlers.Compost; +import modtweaker2.mods.exnihilo.handlers.Crucible; +import modtweaker2.mods.exnihilo.handlers.Hammer; +import modtweaker2.mods.exnihilo.handlers.Sieve; public class ExNihilo { public ExNihilo() { diff --git a/src/main/java/modtweaker/mods/exnihilo/handlers/Compost.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java similarity index 92% rename from src/main/java/modtweaker/mods/exnihilo/handlers/Compost.java rename to src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java index 470ec76..e72e2a4 100644 --- a/src/main/java/modtweaker/mods/exnihilo/handlers/Compost.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java @@ -1,10 +1,10 @@ -package modtweaker.mods.exnihilo.handlers; +package modtweaker2.mods.exnihilo.handlers; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/exnihilo/handlers/Crucible.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java similarity index 93% rename from src/main/java/modtweaker/mods/exnihilo/handlers/Crucible.java rename to src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java index 7199839..9a91299 100644 --- a/src/main/java/modtweaker/mods/exnihilo/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java @@ -1,13 +1,13 @@ -package modtweaker.mods.exnihilo.handlers; +package modtweaker2.mods.exnihilo.handlers; -import static modtweaker.helpers.InputHelper.isABlock; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.isABlock; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java similarity index 91% rename from src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java rename to src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java index b2314db..3ef6df5 100644 --- a/src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java @@ -1,14 +1,14 @@ -package modtweaker.mods.exnihilo.handlers; +package modtweaker2.mods.exnihilo.handlers; -import static modtweaker.helpers.InputHelper.isABlock; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.isABlock; +import static modtweaker2.helpers.InputHelper.toStack; import java.util.Iterator; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/modtweaker/mods/exnihilo/handlers/Sieve.java b/src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java similarity index 88% rename from src/main/java/modtweaker/mods/exnihilo/handlers/Sieve.java rename to src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java index 0223dcc..51a48a8 100644 --- a/src/main/java/modtweaker/mods/exnihilo/handlers/Sieve.java +++ b/src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java @@ -1,13 +1,13 @@ -package modtweaker.mods.exnihilo.handlers; +package modtweaker2.mods.exnihilo.handlers; -import static modtweaker.helpers.InputHelper.isABlock; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.isABlock; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseMultipleListRemoval; -import modtweaker.util.BaseMultipleListRemoval.Position; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseMultipleListRemoval; +import modtweaker2.util.BaseMultipleListRemoval.Position; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/extendedworkbench/ExtendedWorkbench.java b/src/main/java/modtweaker2/mods/extendedworkbench/ExtendedWorkbench.java similarity index 60% rename from src/main/java/modtweaker/mods/extendedworkbench/ExtendedWorkbench.java rename to src/main/java/modtweaker2/mods/extendedworkbench/ExtendedWorkbench.java index 09eabe5..0e23edf 100644 --- a/src/main/java/modtweaker/mods/extendedworkbench/ExtendedWorkbench.java +++ b/src/main/java/modtweaker2/mods/extendedworkbench/ExtendedWorkbench.java @@ -1,7 +1,7 @@ -package modtweaker.mods.extendedworkbench; +package modtweaker2.mods.extendedworkbench; import minetweaker.MineTweakerAPI; -import modtweaker.mods.extendedworkbench.handlers.ExtendedCrafting; +import modtweaker2.mods.extendedworkbench.handlers.ExtendedCrafting; public class ExtendedWorkbench { public ExtendedWorkbench() { diff --git a/src/main/java/modtweaker/mods/extendedworkbench/handlers/ExtendedCrafting.java b/src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java similarity index 92% rename from src/main/java/modtweaker/mods/extendedworkbench/handlers/ExtendedCrafting.java rename to src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java index 68ae774..ad794d0 100644 --- a/src/main/java/modtweaker/mods/extendedworkbench/handlers/ExtendedCrafting.java +++ b/src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java @@ -1,15 +1,11 @@ -package modtweaker.mods.extendedworkbench.handlers; - -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toStacks; -import static modtweaker.helpers.StackHelper.areEqual; +package modtweaker2.mods.extendedworkbench.handlers; import java.util.Arrays; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import naruto1310.extendedWorkbench.crafting.ExtendedCraftingManager; import naruto1310.extendedWorkbench.crafting.ExtendedShapedRecipes; import naruto1310.extendedWorkbench.crafting.ExtendedShapelessRecipes; @@ -17,6 +13,8 @@ import naruto1310.extendedWorkbench.crafting.IExtendedRecipe; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.extendedworkbench") public class ExtendedCrafting { diff --git a/src/main/java/modtweaker/mods/factorization/Factorization.java b/src/main/java/modtweaker2/mods/factorization/Factorization.java similarity index 55% rename from src/main/java/modtweaker/mods/factorization/Factorization.java rename to src/main/java/modtweaker2/mods/factorization/Factorization.java index 98d9dd2..34af896 100644 --- a/src/main/java/modtweaker/mods/factorization/Factorization.java +++ b/src/main/java/modtweaker2/mods/factorization/Factorization.java @@ -1,9 +1,9 @@ -package modtweaker.mods.factorization; +package modtweaker2.mods.factorization; import minetweaker.MineTweakerAPI; -import modtweaker.mods.factorization.handlers.Crystallizer; -import modtweaker.mods.factorization.handlers.Lacerator; -import modtweaker.mods.factorization.handlers.SlagFurnace; +import modtweaker2.mods.factorization.handlers.Crystallizer; +import modtweaker2.mods.factorization.handlers.Lacerator; +import modtweaker2.mods.factorization.handlers.SlagFurnace; public class Factorization { public Factorization() { diff --git a/src/main/java/modtweaker/mods/factorization/FactorizationHelper.java b/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java similarity index 96% rename from src/main/java/modtweaker/mods/factorization/FactorizationHelper.java rename to src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java index 530eec7..6e5797d 100644 --- a/src/main/java/modtweaker/mods/factorization/FactorizationHelper.java +++ b/src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java @@ -1,11 +1,10 @@ -package modtweaker.mods.factorization; - -import static modtweaker.helpers.ReflectionHelper.getStaticObject; +package modtweaker2.mods.factorization; import java.lang.reflect.Constructor; import java.util.List; import net.minecraft.item.ItemStack; +import static modtweaker2.helpers.ReflectionHelper.*; public class FactorizationHelper { public static List lacerator = null; diff --git a/src/main/java/modtweaker/mods/factorization/handlers/Crystallizer.java b/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java similarity index 86% rename from src/main/java/modtweaker/mods/factorization/handlers/Crystallizer.java rename to src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java index f7b9a4f..5710aa4 100644 --- a/src/main/java/modtweaker/mods/factorization/handlers/Crystallizer.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java @@ -1,17 +1,18 @@ -package modtweaker.mods.factorization.handlers; +package modtweaker2.mods.factorization.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.mods.factorization.FactorizationHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.mods.factorization.FactorizationHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; + @ZenClass("mods.factorization.Crystallizer") public class Crystallizer { @ZenMethod diff --git a/src/main/java/modtweaker/mods/factorization/handlers/Lacerator.java b/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java similarity index 85% rename from src/main/java/modtweaker/mods/factorization/handlers/Lacerator.java rename to src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java index 79f61ca..8ed2fb1 100644 --- a/src/main/java/modtweaker/mods/factorization/handlers/Lacerator.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java @@ -1,13 +1,13 @@ -package modtweaker.mods.factorization.handlers; +package modtweaker2.mods.factorization.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.mods.factorization.FactorizationHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.mods.factorization.FactorizationHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/factorization/handlers/SlagFurnace.java b/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java similarity index 83% rename from src/main/java/modtweaker/mods/factorization/handlers/SlagFurnace.java rename to src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java index e7d86b3..ae994cf 100644 --- a/src/main/java/modtweaker/mods/factorization/handlers/SlagFurnace.java +++ b/src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java @@ -1,14 +1,14 @@ -package modtweaker.mods.factorization.handlers; +package modtweaker2.mods.factorization.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.mods.factorization.FactorizationHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseMultipleListRemoval; -import modtweaker.util.BaseMultipleListRemoval.Position; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.mods.factorization.FactorizationHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseMultipleListRemoval; +import modtweaker2.util.BaseMultipleListRemoval.Position; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/forestry/Forestry.java b/src/main/java/modtweaker2/mods/forestry/Forestry.java similarity index 51% rename from src/main/java/modtweaker/mods/forestry/Forestry.java rename to src/main/java/modtweaker2/mods/forestry/Forestry.java index 02ac25c..6ff297b 100644 --- a/src/main/java/modtweaker/mods/forestry/Forestry.java +++ b/src/main/java/modtweaker2/mods/forestry/Forestry.java @@ -1,13 +1,13 @@ -package modtweaker.mods.forestry; +package modtweaker2.mods.forestry; import minetweaker.MineTweakerAPI; -import modtweaker.mods.forestry.handlers.Carpenter; -import modtweaker.mods.forestry.handlers.Centrifuge; -import modtweaker.mods.forestry.handlers.Fermenter; -import modtweaker.mods.forestry.handlers.Moistener; -import modtweaker.mods.forestry.handlers.Squeezer; -import modtweaker.mods.forestry.handlers.Still; -import modtweaker.mods.forestry.handlers.ThermionicFabricator; +import modtweaker2.mods.forestry.handlers.Carpenter; +import modtweaker2.mods.forestry.handlers.Centrifuge; +import modtweaker2.mods.forestry.handlers.Fermenter; +import modtweaker2.mods.forestry.handlers.Moistener; +import modtweaker2.mods.forestry.handlers.Squeezer; +import modtweaker2.mods.forestry.handlers.Still; +import modtweaker2.mods.forestry.handlers.ThermionicFabricator; public class Forestry { public Forestry() { diff --git a/src/main/java/modtweaker/mods/forestry/ForestryHelper.java b/src/main/java/modtweaker2/mods/forestry/ForestryHelper.java similarity index 97% rename from src/main/java/modtweaker/mods/forestry/ForestryHelper.java rename to src/main/java/modtweaker2/mods/forestry/ForestryHelper.java index 5102e31..5733957 100644 --- a/src/main/java/modtweaker/mods/forestry/ForestryHelper.java +++ b/src/main/java/modtweaker2/mods/forestry/ForestryHelper.java @@ -1,4 +1,4 @@ -package modtweaker.mods.forestry; +package modtweaker2.mods.forestry; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java similarity index 80% rename from src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java rename to src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java index d239dd2..acee8e8 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java @@ -1,8 +1,4 @@ -package modtweaker.mods.forestry.handlers; - -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStacks; +package modtweaker2.mods.forestry.handlers; import java.util.ArrayList; import java.util.List; @@ -10,23 +6,19 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.recipes.ShapedRecipe; -import minetweaker.mc1710.recipes.RecipeConverter; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.forestry.ForestryHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.Forestry; -import forestry.api.core.ForestryAPI; -import forestry.api.recipes.RecipeManagers; -import forestry.core.utils.RecipeUtil; import forestry.core.utils.ShapedRecipeCustom; import forestry.factory.gadgets.MachineCarpenter; import forestry.factory.gadgets.MachineCarpenter.Recipe; import forestry.factory.gadgets.MachineCarpenter.RecipeManager; -import modtweaker.mods.forestry.ForestryHelper; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.Carpenter") public class Carpenter { diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java similarity index 86% rename from src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java rename to src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java index 8b89b2a..40b46ef 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java @@ -1,21 +1,19 @@ -package modtweaker.mods.forestry.handlers; +package modtweaker2.mods.forestry.handlers; -import java.util.List; import java.util.HashMap; -import net.minecraft.item.ItemStack; +import java.util.List; -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toStacks; - -import forestry.factory.gadgets.MachineCentrifuge; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; +import net.minecraft.item.ItemStack; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; import forestry.factory.gadgets.MachineCentrifuge.Recipe; import forestry.factory.gadgets.MachineCentrifuge.RecipeManager; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.Centrifuge") diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java similarity index 86% rename from src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java rename to src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java index 9135156..bd8d2ba 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java @@ -1,8 +1,4 @@ -package modtweaker.mods.forestry.handlers; - -import static modtweaker.helpers.InputHelper.getFluid; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; +package modtweaker2.mods.forestry.handlers; import java.util.ArrayList; import java.util.List; @@ -10,14 +6,16 @@ import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import forestry.factory.gadgets.MachineFermenter; import forestry.factory.gadgets.MachineFermenter.Recipe; import forestry.factory.gadgets.MachineFermenter.RecipeManager; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.Fermenter") public class Fermenter { diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Moistener.java b/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java similarity index 86% rename from src/main/java/modtweaker/mods/forestry/handlers/Moistener.java rename to src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java index 7d869ae..680fd35 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Moistener.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java @@ -1,19 +1,19 @@ -package modtweaker.mods.forestry.handlers; - -import static modtweaker.helpers.InputHelper.toStack; +package modtweaker2.mods.forestry.handlers; import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import forestry.factory.gadgets.MachineMoistener; import forestry.factory.gadgets.MachineMoistener.Recipe; import forestry.factory.gadgets.MachineMoistener.RecipeManager; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.Moistener") public class Moistener { diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java b/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java similarity index 82% rename from src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java rename to src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java index c488fd8..d1f9b61 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java @@ -1,23 +1,20 @@ -package modtweaker.mods.forestry.handlers; - -import static modtweaker.helpers.InputHelper.getFluid; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toStacks; +package modtweaker2.mods.forestry.handlers; import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import forestry.factory.gadgets.MachineSqueezer; import forestry.factory.gadgets.MachineSqueezer.Recipe; import forestry.factory.gadgets.MachineSqueezer.RecipeManager; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.Squeezer") public class Squeezer { diff --git a/src/main/java/modtweaker/mods/forestry/handlers/Still.java b/src/main/java/modtweaker2/mods/forestry/handlers/Still.java similarity index 68% rename from src/main/java/modtweaker/mods/forestry/handlers/Still.java rename to src/main/java/modtweaker2/mods/forestry/handlers/Still.java index c858838..df27dc4 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/Still.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/Still.java @@ -1,32 +1,19 @@ -package modtweaker.mods.forestry.handlers; - -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.getFluid; +package modtweaker2.mods.forestry.handlers; import java.util.List; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.helpers.InputHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; -import net.minecraftforge.fluids.Fluid; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import forestry.Forestry; -import forestry.api.core.ForestryAPI; -import forestry.core.utils.LiquidHelper; -import forestry.core.utils.RecipeUtil; -import forestry.factory.gadgets.MachineSqueezer; import forestry.factory.gadgets.MachineStill; import forestry.factory.gadgets.MachineStill.Recipe; import forestry.factory.gadgets.MachineStill.RecipeManager; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.Still") public class Still { diff --git a/src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java b/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java similarity index 89% rename from src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java rename to src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java index b019e17..e617e4b 100644 --- a/src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java +++ b/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java @@ -1,28 +1,21 @@ -package modtweaker.mods.forestry.handlers; +package modtweaker2.mods.forestry.handlers; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidRegistry; - -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import minetweaker.api.item.IIngredient; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toObject; - +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; import forestry.core.utils.ShapedRecipeCustom; -import forestry.factory.gadgets.MachineFabricator; -import forestry.factory.gadgets.MachineFabricator.RecipeManager; import forestry.factory.gadgets.MachineFabricator.Recipe; +import forestry.factory.gadgets.MachineFabricator.RecipeManager; import forestry.factory.gadgets.MachineFabricator.Smelting; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.forestry.ThermionicFabricator") public class ThermionicFabricator { diff --git a/src/main/java/modtweaker/mods/fsp/FSPHelper.java b/src/main/java/modtweaker2/mods/fsp/FSPHelper.java similarity index 92% rename from src/main/java/modtweaker/mods/fsp/FSPHelper.java rename to src/main/java/modtweaker2/mods/fsp/FSPHelper.java index 7633e38..2182866 100644 --- a/src/main/java/modtweaker/mods/fsp/FSPHelper.java +++ b/src/main/java/modtweaker2/mods/fsp/FSPHelper.java @@ -1,4 +1,4 @@ -package modtweaker.mods.fsp; +package modtweaker2.mods.fsp; import flaxbeard.steamcraft.api.CrucibleLiquid; import flaxbeard.steamcraft.api.SteamcraftRegistry; diff --git a/src/main/java/modtweaker/mods/fsp/Steamcraft.java b/src/main/java/modtweaker2/mods/fsp/Steamcraft.java similarity index 62% rename from src/main/java/modtweaker/mods/fsp/Steamcraft.java rename to src/main/java/modtweaker2/mods/fsp/Steamcraft.java index 5ed823a..26d8ac0 100644 --- a/src/main/java/modtweaker/mods/fsp/Steamcraft.java +++ b/src/main/java/modtweaker2/mods/fsp/Steamcraft.java @@ -1,8 +1,8 @@ -package modtweaker.mods.fsp; +package modtweaker2.mods.fsp; import minetweaker.MineTweakerAPI; -import modtweaker.mods.fsp.handlers.Crucible; -import modtweaker.mods.fsp.handlers.Furnace; +import modtweaker2.mods.fsp.handlers.Crucible; +import modtweaker2.mods.fsp.handlers.Furnace; public class Steamcraft { public Steamcraft() { diff --git a/src/main/java/modtweaker/mods/fsp/handlers/Crucible.java b/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java similarity index 93% rename from src/main/java/modtweaker/mods/fsp/handlers/Crucible.java rename to src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java index eae7d4c..6c7edbd 100644 --- a/src/main/java/modtweaker/mods/fsp/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java @@ -1,12 +1,11 @@ -package modtweaker.mods.fsp.handlers; +package modtweaker2.mods.fsp.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.mods.fsp.FSPHelper.getLiquid; +import static modtweaker2.mods.fsp.FSPHelper.getLiquid; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import org.apache.commons.lang3.tuple.MutablePair; @@ -17,6 +16,8 @@ import flaxbeard.steamcraft.api.CrucibleFormula; import flaxbeard.steamcraft.api.CrucibleLiquid; import flaxbeard.steamcraft.api.SteamcraftRegistry; import flaxbeard.steamcraft.api.Tuple3; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.fsp.Crucible") public class Crucible { diff --git a/src/main/java/modtweaker/mods/fsp/handlers/Furnace.java b/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java similarity index 89% rename from src/main/java/modtweaker/mods/fsp/handlers/Furnace.java rename to src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java index b3294f0..a544bc9 100644 --- a/src/main/java/modtweaker/mods/fsp/handlers/Furnace.java +++ b/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java @@ -1,10 +1,9 @@ -package modtweaker.mods.fsp.handlers; +package modtweaker2.mods.fsp.handlers; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import org.apache.commons.lang3.tuple.MutablePair; @@ -12,6 +11,8 @@ import org.apache.commons.lang3.tuple.MutablePair; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import flaxbeard.steamcraft.api.SteamcraftRegistry; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.fsp.Furnace") public class Furnace { diff --git a/src/main/java/modtweaker/mods/hee/HardcoreEnderExpansion.java b/src/main/java/modtweaker2/mods/hee/HardcoreEnderExpansion.java similarity index 68% rename from src/main/java/modtweaker/mods/hee/HardcoreEnderExpansion.java rename to src/main/java/modtweaker2/mods/hee/HardcoreEnderExpansion.java index 0918015..4410770 100644 --- a/src/main/java/modtweaker/mods/hee/HardcoreEnderExpansion.java +++ b/src/main/java/modtweaker2/mods/hee/HardcoreEnderExpansion.java @@ -1,7 +1,7 @@ -package modtweaker.mods.hee; +package modtweaker2.mods.hee; import minetweaker.MineTweakerAPI; -import modtweaker.mods.hee.handlers.EssenceAltar; +import modtweaker2.mods.hee.handlers.EssenceAltar; public class HardcoreEnderExpansion { public HardcoreEnderExpansion() { diff --git a/src/main/java/modtweaker/mods/hee/handlers/EssenceAltar.java b/src/main/java/modtweaker2/mods/hee/handlers/EssenceAltar.java similarity index 88% rename from src/main/java/modtweaker/mods/hee/handlers/EssenceAltar.java rename to src/main/java/modtweaker2/mods/hee/handlers/EssenceAltar.java index 4bce1a9..9439ab7 100644 --- a/src/main/java/modtweaker/mods/hee/handlers/EssenceAltar.java +++ b/src/main/java/modtweaker2/mods/hee/handlers/EssenceAltar.java @@ -1,15 +1,15 @@ -package modtweaker.mods.hee.handlers; +package modtweaker2.mods.hee.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/imc/IMC.java b/src/main/java/modtweaker2/mods/imc/IMC.java similarity index 74% rename from src/main/java/modtweaker/mods/imc/IMC.java rename to src/main/java/modtweaker2/mods/imc/IMC.java index 6030b35..e881d19 100644 --- a/src/main/java/modtweaker/mods/imc/IMC.java +++ b/src/main/java/modtweaker2/mods/imc/IMC.java @@ -1,7 +1,6 @@ -package modtweaker.mods.imc; +package modtweaker2.mods.imc; import java.util.ArrayList; -import java.util.List; public class IMC { diff --git a/src/main/java/modtweaker/mods/imc/handler/Message.java b/src/main/java/modtweaker2/mods/imc/handler/Message.java similarity index 95% rename from src/main/java/modtweaker/mods/imc/handler/Message.java rename to src/main/java/modtweaker2/mods/imc/handler/Message.java index 37a5b3a..abbd551 100644 --- a/src/main/java/modtweaker/mods/imc/handler/Message.java +++ b/src/main/java/modtweaker2/mods/imc/handler/Message.java @@ -1,9 +1,8 @@ -package modtweaker.mods.imc.handler; +package modtweaker2.mods.imc.handler; import java.io.File; import java.io.FileNotFoundException; import java.io.FilenameFilter; -import java.util.ArrayList; import java.util.Scanner; import cpw.mods.fml.common.event.FMLInterModComms; diff --git a/src/main/java/modtweaker/mods/mariculture/Mariculture.java b/src/main/java/modtweaker2/mods/mariculture/Mariculture.java similarity index 54% rename from src/main/java/modtweaker/mods/mariculture/Mariculture.java rename to src/main/java/modtweaker2/mods/mariculture/Mariculture.java index 491b2fd..5e53e2a 100644 --- a/src/main/java/modtweaker/mods/mariculture/Mariculture.java +++ b/src/main/java/modtweaker2/mods/mariculture/Mariculture.java @@ -1,11 +1,11 @@ -package modtweaker.mods.mariculture; +package modtweaker2.mods.mariculture; import minetweaker.MineTweakerAPI; -import modtweaker.mods.mariculture.handlers.Anvil; -import modtweaker.mods.mariculture.handlers.Casting; -import modtweaker.mods.mariculture.handlers.Crucible; -import modtweaker.mods.mariculture.handlers.Fishing; -import modtweaker.mods.mariculture.handlers.Vat; +import modtweaker2.mods.mariculture.handlers.Anvil; +import modtweaker2.mods.mariculture.handlers.Casting; +import modtweaker2.mods.mariculture.handlers.Crucible; +import modtweaker2.mods.mariculture.handlers.Fishing; +import modtweaker2.mods.mariculture.handlers.Vat; public class Mariculture { public Mariculture() { diff --git a/src/main/java/modtweaker/mods/mariculture/MaricultureHelper.java b/src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java similarity index 95% rename from src/main/java/modtweaker/mods/mariculture/MaricultureHelper.java rename to src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java index 20ad74c..3fa258a 100644 --- a/src/main/java/modtweaker/mods/mariculture/MaricultureHelper.java +++ b/src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java @@ -1,4 +1,4 @@ -package modtweaker.mods.mariculture; +package modtweaker2.mods.mariculture; import java.util.ArrayList; import java.util.HashMap; @@ -8,7 +8,7 @@ import mariculture.api.core.MaricultureHandlers; import mariculture.api.fishery.Fishing; import mariculture.api.fishery.Loot; import mariculture.api.fishery.Loot.Rarity; -import modtweaker.helpers.ReflectionHelper; +import modtweaker2.helpers.ReflectionHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker/mods/mariculture/handlers/Anvil.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java similarity index 87% rename from src/main/java/modtweaker/mods/mariculture/handlers/Anvil.java rename to src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java index b362b3d..b0fe17a 100644 --- a/src/main/java/modtweaker/mods/mariculture/handlers/Anvil.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java @@ -1,13 +1,13 @@ -package modtweaker.mods.mariculture.handlers; +package modtweaker2.mods.mariculture.handlers; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import mariculture.api.core.IAnvilHandler.RecipeAnvil; import mariculture.api.core.MaricultureHandlers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mariculture.MaricultureHelper; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.mariculture.MaricultureHelper; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mariculture/handlers/Casting.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java similarity index 90% rename from src/main/java/modtweaker/mods/mariculture/handlers/Casting.java rename to src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java index d33df1b..35fb5d4 100644 --- a/src/main/java/modtweaker/mods/mariculture/handlers/Casting.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java @@ -1,7 +1,7 @@ -package modtweaker.mods.mariculture.handlers; +package modtweaker2.mods.mariculture.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; import java.util.HashMap; @@ -11,9 +11,9 @@ import mariculture.api.core.RecipeCasting.RecipeNuggetCasting; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.mods.mariculture.MaricultureHelper; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.mariculture.MaricultureHelper; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mariculture/handlers/Crucible.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java similarity index 90% rename from src/main/java/modtweaker/mods/mariculture/handlers/Crucible.java rename to src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java index 2be891c..b40209d 100644 --- a/src/main/java/modtweaker/mods/mariculture/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java @@ -1,19 +1,19 @@ -package modtweaker.mods.mariculture.handlers; +package modtweaker2.mods.mariculture.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import mariculture.api.core.FuelInfo; import mariculture.api.core.MaricultureHandlers; import mariculture.api.core.RecipeSmelter; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.mods.mariculture.MaricultureHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.mariculture.MaricultureHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/mariculture/handlers/Fishing.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java similarity index 93% rename from src/main/java/modtweaker/mods/mariculture/handlers/Fishing.java rename to src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java index 188d9f4..10b087e 100644 --- a/src/main/java/modtweaker/mods/mariculture/handlers/Fishing.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java @@ -1,7 +1,7 @@ -package modtweaker.mods.mariculture.handlers; +package modtweaker2.mods.mariculture.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.ArrayList; import java.util.HashMap; @@ -12,10 +12,10 @@ import mariculture.api.fishery.Loot.Rarity; import mariculture.api.fishery.RodType; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.mods.mariculture.MaricultureHelper; -import modtweaker.util.BaseDescriptionAddition; -import modtweaker.util.BaseDescriptionRemoval; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.mods.mariculture.MaricultureHelper; +import modtweaker2.util.BaseDescriptionAddition; +import modtweaker2.util.BaseDescriptionRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/mariculture/handlers/Vat.java b/src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java similarity index 94% rename from src/main/java/modtweaker/mods/mariculture/handlers/Vat.java rename to src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java index 8fbd230..67a48b9 100644 --- a/src/main/java/modtweaker/mods/mariculture/handlers/Vat.java +++ b/src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java @@ -1,19 +1,18 @@ -package modtweaker.mods.mariculture.handlers; +package modtweaker2.mods.mariculture.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import mariculture.api.core.MaricultureHandlers; import mariculture.api.core.RecipeVat; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.mariculture.Vat") public class Vat { diff --git a/src/main/java/modtweaker/mods/mekanism/Mekanism.java b/src/main/java/modtweaker2/mods/mekanism/Mekanism.java similarity index 52% rename from src/main/java/modtweaker/mods/mekanism/Mekanism.java rename to src/main/java/modtweaker2/mods/mekanism/Mekanism.java index 81cbd23..4cddae6 100644 --- a/src/main/java/modtweaker/mods/mekanism/Mekanism.java +++ b/src/main/java/modtweaker2/mods/mekanism/Mekanism.java @@ -1,23 +1,23 @@ -package modtweaker.mods.mekanism; +package modtweaker2.mods.mekanism; import minetweaker.MineTweakerAPI; -import modtweaker.mods.mekanism.gas.GasBracketHandler; -import modtweaker.mods.mekanism.handlers.ChemicalCrystallizer; -import modtweaker.mods.mekanism.handlers.ChemicalDissolution; -import modtweaker.mods.mekanism.handlers.ChemicalInfuser; -import modtweaker.mods.mekanism.handlers.ChemicalInjection; -import modtweaker.mods.mekanism.handlers.ChemicalOxidizer; -import modtweaker.mods.mekanism.handlers.ChemicalWasher; -import modtweaker.mods.mekanism.handlers.Combiner; -import modtweaker.mods.mekanism.handlers.Compressor; -import modtweaker.mods.mekanism.handlers.Crusher; -import modtweaker.mods.mekanism.handlers.Enrichment; -import modtweaker.mods.mekanism.handlers.Infuser; -import modtweaker.mods.mekanism.handlers.Purification; -import modtweaker.mods.mekanism.handlers.Reaction; -import modtweaker.mods.mekanism.handlers.Sawmill; -import modtweaker.mods.mekanism.handlers.Separator; -import modtweaker.util.TweakerPlugin; +import modtweaker2.mods.mekanism.gas.GasBracketHandler; +import modtweaker2.mods.mekanism.handlers.ChemicalCrystallizer; +import modtweaker2.mods.mekanism.handlers.ChemicalDissolution; +import modtweaker2.mods.mekanism.handlers.ChemicalInfuser; +import modtweaker2.mods.mekanism.handlers.ChemicalInjection; +import modtweaker2.mods.mekanism.handlers.ChemicalOxidizer; +import modtweaker2.mods.mekanism.handlers.ChemicalWasher; +import modtweaker2.mods.mekanism.handlers.Combiner; +import modtweaker2.mods.mekanism.handlers.Compressor; +import modtweaker2.mods.mekanism.handlers.Crusher; +import modtweaker2.mods.mekanism.handlers.Enrichment; +import modtweaker2.mods.mekanism.handlers.Infuser; +import modtweaker2.mods.mekanism.handlers.Purification; +import modtweaker2.mods.mekanism.handlers.Reaction; +import modtweaker2.mods.mekanism.handlers.Sawmill; +import modtweaker2.mods.mekanism.handlers.Separator; +import modtweaker2.util.TweakerPlugin; public class Mekanism extends TweakerPlugin { public Mekanism() { diff --git a/src/main/java/modtweaker/mods/mekanism/MekanismHelper.java b/src/main/java/modtweaker2/mods/mekanism/MekanismHelper.java similarity index 89% rename from src/main/java/modtweaker/mods/mekanism/MekanismHelper.java rename to src/main/java/modtweaker2/mods/mekanism/MekanismHelper.java index ccb616a..07a64a7 100644 --- a/src/main/java/modtweaker/mods/mekanism/MekanismHelper.java +++ b/src/main/java/modtweaker2/mods/mekanism/MekanismHelper.java @@ -1,9 +1,9 @@ -package modtweaker.mods.mekanism; +package modtweaker2.mods.mekanism; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import minetweaker.api.item.IIngredient; -import modtweaker.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.gas.IGasStack; public class MekanismHelper { private MekanismHelper() {} diff --git a/src/main/java/modtweaker/mods/mekanism/gas/GasBracketHandler.java b/src/main/java/modtweaker2/mods/mekanism/gas/GasBracketHandler.java similarity index 98% rename from src/main/java/modtweaker/mods/mekanism/gas/GasBracketHandler.java rename to src/main/java/modtweaker2/mods/mekanism/gas/GasBracketHandler.java index 614d0ec..17f721c 100644 --- a/src/main/java/modtweaker/mods/mekanism/gas/GasBracketHandler.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/GasBracketHandler.java @@ -1,4 +1,4 @@ -package modtweaker.mods.mekanism.gas; +package modtweaker2.mods.mekanism.gas; import java.util.List; diff --git a/src/main/java/modtweaker/mods/mekanism/gas/GasLogger.java b/src/main/java/modtweaker2/mods/mekanism/gas/GasLogger.java similarity index 97% rename from src/main/java/modtweaker/mods/mekanism/gas/GasLogger.java rename to src/main/java/modtweaker2/mods/mekanism/gas/GasLogger.java index 355fceb..109f353 100644 --- a/src/main/java/modtweaker/mods/mekanism/gas/GasLogger.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/GasLogger.java @@ -1,4 +1,4 @@ -package modtweaker.mods.mekanism.gas; +package modtweaker2.mods.mekanism.gas; import java.util.Collections; import java.util.Comparator; diff --git a/src/main/java/modtweaker/mods/mekanism/gas/IGasDefinition.java b/src/main/java/modtweaker2/mods/mekanism/gas/IGasDefinition.java similarity index 92% rename from src/main/java/modtweaker/mods/mekanism/gas/IGasDefinition.java rename to src/main/java/modtweaker2/mods/mekanism/gas/IGasDefinition.java index 689a189..693865a 100644 --- a/src/main/java/modtweaker/mods/mekanism/gas/IGasDefinition.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/IGasDefinition.java @@ -1,4 +1,4 @@ -package modtweaker.mods.mekanism.gas; +package modtweaker2.mods.mekanism.gas; import stanhebben.zenscript.annotations.OperatorType; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/mekanism/gas/IGasStack.java b/src/main/java/modtweaker2/mods/mekanism/gas/IGasStack.java similarity index 94% rename from src/main/java/modtweaker/mods/mekanism/gas/IGasStack.java rename to src/main/java/modtweaker2/mods/mekanism/gas/IGasStack.java index 1cf2759..6865a3e 100644 --- a/src/main/java/modtweaker/mods/mekanism/gas/IGasStack.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/IGasStack.java @@ -1,4 +1,4 @@ -package modtweaker.mods.mekanism.gas; +package modtweaker2.mods.mekanism.gas; import stanhebben.zenscript.annotations.OperatorType; import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker/mods/mekanism/gas/MCGasDefinition.java b/src/main/java/modtweaker2/mods/mekanism/gas/MCGasDefinition.java similarity index 92% rename from src/main/java/modtweaker/mods/mekanism/gas/MCGasDefinition.java rename to src/main/java/modtweaker2/mods/mekanism/gas/MCGasDefinition.java index aa53b58..aa6b716 100644 --- a/src/main/java/modtweaker/mods/mekanism/gas/MCGasDefinition.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/MCGasDefinition.java @@ -1,8 +1,9 @@ -package modtweaker.mods.mekanism.gas; +package modtweaker2.mods.mekanism.gas; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; + public class MCGasDefinition implements IGasDefinition { private final Gas gas; diff --git a/src/main/java/modtweaker/mods/mekanism/gas/MCGasStack.java b/src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java similarity index 85% rename from src/main/java/modtweaker/mods/mekanism/gas/MCGasStack.java rename to src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java index 78e1d1b..ee13cb2 100644 --- a/src/main/java/modtweaker/mods/mekanism/gas/MCGasStack.java +++ b/src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java @@ -1,6 +1,9 @@ -package modtweaker.mods.mekanism.gas; +package modtweaker2.mods.mekanism.gas; import mekanism.api.gas.GasStack; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; + public class MCGasStack implements IGasStack { private final GasStack stack; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalCrystallizer.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalCrystallizer.java similarity index 70% rename from src/main/java/modtweaker/mods/mekanism/handlers/ChemicalCrystallizer.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalCrystallizer.java index ddd6aa0..2fc8a73 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalCrystallizer.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalCrystallizer.java @@ -1,13 +1,13 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalDissolution.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalDissolution.java similarity index 86% rename from src/main/java/modtweaker/mods/mekanism/handlers/ChemicalDissolution.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalDissolution.java index a6d95d5..cf3a0e5 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalDissolution.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalDissolution.java @@ -1,8 +1,6 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import java.util.Iterator; import java.util.List; @@ -13,14 +11,16 @@ import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.oredict.IOreDictEntry; -import modtweaker.helpers.InputHelper; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.helpers.InputHelper; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.mekanism.chemical.Dissolution") public class ChemicalDissolution { diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalInfuser.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalInfuser.java similarity index 74% rename from src/main/java/modtweaker/mods/mekanism/handlers/ChemicalInfuser.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalInfuser.java index f88294e..ef47e40 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalInfuser.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalInfuser.java @@ -1,12 +1,12 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import mekanism.api.ChemicalPair; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalInjection.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalInjection.java similarity index 73% rename from src/main/java/modtweaker/mods/mekanism/handlers/ChemicalInjection.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalInjection.java index cc7c268..588ee3b 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalInjection.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalInjection.java @@ -1,14 +1,14 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import mekanism.api.AdvancedInput; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalOxidizer.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalOxidizer.java similarity index 69% rename from src/main/java/modtweaker/mods/mekanism/handlers/ChemicalOxidizer.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalOxidizer.java index 67dde0b..9a2b568 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalOxidizer.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalOxidizer.java @@ -1,13 +1,13 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalWasher.java b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalWasher.java similarity index 85% rename from src/main/java/modtweaker/mods/mekanism/handlers/ChemicalWasher.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalWasher.java index 29e9970..6688408 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/ChemicalWasher.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/ChemicalWasher.java @@ -1,6 +1,6 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import java.util.Iterator; import java.util.Map; @@ -8,9 +8,9 @@ import java.util.Map; import mekanism.api.gas.GasStack; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Combiner.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Combiner.java similarity index 79% rename from src/main/java/modtweaker/mods/mekanism/handlers/Combiner.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Combiner.java index bf4e43f..c9f77a8 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Combiner.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Combiner.java @@ -1,13 +1,13 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import mekanism.api.AdvancedInput; import mekanism.api.gas.GasRegistry; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Compressor.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Compressor.java similarity index 80% rename from src/main/java/modtweaker/mods/mekanism/handlers/Compressor.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Compressor.java index 789a5a1..bae7388 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Compressor.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Compressor.java @@ -1,13 +1,13 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import mekanism.api.AdvancedInput; import mekanism.api.gas.GasRegistry; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Crusher.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Crusher.java similarity index 76% rename from src/main/java/modtweaker/mods/mekanism/handlers/Crusher.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Crusher.java index ed353ef..48ec092 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Crusher.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Crusher.java @@ -1,11 +1,11 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Enrichment.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Enrichment.java similarity index 77% rename from src/main/java/modtweaker/mods/mekanism/handlers/Enrichment.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Enrichment.java index 671cb81..3fddaac 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Enrichment.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Enrichment.java @@ -1,11 +1,11 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.toStack; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Infuser.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Infuser.java similarity index 88% rename from src/main/java/modtweaker/mods/mekanism/handlers/Infuser.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Infuser.java index 44d7ac3..96fb60b 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Infuser.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Infuser.java @@ -1,7 +1,7 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.Iterator; import java.util.Map; @@ -12,8 +12,8 @@ import mekanism.api.infuse.InfusionOutput; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Purification.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Purification.java similarity index 86% rename from src/main/java/modtweaker/mods/mekanism/handlers/Purification.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Purification.java index 7a17499..847ca77 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Purification.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Purification.java @@ -1,7 +1,7 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.Map; @@ -10,8 +10,8 @@ import mekanism.api.gas.GasRegistry; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Reaction.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Reaction.java similarity index 78% rename from src/main/java/modtweaker/mods/mekanism/handlers/Reaction.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Reaction.java index 334e707..a45ef29 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Reaction.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Reaction.java @@ -1,8 +1,8 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import mekanism.api.PressurizedProducts; import mekanism.api.PressurizedReactants; import mekanism.api.PressurizedRecipe; @@ -10,9 +10,9 @@ import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.mods.mekanism.util.RemoveMekanismRecipe; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.mods.mekanism.util.RemoveMekanismRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Sawmill.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Sawmill.java similarity index 87% rename from src/main/java/modtweaker/mods/mekanism/handlers/Sawmill.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Sawmill.java index 399443f..36d01c3 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Sawmill.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Sawmill.java @@ -1,7 +1,7 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.Map; @@ -9,8 +9,8 @@ import mekanism.api.ChanceOutput; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; diff --git a/src/main/java/modtweaker/mods/mekanism/handlers/Separator.java b/src/main/java/modtweaker2/mods/mekanism/handlers/Separator.java similarity index 83% rename from src/main/java/modtweaker/mods/mekanism/handlers/Separator.java rename to src/main/java/modtweaker2/mods/mekanism/handlers/Separator.java index a4be2fb..66343a9 100644 --- a/src/main/java/modtweaker/mods/mekanism/handlers/Separator.java +++ b/src/main/java/modtweaker2/mods/mekanism/handlers/Separator.java @@ -1,7 +1,7 @@ -package modtweaker.mods.mekanism.handlers; +package modtweaker2.mods.mekanism.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.mods.mekanism.MekanismHelper.toGas; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.mods.mekanism.MekanismHelper.toGas; import java.util.Map; @@ -9,9 +9,9 @@ import mekanism.api.ChemicalPair; import mekanism.common.recipe.RecipeHandler.Recipe; import minetweaker.MineTweakerAPI; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.mods.mekanism.gas.IGasStack; -import modtweaker.mods.mekanism.util.AddMekanismRecipe; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.mekanism.gas.IGasStack; +import modtweaker2.mods.mekanism.util.AddMekanismRecipe; +import modtweaker2.util.BaseMapRemoval; import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/mekanism/util/AddMekanismRecipe.java b/src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java similarity index 97% rename from src/main/java/modtweaker/mods/mekanism/util/AddMekanismRecipe.java rename to src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java index fbaf1ee..b8c1ab6 100644 --- a/src/main/java/modtweaker/mods/mekanism/util/AddMekanismRecipe.java +++ b/src/main/java/modtweaker2/mods/mekanism/util/AddMekanismRecipe.java @@ -1,4 +1,4 @@ -package modtweaker.mods.mekanism.util; +package modtweaker2.mods.mekanism.util; import java.util.Map; @@ -7,7 +7,7 @@ import mekanism.api.ChemicalPair; import mekanism.api.PressurizedReactants; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfusionOutput; -import modtweaker.util.BaseMapAddition; +import modtweaker2.util.BaseMapAddition; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker/mods/mekanism/util/RemoveMekanismRecipe.java b/src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java similarity index 97% rename from src/main/java/modtweaker/mods/mekanism/util/RemoveMekanismRecipe.java rename to src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java index 25344b6..b985a67 100644 --- a/src/main/java/modtweaker/mods/mekanism/util/RemoveMekanismRecipe.java +++ b/src/main/java/modtweaker2/mods/mekanism/util/RemoveMekanismRecipe.java @@ -1,6 +1,6 @@ -package modtweaker.mods.mekanism.util; +package modtweaker2.mods.mekanism.util; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.StackHelper.areEqual; import java.util.Iterator; import java.util.Map; @@ -12,7 +12,7 @@ import mekanism.api.PressurizedReactants; import mekanism.api.PressurizedRecipe; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfusionOutput; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker/mods/metallurgy/Metallurgy.java b/src/main/java/modtweaker2/mods/metallurgy/Metallurgy.java similarity index 58% rename from src/main/java/modtweaker/mods/metallurgy/Metallurgy.java rename to src/main/java/modtweaker2/mods/metallurgy/Metallurgy.java index ce92f6b..77f7eac 100644 --- a/src/main/java/modtweaker/mods/metallurgy/Metallurgy.java +++ b/src/main/java/modtweaker2/mods/metallurgy/Metallurgy.java @@ -1,8 +1,8 @@ -package modtweaker.mods.metallurgy; +package modtweaker2.mods.metallurgy; import minetweaker.MineTweakerAPI; -import modtweaker.mods.metallurgy.handlers.Alloyer; -import modtweaker.mods.metallurgy.handlers.Crusher; +import modtweaker2.mods.metallurgy.handlers.Alloyer; +import modtweaker2.mods.metallurgy.handlers.Crusher; public class Metallurgy { public Metallurgy() { diff --git a/src/main/java/modtweaker/mods/metallurgy/MetallurgyHelper.java b/src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java similarity index 93% rename from src/main/java/modtweaker/mods/metallurgy/MetallurgyHelper.java rename to src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java index 8f1f686..52f2b5a 100644 --- a/src/main/java/modtweaker/mods/metallurgy/MetallurgyHelper.java +++ b/src/main/java/modtweaker2/mods/metallurgy/MetallurgyHelper.java @@ -1,10 +1,9 @@ -package modtweaker.mods.metallurgy; +package modtweaker2.mods.metallurgy; -import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.HashMap; -import modtweaker.helpers.ReflectionHelper; +import modtweaker2.helpers.ReflectionHelper; import net.minecraft.item.ItemStack; import com.teammetallurgy.metallurgy.recipes.AlloyerRecipes; diff --git a/src/main/java/modtweaker/mods/metallurgy/handlers/Alloyer.java b/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java similarity index 88% rename from src/main/java/modtweaker/mods/metallurgy/handlers/Alloyer.java rename to src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java index ab3fd41..7ea2956 100644 --- a/src/main/java/modtweaker/mods/metallurgy/handlers/Alloyer.java +++ b/src/main/java/modtweaker2/mods/metallurgy/handlers/Alloyer.java @@ -1,12 +1,12 @@ -package modtweaker.mods.metallurgy.handlers; +package modtweaker2.mods.metallurgy.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.metallurgy.MetallurgyHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.metallurgy.MetallurgyHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/metallurgy/handlers/Crusher.java b/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java similarity index 92% rename from src/main/java/modtweaker/mods/metallurgy/handlers/Crusher.java rename to src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java index 15bae7e..24df5ba 100644 --- a/src/main/java/modtweaker/mods/metallurgy/handlers/Crusher.java +++ b/src/main/java/modtweaker2/mods/metallurgy/handlers/Crusher.java @@ -1,15 +1,15 @@ -package modtweaker.mods.metallurgy.handlers; +package modtweaker2.mods.metallurgy.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.metallurgy.MetallurgyHelper; -import modtweaker.util.BaseMapAddition; -import modtweaker.util.BaseMapRemoval; +import modtweaker2.mods.metallurgy.MetallurgyHelper; +import modtweaker2.util.BaseMapAddition; +import modtweaker2.util.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.metallurgy.Crusher") public class Crusher { diff --git a/src/main/java/modtweaker/mods/pneumaticcraft/PneumaticCraft.java b/src/main/java/modtweaker2/mods/pneumaticcraft/PneumaticCraft.java similarity index 57% rename from src/main/java/modtweaker/mods/pneumaticcraft/PneumaticCraft.java rename to src/main/java/modtweaker2/mods/pneumaticcraft/PneumaticCraft.java index a06912b..b5bd5fb 100644 --- a/src/main/java/modtweaker/mods/pneumaticcraft/PneumaticCraft.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/PneumaticCraft.java @@ -1,8 +1,8 @@ -package modtweaker.mods.pneumaticcraft; +package modtweaker2.mods.pneumaticcraft; import minetweaker.MineTweakerAPI; -import modtweaker.mods.pneumaticcraft.handlers.Assembly; -import modtweaker.mods.pneumaticcraft.handlers.Pressure; +import modtweaker2.mods.pneumaticcraft.handlers.Assembly; +import modtweaker2.mods.pneumaticcraft.handlers.Pressure; public class PneumaticCraft { public PneumaticCraft() { diff --git a/src/main/java/modtweaker/mods/pneumaticcraft/handlers/Assembly.java b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java similarity index 91% rename from src/main/java/modtweaker/mods/pneumaticcraft/handlers/Assembly.java rename to src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java index 70349a2..d33f982 100644 --- a/src/main/java/modtweaker/mods/pneumaticcraft/handlers/Assembly.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Assembly.java @@ -1,18 +1,17 @@ -package modtweaker.mods.pneumaticcraft.handlers; - -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +package modtweaker2.mods.pneumaticcraft.handlers; import java.util.List; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import pneumaticCraft.api.recipe.AssemblyRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.pneumaticcraft.Assembly") public class Assembly { diff --git a/src/main/java/modtweaker/mods/pneumaticcraft/handlers/Pressure.java b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java similarity index 90% rename from src/main/java/modtweaker/mods/pneumaticcraft/handlers/Pressure.java rename to src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java index c94a68e..cbae020 100644 --- a/src/main/java/modtweaker/mods/pneumaticcraft/handlers/Pressure.java +++ b/src/main/java/modtweaker2/mods/pneumaticcraft/handlers/Pressure.java @@ -1,15 +1,15 @@ -package modtweaker.mods.pneumaticcraft.handlers; +package modtweaker2.mods.pneumaticcraft.handlers; -import static modtweaker.helpers.InputHelper.toStacks; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import pneumaticCraft.api.recipe.PressureChamberRecipe; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.pneumaticcraft.Pressure") public class Pressure { diff --git a/src/main/java/modtweaker/mods/railcraft/Railcraft.java b/src/main/java/modtweaker2/mods/railcraft/Railcraft.java similarity index 55% rename from src/main/java/modtweaker/mods/railcraft/Railcraft.java rename to src/main/java/modtweaker2/mods/railcraft/Railcraft.java index 74a1bc9..15670d9 100644 --- a/src/main/java/modtweaker/mods/railcraft/Railcraft.java +++ b/src/main/java/modtweaker2/mods/railcraft/Railcraft.java @@ -1,10 +1,10 @@ -package modtweaker.mods.railcraft; +package modtweaker2.mods.railcraft; import minetweaker.MineTweakerAPI; -import modtweaker.mods.railcraft.handlers.BlastFurnace; -import modtweaker.mods.railcraft.handlers.CokeOven; -import modtweaker.mods.railcraft.handlers.RockCrusher; -import modtweaker.mods.railcraft.handlers.RollingMachine; +import modtweaker2.mods.railcraft.handlers.BlastFurnace; +import modtweaker2.mods.railcraft.handlers.CokeOven; +import modtweaker2.mods.railcraft.handlers.RockCrusher; +import modtweaker2.mods.railcraft.handlers.RollingMachine; public class Railcraft { public Railcraft() { diff --git a/src/main/java/modtweaker/mods/railcraft/RailcraftHelper.java b/src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java similarity index 98% rename from src/main/java/modtweaker/mods/railcraft/RailcraftHelper.java rename to src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java index 3c94944..9d048b1 100644 --- a/src/main/java/modtweaker/mods/railcraft/RailcraftHelper.java +++ b/src/main/java/modtweaker2/mods/railcraft/RailcraftHelper.java @@ -1,4 +1,4 @@ -package modtweaker.mods.railcraft; +package modtweaker2.mods.railcraft; import java.lang.reflect.Constructor; import java.util.List; diff --git a/src/main/java/modtweaker/mods/railcraft/handlers/BlastFurnace.java b/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java similarity index 87% rename from src/main/java/modtweaker/mods/railcraft/handlers/BlastFurnace.java rename to src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java index ba22ea9..3d37e9f 100644 --- a/src/main/java/modtweaker/mods/railcraft/handlers/BlastFurnace.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/BlastFurnace.java @@ -1,13 +1,13 @@ -package modtweaker.mods.railcraft.handlers; +package modtweaker2.mods.railcraft.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import mods.railcraft.api.crafting.IBlastFurnaceRecipe; -import modtweaker.mods.railcraft.RailcraftHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.railcraft.RailcraftHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/railcraft/handlers/CokeOven.java b/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java similarity index 84% rename from src/main/java/modtweaker/mods/railcraft/handlers/CokeOven.java rename to src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java index 7d374d5..1dc358f 100644 --- a/src/main/java/modtweaker/mods/railcraft/handlers/CokeOven.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/CokeOven.java @@ -1,15 +1,15 @@ -package modtweaker.mods.railcraft.handlers; +package modtweaker2.mods.railcraft.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; import mods.railcraft.api.crafting.ICokeOvenRecipe; -import modtweaker.mods.railcraft.RailcraftHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.railcraft.RailcraftHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/railcraft/handlers/RockCrusher.java b/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java similarity index 87% rename from src/main/java/modtweaker/mods/railcraft/handlers/RockCrusher.java rename to src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java index fc252b7..a2f904b 100644 --- a/src/main/java/modtweaker/mods/railcraft/handlers/RockCrusher.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/RockCrusher.java @@ -1,13 +1,13 @@ -package modtweaker.mods.railcraft.handlers; +package modtweaker2.mods.railcraft.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker2.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import mods.railcraft.api.crafting.IRockCrusherRecipe; -import modtweaker.mods.railcraft.RailcraftHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.railcraft.RailcraftHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/railcraft/handlers/RollingMachine.java b/src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java similarity index 83% rename from src/main/java/modtweaker/mods/railcraft/handlers/RollingMachine.java rename to src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java index 736eb93..bb759e4 100644 --- a/src/main/java/modtweaker/mods/railcraft/handlers/RollingMachine.java +++ b/src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java @@ -1,18 +1,17 @@ -package modtweaker.mods.railcraft.handlers; +package modtweaker2.mods.railcraft.handlers; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toShapedObjects; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import mods.railcraft.api.crafting.RailcraftCraftingManager; -import modtweaker.mods.railcraft.RailcraftHelper; -import modtweaker.util.BaseCraftingAddition; -import modtweaker.util.BaseCraftingRemoval; +import modtweaker2.mods.railcraft.RailcraftHelper; +import modtweaker2.util.BaseCraftingAddition; +import modtweaker2.util.BaseCraftingRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.railcraft.Rolling") public class RollingMachine { diff --git a/src/main/java/modtweaker2/mods/tconstruct/MaterialLogger.java b/src/main/java/modtweaker2/mods/tconstruct/MaterialLogger.java new file mode 100644 index 0000000..2ebf337 --- /dev/null +++ b/src/main/java/modtweaker2/mods/tconstruct/MaterialLogger.java @@ -0,0 +1,35 @@ +package modtweaker2.mods.tconstruct; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Map; + +import minetweaker.MineTweakerAPI; +import minetweaker.api.player.IPlayer; +import minetweaker.api.server.ICommandFunction; +import tconstruct.library.TConstructRegistry; +import tconstruct.library.tools.ToolMaterial; +import static modtweaker2.helpers.LogHelper.*; + +public class MaterialLogger implements ICommandFunction { + private static ArrayList materials = new ArrayList(); + static { + materials = new ArrayList(); + for (Map.Entry entry : TConstructRegistry.toolMaterialStrings.entrySet()) { + materials.add(entry.getKey()); + } + + Collections.sort(materials); + } + + @Override + public void execute(String[] arguments, IPlayer player) { + System.out.println("Materials: " + materials.size()); + for (String s : materials) { + System.out.println("Material " + s); + MineTweakerAPI.logCommand("<" + s + "> -- "); + } + + logPrinted(player); + } +} diff --git a/src/main/java/modtweaker/mods/tconstruct/TConstruct.java b/src/main/java/modtweaker2/mods/tconstruct/TConstruct.java similarity index 54% rename from src/main/java/modtweaker/mods/tconstruct/TConstruct.java rename to src/main/java/modtweaker2/mods/tconstruct/TConstruct.java index 4e1138f..d2aee5b 100644 --- a/src/main/java/modtweaker/mods/tconstruct/TConstruct.java +++ b/src/main/java/modtweaker2/mods/tconstruct/TConstruct.java @@ -1,11 +1,11 @@ -package modtweaker.mods.tconstruct; +package modtweaker2.mods.tconstruct; import minetweaker.MineTweakerAPI; -import modtweaker.mods.tconstruct.handlers.Casting; -import modtweaker.mods.tconstruct.handlers.Drying; -import modtweaker.mods.tconstruct.handlers.Smeltery; -import modtweaker.mods.tconstruct.handlers.TiCTweaks; -import modtweaker.mods.tconstruct.handlers.ToolStats; +import modtweaker2.mods.tconstruct.handlers.Casting; +import modtweaker2.mods.tconstruct.handlers.Drying; +import modtweaker2.mods.tconstruct.handlers.Smeltery; +import modtweaker2.mods.tconstruct.handlers.TiCTweaks; +import modtweaker2.mods.tconstruct.handlers.ToolStats; public class TConstruct { public TConstruct() { diff --git a/src/main/java/modtweaker/mods/tconstruct/TConstructHelper.java b/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java similarity index 99% rename from src/main/java/modtweaker/mods/tconstruct/TConstructHelper.java rename to src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java index 256f691..3202059 100644 --- a/src/main/java/modtweaker/mods/tconstruct/TConstructHelper.java +++ b/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java @@ -1,4 +1,4 @@ -package modtweaker.mods.tconstruct; +package modtweaker2.mods.tconstruct; import java.lang.reflect.Constructor; import java.util.ArrayList; diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java similarity index 89% rename from src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java rename to src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java index 80138a8..31d3b4f 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java @@ -1,22 +1,20 @@ -package modtweaker.mods.tconstruct.handlers; - -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +package modtweaker2.mods.tconstruct.handlers; import java.util.ArrayList; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.mods.tconstruct.TConstructHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import tconstruct.library.crafting.CastingRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.tconstruct.Casting") public class Casting { diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Drying.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java similarity index 88% rename from src/main/java/modtweaker/mods/tconstruct/handlers/Drying.java rename to src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java index de268bb..55831c7 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Drying.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java @@ -1,20 +1,19 @@ -package modtweaker.mods.tconstruct.handlers; - -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; +package modtweaker2.mods.tconstruct.handlers; import java.util.ArrayList; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.tconstruct.TConstructHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import tconstruct.library.crafting.DryingRackRecipes; import tconstruct.library.crafting.DryingRackRecipes.DryingRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.tconstruct.Drying") public class Drying { diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Modifiers.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Modifiers.java similarity index 87% rename from src/main/java/modtweaker/mods/tconstruct/handlers/Modifiers.java rename to src/main/java/modtweaker2/mods/tconstruct/handlers/Modifiers.java index 320933c..520f869 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Modifiers.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Modifiers.java @@ -1,10 +1,10 @@ -package modtweaker.mods.tconstruct.handlers; +package modtweaker2.mods.tconstruct.handlers; import java.util.List; import minetweaker.MineTweakerAPI; -import modtweaker.mods.tconstruct.TConstructHelper; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker2.util.BaseListRemoval; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import tconstruct.library.modifier.ItemModifier; diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java similarity index 92% rename from src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java rename to src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java index b076fcd..5e498c3 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java @@ -1,9 +1,7 @@ -package modtweaker.mods.tconstruct.handlers; +package modtweaker2.mods.tconstruct.handlers; -import static modtweaker.helpers.InputHelper.isABlock; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toFluids; -import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; import java.util.ArrayList; import java.util.Arrays; @@ -14,11 +12,11 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.oredict.IOreDictEntry; -import modtweaker.mods.tconstruct.TConstructHelper; -import modtweaker.util.BaseDescriptionAddition; -import modtweaker.util.BaseDescriptionRemoval; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker2.util.BaseDescriptionAddition; +import modtweaker2.util.BaseDescriptionRemoval; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/TiCTweaks.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java similarity index 90% rename from src/main/java/modtweaker/mods/tconstruct/handlers/TiCTweaks.java rename to src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java index 09edea8..5d896ac 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/TiCTweaks.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java @@ -1,24 +1,22 @@ -package modtweaker.mods.tconstruct.handlers; +package modtweaker2.mods.tconstruct.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import cofh.api.energy.EnergyStorage; -import cofh.api.energy.IEnergyContainerItem; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.mods.tconstruct.TConstructHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; -import modtweaker.util.BaseSetVar; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; +import modtweaker2.util.BaseSetVar; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.PatternBuilder; import tconstruct.library.crafting.PatternBuilder.ItemKey; import tconstruct.library.tools.ToolCore; import tconstruct.tools.TinkerTools; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.tconstruct.Tweaks") public class TiCTweaks { diff --git a/src/main/java/modtweaker/mods/tconstruct/handlers/ToolStats.java b/src/main/java/modtweaker2/mods/tconstruct/handlers/ToolStats.java similarity index 98% rename from src/main/java/modtweaker/mods/tconstruct/handlers/ToolStats.java rename to src/main/java/modtweaker2/mods/tconstruct/handlers/ToolStats.java index 367dd31..2ebf54a 100644 --- a/src/main/java/modtweaker/mods/tconstruct/handlers/ToolStats.java +++ b/src/main/java/modtweaker2/mods/tconstruct/handlers/ToolStats.java @@ -1,9 +1,9 @@ -package modtweaker.mods.tconstruct.handlers; +package modtweaker2.mods.tconstruct.handlers; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; -import modtweaker.helpers.ReflectionHelper; -import modtweaker.mods.tconstruct.TConstructHelper; +import modtweaker2.helpers.ReflectionHelper; +import modtweaker2.mods.tconstruct.TConstructHelper; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker/mods/thaumcraft/Thaumcraft.java b/src/main/java/modtweaker2/mods/thaumcraft/Thaumcraft.java similarity index 53% rename from src/main/java/modtweaker/mods/thaumcraft/Thaumcraft.java rename to src/main/java/modtweaker2/mods/thaumcraft/Thaumcraft.java index 8a31d12..b5d014d 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/Thaumcraft.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/Thaumcraft.java @@ -1,12 +1,12 @@ -package modtweaker.mods.thaumcraft; +package modtweaker2.mods.thaumcraft; import minetweaker.MineTweakerAPI; -import modtweaker.mods.thaumcraft.handlers.Arcane; -import modtweaker.mods.thaumcraft.handlers.Aspects; -import modtweaker.mods.thaumcraft.handlers.Crucible; -import modtweaker.mods.thaumcraft.handlers.Infusion; -import modtweaker.mods.thaumcraft.handlers.Research; -import modtweaker.mods.thaumcraft.handlers.Warp; +import modtweaker2.mods.thaumcraft.handlers.Arcane; +import modtweaker2.mods.thaumcraft.handlers.Aspects; +import modtweaker2.mods.thaumcraft.handlers.Crucible; +import modtweaker2.mods.thaumcraft.handlers.Infusion; +import modtweaker2.mods.thaumcraft.handlers.Research; +import modtweaker2.mods.thaumcraft.handlers.Warp; public class Thaumcraft { public Thaumcraft() { diff --git a/src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java b/src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java similarity index 97% rename from src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java rename to src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java index e3d057b..ae9d160 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/ThaumcraftHelper.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/ThaumcraftHelper.java @@ -1,10 +1,10 @@ -package modtweaker.mods.thaumcraft; +package modtweaker2.mods.thaumcraft; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import modtweaker.helpers.ReflectionHelper; +import modtweaker2.helpers.ReflectionHelper; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApi.EntityTags; import thaumcraft.api.aspects.Aspect; diff --git a/src/main/java/modtweaker/mods/thaumcraft/commands/AspectLogger.java b/src/main/java/modtweaker2/mods/thaumcraft/commands/AspectLogger.java similarity index 90% rename from src/main/java/modtweaker/mods/thaumcraft/commands/AspectLogger.java rename to src/main/java/modtweaker2/mods/thaumcraft/commands/AspectLogger.java index 05a80e5..83c40fb 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/commands/AspectLogger.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/commands/AspectLogger.java @@ -1,22 +1,19 @@ -package modtweaker.mods.thaumcraft.commands; +package modtweaker2.mods.thaumcraft.commands; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map.Entry; -import java.util.Set; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.ThaumcraftApi.EntityTags; -import thaumcraft.api.ThaumcraftApi.EntityTagsNBT; -import thaumcraft.api.aspects.AspectList; -import net.minecraft.entity.EntityList; -import net.minecraft.item.Item; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import net.minecraft.item.Item; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.ThaumcraftApi.EntityTags; +import thaumcraft.api.ThaumcraftApi.EntityTagsNBT; +import thaumcraft.api.aspects.AspectList; public class AspectLogger implements ICommandFunction{ diff --git a/src/main/java/modtweaker/mods/thaumcraft/handlers/Arcane.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java similarity index 83% rename from src/main/java/modtweaker/mods/thaumcraft/handlers/Arcane.java rename to src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java index 27dae1a..933760c 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/handlers/Arcane.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Arcane.java @@ -1,16 +1,11 @@ -package modtweaker.mods.thaumcraft.handlers; +package modtweaker2.mods.thaumcraft.handlers; -import static modtweaker.helpers.InputHelper.toObjects; -import static modtweaker.helpers.InputHelper.toShapedObjects; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; -import forestry.api.apiculture.FlowerManager; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -18,6 +13,8 @@ import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.IArcaneRecipe; import thaumcraft.api.crafting.ShapedArcaneRecipe; import thaumcraft.api.crafting.ShapelessArcaneRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thaumcraft.Arcane") public class Arcane { diff --git a/src/main/java/modtweaker/mods/thaumcraft/handlers/Aspects.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java similarity index 96% rename from src/main/java/modtweaker/mods/thaumcraft/handlers/Aspects.java rename to src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java index 1004724..6d81c96 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/handlers/Aspects.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java @@ -1,14 +1,12 @@ -package modtweaker.mods.thaumcraft.handlers; - -import static modtweaker.helpers.InputHelper.toStack; +package modtweaker2.mods.thaumcraft.handlers; import java.util.Arrays; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; -import modtweaker.util.BaseDescriptionAddition; -import modtweaker.util.BaseDescriptionRemoval; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.util.BaseDescriptionAddition; +import modtweaker2.util.BaseDescriptionRemoval; import net.minecraft.entity.EntityList; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; @@ -16,6 +14,8 @@ import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thaumcraft.Aspects") public class Aspects { diff --git a/src/main/java/modtweaker/mods/thaumcraft/handlers/Crucible.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java similarity index 86% rename from src/main/java/modtweaker/mods/thaumcraft/handlers/Crucible.java rename to src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java index d8715d6..492f4a1 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Crucible.java @@ -1,19 +1,18 @@ -package modtweaker.mods.thaumcraft.handlers; +package modtweaker2.mods.thaumcraft.handlers; -import static modtweaker.helpers.InputHelper.toObject; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.CrucibleRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thaumcraft.Crucible") public class Crucible { diff --git a/src/main/java/modtweaker/mods/thaumcraft/handlers/Infusion.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java similarity index 93% rename from src/main/java/modtweaker/mods/thaumcraft/handlers/Infusion.java rename to src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java index c8430b2..80d7a81 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/handlers/Infusion.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Infusion.java @@ -1,15 +1,12 @@ -package modtweaker.mods.thaumcraft.handlers; +package modtweaker2.mods.thaumcraft.handlers; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.helpers.InputHelper.toStacks; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; -import modtweaker.mods.thaumcraft.recipe.MTInfusionRecipe; -import modtweaker.util.BaseListAddition; -import modtweaker.util.BaseListRemoval; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.recipe.MTInfusionRecipe; +import modtweaker2.util.BaseListAddition; +import modtweaker2.util.BaseListRemoval; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; @@ -17,6 +14,8 @@ import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.InfusionEnchantmentRecipe; import thaumcraft.api.crafting.InfusionRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thaumcraft.Infusion") public class Infusion { diff --git a/src/main/java/modtweaker/mods/thaumcraft/handlers/Research.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java similarity index 84% rename from src/main/java/modtweaker/mods/thaumcraft/handlers/Research.java rename to src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java index f1f7f64..7cec73a 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/handlers/Research.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Research.java @@ -1,35 +1,35 @@ -package modtweaker.mods.thaumcraft.handlers; +package modtweaker2.mods.thaumcraft.handlers; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.player.IPlayer; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; -import modtweaker.mods.thaumcraft.research.AddPage; -import modtweaker.mods.thaumcraft.research.AddPrereq; -import modtweaker.mods.thaumcraft.research.AddResearch; -import modtweaker.mods.thaumcraft.research.AddSibling; -import modtweaker.mods.thaumcraft.research.AddTab; -import modtweaker.mods.thaumcraft.research.ClearPages; -import modtweaker.mods.thaumcraft.research.ClearPrereqs; -import modtweaker.mods.thaumcraft.research.ClearSiblings; -import modtweaker.mods.thaumcraft.research.Difficulty; -import modtweaker.mods.thaumcraft.research.MoveResearch; -import modtweaker.mods.thaumcraft.research.OrphanResearch; -import modtweaker.mods.thaumcraft.research.RefreshResearch; -import modtweaker.mods.thaumcraft.research.RemoveResearch; -import modtweaker.mods.thaumcraft.research.RemoveTab; -import modtweaker.mods.thaumcraft.research.SetAspects; -import modtweaker.mods.thaumcraft.research.SetResearch; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.research.AddPage; +import modtweaker2.mods.thaumcraft.research.AddPrereq; +import modtweaker2.mods.thaumcraft.research.AddResearch; +import modtweaker2.mods.thaumcraft.research.AddSibling; +import modtweaker2.mods.thaumcraft.research.AddTab; +import modtweaker2.mods.thaumcraft.research.ClearPages; +import modtweaker2.mods.thaumcraft.research.ClearPrereqs; +import modtweaker2.mods.thaumcraft.research.ClearSiblings; +import modtweaker2.mods.thaumcraft.research.Difficulty; +import modtweaker2.mods.thaumcraft.research.MoveResearch; +import modtweaker2.mods.thaumcraft.research.OrphanResearch; +import modtweaker2.mods.thaumcraft.research.RefreshResearch; +import modtweaker2.mods.thaumcraft.research.RemoveResearch; +import modtweaker2.mods.thaumcraft.research.RemoveTab; +import modtweaker2.mods.thaumcraft.research.SetAspects; +import modtweaker2.mods.thaumcraft.research.SetResearch; import net.minecraft.enchantment.Enchantment; import net.minecraft.util.ResourceLocation; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage.PageType; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thaumcraft.Research") public class Research { diff --git a/src/main/java/modtweaker/mods/thaumcraft/handlers/Warp.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java similarity index 97% rename from src/main/java/modtweaker/mods/thaumcraft/handlers/Warp.java rename to src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java index 91dbb42..6eb0d0a 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/handlers/Warp.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Warp.java @@ -1,6 +1,4 @@ -package modtweaker.mods.thaumcraft.handlers; - -import static modtweaker.helpers.InputHelper.toStack; +package modtweaker2.mods.thaumcraft.handlers; import java.util.Arrays; import java.util.HashMap; @@ -9,11 +7,13 @@ import java.util.List; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thaumcraft.api.ThaumcraftApi; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thaumcraft.Warp") public class Warp { diff --git a/src/main/java/modtweaker/mods/thaumcraft/recipe/MTInfusionRecipe.java b/src/main/java/modtweaker2/mods/thaumcraft/recipe/MTInfusionRecipe.java similarity index 98% rename from src/main/java/modtweaker/mods/thaumcraft/recipe/MTInfusionRecipe.java rename to src/main/java/modtweaker2/mods/thaumcraft/recipe/MTInfusionRecipe.java index d686282..f617085 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/recipe/MTInfusionRecipe.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/recipe/MTInfusionRecipe.java @@ -1,4 +1,4 @@ -package modtweaker.mods.thaumcraft.recipe; +package modtweaker2.mods.thaumcraft.recipe; import java.util.ArrayList; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/AddPage.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java similarity index 96% rename from src/main/java/modtweaker/mods/thaumcraft/research/AddPage.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java index 045e635..88c83ee 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/AddPage.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPage.java @@ -1,8 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import net.minecraft.enchantment.Enchantment; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; @@ -15,6 +14,8 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchPage; import thaumcraft.api.research.ResearchPage.PageType; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; public class AddPage implements IUndoableAction { String key; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/AddPrereq.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java similarity index 95% rename from src/main/java/modtweaker/mods/thaumcraft/research/AddPrereq.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java index d73868e..7a76f7a 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/AddPrereq.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddPrereq.java @@ -1,7 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; public class AddPrereq implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/AddResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java similarity index 95% rename from src/main/java/modtweaker/mods/thaumcraft/research/AddResearch.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java index 9e98112..d05c288 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/AddResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddResearch.java @@ -1,4 +1,4 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import thaumcraft.api.research.ResearchCategories; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/AddSibling.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java similarity index 93% rename from src/main/java/modtweaker/mods/thaumcraft/research/AddSibling.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java index 792f275..c7fa00f 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/AddSibling.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddSibling.java @@ -1,7 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; public class AddSibling implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/AddTab.java b/src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java similarity index 95% rename from src/main/java/modtweaker/mods/thaumcraft/research/AddTab.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java index 77750c5..83085a6 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/AddTab.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/AddTab.java @@ -1,4 +1,4 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/ClearPages.java b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java similarity index 91% rename from src/main/java/modtweaker/mods/thaumcraft/research/ClearPages.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java index f904013..86a552b 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/ClearPages.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPages.java @@ -1,7 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchPage; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/ClearPrereqs.java b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java similarity index 93% rename from src/main/java/modtweaker/mods/thaumcraft/research/ClearPrereqs.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java index fae4fae..5fd9899 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/ClearPrereqs.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearPrereqs.java @@ -1,7 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; public class ClearPrereqs implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/ClearSiblings.java b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java similarity index 91% rename from src/main/java/modtweaker/mods/thaumcraft/research/ClearSiblings.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java index 51057c0..d24b2a3 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/ClearSiblings.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/ClearSiblings.java @@ -1,7 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; public class ClearSiblings implements IUndoableAction { diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/Difficulty.java b/src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java similarity index 94% rename from src/main/java/modtweaker/mods/thaumcraft/research/Difficulty.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java index 5fb297c..b2bd873 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/Difficulty.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/Difficulty.java @@ -1,9 +1,9 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import java.lang.reflect.Field; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/MoveResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java similarity index 96% rename from src/main/java/modtweaker/mods/thaumcraft/research/MoveResearch.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java index 1dbeace..7339287 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/MoveResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/MoveResearch.java @@ -1,9 +1,9 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import java.lang.reflect.Field; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/OrphanResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java similarity index 99% rename from src/main/java/modtweaker/mods/thaumcraft/research/OrphanResearch.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java index f7a70ae..8089006 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/OrphanResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/OrphanResearch.java @@ -1,4 +1,4 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/RefreshResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java similarity index 95% rename from src/main/java/modtweaker/mods/thaumcraft/research/RefreshResearch.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java index 2c2d8a1..c430b21 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/RefreshResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/RefreshResearch.java @@ -1,8 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; -import static modtweaker.helpers.StackHelper.areEqual; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; @@ -13,6 +12,8 @@ import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; public class RefreshResearch implements IUndoableAction { String research; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/RemoveResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/RemoveResearch.java similarity index 91% rename from src/main/java/modtweaker/mods/thaumcraft/research/RemoveResearch.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/RemoveResearch.java index 92c6eec..3eb114c 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/RemoveResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/RemoveResearch.java @@ -1,7 +1,7 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/RemoveTab.java b/src/main/java/modtweaker2/mods/thaumcraft/research/RemoveTab.java similarity index 95% rename from src/main/java/modtweaker/mods/thaumcraft/research/RemoveTab.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/RemoveTab.java index 21e0915..ded9eda 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/RemoveTab.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/RemoveTab.java @@ -1,4 +1,4 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import minetweaker.IUndoableAction; import thaumcraft.api.research.ResearchCategories; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/SetAspects.java b/src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java similarity index 94% rename from src/main/java/modtweaker/mods/thaumcraft/research/SetAspects.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java index af552b7..abc1ddf 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/SetAspects.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/SetAspects.java @@ -1,9 +1,9 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import java.lang.reflect.Field; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/SetResearch.java b/src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java similarity index 96% rename from src/main/java/modtweaker/mods/thaumcraft/research/SetResearch.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java index b4d92db..13cdd3c 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/SetResearch.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/SetResearch.java @@ -1,10 +1,10 @@ -package modtweaker.mods.thaumcraft.research; +package modtweaker2.mods.thaumcraft.research; import java.lang.reflect.Field; import minetweaker.IUndoableAction; -import modtweaker.mods.thaumcraft.ThaumcraftHelper; -import modtweaker.mods.thaumcraft.handlers.Research.SetType; +import modtweaker2.mods.thaumcraft.ThaumcraftHelper; +import modtweaker2.mods.thaumcraft.handlers.Research.SetType; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/modtweaker/mods/thaumcraft/research/commands/ResearchLogger.java b/src/main/java/modtweaker2/mods/thaumcraft/research/commands/ResearchLogger.java similarity index 89% rename from src/main/java/modtweaker/mods/thaumcraft/research/commands/ResearchLogger.java rename to src/main/java/modtweaker2/mods/thaumcraft/research/commands/ResearchLogger.java index 082a9ef..6763068 100644 --- a/src/main/java/modtweaker/mods/thaumcraft/research/commands/ResearchLogger.java +++ b/src/main/java/modtweaker2/mods/thaumcraft/research/commands/ResearchLogger.java @@ -1,11 +1,11 @@ -package modtweaker.mods.thaumcraft.research.commands; +package modtweaker2.mods.thaumcraft.research.commands; -import static modtweaker.helpers.LogHelper.log; -import static modtweaker.helpers.LogHelper.logPrinted; import minetweaker.MineTweakerAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; import thaumcraft.api.research.ResearchCategories; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.LogHelper.*; public class ResearchLogger implements ICommandFunction { @Override diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/ThermalExpansion.java b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalExpansion.java new file mode 100644 index 0000000..7664b29 --- /dev/null +++ b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalExpansion.java @@ -0,0 +1,14 @@ +package modtweaker2.mods.thermalexpansion; + +import minetweaker.MineTweakerAPI; +import modtweaker2.mods.thermalexpansion.handlers.Crucible; +import modtweaker2.mods.thermalexpansion.handlers.Furnace; + +public class ThermalExpansion { + + public ThermalExpansion(){ + MineTweakerAPI.registerClass(Crucible.class); + MineTweakerAPI.registerClass(Furnace.class); + + } +} diff --git a/src/main/java/modtweaker/mods/thermalexpansion/ThermalHelper.java b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java similarity index 94% rename from src/main/java/modtweaker/mods/thermalexpansion/ThermalHelper.java rename to src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java index a52f714..5f2219c 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/ThermalHelper.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java @@ -1,12 +1,10 @@ -package modtweaker.mods.thermalexpansion; - -import static modtweaker.helpers.ReflectionHelper.getConstructor; -import static modtweaker.helpers.ReflectionHelper.getStaticObject; +package modtweaker2.mods.thermalexpansion; import java.lang.reflect.Constructor; import java.util.List; import java.util.Map; import java.util.Set; +import static modtweaker2.helpers.ReflectionHelper.*; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Crucible.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java similarity index 92% rename from src/main/java/modtweaker/mods/thermalexpansion/handlers/Crucible.java rename to src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java index cba4e07..3770234 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java @@ -1,8 +1,6 @@ -package modtweaker.mods.thermalexpansion.handlers; +package modtweaker2.mods.thermalexpansion.handlers; -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; -import static modtweaker.mods.thermalexpansion.ThermalHelper.removeCrucibleRecipe; +import static modtweaker2.mods.thermalexpansion.ThermalHelper.removeCrucibleRecipe; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -13,6 +11,8 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thermalexpansion.util.crafting.CrucibleManager; import thermalexpansion.util.crafting.CrucibleManager.RecipeCrucible; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thermalexpansion.Crucible") public class Crucible { diff --git a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Furnace.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java similarity index 95% rename from src/main/java/modtweaker/mods/thermalexpansion/handlers/Furnace.java rename to src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java index af79d79..3e07cea 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Furnace.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java @@ -1,6 +1,5 @@ -package modtweaker.mods.thermalexpansion.handlers; +package modtweaker2.mods.thermalexpansion.handlers; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -9,6 +8,8 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thermalexpansion.util.crafting.FurnaceManager; import thermalexpansion.util.crafting.FurnaceManager.RecipeFurnace; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thermalexpansion.Furnace") public class Furnace { diff --git a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Pulverizer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java similarity index 95% rename from src/main/java/modtweaker/mods/thermalexpansion/handlers/Pulverizer.java rename to src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java index dd0151c..a25c086 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Pulverizer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java @@ -1,6 +1,5 @@ -package modtweaker.mods.thermalexpansion.handlers; +package modtweaker2.mods.thermalexpansion.handlers; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -9,6 +8,8 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thermalexpansion.util.crafting.PulverizerManager; import thermalexpansion.util.crafting.PulverizerManager.RecipePulverizer; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thermalexpansion.Pulverizer") public class Pulverizer { diff --git a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Sawmill.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java similarity index 95% rename from src/main/java/modtweaker/mods/thermalexpansion/handlers/Sawmill.java rename to src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java index 1f5a39b..810728b 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Sawmill.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java @@ -1,6 +1,5 @@ -package modtweaker.mods.thermalexpansion.handlers; +package modtweaker2.mods.thermalexpansion.handlers; -import static modtweaker.helpers.InputHelper.toStack; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; @@ -9,6 +8,8 @@ import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thermalexpansion.util.crafting.SawmillManager; import thermalexpansion.util.crafting.SawmillManager.RecipeSawmill; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thermalexpansion.Sawmill") public class Sawmill { diff --git a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Smelter.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java similarity index 93% rename from src/main/java/modtweaker/mods/thermalexpansion/handlers/Smelter.java rename to src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java index 3056cea..4c5577b 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Smelter.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java @@ -1,6 +1,4 @@ -package modtweaker.mods.thermalexpansion.handlers; - -import static modtweaker.helpers.InputHelper.toStack; +package modtweaker2.mods.thermalexpansion.handlers; import java.util.Arrays; import java.util.List; @@ -8,14 +6,16 @@ import java.util.Map; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker.mods.thermalexpansion.ThermalHelper; -import modtweaker.util.BaseDescriptionAddition; -import modtweaker.util.BaseDescriptionRemoval; +import modtweaker2.mods.thermalexpansion.ThermalHelper; +import modtweaker2.util.BaseDescriptionAddition; +import modtweaker2.util.BaseDescriptionRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; import cofh.lib.inventory.ComparableItemStackSafe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thermalexpansion.Smelter") public class Smelter { diff --git a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Transposer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java similarity index 95% rename from src/main/java/modtweaker/mods/thermalexpansion/handlers/Transposer.java rename to src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java index 51e7752..b560340 100644 --- a/src/main/java/modtweaker/mods/thermalexpansion/handlers/Transposer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java @@ -1,7 +1,4 @@ -package modtweaker.mods.thermalexpansion.handlers; - -import static modtweaker.helpers.InputHelper.toFluid; -import static modtweaker.helpers.InputHelper.toStack; +package modtweaker2.mods.thermalexpansion.handlers; import java.util.Arrays; import java.util.List; @@ -10,15 +7,17 @@ import java.util.Map; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker.mods.thermalexpansion.ThermalHelper; -import modtweaker.util.BaseDescriptionAddition; -import modtweaker.util.BaseDescriptionRemoval; +import modtweaker2.mods.thermalexpansion.ThermalHelper; +import modtweaker2.util.BaseDescriptionAddition; +import modtweaker2.util.BaseDescriptionRemoval; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; import cofh.lib.inventory.ComparableItemStackSafe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; @ZenClass("mods.thermalexpansion.Transposer") public class Transposer { diff --git a/src/main/java/modtweaker2/util/ArrayUtils.java b/src/main/java/modtweaker2/util/ArrayUtils.java new file mode 100644 index 0000000..da4ca4c --- /dev/null +++ b/src/main/java/modtweaker2/util/ArrayUtils.java @@ -0,0 +1,15 @@ +package modtweaker2.util; + +import java.util.ArrayList; + +public class ArrayUtils { + + + public static ArrayList toArrayList(E[] array) { + ArrayList list = new ArrayList(); + for (E e : array) { + list.add(e); + } + return list; + } +} diff --git a/src/main/java/modtweaker/util/BaseCraftingAddition.java b/src/main/java/modtweaker2/util/BaseCraftingAddition.java similarity index 91% rename from src/main/java/modtweaker/util/BaseCraftingAddition.java rename to src/main/java/modtweaker2/util/BaseCraftingAddition.java index bbfc89f..f2d7aea 100644 --- a/src/main/java/modtweaker/util/BaseCraftingAddition.java +++ b/src/main/java/modtweaker2/util/BaseCraftingAddition.java @@ -1,11 +1,11 @@ -package modtweaker.util; - -import static modtweaker.helpers.StackHelper.areEqual; +package modtweaker2.util; import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; public abstract class BaseCraftingAddition extends BaseDescriptionAddition { protected final List list; diff --git a/src/main/java/modtweaker/util/BaseCraftingRemoval.java b/src/main/java/modtweaker2/util/BaseCraftingRemoval.java similarity index 85% rename from src/main/java/modtweaker/util/BaseCraftingRemoval.java rename to src/main/java/modtweaker2/util/BaseCraftingRemoval.java index eeb66a5..eab2988 100644 --- a/src/main/java/modtweaker/util/BaseCraftingRemoval.java +++ b/src/main/java/modtweaker2/util/BaseCraftingRemoval.java @@ -1,11 +1,11 @@ -package modtweaker.util; - -import static modtweaker.helpers.StackHelper.areEqual; +package modtweaker2.util; import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import static modtweaker2.helpers.InputHelper.*; +import static modtweaker2.helpers.StackHelper.*; public class BaseCraftingRemoval extends BaseListRemoval { public BaseCraftingRemoval(String name, List list, ItemStack stack) { diff --git a/src/main/java/modtweaker/util/BaseDescriptionAddition.java b/src/main/java/modtweaker2/util/BaseDescriptionAddition.java similarity index 96% rename from src/main/java/modtweaker/util/BaseDescriptionAddition.java rename to src/main/java/modtweaker2/util/BaseDescriptionAddition.java index 8d4fc99..94480c8 100644 --- a/src/main/java/modtweaker/util/BaseDescriptionAddition.java +++ b/src/main/java/modtweaker2/util/BaseDescriptionAddition.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import minetweaker.IUndoableAction; diff --git a/src/main/java/modtweaker/util/BaseDescriptionRemoval.java b/src/main/java/modtweaker2/util/BaseDescriptionRemoval.java similarity index 96% rename from src/main/java/modtweaker/util/BaseDescriptionRemoval.java rename to src/main/java/modtweaker2/util/BaseDescriptionRemoval.java index 5d916b3..485f7a5 100644 --- a/src/main/java/modtweaker/util/BaseDescriptionRemoval.java +++ b/src/main/java/modtweaker2/util/BaseDescriptionRemoval.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import minetweaker.IUndoableAction; diff --git a/src/main/java/modtweaker/util/BaseListAddition.java b/src/main/java/modtweaker2/util/BaseListAddition.java similarity index 98% rename from src/main/java/modtweaker/util/BaseListAddition.java rename to src/main/java/modtweaker2/util/BaseListAddition.java index 769aa26..df82f6b 100644 --- a/src/main/java/modtweaker/util/BaseListAddition.java +++ b/src/main/java/modtweaker2/util/BaseListAddition.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import java.util.List; diff --git a/src/main/java/modtweaker/util/BaseListRemoval.java b/src/main/java/modtweaker2/util/BaseListRemoval.java similarity index 98% rename from src/main/java/modtweaker/util/BaseListRemoval.java rename to src/main/java/modtweaker2/util/BaseListRemoval.java index b170e08..1d70e9f 100644 --- a/src/main/java/modtweaker/util/BaseListRemoval.java +++ b/src/main/java/modtweaker2/util/BaseListRemoval.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import java.util.List; diff --git a/src/main/java/modtweaker/util/BaseMapAddition.java b/src/main/java/modtweaker2/util/BaseMapAddition.java similarity index 98% rename from src/main/java/modtweaker/util/BaseMapAddition.java rename to src/main/java/modtweaker2/util/BaseMapAddition.java index 06f260f..2053310 100644 --- a/src/main/java/modtweaker/util/BaseMapAddition.java +++ b/src/main/java/modtweaker2/util/BaseMapAddition.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import java.util.Map; diff --git a/src/main/java/modtweaker/util/BaseMapRemoval.java b/src/main/java/modtweaker2/util/BaseMapRemoval.java similarity index 98% rename from src/main/java/modtweaker/util/BaseMapRemoval.java rename to src/main/java/modtweaker2/util/BaseMapRemoval.java index 9baecc7..fc43a94 100644 --- a/src/main/java/modtweaker/util/BaseMapRemoval.java +++ b/src/main/java/modtweaker2/util/BaseMapRemoval.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import java.util.Map; diff --git a/src/main/java/modtweaker/util/BaseMultipleListRemoval.java b/src/main/java/modtweaker2/util/BaseMultipleListRemoval.java similarity index 98% rename from src/main/java/modtweaker/util/BaseMultipleListRemoval.java rename to src/main/java/modtweaker2/util/BaseMultipleListRemoval.java index 15a5794..9311824 100644 --- a/src/main/java/modtweaker/util/BaseMultipleListRemoval.java +++ b/src/main/java/modtweaker2/util/BaseMultipleListRemoval.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/modtweaker/util/BaseSetVar.java b/src/main/java/modtweaker2/util/BaseSetVar.java similarity index 95% rename from src/main/java/modtweaker/util/BaseSetVar.java rename to src/main/java/modtweaker2/util/BaseSetVar.java index 7914f6b..b5cf4fb 100644 --- a/src/main/java/modtweaker/util/BaseSetVar.java +++ b/src/main/java/modtweaker2/util/BaseSetVar.java @@ -1,7 +1,7 @@ -package modtweaker.util; +package modtweaker2.util; import minetweaker.IUndoableAction; -import modtweaker.helpers.ReflectionHelper; +import modtweaker2.helpers.ReflectionHelper; public abstract class BaseSetVar implements IUndoableAction { protected Object object; diff --git a/src/main/java/modtweaker/util/BaseUndoable.java b/src/main/java/modtweaker2/util/BaseUndoable.java similarity index 90% rename from src/main/java/modtweaker/util/BaseUndoable.java rename to src/main/java/modtweaker2/util/BaseUndoable.java index 1f581aa..274f0b5 100644 --- a/src/main/java/modtweaker/util/BaseUndoable.java +++ b/src/main/java/modtweaker2/util/BaseUndoable.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import minetweaker.IUndoableAction; diff --git a/src/main/java/modtweaker/util/TweakerPlugin.java b/src/main/java/modtweaker2/util/TweakerPlugin.java similarity index 89% rename from src/main/java/modtweaker/util/TweakerPlugin.java rename to src/main/java/modtweaker2/util/TweakerPlugin.java index 7fd404a..6b3cdfe 100644 --- a/src/main/java/modtweaker/util/TweakerPlugin.java +++ b/src/main/java/modtweaker2/util/TweakerPlugin.java @@ -1,4 +1,4 @@ -package modtweaker.util; +package modtweaker2.util; import java.util.ArrayList; @@ -10,7 +10,7 @@ public class TweakerPlugin { public static void register(String mod, Class clazz) { if (Loader.isModLoaded(mod)) { try { - clazz.newInstance(); + clazz.newInstance(); isLoaded.add(mod); } catch (Exception e) { isLoaded.remove(mod);