From ebe8798ed8a7cb4008180d642ffc52ee869cee1c Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Mon, 9 Nov 2015 19:12:56 +0100 Subject: [PATCH] Fix dynamic items not behaving correctly if metada wasn't registered in ascending order --- .../java/slimeknights/mantle/item/ItemMetaDynamic.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java index 758ee96..ff98235 100644 --- a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java +++ b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java @@ -48,14 +48,14 @@ public class ItemMetaDynamic extends Item { * @return An itemstack representing the Item-Meta combination. */ public ItemStack addMeta(int meta, String name) { - if(meta > MAX) { + if(meta > MAX || isValid(meta)) { throw new IllegalArgumentException(String .format("Metadata too high, highest supported value is %d. Meta was %d", MAX, meta)); } if(meta > maxMeta) { maxMeta = meta; - setValid(meta); } + setValid(meta); names.put(meta, name); return new ItemStack(this, 1, meta); } @@ -97,8 +97,12 @@ public class ItemMetaDynamic extends Item { @SideOnly(Side.CLIENT) public void registerItemModels(final String prefix) { + registerItemModels(prefix, this); + } + + @SideOnly(Side.CLIENT) + protected void registerItemModels(final String prefix, final Item item) { final String resourceId = Loader.instance().activeModContainer().getModId().toLowerCase(); - final Item item = this; names.forEachEntry(new TIntObjectProcedure() { @Override public boolean execute(int meta, String name) {