Skip to content

Commit 74a96a3

Browse files
committed
more cleanups and attempt to fix fishing rods
1 parent 8b42c83 commit 74a96a3

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

src/main/java/modernmetals/init/Recipes.java

-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ private static void initMetalRecipes(){
168168
if(rod != null && arrow != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(arrow), "x", "y", "z", 'x', "nugget"+oreDictName, 'y', "rod"+oreDictName,'z' ,Items.FEATHER));
169169
if(rod != null && bow != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(bow), " xy", "x y", " xy", 'x', "rod"+oreDictName, 'y', Items.STRING));
170170
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));
171-
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));
172171
if(rod != null && bolt != null) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(bolt), "x", "x", "y", 'x', "rod"+oreDictName, 'y', Items.FEATHER));
173172
}
174173

src/main/java/modernmetals/items/ItemMetalFishingRod.java

+13
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@
99
import cyano.basemetals.registry.IOreDictionaryEntry;
1010
import net.minecraft.creativetab.CreativeTabs;
1111
import net.minecraft.entity.Entity;
12+
import net.minecraft.entity.EntityLivingBase;
1213
import net.minecraft.entity.player.EntityPlayer;
14+
import net.minecraft.item.IItemPropertyGetter;
1315
import net.minecraft.item.ItemFishingRod;
1416
import net.minecraft.item.ItemStack;
17+
import net.minecraft.util.ResourceLocation;
1518
import net.minecraft.world.World;
19+
import net.minecraftforge.fml.relauncher.Side;
20+
import net.minecraftforge.fml.relauncher.SideOnly;
1621
import net.minecraftforge.oredict.OreDictionary;
1722

1823
public class ItemMetalFishingRod extends ItemFishingRod implements IOreDictionaryEntry, IMetalObject {
@@ -33,6 +38,14 @@ public ItemMetalFishingRod(MetalMaterial m){
3338
} else {
3439
regenerates = false;
3540
}
41+
this.addPropertyOverride(new ResourceLocation("cast"), new IItemPropertyGetter()
42+
{
43+
@SideOnly(Side.CLIENT)
44+
public float apply(ItemStack stack, World worldIn, EntityLivingBase entityIn)
45+
{
46+
return entityIn == null ? 0.0F : (entityIn.getHeldItemMainhand() == stack && entityIn instanceof EntityPlayer && ((EntityPlayer)entityIn).fishEntity != null ? 1.0F : 0.0F);
47+
}
48+
});
3649
this.oreDict = "fishingrod"+metal.getCapitalizedName();
3750
}
3851

0 commit comments

Comments
 (0)