From 4b8af7805730f2c4ec0a931f07aa0f024eb28cb1 Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Sun, 6 Sep 2015 08:48:25 +0200 Subject: [PATCH] - IC2 integration will now try to override recipes, if it can. - Fixed a couple tiny things --- .../minetweaker/mc1710/MineTweakerMod.java | 5 +--- .../mods/ic2/MachineAddRecipeAction.java | 7 ++++- MineTweaker3-Web/downloads.html | 27 ++++++++++++------- MineTweaker3-Web/index.html | 3 ++- configuration.gradle | 3 ++- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index cf7f958..110e480 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -17,11 +17,9 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.relauncher.Side; import java.io.File; -import java.util.Set; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -49,7 +47,6 @@ import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; import minetweaker.runtime.providers.ScriptProviderDirectory; -import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.MinecraftForge; @@ -59,7 +56,7 @@ import net.minecraftforge.common.MinecraftForge; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = "3.0.9B") +@Mod(modid = MineTweakerMod.MODID, version = "3.0.10") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; public static final String MCVERSION = "1.7.10"; diff --git a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java index 4866974..d9600ac 100644 --- a/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java +++ b/MineTweaker3-MC1710-Mod-IC2/src/main/java/minetweaker/mods/ic2/MachineAddRecipeAction.java @@ -1,6 +1,7 @@ package minetweaker.mods.ic2; import ic2.api.recipe.IMachineRecipeManager; +import ic2.api.recipe.IMachineRecipeManagerExt; import java.util.Arrays; import minetweaker.MineTweakerAPI; import minetweaker.OneWayAction; @@ -29,7 +30,11 @@ public class MachineAddRecipeAction extends OneWayAction { @Override public void apply() { try { - machine.addRecipe(input, tag, output); + if (machine instanceof IMachineRecipeManagerExt) { + ((IMachineRecipeManagerExt) machine).addRecipe(input, tag, true, output); + } else { + machine.addRecipe(input, tag, output); + } } catch (RuntimeException ex) { MineTweakerAPI.logError(ex.getMessage()); } diff --git a/MineTweaker3-Web/downloads.html b/MineTweaker3-Web/downloads.html index 40c6662..4aa9fcb 100644 --- a/MineTweaker3-Web/downloads.html +++ b/MineTweaker3-Web/downloads.html @@ -82,32 +82,41 @@

Latest version

Development versions

Basic version (without mod support)

This version is recommended for development, as it won't need you to provide the libraries for every mod in it.

Full version (with mod support)

This version includes all mod support. You may need the development versions of the supported mods as well.

What's changed? Changelog

Archived versions

+

Version 3.0.9C

+

Version 3.0.9B