Add an alternative way to craft bolts with config (default off) #1295

SlimeKnights · Jan 2, 2015 · 195dfc7 · 195dfc7
1 parent 1a18389
commit 195dfc7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java b/src/main/java/tconstruct/library/tools/DualMaterialToolPart.java
@@ -109,7 +109,7 @@ public int getColorFromItemStack(ItemStack stack, int renderpass) {
         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
@@ -64,6 +64,7 @@ public static void initProps (File location)
         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 static void initProps (File location)
     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
@@ -15,11 +15,13 @@
 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 @@ private void addWeaponRecipies()
 
     private void registerBoltCasting()
     {
+        if(PHConstruct.alternativeBoltRecipe)
+            GameRegistry.addRecipe(new AlternateBoltRecipe());
+
         LiquidCasting tb = TConstructRegistry.getTableCasting();
 
         // any fluid that is a toolpart material can be used