diff --git a/src/main/java/modernmetals/init/Recipes.java b/src/main/java/modernmetals/init/Recipes.java index a57216b6..b759b8cd 100644 --- a/src/main/java/modernmetals/init/Recipes.java +++ b/src/main/java/modernmetals/init/Recipes.java @@ -168,7 +168,6 @@ private static void initMetalRecipes(){ if(rod != null && arrow != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(arrow), "x", "y", "z", 'x', "nugget"+oreDictName, 'y', "rod"+oreDictName,'z' ,Items.FEATHER)); if(rod != null && bow != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(bow), " xy", "x y", " xy", 'x', "rod"+oreDictName, 'y', Items.STRING)); if(rod != null && gear != null && crossbow != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(crossbow), "zxx", " yx", "x z", 'x', "rod"+oreDictName, 'y', "gear"+oreDictName, 'z', Items.STRING)); - if(rod != null && gear != null && crossbow != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(crossbow), "xxz", "xy ", "z x", 'x', "rod"+oreDictName, 'y', "gear"+oreDictName, 'z', Items.STRING)); if(rod != null && bolt != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(bolt), "x", "x", "y", 'x', "rod"+oreDictName, 'y', Items.FEATHER)); } diff --git a/src/main/java/modernmetals/items/ItemMetalFishingRod.java b/src/main/java/modernmetals/items/ItemMetalFishingRod.java index 2c50cd83..4204baa9 100644 --- a/src/main/java/modernmetals/items/ItemMetalFishingRod.java +++ b/src/main/java/modernmetals/items/ItemMetalFishingRod.java @@ -9,10 +9,15 @@ import cyano.basemetals.registry.IOreDictionaryEntry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.ItemFishingRod; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; public class ItemMetalFishingRod extends ItemFishingRod implements IOreDictionaryEntry, IMetalObject { @@ -33,6 +38,14 @@ public ItemMetalFishingRod(MetalMaterial m){ } else { regenerates = false; } + this.addPropertyOverride(new ResourceLocation("cast"), new IItemPropertyGetter() + { + @SideOnly(Side.CLIENT) + public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn) + { + return entityIn == null ? 0.0F : (entityIn.getHeldItemMainhand() == stack && entityIn instanceof EntityPlayer && ((EntityPlayer)entityIn).fishEntity != null ? 1.0F : 0.0F); + } + }); this.oreDict = "fishingrod"+metal.getCapitalizedName(); }