Merge pull request RobertSkalko#193 from TUsama/backpack

RobertSkalko · web-flow · commit d90f8ebf8e4a · 2025-04-21T17:49:35.000+02:00
fix backpack pick up issue, patch the mouse relocation after clicking…
diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/container/BackpackButton.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/container/BackpackButton.java
@@ -23,9 +23,6 @@ public class BackpackButton extends ImageButton {
 
     public BackpackButton(Backpacks.BackpackType type, int xPos, int yPos) {
         super(xPos, yPos, SX, SY, 0, 0, SY, new ResourceLocation("empty"), (button) -> {
-            //MOUSEPOS.X = Minecraft.getInstance().mouseHandler.xpos(); todo this isnt working for some reason
-            //MOUSEPOS.Y = Minecraft.getInstance().mouseHandler.ypos();
-            //MOUSEPOS.SET_MOUSE = true;
             Packets.sendToServer(new OpenBackpackPacket(type));
         });
         this.type = type;
@@ -47,6 +44,13 @@ public void renderWidget(GuiGraphics gui, int mouseX, int mouseY, float delta) {
 
     }
 
+    @Override
+    public void onClick(double pMouseX, double pMouseY) {
+        BackpackScreen.iMouseX = Minecraft.getInstance().mouseHandler.xpos();
+        BackpackScreen.iMouseY = Minecraft.getInstance().mouseHandler.ypos();
+        super.onClick(pMouseX, pMouseY);
+    }
+
     public void setModTooltip() {
         this.setTooltip(Tooltip.create(TextUTIL.mergeList(Arrays.asList(
                 this.type.name.locName()
diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/container/BackpackScreen.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/container/BackpackScreen.java
@@ -1,18 +1,25 @@
 package com.robertx22.mine_and_slash.capability.player.container;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import com.robertx22.mine_and_slash.capability.player.data.Backpacks;
+import com.robertx22.mine_and_slash.mixin_ducks.MouseHandlerDuck;
 import com.robertx22.mine_and_slash.mmorpg.SlashRef;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Inventory;
+import net.minecraftforge.client.event.ScreenEvent;
 
 public class BackpackScreen extends AbstractContainerScreen<BackpackMenu> {
 
 
     public static final ResourceLocation BACKGROUND_LOCATION = new ResourceLocation(SlashRef.MODID, "textures/gui/master_bag.png");
 
+    public static double iMouseX = (double)(Minecraft.getInstance().getWindow().getScreenWidth() / 2);
+    public static double iMouseY = (double)(Minecraft.getInstance().getWindow().getHeight() / 2);
+
     public BackpackScreen(BackpackMenu pMenu, Inventory pPlayerInventory, Component txt) {
         super(pMenu, pPlayerInventory, Component.literal(""));
         this.imageWidth = 199;
@@ -33,16 +40,31 @@ protected void init() {
             y += 18;
         }
 
+        MouseHandlerDuck mouseHandler = (MouseHandlerDuck) Minecraft.getInstance().mouseHandler;
+        //init() will be invoked when this screen be set to Minecraft.screen after the releaseMouse(), see setScreen();
+        mouseHandler.setXPos(iMouseX);
+        mouseHandler.setYPos(iMouseY);
+        //from MouseHandler.class releaseMouse()
+        InputConstants.grabOrReleaseMouse(this.minecraft.getWindow().getWindow(), 212993, iMouseX, iMouseY);
     }
 
     public void render(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY, float pPartialTick) {
         this.renderBackground(pGuiGraphics);
         super.render(pGuiGraphics, pMouseX, pMouseY, pPartialTick);
         this.renderTooltip(pGuiGraphics, pMouseX, pMouseY);
 
+    }
 
+    @Override
+    public void onClose() {
+        super.onClose();
+        //reset position
+        iMouseX = (double)(Minecraft.getInstance().getWindow().getScreenWidth() / 2);
+        iMouseY = (double)(Minecraft.getInstance().getWindow().getHeight() / 2);
     }
 
+
+
     @Override
     protected void renderLabels(GuiGraphics pGuiGraphics, int pMouseX, int pMouseY) {
         //  pGuiGraphics.drawString(this.font, this.title, this.titleLabelX, this.titleLabelY, 4210752, false);
diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/data/Backpacks.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/data/Backpacks.java
@@ -96,26 +96,32 @@ public BackpackInventory getInv(BackpackType type) {
     }
 
 
-    public void tryAutoPickup(Player p, ItemStack stack) {
+    public boolean tryAutoPickup(Player p, ItemStack stack, boolean shouldPlaySound) {
 
         if (p.getInventory().countItem(SlashItems.MASTER_BAG.get()) < 1) {
-            return;
+            return false;
         }
-
+        boolean result = false;
         for (BackpackType type : BackpackType.values()) {
             if (type.isValid(stack)) {
                 var bag = getInv(type);
 
-                if (bag.hasFreeSlots()) {
+                if (bag.canAddItem(stack)) {
                     bag.addItem(stack.copy());
                     stack.shrink(stack.getCount() + 10); // just in case
-                    SoundUtils.playSound(this.player, SoundEvents.ITEM_PICKUP);
-                    return;
+                    if (shouldPlaySound) SoundUtils.playSound(this.player, SoundEvents.ITEM_PICKUP);
+                    result = true;
+                    break;
                 }
             }
         }
 
+        return result;
+
+    }
 
+    public boolean tryAutoPickup(Player p, ItemStack stack){
+        return tryAutoPickup(p, stack, true);
     }
     // todo every time before you open backpack, it will replace locked slots with blocked slots that cant be clicked on and throw out/give items back
 
diff --git a/src/main/java/com/robertx22/mine_and_slash/capability/player/data/PlayerConfigData.java b/src/main/java/com/robertx22/mine_and_slash/capability/player/data/PlayerConfigData.java
@@ -121,28 +121,10 @@ public boolean trySalvageOnPickup(Player player, ItemStack stack) {
 
                 if (doSalvage) {
                     SoundUtils.playSound(player, SoundEvents.EXPERIENCE_ORB_PICKUP, 0.75F, 1.25F);
-                    stack.shrink(100);
+                    stack.shrink(stack.getCount() + 100);
                     data.getSalvageResult(ex).forEach(e -> {
                         Backpacks backpacks = Load.backpacks(player).getBackpacks();
-                        //copy tryAutoPickup() but without playing sound
-                        if (player.getInventory().countItem(SlashItems.MASTER_BAG.get()) >= 1) {
-                            for (Backpacks.BackpackType type : Backpacks.BackpackType.values()) {
-                                if (type.isValid(e)) {
-                                    var bag = backpacks.getInv(type);
-
-                                    if (bag.hasFreeSlots()) {
-                                        bag.addItem(e.copy());
-                                        e.shrink(e.getCount() + 10);
-                                    } else {
-                                        PlayerUtils.giveItem(e, player);
-                                    }
-                                }
-                            }
-
-                        } else {
-                            PlayerUtils.giveItem(e, player);
-                        }
-                        backpacks.tryAutoPickup(player, stack);
+                        if (!backpacks.tryAutoPickup(player, e, false)) PlayerUtils.giveItem(e, player);
                     });
                     return true;
                 }
diff --git a/src/main/java/com/robertx22/mine_and_slash/mixin_ducks/MouseHandlerDuck.java b/src/main/java/com/robertx22/mine_and_slash/mixin_ducks/MouseHandlerDuck.java
@@ -0,0 +1,6 @@
+package com.robertx22.mine_and_slash.mixin_ducks;
+
+public interface MouseHandlerDuck {
+    void setXPos(double pos);
+    void setYPos(double pos);
+}
diff --git a/src/main/java/com/robertx22/mine_and_slash/mixins/MouseHandlerMixin.java b/src/main/java/com/robertx22/mine_and_slash/mixins/MouseHandlerMixin.java
@@ -0,0 +1,25 @@
+package com.robertx22.mine_and_slash.mixins;
+
+import com.robertx22.mine_and_slash.mixin_ducks.MouseHandlerDuck;
+import net.minecraft.client.MouseHandler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(value = MouseHandler.class)
+public class MouseHandlerMixin implements MouseHandlerDuck {
+
+
+    @Shadow private double xpos;
+
+    @Shadow private double ypos;
+
+    @Override
+    public void setXPos(double pos) {
+        this.xpos = pos;
+    }
+
+    @Override
+    public void setYPos(double pos) {
+        this.ypos = pos;
+    }
+}
diff --git a/src/main/java/com/robertx22/mine_and_slash/mmorpg/event_registers/CommonEvents.java b/src/main/java/com/robertx22/mine_and_slash/mmorpg/event_registers/CommonEvents.java
@@ -43,6 +43,7 @@
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingEvent;
 import net.minecraftforge.event.entity.player.*;
+import net.minecraftforge.eventbus.api.EventPriority;
 
 public class CommonEvents {
 
@@ -166,7 +167,8 @@ public static void register() {
                     }
                 }
             }
-        });
+        }, EventPriority.HIGHEST);
+
         ForgeEvents.registerForgeEvent(PlayerEvent.Clone.class, event ->
 
         {
diff --git a/src/main/resources/mmorpg-mixins.json b/src/main/resources/mmorpg-mixins.json
@@ -26,7 +26,8 @@
     "AccessorRenderType",
     "ItemGlintMixin",
     "ItemStackMixin",
-    "WorldRendererMixin"
+    "WorldRendererMixin",
+    "MouseHandlerMixin"
   ],
   "injectors": {
     "defaultRequire": 1

Original file line number	Diff line number	Diff line change
`@@ -96,26 +96,32 @@ public BackpackInventory getInv(BackpackType type) {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`
`99`		`- public void tryAutoPickup(Player p, ItemStack stack) {`
	`99`	`+ public boolean tryAutoPickup(Player p, ItemStack stack, boolean shouldPlaySound) {`
`100`	`100`
`101`	`101`	`if (p.getInventory().countItem(SlashItems.MASTER_BAG.get()) < 1) {`
`102`		`- return;`
	`102`	`+ return false;`
`103`	`103`	`}`
`104`		`-`
	`104`	`+ boolean result = false;`
`105`	`105`	`for (BackpackType type : BackpackType.values()) {`
`106`	`106`	`if (type.isValid(stack)) {`
`107`	`107`	`var bag = getInv(type);`
`108`	`108`
`109`		`- if (bag.hasFreeSlots()) {`
	`109`	`+ if (bag.canAddItem(stack)) {`
`110`	`110`	`bag.addItem(stack.copy());`
`111`	`111`	`stack.shrink(stack.getCount() + 10); // just in case`
`112`		`- SoundUtils.playSound(this.player, SoundEvents.ITEM_PICKUP);`
`113`		`- return;`
	`112`	`+ if (shouldPlaySound) SoundUtils.playSound(this.player, SoundEvents.ITEM_PICKUP);`
	`113`	`+ result = true;`
	`114`	`+ break;`
`114`	`115`	`}`
`115`	`116`	`}`
`116`	`117`	`}`
`117`	`118`
	`119`	`+ return result;`
	`120`	`+`
	`121`	`+ }`
`118`	`122`
	`123`	`+ public boolean tryAutoPickup(Player p, ItemStack stack){`
	`124`	`+ return tryAutoPickup(p, stack, true);`
`119`	`125`	`}`
`120`	`126`	`// todo every time before you open backpack, it will replace locked slots with blocked slots that cant be clicked on and throw out/give items back`
`121`	`127`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`import net.minecraftforge.event.entity.living.LivingDeathEvent;`
`44`	`44`	`import net.minecraftforge.event.entity.living.LivingEvent;`
`45`	`45`	`import net.minecraftforge.event.entity.player.*;`
	`46`	`+import net.minecraftforge.eventbus.api.EventPriority;`
`46`	`47`
`47`	`48`	`public class CommonEvents {`
`48`	`49`
`@@ -166,7 +167,8 @@ public static void register() {`
`166`	`167`	`}`
`167`	`168`	`}`
`168`	`169`	`}`
`169`		`- });`
	`170`	`+ }, EventPriority.HIGHEST);`
	`171`	`+`
`170`	`172`	`ForgeEvents.registerForgeEvent(PlayerEvent.Clone.class, event ->`
`171`	`173`
`172`	`174`	`{`