From f101d36a5f2eb7bafa6cf16d76f2979083c43042 Mon Sep 17 00:00:00 2001 From: Chicken-Bomes Date: Fri, 11 Jul 2014 15:43:53 +1000 Subject: [PATCH] Fix asm crash in beacon gui Fix rare ItemSorter crash --- resources/assets/nei/asm/blocks.asm | 3 ++- src/codechicken/nei/ItemSorter.java | 9 +++++---- src/codechicken/nei/asm/NEITransformer.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/assets/nei/asm/blocks.asm b/resources/assets/nei/asm/blocks.asm index e6c7e803..f80d5615 100644 --- a/resources/assets/nei/asm/blocks.asm +++ b/resources/assets/nei/asm/blocks.asm @@ -354,7 +354,8 @@ LCONT list beaconButtonObscured ALOAD 0 -GETFIELD BeaconButton.this$0 : Lnet/minecraft/client/gui/inventory/GuiBeacon; +# NEI will replace the owner with the appropriate inner class +GETFIELD net/minecraft/client/gui/inventory/GuiBeacon.this$0 : Lnet/minecraft/client/gui/inventory/GuiBeacon; DUP GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager; SWAP diff --git a/src/codechicken/nei/ItemSorter.java b/src/codechicken/nei/ItemSorter.java index 13c5a396..b27dd10d 100644 --- a/src/codechicken/nei/ItemSorter.java +++ b/src/codechicken/nei/ItemSorter.java @@ -37,10 +37,10 @@ public class ItemSorter implements Comparator, ItemsLoadedCallback public static ArrayList entries = new ArrayList(); public static ArrayList list = new ArrayList(); - public static ItemSorter instance = new ItemSorter(); + public static final ItemSorter instance = new ItemSorter(); //optimisations - public HashMap ordering = new HashMap(); + public HashMap ordering = null; public static void sort(ArrayList items) { Collections.sort(items, instance); @@ -57,10 +57,11 @@ public class ItemSorter implements Comparator, ItemsLoadedCallback @Override public void itemsLoaded() { - ordering.clear(); + HashMap newMap = new HashMap(); int i = 0; for(ItemStack stack : ItemList.items) - ordering.put(stack, i++); + newMap.put(stack, i++); + ordering = newMap; } public static String getSaveString() { diff --git a/src/codechicken/nei/asm/NEITransformer.java b/src/codechicken/nei/asm/NEITransformer.java index 7cfdaf5e..c135dcac 100644 --- a/src/codechicken/nei/asm/NEITransformer.java +++ b/src/codechicken/nei/asm/NEITransformer.java @@ -162,7 +162,7 @@ public class NEITransformer implements IClassTransformer asmblocks.get("renderTabTooltip"), true)); String[] buttons = new String[]{"CancelButton", "ConfirmButton", "PowerButton"}; - String[] this_fields = new String[]{"field_146146_o", "field_146147_o", "field_146149_p"}; + String[] this_fields = new String[]{"field_146146_o", "field_146147_o", "field_146150_o"}; for(int i = 0; i < 3; i++) { ObfMapping m = new ObfMapping("net/minecraft/client/gui/inventory/GuiBeacon$"+buttons[i], "func_146111_b", "(II)V"); InsnListSection l = asmblocks.get("beaconButtonObscured").list.copy();