From 1fa3d76aedbafeecb6520d7be4eaab442a0418dc Mon Sep 17 00:00:00 2001 From: Sen Date: Mon, 8 Sep 2025 00:41:22 +0200 Subject: [PATCH] improve container gui --- client/src/main/java/client/gui/container/GuiContainer.java | 3 ++- .../src/main/java/common/entity/npc/EntityCameraHolder.java | 2 +- common/src/main/java/common/entity/npc/EntityDwarf.java | 2 +- common/src/main/java/common/entity/npc/EntityFireDemon.java | 2 +- common/src/main/java/common/entity/npc/EntityGoblin.java | 2 +- common/src/main/java/common/entity/npc/EntityNPC.java | 2 +- common/src/main/java/common/entity/npc/EntityPrimarch.java | 2 +- common/src/main/java/common/entity/npc/EntitySlime.java | 2 +- common/src/main/java/common/vars/Vars.java | 2 ++ server/src/main/java/server/network/Player.java | 6 ++++++ 10 files changed, 17 insertions(+), 8 deletions(-) diff --git a/client/src/main/java/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java index 69b241d6..c3511a88 100755 --- a/client/src/main/java/client/gui/container/GuiContainer.java +++ b/client/src/main/java/client/gui/container/GuiContainer.java @@ -38,6 +38,7 @@ import common.packet.CPacketAction; import common.packet.CPacketCheat; import common.util.ExtMath; import common.util.Util; +import common.vars.Vars; import common.util.Color; import common.util.Equipment; @@ -793,7 +794,7 @@ public abstract class GuiContainer extends Gui } if(this.gm != null && this.gm.player != null) - this.inventoryLabel.setText((this.gm.player.getInventoryWeight() > this.gm.player.getInventoryCapacity() ? Color.RED : Color.NEON) + String.format("% 5d / % 5d", this.gm.player.getInventoryWeight(), this.gm.player.getInventoryCapacity())); + this.inventoryLabel.setText((Vars.itemWeight && this.gm.player.getInventoryWeight() > this.gm.player.getInventoryCapacity() ? Color.RED : Color.NEON) + String.format("% 5d / % 5d", this.gm.player.getInventoryWeight(), this.gm.player.getInventoryCapacity())); } public void renderItemOverlayIntoGUI(ItemStack stack, int xPosition, int yPosition, String text) diff --git a/common/src/main/java/common/entity/npc/EntityCameraHolder.java b/common/src/main/java/common/entity/npc/EntityCameraHolder.java index 33a08154..1ba3c2ab 100755 --- a/common/src/main/java/common/entity/npc/EntityCameraHolder.java +++ b/common/src/main/java/common/entity/npc/EntityCameraHolder.java @@ -11,7 +11,7 @@ public class EntityCameraHolder extends EntityNPC { } public int getInventoryCapacity() { - return 1; + return 0; } public boolean hasArmorSlot(Equipment slot) { diff --git a/common/src/main/java/common/entity/npc/EntityDwarf.java b/common/src/main/java/common/entity/npc/EntityDwarf.java index 1e112175..7b0c4304 100755 --- a/common/src/main/java/common/entity/npc/EntityDwarf.java +++ b/common/src/main/java/common/entity/npc/EntityDwarf.java @@ -10,7 +10,7 @@ public class EntityDwarf extends EntityNPC { } public int getInventoryCapacity() { - return 30; + return 800; } // public boolean isAggressive() { diff --git a/common/src/main/java/common/entity/npc/EntityFireDemon.java b/common/src/main/java/common/entity/npc/EntityFireDemon.java index 2e3262d6..f7bceeb7 100755 --- a/common/src/main/java/common/entity/npc/EntityFireDemon.java +++ b/common/src/main/java/common/entity/npc/EntityFireDemon.java @@ -14,7 +14,7 @@ public class EntityFireDemon extends EntityFlyingNPC { } public int getInventoryCapacity() { - return 48; + return 2800; } // public boolean isAggressive() { diff --git a/common/src/main/java/common/entity/npc/EntityGoblin.java b/common/src/main/java/common/entity/npc/EntityGoblin.java index f387058f..83500dcf 100755 --- a/common/src/main/java/common/entity/npc/EntityGoblin.java +++ b/common/src/main/java/common/entity/npc/EntityGoblin.java @@ -10,7 +10,7 @@ public class EntityGoblin extends EntityNPC { } public int getInventoryCapacity() { - return 24; + return 600; } public boolean isAggressive(Class clazz) { diff --git a/common/src/main/java/common/entity/npc/EntityNPC.java b/common/src/main/java/common/entity/npc/EntityNPC.java index 4141f580..a6502e34 100755 --- a/common/src/main/java/common/entity/npc/EntityNPC.java +++ b/common/src/main/java/common/entity/npc/EntityNPC.java @@ -2758,7 +2758,7 @@ public abstract class EntityNPC extends EntityLiving implements IInventory } public int getInventoryCapacity() { - return 36; + return 1200; } public int getInventoryWeight() { diff --git a/common/src/main/java/common/entity/npc/EntityPrimarch.java b/common/src/main/java/common/entity/npc/EntityPrimarch.java index 1c8e9218..6e86b135 100755 --- a/common/src/main/java/common/entity/npc/EntityPrimarch.java +++ b/common/src/main/java/common/entity/npc/EntityPrimarch.java @@ -88,7 +88,7 @@ public class EntityPrimarch extends EntityMobNPC { } public int getInventoryCapacity() { - return 48; + return 2500; } // public boolean isAggressive() { diff --git a/common/src/main/java/common/entity/npc/EntitySlime.java b/common/src/main/java/common/entity/npc/EntitySlime.java index a85bf93e..75517c7c 100755 --- a/common/src/main/java/common/entity/npc/EntitySlime.java +++ b/common/src/main/java/common/entity/npc/EntitySlime.java @@ -44,7 +44,7 @@ public class EntitySlime extends EntityNPC } public int getInventoryCapacity() { - return 12; + return 1000; } public boolean hasArmorSlot(Equipment slot) { diff --git a/common/src/main/java/common/vars/Vars.java b/common/src/main/java/common/vars/Vars.java index 2c9cbb13..67c136e3 100755 --- a/common/src/main/java/common/vars/Vars.java +++ b/common/src/main/java/common/vars/Vars.java @@ -191,6 +191,8 @@ public abstract class Vars { public static boolean skullDrop = true; @Var(name = "deviceExplosions") public static boolean deviceExplosions = true; + @Var(name = "itemWeight") + public static boolean itemWeight = true; @Var(name = "keepInventory") public static boolean keepInventory = false; diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 84eb824e..9066d071 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -957,6 +957,12 @@ public class Player extends User implements Executor, IPlayer this.entity.openContainer.clearStacks(); this.entity.openContainer.detectAndSendChanges(); + if(Vars.itemWeight) { + int weight = this.entity.getInventoryWeight(); + int capacity = this.entity.getInventoryCapacity(); + if(weight > capacity) + this.entity.addEffect(new StatusEffect(Effect.SLOWNESS, 100, Math.min(5, (int)((float)(weight - capacity) / (float)capacity * 10.0f)))); + } // if(!this.worldObj.client) if (/* !this.worldObj.client && */ !this.entity.openContainer.canInteractWith(this.entity))