diff --git a/src/main/java/tconstruct/util/Reference.java b/src/main/java/tconstruct/util/Reference.java index 769a6c9a..ccbccbd8 100644 --- a/src/main/java/tconstruct/util/Reference.java +++ b/src/main/java/tconstruct/util/Reference.java @@ -8,7 +8,7 @@ public final class Reference { public static final String MOD_ID = TConstruct.modID; public static final String MOD_NAME = "Tinkers' Construct"; - public static final String RESOURCE = MOD_ID.toLowerCase(); + public static final String RESOURCE = "tinker"; public static String resource(String res) { diff --git a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java index 4fb65e8d..11414ee6 100644 --- a/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java +++ b/src/main/java/tconstruct/weaponry/WeaponryCommonProxy.java @@ -6,10 +6,10 @@ import cpw.mods.fml.common.registry.EntityRegistry; public class WeaponryCommonProxy { public void init() { - EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 0, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 1, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 2, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 3, TConstruct.instance, 32, 5, true); - EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 4, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(ShurikenEntity.class, "Shuriken", 10, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(ThrowingKnifeEntity.class, "ThrowingKnife", 11, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(JavelinEntity.class, "Javelin", 12, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 13, TConstruct.instance, 32, 5, true); + EntityRegistry.registerModEntity(BoltEntity.class, "Bolt", 14, TConstruct.instance, 32, 5, true); } } diff --git a/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java b/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java index 02f77bec..4cc3e6dc 100644 --- a/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java +++ b/src/main/java/tconstruct/weaponry/client/entity/ProjectileBaseRenderer.java @@ -14,6 +14,7 @@ import org.lwjgl.opengl.GL12; public class ProjectileBaseRenderer extends Render { protected static FlexibleToolRenderer toolCoreRenderer = new FlexibleToolRenderer(); + @SuppressWarnings("unchecked") @Override public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) { doRender((T)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);