From d3e18d2a45c2cd8498a6e70c66713040cf6134a7 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Fri, 4 Mar 2016 17:05:27 +0100 Subject: [PATCH] Change ItemMeta to use blockstates instead of separate item model files. Much more convenient >_> --- src/main/java/slimeknights/mantle/item/ItemEdible.java | 4 ++-- .../java/slimeknights/mantle/item/ItemMetaDynamic.java | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/slimeknights/mantle/item/ItemEdible.java b/src/main/java/slimeknights/mantle/item/ItemEdible.java index 877ebd6..34e0e14 100644 --- a/src/main/java/slimeknights/mantle/item/ItemEdible.java +++ b/src/main/java/slimeknights/mantle/item/ItemEdible.java @@ -104,7 +104,7 @@ public class ItemEdible extends ItemFood { } @SideOnly(Side.CLIENT) - public void registerItemModels(final String prefix) { - dynamic.registerItemModels(prefix, this); + public void registerItemModels() { + dynamic.registerItemModels(this); } } diff --git a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java index fae5f15..b288486 100644 --- a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java +++ b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java @@ -99,20 +99,18 @@ public class ItemMetaDynamic extends Item { } @SideOnly(Side.CLIENT) - public void registerItemModels(final String prefix) { - registerItemModels(prefix, this); + public void registerItemModels() { + registerItemModels(this); } @SideOnly(Side.CLIENT) - protected void registerItemModels(final String prefix, final Item item) { + protected void registerItemModels(final Item item) { final String resourceId = Loader.instance().activeModContainer().getModId().toLowerCase(); names.forEachEntry(new TIntObjectProcedure() { @Override public boolean execute(int meta, String name) { - name = String.format("%s:%s%s", resourceId, prefix, name); - ModelBakery.addVariantName(item, name); // tell the game which model to use for this item-meta combination - ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(name, "inventory")); + ModelLoader.setCustomModelResourceLocation(item, meta, new ModelResourceLocation(item.getRegistryName(), name)); return true; } });