New Rule: chestBoatDupeFix

Author: FxMorin

src/main/java/carpetfixes/CFSettings.java

@@ -1871,6 +1871,13 @@ other bugs, except they deserve a category of their own (for sorting purposes...
     )
     public static boolean horseDupeFix = false;
 
+    //by FX - PR0CESS
+    @Rule(
+            desc = "Fixes MULTIPLE dupes using chest boats",
+            category = {BUGFIX,DUPE}
+    )
+    public static boolean chestBoatDupeFix = false;
+
 
     /*
 

src/main/java/carpetfixes/mixins/dupeFixes/chestBoatDupe/ChestBoatEntity_screenDupeMixin.java

@@ -0,0 +1,40 @@
+package carpetfixes.mixins.dupeFixes.chestBoatDupe;
+
+import carpetfixes.CFSettings;
+import carpetfixes.patches.linkedEntityInventory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.vehicle.ChestBoatEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ChestBoatEntity.class)
+public class ChestBoatEntity_screenDupeMixin {
+
+    private final Entity self = (Entity)(Object)this;
+
+
+    @Redirect(
+            method = "createMenu",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/screen/GenericContainerScreenHandler;createGeneric9x3(" +
+                            "ILnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/inventory/Inventory;)" +
+                            "Lnet/minecraft/screen/GenericContainerScreenHandler;"
+            )
+    )
+    public GenericContainerScreenHandler createMenu(int syncId, PlayerInventory playerInventory, Inventory inventory) {
+        if (CFSettings.chestBoatDupeFix) {
+            GenericContainerScreenHandler screenHandler = GenericContainerScreenHandler.createGeneric9x3(
+                    syncId, playerInventory, inventory
+            );
+            ((linkedEntityInventory)screenHandler).setLinkedEntity(self);
+            return screenHandler;
+        } else {
+            return GenericContainerScreenHandler.createGeneric9x3(syncId, playerInventory, inventory);
+        }
+    }
+}

src/main/java/carpetfixes/mixins/dupeFixes/chestBoatDupe/GenericContainerScreenHandler_dupeMixin.java

@@ -0,0 +1,60 @@
+package carpetfixes.mixins.dupeFixes.chestBoatDupe;
+
+import carpetfixes.CFSettings;
+import carpetfixes.patches.linkedEntityInventory;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.vehicle.VehicleInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.screen.GenericContainerScreenHandler;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(GenericContainerScreenHandler.class)
+public class GenericContainerScreenHandler_dupeMixin implements linkedEntityInventory {
+
+    @Shadow
+    @Final
+    private Inventory inventory;
+
+    @Nullable
+    private Entity linkedEntity;
+
+    @Override
+    public void setLinkedEntity(@Nullable Entity linkedEntity) {
+        this.linkedEntity = linkedEntity;
+    }
+
+
+    @Inject(
+            method = "canUse",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    public void canUseWithEntity(PlayerEntity player, CallbackInfoReturnable<Boolean> cir) {
+        if (CFSettings.chestBoatDupeFix && this.linkedEntity != null) {
+            boolean isValid = true;
+            if (this.linkedEntity instanceof VehicleInventory vehicleInventory)
+                isValid = vehicleInventory.canPlayerAccess(player);
+            cir.setReturnValue(isValid && this.inventory.canPlayerUse(player) && this.linkedEntity.isAlive());
+        }
+    }
+
+
+    @Inject(
+            method = "transferSlot(Lnet/minecraft/entity/player/PlayerEntity;I)Lnet/minecraft/item/ItemStack;",
+            at = @At("HEAD"),
+            cancellable = true
+    )
+    private void onlyTransferIfEntityAlive(PlayerEntity p, int i, CallbackInfoReturnable<ItemStack> cir) {
+        if (CFSettings.chestBoatDupeFix && this.linkedEntity != null &&
+                (p.isDead() || p.isRemoved() || !this.linkedEntity.isAlive() || this.linkedEntity.isRemoved()))
+            cir.setReturnValue(ItemStack.EMPTY);
+    }
+}

src/main/java/carpetfixes/patches/linkedEntityInventory.java

@@ -0,0 +1,7 @@
+package carpetfixes.patches;
+
+import net.minecraft.entity.Entity;
+
+public interface linkedEntityInventory {
+    void setLinkedEntity(Entity linkedEntity);
+}

src/main/resources/carpet-fixes.mixins.json

@@ -141,6 +141,8 @@
     "dupeFixes.SimpleInventory_dataDupeMixin",
     "dupeFixes.TripwireBlock_stringDupeMixin",
     "dupeFixes.TripwireHookBlock_hookDupeMixin",
+    "dupeFixes.chestBoatDupe.ChestBoatEntity_screenDupeMixin",
+    "dupeFixes.chestBoatDupe.GenericContainerScreenHandler_dupeMixin",
     "dupeFixes.saferItemTransfer.DropperBlock_dontCopyMixin",
     "entityFixes.AbstractDecorationEntity_triggersTrapsMixin",
     "entityFixes.AbstractMinecartEntity_armorStandMixin",