diff --git a/build.gradle b/build.gradle index 1252864..02e35cc 100644 --- a/build.gradle +++ b/build.gradle @@ -59,7 +59,20 @@ allprojects } } -dependencies { +repositories +{ + maven { + // the repo from which to get NEI and stuff + name 'CB Repo' + url "http://chickenbones.net/maven/" + } +} + +dependencies +{ + compile "codechicken:CodeChickenCore:1.7.10-1.0.4.35:dev" + compile "codechicken:CodeChickenLib:1.7.10-1.1.3.127:dev" + compile "codechicken:NotEnoughItems:1.7.10-1.0.4.95:dev" } //Creates a compiled de-obfuscated jar diff --git a/build.prop b/build.prop index 2d5d7ad..afd0d40 100644 --- a/build.prop +++ b/build.prop @@ -1,6 +1,6 @@ minecraft_version=1.7.10 forge_version=10.13.4.1558-1.7.10 tfc_version=0.79.27 -mod_version=1.00 +mod_version=1.01 mod_id=TerraFirmaPunkTweaks group_name=com.onewolfe.tfptweaks \ No newline at end of file diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.00.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.00.jar deleted file mode 100644 index 76f4e06..0000000 Binary files a/builds/[1.7.10]TerraFirmaPunkTweaks-1.00.jar and /dev/null differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar new file mode 100644 index 0000000..ecc4411 Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-1.01.jar differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.00.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.00.jar deleted file mode 100644 index 4b13791..0000000 Binary files a/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.00.jar and /dev/null differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar new file mode 100644 index 0000000..28f5340 Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-deobf-1.01.jar differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.00.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.00.jar deleted file mode 100644 index eeda877..0000000 Binary files a/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.00.jar and /dev/null differ diff --git a/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.01.jar b/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.01.jar new file mode 100644 index 0000000..bb476d5 Binary files /dev/null and b/builds/[1.7.10]TerraFirmaPunkTweaks-src-1.01.jar differ diff --git a/src/main/java/com/onewolfe/tfptweaks/NEIConfig.java b/src/main/java/com/onewolfe/tfptweaks/NEIConfig.java new file mode 100644 index 0000000..766abbe --- /dev/null +++ b/src/main/java/com/onewolfe/tfptweaks/NEIConfig.java @@ -0,0 +1,27 @@ +package com.onewolfe.tfptweaks; + +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; +import net.minecraft.item.ItemStack; +import steamcraft.common.init.InitBlocks; + +public class NEIConfig implements IConfigureNEI +{ + + @Override + public String getName() { + return References.ModName; + } + + @Override + public String getVersion() { + return References.ModVersion; + } + + @Override + public void loadConfig() + { + API.hideItem(new ItemStack(InitBlocks.blockFlesh, 1)); + } + +} diff --git a/src/main/java/com/onewolfe/tfptweaks/RecipeTweaks.java b/src/main/java/com/onewolfe/tfptweaks/RecipeTweaks.java new file mode 100644 index 0000000..95e3d21 --- /dev/null +++ b/src/main/java/com/onewolfe/tfptweaks/RecipeTweaks.java @@ -0,0 +1,32 @@ +package com.onewolfe.tfptweaks; + +import java.util.List; + +import cpw.mods.fml.common.Loader; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import steamcraft.common.init.InitBlocks; + +public class RecipeTweaks +{ + @SuppressWarnings("unchecked") + public static void SC2RecipeTweaks() + { + if(Loader.isModLoaded("steamcraft2")) + { + List recipes = CraftingManager.getInstance().getRecipeList(); + for (int i = 0; i < recipes.size(); i++) + { + if (recipes.get(i) != null) + { + ItemStack recipeResult = recipes.get(i).getRecipeOutput(); + + if (recipeResult != null && recipeResult.getItem() == Item.getItemFromBlock(InitBlocks.blockFlesh)) + recipes.remove(i--); + } + } + } + } +} diff --git a/src/main/java/com/onewolfe/tfptweaks/References.java b/src/main/java/com/onewolfe/tfptweaks/References.java index 38b300c..fc0a86e 100644 --- a/src/main/java/com/onewolfe/tfptweaks/References.java +++ b/src/main/java/com/onewolfe/tfptweaks/References.java @@ -7,7 +7,9 @@ public class References public static final String MODID_TFC = "terrafirmacraft"; public static final String MODNAME_TFC = "TerraFirmaCraft"; + + public static final String MODID_SC2 = "steamcraft2"; public static final String ModVersion = "@MOD_VERSION@"; - public static final String ModDependencies = "required-after:" + MODID_TFC; + public static final String ModDependencies = "required-after:" + MODID_TFC + MODID_SC2; } diff --git a/src/main/java/com/onewolfe/tfptweaks/TerraFirmaPunkTweaks.java b/src/main/java/com/onewolfe/tfptweaks/TerraFirmaPunkTweaks.java index 24db768..a96d73f 100644 --- a/src/main/java/com/onewolfe/tfptweaks/TerraFirmaPunkTweaks.java +++ b/src/main/java/com/onewolfe/tfptweaks/TerraFirmaPunkTweaks.java @@ -3,6 +3,7 @@ package com.onewolfe.tfptweaks; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.common.MinecraftForge; @Mod(modid = References.ModID, name = References.ModName, version = References.ModVersion, dependencies = References.ModDependencies) @@ -18,4 +19,10 @@ public class TerraFirmaPunkTweaks { MinecraftForge.EVENT_BUS.register(new PlayerHandler()); } + + @EventHandler + public void postInit(FMLPostInitializationEvent event) + { + RecipeTweaks.SC2RecipeTweaks(); + } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index d2e205a..5b59902 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -14,7 +14,7 @@ "screenshots": [], "parent": "", "requiredMods": [], - "dependencies": ["terrafirmacraft"], + "dependencies": ["terrafirmacraft", "steamcraft2"], "dependants": [ ], "useDependencyInformation": "true" }]