diff --git a/gradle.properties b/gradle.properties index 31dbced..d7f2433 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ mc_version=1.7.10 -forge_version=10.13.2.1291 +forge_version=10.13.4.1492-1.7.10 mod_version=0.3.0 diff --git a/libs/CoFHCore-[1.7.10]3.0.1-258-dev.jar b/libs/CoFHCore-[1.7.10]3.0.4B1-308-dev.jar similarity index 74% rename from libs/CoFHCore-[1.7.10]3.0.1-258-dev.jar rename to libs/CoFHCore-[1.7.10]3.0.4B1-308-dev.jar index c8cc254..c5b1e44 100644 Binary files a/libs/CoFHCore-[1.7.10]3.0.1-258-dev.jar and b/libs/CoFHCore-[1.7.10]3.0.4B1-308-dev.jar 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 deleted file mode 100644 index ec8235a..0000000 Binary files a/libs/ForgeMultipart-1.7.10-1.1.1.322-dev.jar and /dev/null differ diff --git a/libs/ForgeMultipart-1.7.10-1.2.0.345-dev.jar b/libs/ForgeMultipart-1.7.10-1.2.0.345-dev.jar new file mode 100644 index 0000000..7244bfb Binary files /dev/null and b/libs/ForgeMultipart-1.7.10-1.2.0.345-dev.jar differ diff --git a/libs/TConstruct-1.7.10-1.8.2.build858-deobf.jar b/libs/TConstruct-1.7.10-1.8.6b.build977-deobf.jar similarity index 67% rename from libs/TConstruct-1.7.10-1.8.2.build858-deobf.jar rename to libs/TConstruct-1.7.10-1.8.6b.build977-deobf.jar index 78f966f..365a229 100644 Binary files a/libs/TConstruct-1.7.10-1.8.2.build858-deobf.jar and b/libs/TConstruct-1.7.10-1.8.6b.build977-deobf.jar differ diff --git a/libs/ThermalExpansion-[1.7.10]4.0.0-176-dev.jar b/libs/ThermalExpansion-[1.7.10]4.0.3B1-218-dev.jar similarity index 76% rename from libs/ThermalExpansion-[1.7.10]4.0.0-176-dev.jar rename to libs/ThermalExpansion-[1.7.10]4.0.3B1-218-dev.jar index 8619cd7..94a2f7f 100644 Binary files a/libs/ThermalExpansion-[1.7.10]4.0.0-176-dev.jar and b/libs/ThermalExpansion-[1.7.10]4.0.3B1-218-dev.jar differ diff --git a/libs/ThermalFoundation-[1.7.10]1.0.0-81-dev.jar b/libs/ThermalFoundation-[1.7.10]1.2.0-102-dev.jar similarity index 68% rename from libs/ThermalFoundation-[1.7.10]1.0.0-81-dev.jar rename to libs/ThermalFoundation-[1.7.10]1.2.0-102-dev.jar index 0c8942e..e1d406f 100644 Binary files a/libs/ThermalFoundation-[1.7.10]1.0.0-81-dev.jar and b/libs/ThermalFoundation-[1.7.10]1.2.0-102-dev.jar differ diff --git a/libs/[1.7.10]TerraFirmaCraft-deobf-0.79.17.jar b/libs/[1.7.10]TerraFirmaCraft-deobf-0.79.17.jar deleted file mode 100644 index 853c43f..0000000 Binary files a/libs/[1.7.10]TerraFirmaCraft-deobf-0.79.17.jar and /dev/null differ diff --git a/libs/extrautilities-1.2.10-deobf.jar b/libs/extrautilities-1.2.10-deobf.jar new file mode 100644 index 0000000..e023a6f Binary files /dev/null and b/libs/extrautilities-1.2.10-deobf.jar differ diff --git a/src/main/java/modtweaker2/ModTweaker2.java b/src/main/java/modtweaker2/ModTweaker2.java index cdce8f3..9b3dcd1 100644 --- a/src/main/java/modtweaker2/ModTweaker2.java +++ b/src/main/java/modtweaker2/ModTweaker2.java @@ -12,6 +12,7 @@ import modtweaker2.mods.botania.Botania; import modtweaker2.mods.chisel.Chisel; import modtweaker2.mods.exnihilo.ExNihilo; import modtweaker2.mods.extendedworkbench.ExtendedWorkbench; +import modtweaker2.mods.extraUtils.ExtraUtils; import modtweaker2.mods.factorization.Factorization; import modtweaker2.mods.forestry.Forestry; import modtweaker2.mods.fsp.Steamcraft; @@ -84,6 +85,8 @@ public class ModTweaker2 { TweakerPlugin.register("Forestry", Forestry.class); TweakerPlugin.register("chisel", Chisel.class); TweakerPlugin.register("aura", AuraCascade.class); + TweakerPlugin.register("ExtraUtilities", ExtraUtils.class); + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { MinecraftForge.EVENT_BUS.register(new ClientEvents()); diff --git a/src/main/java/modtweaker2/mods/extraUtils/ExtraUtils.java b/src/main/java/modtweaker2/mods/extraUtils/ExtraUtils.java new file mode 100644 index 0000000..3f2febf --- /dev/null +++ b/src/main/java/modtweaker2/mods/extraUtils/ExtraUtils.java @@ -0,0 +1,12 @@ +package modtweaker2.mods.extraUtils; + +import minetweaker.MineTweakerAPI; +import modtweaker2.mods.appeng.handlers.Grind; +import modtweaker2.mods.extraUtils.handlers.QED; + +public class ExtraUtils { + + public ExtraUtils() { + MineTweakerAPI.registerClass(QED.class); + } +} diff --git a/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java b/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java new file mode 100644 index 0000000..7ce123c --- /dev/null +++ b/src/main/java/modtweaker2/mods/extraUtils/handlers/QED.java @@ -0,0 +1,73 @@ +package modtweaker2.mods.extraUtils.handlers; + +import java.util.LinkedList; + +import minetweaker.MineTweakerAPI; +import minetweaker.api.item.IItemStack; +import modtweaker2.helpers.InputHelper; +import modtweaker2.helpers.LogHelper; +import modtweaker2.utils.BaseListAddition; +import modtweaker2.utils.BaseListRemoval; +import net.minecraft.item.crafting.IRecipe; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; +import stanhebben.zenscript.annotations.ZenClass; +import stanhebben.zenscript.annotations.ZenMethod; + +import com.rwtema.extrautils.tileentity.enderconstructor.EnderConstructorRecipesHandler; + +@ZenClass("mods.extraUtils.QED") +public class QED { + + @ZenMethod + public static void addShapedRecipe(IItemStack output, IItemStack[][] recipe) { + MineTweakerAPI.apply(new Add(new ShapedOreRecipe(InputHelper.toStack(output), InputHelper.toShapedObjects(recipe)))); + } + + private static class Add extends BaseListAddition { + + public Add(IRecipe recipe) { + super("QED", EnderConstructorRecipesHandler.recipes); + recipes.add(recipe); + } + + @Override + protected String getRecipeInfo(IRecipe recipe) { + return recipe.toString(); + } + + } + + @ZenMethod + public static void removeRecipe(IItemStack toRemove) { + if (toRemove == null) { + LogHelper.logError(String.format("Required parameters missing for %s Recipe.", "QED")); + return; + } + LinkedList recipes = new LinkedList(); + + for (IRecipe recipe : EnderConstructorRecipesHandler.recipes) { + if (recipe != null && recipe.getRecipeOutput() != null && recipe.getRecipeOutput().isItemEqual(InputHelper.toStack(toRemove))) { + recipes.add(recipe); + } + } + + MineTweakerAPI.apply(new Remove(recipes)); + + } + + public static class Remove extends BaseListRemoval { + + protected Remove(LinkedList stacks) { + super("QED", EnderConstructorRecipesHandler.recipes, stacks); + + } + + @Override + protected String getRecipeInfo(IRecipe recipe) { + return recipe.toString(); + } + + } + +}