local comit for merging

This commit is contained in:
elite
2017-04-02 15:23:19 -05:00
parent 72fde890a6
commit be17c83fef
2 changed files with 17 additions and 0 deletions

1
1.11/.gitignore vendored
View File

@@ -15,6 +15,7 @@ logs
usercache.json
usernamecache.json
options.txt
screenshots/
# eclipse
bin

View File

@@ -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;
}
});
}
}