From 0c7459d371a81d83705a6692ab6371db95ef4a27 Mon Sep 17 00:00:00 2001 From: Sen Date: Sat, 5 Jul 2025 14:17:57 +0200 Subject: [PATCH] further cheat improvements, change some tabs --- .../src/main/java/client/gui/container/GuiContainer.java | 4 ++-- common/src/main/java/common/init/ItemRegistry.java | 2 +- common/src/main/java/common/item/CheatTab.java | 7 ++++++- common/src/main/java/common/item/tool/ItemAmmo.java | 2 +- common/src/main/java/common/item/tool/ItemArmor.java | 2 +- common/src/main/java/common/item/tool/ItemBow.java | 2 +- common/src/main/java/common/item/tool/ItemGunBase.java | 2 +- common/src/main/java/common/item/tool/ItemHorseArmor.java | 2 +- common/src/main/java/common/item/tool/ItemSword.java | 2 +- server/src/main/java/server/network/Player.java | 5 +++-- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/client/src/main/java/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java index b127d81e..f99d284c 100755 --- a/client/src/main/java/client/gui/container/GuiContainer.java +++ b/client/src/main/java/client/gui/container/GuiContainer.java @@ -710,7 +710,7 @@ public abstract class GuiContainer extends Gui } public void dropItem() { - if (this.gm != null && this.gm.player != null && this.theSlot != null && this.theSlot.getHasStack()) + if (!this.clickSide(this.gm.mouse_x, this.gm.mouse_y, -100, this.gm.shift(), this.gm.ctrl()) && this.gm != null && this.gm.player != null && this.theSlot != null && this.theSlot.getHasStack()) { this.handleMouseClick(this.theSlot, this.theSlot.slotNumber, this.gm.ctrl() ? 1 : 0, 4); } @@ -872,7 +872,7 @@ public abstract class GuiContainer extends Gui int idx = sx + (sy + off) * this.cheatWidth; if(idx >= 0 && idx < ITEM_LIST.size()) { - if(slot >= 0 || instant) { + if(slot != -1 || instant) { this.gm.player.client.addToSendQueue(new CPacketCheat(ITEM_LIST.get(idx), slot < 0 ? slot : -2 - slot, full)); } else { diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java index 93b06813..baf855e1 100755 --- a/common/src/main/java/common/init/ItemRegistry.java +++ b/common/src/main/java/common/init/ItemRegistry.java @@ -226,7 +226,7 @@ public abstract class ItemRegistry { register("bow", (new ItemBow()).setDisplay("Bogen")); register("boltgun", (new ItemBoltgun()).setDisplay("Bolter")); register("bolt", (new ItemAmmo(5, 1.0f, 128)).setDisplay("Bolter-Munition")); - register("arrow", (new ItemArrow()).setDisplay("Pfeil").setTab(CheatTab.COMBAT).setMaxAmount(128)); + register("arrow", (new ItemArrow()).setDisplay("Pfeil").setTab(CheatTab.WEAPONS).setMaxAmount(128)); Item coal = (new Item()).setDisplay("Kohle").setTab(CheatTab.METALS); register("coal", coal); register("charcoal", (new Item()).setDisplay("Holzkohle").setTab(CheatTab.METALS)); diff --git a/common/src/main/java/common/item/CheatTab.java b/common/src/main/java/common/item/CheatTab.java index bb7a5638..bc36fc81 100755 --- a/common/src/main/java/common/item/CheatTab.java +++ b/common/src/main/java/common/item/CheatTab.java @@ -77,11 +77,16 @@ public enum CheatTab { return Items.water_bucket; } }, - COMBAT("Kampf", false) { + WEAPONS("Waffen", false) { protected Item getIconItem() { return Items.bow; } }, + ARMOR("Rüstung", false) { + protected Item getIconItem() { + return Items.iron_chestplate; + } + }, MAGIC("Tränke & Verzauberungen", false) { protected Item getIconItem() { return Items.potion; diff --git a/common/src/main/java/common/item/tool/ItemAmmo.java b/common/src/main/java/common/item/tool/ItemAmmo.java index ffacc2ab..0c2f2591 100755 --- a/common/src/main/java/common/item/tool/ItemAmmo.java +++ b/common/src/main/java/common/item/tool/ItemAmmo.java @@ -10,7 +10,7 @@ public class ItemAmmo extends ItemMagnetic { public ItemAmmo(int damage, float explosion, int stack) { this.setMaxAmount(stack); - this.setTab(CheatTab.COMBAT); + this.setTab(CheatTab.WEAPONS); this.damage = damage; this.explosion = explosion; } diff --git a/common/src/main/java/common/item/tool/ItemArmor.java b/common/src/main/java/common/item/tool/ItemArmor.java index c1e53af9..fc4bc62a 100755 --- a/common/src/main/java/common/item/tool/ItemArmor.java +++ b/common/src/main/java/common/item/tool/ItemArmor.java @@ -53,7 +53,7 @@ public class ItemArmor extends Item // this.renderIndex = renderIndex; this.damageReduceAmount = material.getDamageReduction(armorType); this.setMaxDamage(material.getDurability(armorType)); - this.setTab(CheatTab.COMBAT); + this.setTab(CheatTab.ARMOR); } public int getColorFromItemStack(ItemStack stack, int renderPass) diff --git a/common/src/main/java/common/item/tool/ItemBow.java b/common/src/main/java/common/item/tool/ItemBow.java index 6da38765..44252f5c 100755 --- a/common/src/main/java/common/item/tool/ItemBow.java +++ b/common/src/main/java/common/item/tool/ItemBow.java @@ -18,7 +18,7 @@ public class ItemBow extends Item public ItemBow() { this.setMaxDamage(384); - this.setTab(CheatTab.COMBAT); + this.setTab(CheatTab.WEAPONS); } /** diff --git a/common/src/main/java/common/item/tool/ItemGunBase.java b/common/src/main/java/common/item/tool/ItemGunBase.java index c91efef0..cc12b709 100755 --- a/common/src/main/java/common/item/tool/ItemGunBase.java +++ b/common/src/main/java/common/item/tool/ItemGunBase.java @@ -20,7 +20,7 @@ public abstract class ItemGunBase extends Item public ItemGunBase(int durability) { this.setMaxDamage(durability); - this.setTab(CheatTab.COMBAT); + this.setTab(CheatTab.WEAPONS); } public ItemAction getItemPosition(ItemStack stack) diff --git a/common/src/main/java/common/item/tool/ItemHorseArmor.java b/common/src/main/java/common/item/tool/ItemHorseArmor.java index b99127a2..9880717c 100755 --- a/common/src/main/java/common/item/tool/ItemHorseArmor.java +++ b/common/src/main/java/common/item/tool/ItemHorseArmor.java @@ -12,7 +12,7 @@ public class ItemHorseArmor extends Item { this.material = material; this.texture = texture; this.setMaxAmount(1); - this.setTab(CheatTab.COMBAT); + this.setTab(CheatTab.ARMOR); } public boolean isMagnetic() { diff --git a/common/src/main/java/common/item/tool/ItemSword.java b/common/src/main/java/common/item/tool/ItemSword.java index d3870c22..bc516388 100755 --- a/common/src/main/java/common/item/tool/ItemSword.java +++ b/common/src/main/java/common/item/tool/ItemSword.java @@ -23,7 +23,7 @@ public class ItemSword extends Item { this.material = material; this.setMaxDamage(material.getDurability()); - this.setTab(CheatTab.COMBAT); + this.setTab(CheatTab.WEAPONS); this.attackDamage = 4 + material.getDamage(); } diff --git a/server/src/main/java/server/network/Player.java b/server/src/main/java/server/network/Player.java index 844f75ec..80a5b755 100755 --- a/server/src/main/java/server/network/Player.java +++ b/server/src/main/java/server/network/Player.java @@ -2888,9 +2888,10 @@ public class Player extends User implements ICrafting, Executor, IPlayer if(amount <= 0) return; } + else if(packet.getSlot() <= -2 - 9) { + this.entity.dropItem(stack, false, true); + } else { - if(packet.getSlot() <= -2 - 9) - return; Slot slot = packet.getSlot() < 0 ? this.entity.inventoryContainer.getSlot(36 + -2 - packet.getSlot()) : this.entity.openContainer.getSlot(packet.getSlot()); if(slot == null || !slot.canCheatItem()) return;