From 195dfc76f8e87fc87a73c421ac7c2e3adab7e08c Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 2 Jan 2015 11:03:30 +0100 Subject: [PATCH] Add an alternative way to craft bolts with config (default off) #1295 --- .../java/tconstruct/library/tools/DualMaterialToolPart.java | 2 +- src/main/java/tconstruct/util/config/PHConstruct.java | 2 ++ src/main/java/tconstruct/weaponry/TinkerWeaponry.java | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java index 995a246a..4ca43ac6 100644 --- a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java +++ b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java @@ -109,7 +109,7 @@ public class DualMaterialToolPart extends DynamicToolPart { if(renderpass > 0) { int matId = getMaterialID2(stack); - if(matId > icons2.length) + if(matId > icons2.length || matId < 0) return super.getColorFromItemStack(stack, renderpass); if(icons[matId] == null) diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index d2ca0ccd..51578f92 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -64,6 +64,7 @@ public class PHConstruct miningLevelIncrease = config.get("Difficulty Changes", "Modifiers increase Mining Level", true).getBoolean(true); denyMattock = config.get("Difficulty Changes", "Deny creation of non-metal mattocks", false).getBoolean(false); craftEndstone = config.get("Difficulty Changes", "Allow creation of endstone", true).getBoolean(true); + alternativeBoltRecipe = config.get("Difficulty Changes", "Add alternitave recipe for bolt parts: arrowhead + toolrod in a crafting grid", false).getBoolean(false); naturalSlimeSpawn = config.get("Mobs", "Blue Slime spawn chance", 1, "Set to 0 to disable").getInt(1); @@ -315,6 +316,7 @@ public class PHConstruct public static boolean labotimizeVanillaTools; public static boolean miningLevelIncrease; public static boolean denyMattock; + public static boolean alternativeBoltRecipe; // Smeltery Output Modification public static double ingotsPerOre; diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java index d079819d..0eca3311 100644 --- a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java +++ b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java @@ -15,11 +15,13 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; import tconstruct.TConstruct; import tconstruct.library.TConstructRegistry; import tconstruct.library.crafting.*; @@ -348,6 +350,9 @@ public class TinkerWeaponry { private void registerBoltCasting() { + if(PHConstruct.alternativeBoltRecipe) + GameRegistry.addRecipe(new AlternateBoltRecipe()); + LiquidCasting tb = TConstructRegistry.getTableCasting(); // any fluid that is a toolpart material can be used