Fix dynamic items not behaving correctly if metada wasn't registered …

…in ascending order
SlimeKnights · Nov 9, 2015 · ebe8798 · ebe8798
1 parent db887e7
commit ebe8798
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java b/src/main/java/slimeknights/mantle/item/ItemMetaDynamic.java
@@ -48,14 +48,14 @@ public ItemMetaDynamic() {
    * @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 @@ protected boolean isValid(int meta) {
 
   @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<String>() {
       @Override
       public boolean execute(int meta, String name) {