From be17c83fefe186655699435f4418722bb7941730 Mon Sep 17 00:00:00 2001
From: elite <elite.nmd.so>
Date: Sun, 2 Apr 2017 15:23:19 -0500
Subject: [PATCH] local comit for merging

---
 1.11/.gitignore                                  |  1 +
 .../primal/forgecraft/items/weapons/Musket.java  | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/1.11/.gitignore b/1.11/.gitignore
index d877a4db..a9555e6f 100644
--- a/1.11/.gitignore
+++ b/1.11/.gitignore
@@ -15,6 +15,7 @@ logs
 usercache.json
 usernamecache.json
 options.txt
+screenshots/
 
 # eclipse
 bin
diff --git a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java
index b09a1fdc..46a5cd67 100644
--- a/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java
+++ b/1.11/src/main/java/nmd/primal/forgecraft/items/weapons/Musket.java
@@ -1,9 +1,18 @@
 package nmd.primal.forgecraft.items.weapons;
 
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.item.IItemPropertyGetter;
 import net.minecraft.item.Item;
+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 nmd.primal.forgecraft.ModInfo;
 import nmd.primal.forgecraft.items.BaseItem;
 
+import javax.annotation.Nullable;
+
 /**
  * Created by Lyle on 4/2/2017.
  */
@@ -15,5 +24,12 @@ public class Musket extends BaseItem{
         this.setCreativeTab(ModInfo.TAB_FORGECRAFT);
         this.setMaxStackSize(1);
         this.setNoRepair();
+        this.addPropertyOverride(new ResourceLocation("type"), new IItemPropertyGetter() {
+            @SideOnly(Side.CLIENT)
+            public float apply(ItemStack item, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
+                return 0.0f;
+
+            }
+        });
     }
 }