fix #366

Author: Mari023

CHANGELOG.md

@@ -1,2 +1,3 @@
 - Update zh_cn localisation (#363)
 - PT_BR localisation (#364)
+- fix dupe bug with restock when items turn into different items on use (#366)

build.gradle.kts

@@ -145,6 +145,7 @@ neoForge {
         }
         create("server") {
             server()
+            programArguments.add("nogui")
         }
 
         create("guide") {

src/main/java/de/mari_023/ae2wtlib/AE2wtlibEvents.java

@@ -31,10 +31,11 @@ public class AE2wtlibEvents {
      *
      * @param player   The ServerPlayer
      * @param item     The ItemStack that should be restocked
-     * @param count    Current count of the item
+     * @param now      The ItemStack that is now there
      * @param setStack A callback for setting the final modified item stack
      */
-    public static void restock(ServerPlayer player, ItemStack item, int count, Consumer<ItemStack> setStack) {
+    public static void restock(ServerPlayer player, ItemStack item, ItemStack now, Consumer<ItemStack> setStack) {
+        int count = now.getCount();
         if (player.isCreative())
             return;
         if (item.isEmpty())
@@ -57,6 +58,8 @@ public static void restock(ServerPlayer player, ItemStack item, int count, Consu
         int toAdd = item.getMaxStackSize() - count;
         if (toAdd == 0)
             return;
+        if (!now.isEmpty() && !ItemStack.isSameItemSameComponents(item, now))
+            return;
 
         long changed;
         if (toAdd > 0)
@@ -76,7 +79,7 @@ public static void restock(ServerPlayer player, ItemStack item, int count, Consu
             if (player.getInventory().offhand.contains(item))
                 slot = Inventory.INVENTORY_SIZE;
         }
-        PacketDistributor.sendToPlayer(player, new UpdateRestockPacket(slot, item.getCount()));
+        PacketDistributor.sendToPlayer(player, new UpdateRestockPacket(slot, item));
     }
 
     /**

src/main/java/de/mari_023/ae2wtlib/AE2wtlibForge.java

@@ -86,7 +86,7 @@ public static void handle(LivingEntityUseItemEvent.Finish event) {
         if (!(event.getEntity() instanceof ServerPlayer player))
             return;
 
-        AE2wtlibEvents.restock(player, event.getItem(), event.getResultStack().getCount(), event::setResultStack);
+        AE2wtlibEvents.restock(player, event.getItem(), event.getResultStack(), event::setResultStack);
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
@@ -95,7 +95,7 @@ public static void handle(PlayerInteractEvent.RightClickBlock event) {
             return;
         var item = event.getItemStack();
 
-        AE2wtlibEvents.restock(player, item, item.getCount(), (stack -> player.setItemInHand(event.getHand(), stack)));
+        AE2wtlibEvents.restock(player, item, item, (stack -> player.setItemInHand(event.getHand(), stack)));
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
@@ -104,7 +104,7 @@ public static void handle(PlayerInteractEvent.EntityInteractSpecific event) {
             return;
         var item = event.getItemStack();
 
-        AE2wtlibEvents.restock(player, item, item.getCount(), (stack -> player.setItemInHand(event.getHand(), stack)));
+        AE2wtlibEvents.restock(player, item, item, (stack -> player.setItemInHand(event.getHand(), stack)));
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)
@@ -130,7 +130,7 @@ public static void handle(ArrowNockEvent event) {
         if (!(event.getEntity() instanceof ServerPlayer player))
             return;
         ItemStack projectile = player.getProjectile(event.getBow());
-        AE2wtlibEvents.restock(player, projectile, projectile.getCount(), (itemStack) -> {
+        AE2wtlibEvents.restock(player, projectile, projectile, (itemStack) -> {
         });
     }
 
@@ -141,7 +141,7 @@ public static void handle(ArrowLooseEvent event) {
         if (!(event.getEntity() instanceof ServerPlayer player))
             return;
         ItemStack projectile = player.getProjectile(event.getBow());
-        AE2wtlibEvents.restock(player, projectile, projectile.getCount(), (itemStack) -> {
+        AE2wtlibEvents.restock(player, projectile, projectile, (itemStack) -> {
         });
     }
 

src/main/java/de/mari_023/ae2wtlib/mixin/ServerPlayerGameModeMixin.java

@@ -20,7 +20,7 @@ public class ServerPlayerGameModeMixin {
     @Inject(method = "useItemOn", at = @At(value = "RETURN"))
     private static void handle(ServerPlayer player, Level level, ItemStack original, InteractionHand hand,
             BlockHitResult hitResult, CallbackInfoReturnable<InteractionResult> cir) {
-        AE2wtlibEvents.restock(player, original.copy(), player.getItemInHand(hand).getCount(),
+        AE2wtlibEvents.restock(player, original.copy(), player.getItemInHand(hand),
                 (stack -> player.setItemInHand(hand, stack)));
     }
 }

src/main/java/de/mari_023/ae2wtlib/mixin/ServerPlayerMixin.java

@@ -28,7 +28,7 @@ public void restockDrop(boolean pDropStack, CallbackInfoReturnable<Boolean> cir,
         if (!cir.getReturnValue() || item.isEmpty())
             return;
 
-        AE2wtlibEvents.restock((ServerPlayer) (Object) this, item, item.getCount(),
+        AE2wtlibEvents.restock((ServerPlayer) (Object) this, item, item,
                 (itemStack) -> getInventory().setItem(getInventory().selected, itemStack));
     }
 }

src/main/java/de/mari_023/ae2wtlib/networking/UpdateRestockPacket.java

@@ -1,29 +1,29 @@
 package de.mari_023.ae2wtlib.networking;
 
-import io.netty.buffer.ByteBuf;
-
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 
 import de.mari_023.ae2wtlib.api.AE2wtlibAPI;
 
-public record UpdateRestockPacket(int slot, int amount) implements AE2wtlibPacket {
+public record UpdateRestockPacket(int slot, ItemStack itemStack) implements AE2wtlibPacket {
     public static final Type<UpdateRestockPacket> ID = new Type<>(AE2wtlibAPI.id("update_restock"));
-    public static final StreamCodec<ByteBuf, UpdateRestockPacket> STREAM_CODEC = StreamCodec.composite(
+    public static final StreamCodec<RegistryFriendlyByteBuf, UpdateRestockPacket> STREAM_CODEC = StreamCodec.composite(
             ByteBufCodecs.INT, UpdateRestockPacket::slot,
-            ByteBufCodecs.INT, UpdateRestockPacket::amount,
+            ItemStack.STREAM_CODEC, UpdateRestockPacket::itemStack,
             UpdateRestockPacket::new);
 
     @Override
     public void processPacketData(Player player) {
         switch (slot()) {
-            case Inventory.INVENTORY_SIZE -> player.getInventory().offhand.getFirst().setCount(amount());
+            case Inventory.INVENTORY_SIZE -> player.getInventory().offhand.set(0, itemStack());
             case -1 -> {
             }
-            default -> player.getInventory().getItem(slot()).setCount(amount());
+            default -> player.getInventory().setItem(slot(), itemStack());
         }
     }