From d9143c584e9421dde1340e9e994caaf14116e5d6 Mon Sep 17 00:00:00 2001 From: slprime <31038811+slprime@users.noreply.github.com> Date: Sat, 7 Sep 2024 15:49:46 +0300 Subject: [PATCH] Rename GT Classes; Correct show Meta Keys (#525) Co-authored-by: slprime --- .../java/codechicken/nei/NEIClientUtils.java | 22 +++++++++--- .../codechicken/nei/WorldOverlayRenderer.java | 31 +++++++++------- .../nei/recipe/DefaultOverlayHandler.java | 35 +++++++++++-------- .../GTFluidStackStringifyHandler.java | 15 +++++--- 4 files changed, 67 insertions(+), 36 deletions(-) diff --git a/src/main/java/codechicken/nei/NEIClientUtils.java b/src/main/java/codechicken/nei/NEIClientUtils.java index 79dce3bd..58125b27 100644 --- a/src/main/java/codechicken/nei/NEIClientUtils.java +++ b/src/main/java/codechicken/nei/NEIClientUtils.java @@ -59,11 +59,26 @@ public class NEIClientUtils extends NEIServerUtils { /** Formats a number with group separator and at most 2 fraction digits. */ private static final Map decimalFormatters = new HashMap<>(); + private static final Map keyHashMap = new HashMap<>(); public static final int ALT_HASH = 1 << 27; public static final int SHIFT_HASH = 1 << 26; public static final int CTRL_HASH = 1 << 25; + static { + keyHashMap.put(Keyboard.KEY_LSHIFT, SHIFT_HASH); + keyHashMap.put(Keyboard.KEY_RSHIFT, SHIFT_HASH); + + keyHashMap.put(Keyboard.KEY_LCONTROL, CTRL_HASH); + keyHashMap.put(Keyboard.KEY_LCONTROL, CTRL_HASH); + + keyHashMap.put(Keyboard.KEY_LMETA, CTRL_HASH); + keyHashMap.put(Keyboard.KEY_RMETA, CTRL_HASH); + + keyHashMap.put(Keyboard.KEY_LMENU, ALT_HASH); + keyHashMap.put(Keyboard.KEY_LMENU, ALT_HASH); + } + public static Minecraft mc() { return Minecraft.getMinecraft(); } @@ -439,11 +454,7 @@ public class NEIClientUtils extends NEIServerUtils { if (Keyboard.getEventKeyState()) { final int keycode = Keyboard.getEventKey(); - if (keycode != Keyboard.KEY_LSHIFT && keycode != Keyboard.KEY_RSHIFT - && keycode != Keyboard.KEY_LCONTROL - && keycode != Keyboard.KEY_RCONTROL - && keycode != Keyboard.KEY_LMENU - && keycode != Keyboard.KEY_RMENU) { + if (!keyHashMap.containsKey(keycode)) { return getMetaHash() + keycode; } } @@ -470,6 +481,7 @@ public class NEIClientUtils extends NEIServerUtils { } public static String getKeyName(int keyBind) { + keyBind = keyHashMap.getOrDefault(keyBind, keyBind); StringJoiner keyText = new StringJoiner(" + "); String hashText = getKeyHashName(keyBind); int keyID = unHashKey(keyBind); diff --git a/src/main/java/codechicken/nei/WorldOverlayRenderer.java b/src/main/java/codechicken/nei/WorldOverlayRenderer.java index 9424a24b..4e7b7208 100644 --- a/src/main/java/codechicken/nei/WorldOverlayRenderer.java +++ b/src/main/java/codechicken/nei/WorldOverlayRenderer.java @@ -17,6 +17,7 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.math.MathHelper; import codechicken.nei.KeyManager.IKeyStateTracker; +import cpw.mods.fml.relauncher.ReflectionHelper; public class WorldOverlayRenderer implements IKeyStateTracker { @@ -26,12 +27,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker { private static byte[] mobSpawnCache; private static long mobOverlayUpdateTime; private static String oregenPatternName; - private static boolean hasOregenPatternBeenSet = false; public static void reset() { mobOverlay = 0; chunkOverlay = 0; - hasOregenPatternBeenSet = false; + oregenPatternName = null; } @Override @@ -288,18 +288,9 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glVertex3d(x2, y2, z1 + h); } } else if (chunkOverlay == 3) { - if (!hasOregenPatternBeenSet) { - try { - oregenPatternName = ((Enum) Class.forName("gregtech.common.GT_Worldgenerator") - .getDeclaredField("oregenPattern").get(null)).name(); - } catch (Exception ignored) { - oregenPatternName = "AXISSYMMETRICAL"; - } - hasOregenPatternBeenSet = true; - } int gx1; int gz1; - if (oregenPatternName.equals("EQUAL_SPACING")) { + if (getOregenPatternName().equals("EQUAL_SPACING")) { // gt oregen uses new regular pattern gx1 = ((Math.floorDiv(entity.chunkCoordX, 3) * 3) << 4) - intOffsetX; gz1 = ((Math.floorDiv(entity.chunkCoordZ, 3) * 3) << 4) - intOffsetZ; @@ -368,6 +359,22 @@ public class WorldOverlayRenderer implements IKeyStateTracker { GL11.glDisable(GL11.GL_BLEND); } + private static String getOregenPatternName() { + + if (oregenPatternName == null) { + try { + final ClassLoader loader = WorldOverlayRenderer.class.getClassLoader(); + final Class gtWorldGenerator = ReflectionHelper + .getClass(loader, "gregtech.common.GTWorldgenerator", "gregtech.common.GT_Worldgenerator"); + oregenPatternName = ((Enum) gtWorldGenerator.getDeclaredField("oregenPattern").get(null)).name(); + } catch (Exception ignored) { + oregenPatternName = "AXISSYMMETRICAL"; + } + } + + return oregenPatternName; + } + public static void load() { KeyManager.trackers.add(new WorldOverlayRenderer()); } diff --git a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java index 2539c187..fc9c2d51 100644 --- a/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java +++ b/src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java @@ -16,16 +16,19 @@ import codechicken.lib.inventory.InventoryUtils; import codechicken.nei.FastTransferManager; import codechicken.nei.PositionedStack; import codechicken.nei.api.IOverlayHandler; +import cpw.mods.fml.relauncher.ReflectionHelper; public class DefaultOverlayHandler implements IOverlayHandler { - public static Class gtItem; + private static Class gtItem; static { try { - gtItem = Class.forName("gregtech.api.items.GT_MetaBase_Item"); - } catch (ClassNotFoundException ignored) { - gtItem = null; + final ClassLoader loader = DefaultOverlayHandler.class.getClassLoader(); + gtItem = ReflectionHelper + .getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item"); + } catch (Exception ignored) { + /* Do nothing */ } } @@ -85,13 +88,16 @@ public class DefaultOverlayHandler implements IOverlayHandler { } private boolean clearIngredients(GuiContainer gui, List ingreds) { - for (PositionedStack pstack : ingreds) for (Slot slot : (List) gui.inventorySlots.inventorySlots) - if (slot.xDisplayPosition == pstack.relx + offsetx && slot.yDisplayPosition == pstack.rely + offsety) { - if (!slot.getHasStack()) continue; + for (PositionedStack pstack : ingreds) { + for (Slot slot : gui.inventorySlots.inventorySlots) { + if (slot.xDisplayPosition == pstack.relx + offsetx && slot.yDisplayPosition == pstack.rely + offsety) { + if (!slot.getHasStack()) continue; - FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1); - if (slot.getHasStack()) return false; + FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1); + if (slot.getHasStack()) return false; + } } + } return true; } @@ -109,7 +115,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { int slotTransferred = 0; int slotTransferCap = pstack.getMaxStackSize(); - for (Slot slot : (List) gui.inventorySlots.inventorySlots) { + for (Slot slot : gui.inventorySlots.inventorySlots) { if (!slot.getHasStack() || !canMoveFrom(slot, gui)) continue; ItemStack stack = slot.getStack(); @@ -178,7 +184,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { assignedSlots.add(new LinkedList<>()); } - while (avaliableSlots.size() > 0 && remainingIngreds.size() > 0) { + while (!avaliableSlots.isEmpty() && !remainingIngreds.isEmpty()) { for (Iterator iterator = remainingIngreds.iterator(); iterator.hasNext();) { int i = iterator.next(); boolean assigned = false; @@ -196,8 +202,9 @@ public class DefaultOverlayHandler implements IOverlayHandler { } } - if (!assigned || istack.numSlots * istack.stack.getMaxStackSize() >= istack.invAmount) + if (!assigned || istack.numSlots * istack.stack.getMaxStackSize() >= istack.invAmount) { iterator.remove(); + } } } @@ -243,7 +250,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { } private void findInventoryQuantities(GuiContainer gui, List ingredStacks) { - for (Slot slot : (List) gui.inventorySlots.inventorySlots) /* work out how much we have to go round */ { + for (Slot slot : gui.inventorySlots.inventorySlots) /* work out how much we have to go round */ { if (slot.getHasStack() && canMoveFrom(slot, gui)) { ItemStack pstack = slot.getStack(); DistributedIngred istack = findIngred(ingredStacks, pstack); @@ -273,7 +280,7 @@ public class DefaultOverlayHandler implements IOverlayHandler { for (int i = 0; i < ingredients.size(); i++) /* identify slots */ { LinkedList recipeSlots = new LinkedList<>(); PositionedStack pstack = ingredients.get(i); - for (Slot slot : (List) gui.inventorySlots.inventorySlots) { + for (Slot slot : gui.inventorySlots.inventorySlots) { if (slot.xDisplayPosition == pstack.relx + offsetx && slot.yDisplayPosition == pstack.rely + offsety) { recipeSlots.add(slot); break; diff --git a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java index 605fc835..491de8c3 100644 --- a/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java +++ b/src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java @@ -11,22 +11,27 @@ import net.minecraftforge.fluids.FluidStack; import codechicken.nei.api.IStackStringifyHandler; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.ReflectionHelper; public class GTFluidStackStringifyHandler implements IStackStringifyHandler { - protected static Class GTDisplayFluid = null; + protected static Class itemFluidDisplay = null; protected static Method getFluidDisplayStack = null; protected static Method getFluidFromDisplayStack = null; public static boolean replaceAE2FCFluidDrop = false; static { try { - final Class gtUtility = Class.forName("gregtech.api.util.GT_Utility"); + final ClassLoader loader = GTFluidStackStringifyHandler.class.getClassLoader(); + final Class gtUtility = ReflectionHelper + .getClass(loader, "gregtech.api.util.GTUtility", "gregtech.api.util.GT_Utility"); - GTDisplayFluid = Class.forName("gregtech.common.items.GT_FluidDisplayItem"); + itemFluidDisplay = ReflectionHelper.getClass( + loader, + "gregtech.common.items.ItemFluidDisplay", + "gregtech.common.items.GT_FluidDisplayItem"); getFluidFromDisplayStack = gtUtility.getMethod("getFluidFromDisplayStack", ItemStack.class); getFluidDisplayStack = gtUtility.getMethod("getFluidDisplayStack", FluidStack.class, boolean.class); - } catch (Exception ignored) { /* Do nothing */ } @@ -72,7 +77,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler { final Item item = stack.getItem(); try { - if (getFluidFromDisplayStack != null && GTDisplayFluid != null && GTDisplayFluid.isInstance(item)) { + if (getFluidFromDisplayStack != null && itemFluidDisplay != null && itemFluidDisplay.isInstance(item)) { final Object obj = getFluidFromDisplayStack.invoke(null, stack); if (obj != null) {