From e730c2154df09b24bdf79899676165145450eb80 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 4 Jan 2017 23:38:07 -0600 Subject: [PATCH] client.model spackage --- .../java/vazkii/botania/client/model/FloatingFlowerModel.java | 2 +- src/main/java/vazkii/botania/client/model/GunModel.java | 4 ++-- .../java/vazkii/botania/client/model/SpecialFlowerModel.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 86638ad0c..9211a0c37 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -218,7 +218,7 @@ public class FloatingFlowerModel implements IBakedModel { private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { // Items always have GRASS island IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; String identifier; diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index b78a3bbe3..857968c07 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -49,9 +49,9 @@ public class GunModel implements IBakedModel { private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { ItemStack lens = ItemManaGun.getLens(stack); - if(lens != null) { + if(!lens.isEmpty()) { IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); return GunModel.this.getModel(lensModel); } diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 748752668..5330a5140 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -239,7 +239,7 @@ public class SpecialFlowerModel implements IModelCustomData { private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { + public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { Optional item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); if(!item.isPresent())