Fix that the clicked slot is not determined correctly

GTNewHorizons · Nov 7, 2024 · 06ed79a · 06ed79a
1 parent 12ebe0b
commit 06ed79a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java
@@ -2,7 +2,6 @@
 
 import static com.glodblock.github.client.gui.container.ContainerLevelMaintainer.createLevelValues;
 
-import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -354,18 +353,21 @@ public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
         return null;
     }
 
-    private Rectangle getSlotArea(SlotFake slot) {
-        return new Rectangle(guiLeft + slot.getX(), guiTop + slot.getY(), 16, 16);
-    }
-
     @Override
     public boolean handleDragNDrop(GuiContainer gui, int mouseX, int mouseY, ItemStack draggedStack, int button) {
-        if (draggedStack != null) {
-            draggedStack.stackSize = 0;
+        if (draggedStack == null) {
+            return false;
         }
+
+        draggedStack.stackSize = 0;
+        Slot slotAtPosition = this.getSlotAtPosition(mouseX, mouseY);
+        if (slotAtPosition == null) {
+            return false;
+        }
+
         for (int i = 0; i < this.cont.getRequestSlots().length; i++) {
             SlotFluidConvertingFake slot = this.cont.getRequestSlots()[i];
-            if (getSlotArea(slot).contains(mouseX, mouseY) && draggedStack != null) {
+            if (slotAtPosition.equals(slot)) {
                 ItemStack itemStack = createLevelValues(draggedStack.copy());
                 itemStack.getTagCompound().setInteger(TLMTags.Index.tagName, i);
                 slot.putStack(itemStack);

diff --git a/src/main/resources/META-INF/ae2fc_at.cfg b/src/main/resources/META-INF/ae2fc_at.cfg
@@ -7,3 +7,5 @@ public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop
 public net.minecraft.client.gui.inventory.GuiContainer field_147006_u #theSlot
 
 public net.minecraft.client.renderer.texture.TextureMap field_110574_e # mapRegisteredSprites
+
+protected net.minecraft.client.gui.inventory.GuiContainer func_146975_c(II)Lnet.minecraft.inventory.Slot; # getSlotAtPosition
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,5 @@ public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop
		public net.minecraft.client.gui.inventory.GuiContainer field_147006_u #theSlot

		public net.minecraft.client.renderer.texture.TextureMap field_110574_e # mapRegisteredSprites

		protected net.minecraft.client.gui.inventory.GuiContainer func_146975_c(II)Lnet.minecraft.inventory.Slot; # getSlotAtPosition