diff --git a/libs/CoFHCore-[1.7.10]3.0.0B9-89-dev.jar b/libs/CoFHCore-[1.7.10]3.0.0RC1-187-dev.jar similarity index 66% rename from libs/CoFHCore-[1.7.10]3.0.0B9-89-dev.jar rename to libs/CoFHCore-[1.7.10]3.0.0RC1-187-dev.jar index 9b5ea27..fc5acf1 100644 Binary files a/libs/CoFHCore-[1.7.10]3.0.0B9-89-dev.jar and b/libs/CoFHCore-[1.7.10]3.0.0RC1-187-dev.jar differ diff --git a/libs/CoFHLib-[1.7.10]1.0.0B9-60-dev.jar b/libs/CoFHLib-[1.7.10]1.0.0B9-114-dev.jar similarity index 64% rename from libs/CoFHLib-[1.7.10]1.0.0B9-60-dev.jar rename to libs/CoFHLib-[1.7.10]1.0.0B9-114-dev.jar index 167891d..ee186d4 100644 Binary files a/libs/CoFHLib-[1.7.10]1.0.0B9-60-dev.jar and b/libs/CoFHLib-[1.7.10]1.0.0B9-114-dev.jar differ diff --git a/libs/ThermalExpansion-[1.7.10]4.0.0B8-23-dev.jar b/libs/ThermalExpansion-[1.7.10]4.0.0B8-23-dev.jar deleted file mode 100644 index f530266..0000000 Binary files a/libs/ThermalExpansion-[1.7.10]4.0.0B8-23-dev.jar and /dev/null differ diff --git a/libs/ThermalExpansion-[1.7.10]4.0.0RC1-121-dev.jar b/libs/ThermalExpansion-[1.7.10]4.0.0RC1-121-dev.jar new file mode 100644 index 0000000..6ae210c Binary files /dev/null and b/libs/ThermalExpansion-[1.7.10]4.0.0RC1-121-dev.jar differ diff --git a/libs/ThermalFoundation-[1.7.10]1.0.0RC1-20-dev.jar b/libs/ThermalFoundation-[1.7.10]1.0.0RC2-54-dev.jar similarity index 52% rename from libs/ThermalFoundation-[1.7.10]1.0.0RC1-20-dev.jar rename to libs/ThermalFoundation-[1.7.10]1.0.0RC2-54-dev.jar index 5e3d604..7f94a99 100644 Binary files a/libs/ThermalFoundation-[1.7.10]1.0.0RC1-20-dev.jar and b/libs/ThermalFoundation-[1.7.10]1.0.0RC2-54-dev.jar differ diff --git a/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java b/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java index a37bf8d..71c3349 100644 --- a/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java +++ b/src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java @@ -13,7 +13,7 @@ import vazkii.botania.api.recipe.RecipeRuneAltar; import static modtweaker2.helpers.InputHelper.*; import static modtweaker2.helpers.StackHelper.*; -@ZenClass("mods.botania.RuneAlter") +@ZenClass("mods.botania.RuneAltar") public class RuneAltar { @ZenMethod public static void addRecipe(IItemStack output, IIngredient[] input, int mana) { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java index 759d95e..0749e9f 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/ThermalHelper.java @@ -1,16 +1,18 @@ package modtweaker2.mods.thermalexpansion; +import static modtweaker2.helpers.ReflectionHelper.getConstructor; +import static modtweaker2.helpers.ReflectionHelper.getStaticObject; + 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; -import thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; -import thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; import cofh.lib.inventory.ComparableItemStackSafe; +import cofh.thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; +import cofh.thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; public class ThermalHelper { private static Map smelter; diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java index 3770234..682d4d0 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Crucible.java @@ -1,5 +1,7 @@ package modtweaker2.mods.thermalexpansion.handlers; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; import static modtweaker2.mods.thermalexpansion.ThermalHelper.removeCrucibleRecipe; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; @@ -9,10 +11,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; 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.*; +import cofh.thermalexpansion.util.crafting.CrucibleManager; +import cofh.thermalexpansion.util.crafting.CrucibleManager.RecipeCrucible; @ZenClass("mods.thermalexpansion.Crucible") public class Crucible { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java index 3e07cea..d9f657a 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Furnace.java @@ -1,15 +1,14 @@ package modtweaker2.mods.thermalexpansion.handlers; +import static modtweaker2.helpers.InputHelper.toStack; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; 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.*; +import cofh.thermalexpansion.util.crafting.FurnaceManager; +import cofh.thermalexpansion.util.crafting.FurnaceManager.RecipeFurnace; @ZenClass("mods.thermalexpansion.Furnace") public class Furnace { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java index a25c086..dc0af73 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Pulverizer.java @@ -1,15 +1,14 @@ package modtweaker2.mods.thermalexpansion.handlers; +import static modtweaker2.helpers.InputHelper.toStack; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; 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.*; +import cofh.thermalexpansion.util.crafting.PulverizerManager; +import cofh.thermalexpansion.util.crafting.PulverizerManager.RecipePulverizer; @ZenClass("mods.thermalexpansion.Pulverizer") public class Pulverizer { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java index 810728b..710f1a6 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Sawmill.java @@ -1,15 +1,14 @@ package modtweaker2.mods.thermalexpansion.handlers; +import static modtweaker2.helpers.InputHelper.toStack; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import net.minecraft.item.ItemStack; 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.*; +import cofh.thermalexpansion.util.crafting.SawmillManager; +import cofh.thermalexpansion.util.crafting.SawmillManager.RecipeSawmill; @ZenClass("mods.thermalexpansion.Sawmill") public class Sawmill { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java index 4c5577b..d322f93 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Smelter.java @@ -1,5 +1,7 @@ package modtweaker2.mods.thermalexpansion.handlers; +import static modtweaker2.helpers.InputHelper.toStack; + import java.util.Arrays; import java.util.List; import java.util.Map; @@ -12,10 +14,8 @@ 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.*; +import cofh.thermalexpansion.util.crafting.SmelterManager.RecipeSmelter; @ZenClass("mods.thermalexpansion.Smelter") public class Smelter { diff --git a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java index b560340..22c00bf 100644 --- a/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java +++ b/src/main/java/modtweaker2/mods/thermalexpansion/handlers/Transposer.java @@ -1,5 +1,8 @@ package modtweaker2.mods.thermalexpansion.handlers; +import static modtweaker2.helpers.InputHelper.toFluid; +import static modtweaker2.helpers.InputHelper.toStack; + import java.util.Arrays; import java.util.List; import java.util.Map; @@ -14,10 +17,8 @@ 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.*; +import cofh.thermalexpansion.util.crafting.TransposerManager.RecipeTransposer; @ZenClass("mods.thermalexpansion.Transposer") public class Transposer {