From 4b240acbf756ea03db4663a6e0278156919cc2ca Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 27 Feb 2015 12:58:16 +0100 Subject: [PATCH] Fix some internal rendering discrepancies with loaded crossbow ammo and prevent possible crashes from corrupt NBT/worlds/whatever --- .../java/tconstruct/weaponry/client/item/BowRenderer.java | 3 ++- .../tconstruct/weaponry/client/item/CrossbowRenderer.java | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java b/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java index 8d843ee2..565ef162 100644 --- a/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/BowRenderer.java @@ -13,6 +13,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import tconstruct.weaponry.entity.BoltEntity; public class BowRenderer extends FlexibleToolRenderer { private static final ArrowEntity dummy = new ArrowEntity(null); @@ -84,7 +85,7 @@ public class BowRenderer extends FlexibleToolRenderer { // we're crazy, so.. render the arrow =D ItemStack ammo = ((ProjectileWeapon) item.getItem()).searchForAmmo(player, item); // we know it's a projectile weapon, it's a bow! if(ammo != null) { - if(ammo.getItem() == Items.arrow) + if(ammo.getItem() == Items.arrow || !(ammo.getItem() instanceof ArrowAmmo)) dummy.returnStack = ArrowAmmo.vanillaArrow; else dummy.returnStack = ammo; diff --git a/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java b/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java index 9b28e3b2..46961717 100644 --- a/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/item/CrossbowRenderer.java @@ -1,6 +1,8 @@ package tconstruct.weaponry.client.item; import tconstruct.client.FlexibleToolRenderer; +import tconstruct.weaponry.TinkerWeaponry; +import tconstruct.weaponry.ammo.BoltAmmo; import tconstruct.weaponry.entity.ArrowEntity; import tconstruct.weaponry.entity.BoltEntity; import tconstruct.weaponry.weapons.Crossbow; @@ -45,7 +47,10 @@ public class CrossbowRenderer extends FlexibleToolRenderer { //float progress = crossbow.getWindupProgress(item, player); float progress = 1f; dummy.returnStack = ammo; - Render renderer = RenderManager.instance.getEntityClassRenderObject(ArrowEntity.class); + if(!(ammo.getItem() instanceof BoltAmmo)) + dummy.returnStack = TinkerWeaponry.creativeBolt; + + Render renderer = RenderManager.instance.getEntityClassRenderObject(BoltEntity.class); GL11.glPushMatrix(); // adjust position