Fix Projectile Weapons and arrows/bolts building creative items with …

…materials that have no bow/arrow material stats
SlimeKnights · Oct 30, 2014 · eb1a670 · eb1a670
1 parent 3f74dd7
commit eb1a670
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java b/src/main/java/tconstruct/library/weaponry/BowBaseAmmo.java
@@ -1,6 +1,7 @@
 package tconstruct.library.weaponry;
 
 import tconstruct.library.TConstructRegistry;
+import tconstruct.library.tools.BowMaterial;
 import tconstruct.library.tools.BowstringMaterial;
 import tconstruct.weaponry.ammo.ArrowAmmo;
 import tconstruct.weaponry.entity.ArrowEntity;
@@ -136,6 +137,10 @@ public void playFiringSound(World world, EntityPlayer player, ItemStack weapon,
     @Override
     public void buildTool (int id, String name, List list)
     {
+        // does the material have a bow material?
+        if(TConstructRegistry.getBowMaterial(id) == null)
+            return;
+
         // all creative bows use regular bowstring
         ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // regular bowstring
         ItemStack accessoryStack = getPartAmount() > 2 ? new ItemStack(getAccessoryItem(), 1, id) : null;

diff --git a/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java b/src/main/java/tconstruct/weaponry/ammo/ArrowAmmo.java
@@ -2,6 +2,7 @@
 
 import tconstruct.TConstruct;
 import tconstruct.library.TConstructRegistry;
+import tconstruct.library.tools.ArrowMaterial;
 import tconstruct.library.tools.CustomMaterial;
 import tconstruct.library.tools.FletchingMaterial;
 import tconstruct.library.tools.FletchlingLeafMaterial;
@@ -97,6 +98,9 @@ public String[] getTraits ()
     @Override
     public void buildTool (int id, String name, List list)
     {
+        if(TConstructRegistry.getArrowMaterial(id) == null)
+            return;
+
         ItemStack handleStack = new ItemStack(getHandleItem(), 1, 0); // wooden shaft
         ItemStack accessoryStack = new ItemStack(getAccessoryItem(), 1, 0); // feather fletchling
 

diff --git a/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java b/src/main/java/tconstruct/weaponry/ammo/BoltAmmo.java
@@ -82,6 +82,9 @@ public String[] getTraits ()
     @Override
     public void buildTool (int id, String name, List list)
     {
+        if(TConstructRegistry.getArrowMaterial(id) == null)
+            return;
+
         // dual material head: we use wooden shafts
         ItemStack headStack = DualMaterialToolPart.createDualMaterial(getHeadItem(), 0, id); // wooden shaft, material head
         ItemStack handleStack = new ItemStack(getAccessoryItem(), 1, 0); // feather Fletchling

diff --git a/src/main/java/tconstruct/weaponry/weapons/Crossbow.java b/src/main/java/tconstruct/weaponry/weapons/Crossbow.java
@@ -1,5 +1,6 @@
 package tconstruct.weaponry.weapons;
 
+import tconstruct.library.TConstructRegistry;
 import tconstruct.weaponry.TinkerWeaponry;
 import tconstruct.weaponry.ammo.BoltAmmo;
 import tconstruct.weaponry.entity.BoltEntity;
@@ -415,6 +416,10 @@ public String[] getTraits() {
     @Override
     public void buildTool (int id, String name, List list)
     {
+        // does the material have a bow material?
+        if(TConstructRegistry.getBowMaterial(id) == null)
+            return;
+
         // all creative bows use regular bowstring
         ItemStack headStack = new ItemStack(getHeadItem(), 1, id);
         ItemStack handleStack = new ItemStack(getHandleItem(), 1, id);