add blacklist for appeng ghost item compact (#6)

GTNewHorizons · Oct 17, 2022 · c5bb06f · c5bb06f
1 parent 939dcfc
commit c5bb06f
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/main/scala/net/bdew/neiaddons/appeng/AddonAppeng.java b/src/main/scala/net/bdew/neiaddons/appeng/AddonAppeng.java
@@ -35,6 +35,7 @@ public class AddonAppeng extends BaseAddon {
     public static AddonAppeng instance;
 
     public static final String setWorkbenchCommand = "SetAE2FakeSlot";
+    public static String[] blackListGuiName;
 
     public static Class<? extends GuiContainer> clsBaseGui;
     public static Class<? extends Container> clsBaseContainer;
@@ -60,6 +61,17 @@ public void preInit(FMLPreInitializationEvent ev) {
     @Override
     public void init(Side side) throws Exception {
         try {
+            blackListGuiName = NEIAddons.config
+                    .get(
+                            getName(),
+                            "Blacklist Gui Class Name",
+                            new String[] {
+                                "com.glodblock.github.client.gui.GuiFluidPatternTerminal",
+                                "com.glodblock.github.client.gui.GuiFluidPatternTerminalEx"
+                            },
+                            "These Gui won't have the NEI drag item handler from NEI addon.")
+                    .getStringList();
+
             clsBaseContainer = Utils.getAndCheckClass("appeng.container.AEBaseContainer", Container.class);
             clsSlotFake = Utils.getAndCheckClass("appeng.container.slot.SlotFake", Slot.class);
             mSlotFakeIsEnabled = clsSlotFake.getMethod("isEnabled");

diff --git a/src/main/scala/net/bdew/neiaddons/appeng/AppEngGuiHandler.java b/src/main/scala/net/bdew/neiaddons/appeng/AppEngGuiHandler.java
@@ -24,12 +24,10 @@
 public class AppEngGuiHandler extends INEIGuiAdapter {
     @Override
     public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
-        if (AddonAppeng.clsBaseGui.isInstance(gui)) {
+        if (AddonAppeng.clsBaseGui.isInstance(gui) && !checkBlacklist(gui)) {
             final Slot currentSlot = getSlotAtPosition(gui, mouseX, mouseY);
 
-            if (currentSlot != null
-                    && AddonAppeng.clsSlotFake.isInstance(currentSlot)
-                    && SlotHelper.isSlotEnabled(currentSlot)) {
+            if (AddonAppeng.clsSlotFake.isInstance(currentSlot) && SlotHelper.isSlotEnabled(currentSlot)) {
 
                 if (ClientHandler.enabledCommands.contains(AddonAppeng.setWorkbenchCommand)) {
                     final ItemStack stack = draggedStack.copy();
@@ -59,6 +57,16 @@ public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemSta
         return super.handleDragNDrop(gui, mouseX, mouseY, draggedStack, button);
     }
 
+    private boolean checkBlacklist(GuiContainer gui) {
+        String name = gui.getClass().getName();
+        for (String blacklist : AddonAppeng.blackListGuiName) {
+            if (blacklist.equals(name)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private boolean isMouseOverSlot(GuiContainer gui, Slot slot, int mouseX, int mouseY) {
         int slotX = slot.xDisplayPosition;
         int slotY = slot.yDisplayPosition;

diff --git a/src/main/scala/net/bdew/neiaddons/appeng/SetFakeSlotCommandHandler.java b/src/main/scala/net/bdew/neiaddons/appeng/SetFakeSlotCommandHandler.java
@@ -22,9 +22,9 @@ public void handle(NBTTagCompound data, EntityPlayerMP player) {
         ItemStack stack = ItemStack.loadItemStackFromNBT(data.getCompoundTag("item"));
         int slotNum = data.getInteger("slot");
         Container cont = player.openContainer;
-        if ((cont != null) && AddonAppeng.clsBaseContainer.isInstance(cont)) {
+        if (AddonAppeng.clsBaseContainer.isInstance(cont)) {
             Slot slot = cont.getSlot(slotNum);
-            if ((slot != null) && AddonAppeng.clsSlotFake.isInstance(slot) && SlotHelper.isSlotEnabled(slot)) {
+            if (AddonAppeng.clsSlotFake.isInstance(slot) && SlotHelper.isSlotEnabled(slot)) {
                 ItemStack targetStack = slot.getStack();
                 if (null != targetStack && !data.getBoolean("replace") && stack.isItemEqual(targetStack)) {
                     stack.stackSize = slot.getStack().stackSize + stack.stackSize;