From b12cd80ad3b318a8c6dbc83a3fe7f2a212bb87c3 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 28 Feb 2016 12:20:11 -0600 Subject: [PATCH] Update forge and close #52 --- build.properties | 2 +- .../vazkii/botania/client/model/SpecialFlowerModel.java | 2 +- .../equipment/armor/manasteel/ItemManasteelArmor.java | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build.properties b/build.properties index c8427b4fc..a82be69d2 100644 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Thu Feb 25 19:50:43 GMT 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.1.1722 +forge_version=11.15.1.1763 mc_version=1.8.9 dir_repo=./ build_number=250 diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index ef5c77b55..46a0e4402 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -51,7 +51,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -public class SpecialFlowerModel implements IModelCustomData { +public class SpecialFlowerModel implements IModelCustomData { // SpecialFlowerModel for when there are no blockModels registered for a subtile public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap., ModelResourceLocation>of(), ImmutableMap., ModelResourceLocation>of()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index 08b72458c..b28481ff9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -114,18 +114,20 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan @Override @SideOnly(Side.CLIENT) - public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { + public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot, ModelBiped original) { if(ConfigHandler.enableArmorModels) { armorSlot--; // 1.8: mojang is dumb and made armorSlot 1-4 instead of 0-3. ModelBiped model = getArmorModelForSlot(entityLiving, itemStack, armorSlot); if(model == null) model = provideArmorModelForSlot(itemStack, armorSlot); - if(model != null) + if(model != null) { + model.setModelAttributes(original); return model; + } } - return super.getArmorModel(entityLiving, itemStack, armorSlot); + return super.getArmorModel(entityLiving, itemStack, armorSlot, original); } @SideOnly(Side.CLIENT)