Fix Thaumium toolparts for weaponry parts

SlimeKnights · Dec 13, 2014 · da25492 · da25492
1 parent d3c4ab0
commit da25492
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/tconstruct/tools/TinkerTools.java b/src/main/java/tconstruct/tools/TinkerTools.java
@@ -708,9 +708,18 @@ private void modIntegration ()
                     TConstructRegistry.addPartMapping(TinkerTools.woodPattern, meta + 1, 31, new ItemStack(TinkerTools.patternOutputs[meta], 1, 31));
             }
 
-            TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerWeaponry.bowstring, 1, 1), 1F, 0.8F, 0.9f, 0x63bcd9);
-            TConstructRegistry.addBowMaterial(31, 35, 4.75f);
-            TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F);
+            // Thaumium weaponry toolparts
+            if(TConstruct.pulsar.isPulseLoaded("Tinkers' Weaponry"))
+            {
+                for (int m = 0; m < TinkerWeaponry.patternOutputs.length; m++)
+                    TConstructRegistry.addPartMapping(TinkerWeaponry.woodPattern, m, MaterialID.Thaumium, new ItemStack(TinkerWeaponry.patternOutputs[m], 1, MaterialID.Thaumium));
+
+                TConstructRegistry.addPartMapping(TinkerTools.woodPattern, 25, MaterialID.Thaumium, new ItemStack(TinkerWeaponry.arrowhead, 1, MaterialID.Thaumium));
+
+                TConstructRegistry.addBowstringMaterial(1, 2, new ItemStack((Item) obj, 1, 7), new ItemStack(TinkerWeaponry.bowstring, 1, 1), 1F, 0.8F, 0.9f, 0x63bcd9);
+                TConstructRegistry.addBowMaterial(31, 35, 4.75f);
+                TConstructRegistry.addArrowMaterial(31, 1.8F, 0.5F);
+            }
 
             TConstructRegistry.addDefaultToolPartMaterial(MaterialID.Thaumium);
             TConstructRegistry.addDefaultShardMaterial(MaterialID.Thaumium);

diff --git a/src/main/java/tconstruct/weaponry/TinkerWeaponry.java b/src/main/java/tconstruct/weaponry/TinkerWeaponry.java
@@ -94,6 +94,8 @@ public class TinkerWeaponry {
     public static Random random = new Random();
 
 
+    public static Item[] patternOutputs;
+
     @Handler
     public void preInit(FMLPreInitializationEvent event)
     {
@@ -204,7 +206,7 @@ private void addPartRecipies()
         // todo: integrate into tcon
         int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 };
         int[] liquidDamage = new int[] { 2, 13, 10, 11, 12, 14, 15, 6, 16, 18 };
-        Item[] patternOutputs = new Item[] { partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb };
+        patternOutputs = new Item[] { partShuriken, partCrossbowLimb, partCrossbowBody, partBowLimb };
 
 
         // register part crafting
@@ -255,13 +257,6 @@ private void addPartRecipies()
             tableCasting.addCastingRecipe(metalCast, new FluidStack(fs, fluidAmount), cast, 50);
             Smeltery.addMelting(FluidType.getFluidType(fs), metalCast, 0, fluidAmount);
         }
-
-        // Thaumium weaponry toolparts
-        if(TinkerTools.thaumcraftAvailable)
-        {
-            for (int m = 0; m < patternOutputs.length; m++)
-                    TConstructRegistry.addPartMapping(woodPattern, m, MaterialID.Thaumium, new ItemStack(patternOutputs[m], 1, MaterialID.Thaumium));
-        }
     }
 
     private void registerLegendaries()