diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 05629b3c3..f15714f19 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -41,6 +41,7 @@ import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.PrismarineVariant; import vazkii.botania.api.state.enums.PylonVariant; import vazkii.botania.api.state.enums.StorageVariant; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.FloatingFlowerModel; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.ModFluffBlocks; @@ -236,6 +237,54 @@ public final class ModelHandler { : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"); } }); + + ModelLoader.registerItemVariants(manaweaveBoots, + new ModelResourceLocation("botania:manaweaveBoots", "inventory"), + new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveBoots", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manaweaveChest, + new ModelResourceLocation("botania:manaweaveChest", "inventory"), + new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveChest", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manaweaveHelm, + new ModelResourceLocation("botania:manaweaveHelm", "inventory"), + new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveHelm", "inventory"); + } + }); + + ModelLoader.registerItemVariants(manaweaveLegs, + new ModelResourceLocation("botania:manaweaveLegs", "inventory"), + new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")); + + ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) { + return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory") + : new ModelResourceLocation("botania:manaweaveLegs", "inventory"); + } + }); } private static void registerSubtiles() { @@ -398,11 +447,6 @@ public final class ModelHandler { registerItemModel(elementiumShears); registerItemModel(elementiumSword); - registerItemModel(manaweaveHelm); - registerItemModel(manaweaveChest); - registerItemModel(manaweaveLegs); - registerItemModel(manaweaveBoots); - registerItemModel(terrasteelHelm); registerItemModel(terrasteelHelmRevealing); registerItemModel(terrasteelChest); diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 2a19b2930..a48a58c48 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -45,21 +45,10 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi return models[slot]; } - /*@Override - public void registerIcons(IIconRegister par1IconRegister) { - super.registerIcons(par1IconRegister); - iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday"); - }*/ - @Override public String getArmorTextureAfterInk(ItemStack stack, int slot) { return ConfigHandler.enableArmorModels ? (ClientProxy.jingleTheBells ? LibResources.MODEL_MANAWEAVE_NEW_HOLIDAY : LibResources.MODEL_MANAWEAVE_NEW) : slot == 2 ? LibResources.MODEL_MANAWEAVE_1 : LibResources.MODEL_MANAWEAVE_0; } - -// @Override -// public IIcon getIconFromDamage(int dmg) { -// return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg); -// } todo 1.8.8 to smartmodel or getModel lookup @Override @SideOnly(Side.CLIENT)