Add gamerule to toggle blocks/cats stopping containers being opened

Author: DragonEggBedrockBreaking

src/main/java/uk/debb/vanilla_disable/gamerules/RegisterGamerules.java

@@ -382,6 +382,7 @@ public static MinecraftServer getServer() {
     public static GameRules.Key<GameRules.BooleanValue> CROSSBOW_SPAMMING;
     public static GameRules.Key<GameRules.BooleanValue> CREATIVE_SWORD_CAN_BREAK_BLOCKS;
     public static GameRules.Key<GameRules.BooleanValue> PUSHABLE_BUDDING_AMETHYST;
+    public static GameRules.Key<GameRules.BooleanValue> CONTAINER_OPENING_BLOCKED;
 
     @Override
     public void onInitialize() {
@@ -1097,6 +1098,8 @@ public void onInitialize() {
                 "creativeSwordCanBreakBlocks", CreateGameruleCategories.VD_MISC, GameRuleFactory.createBooleanRule(false));
             PUSHABLE_BUDDING_AMETHYST       = GameRuleRegistry.register(
                 "pushableBuddingAmethyst",     CreateGameruleCategories.VD_MISC, GameRuleFactory.createBooleanRule(false));
+            CONTAINER_OPENING_BLOCKED       = GameRuleRegistry.register(
+                "containerOpeningBlocked",     CreateGameruleCategories.VD_MISC, GameRuleFactory.createBooleanRule(true));
         }
 
         // Registering the Minecraft server to when it actually starts

src/main/java/uk/debb/vanilla_disable/mixin/misc/MixinChestBlock.java

@@ -0,0 +1,28 @@
+package uk.debb.vanilla_disable.mixin.misc;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.block.ChestBlock;
+import uk.debb.vanilla_disable.gamerules.RegisterGamerules;
+
+@Mixin(ChestBlock.class)
+public abstract class MixinChestBlock {
+    /**
+     * @author DragonEggBedrockBreaking
+     * @reason prevent containers from being blocked
+     * @param levelAccessor the accessor for the level
+     * @param blockPos the position of the chest
+     * @param cir the returnable callback info (Boolean)
+     */
+    @Inject(method = "isChestBlockedAt", at = @At("HEAD"), cancellable = true)
+    private static void chestNotBlocked(LevelAccessor levelAccessor, BlockPos blockPos, CallbackInfoReturnable<Boolean> cir) {
+        if (RegisterGamerules.getServer() == null) return;
+        if (!RegisterGamerules.getServer().getGameRules().getBoolean(RegisterGamerules.CONTAINER_OPENING_BLOCKED)) {
+            cir.setReturnValue(false);
+        }
+    }
+}

src/main/java/uk/debb/vanilla_disable/mixin/misc/MixinEnderChestBlock.java

@@ -0,0 +1,45 @@
+package uk.debb.vanilla_disable.mixin.misc;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.EnderChestBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.BlockHitResult;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import uk.debb.vanilla_disable.gamerules.RegisterGamerules;
+
+@Mixin(EnderChestBlock.class)
+public abstract class MixinEnderChestBlock {
+    /**
+     * @author DragonEggBedrockBreaking
+     * @param blockState the state of the block above the echest
+     * @param blockGetter the getter of the block above the echest
+     * @param blockPos the position of the block above the echest
+     * @param blockState2 the state of the block above the echest
+     * @param level the level the echest is in
+     * @param blockPos2 the position of the block above the echest
+     * @param player the player trying to open the echest
+     * @param interactionHand the hand the player is trying to open the echest with
+     * @param blockHitResult the result of the player trying to open the echest
+     * @return whether or not the player can open the echest
+     */
+    @Redirect(
+        method = "use",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/level/block/state/BlockState;isRedstoneConductor(Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z"
+        )
+    )
+    private boolean isFullBlock(BlockState blockState, BlockGetter blockGetter, BlockPos blockPos, BlockState blockState2, Level level, BlockPos blockPos2, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult) {
+        if (RegisterGamerules.getServer() == null) return blockState.isRedstoneConductor(blockGetter, blockPos);
+        if (!RegisterGamerules.getServer().getGameRules().getBoolean(RegisterGamerules.CONTAINER_OPENING_BLOCKED)) {
+            return false;
+        }
+        return blockState.isRedstoneConductor(blockGetter, blockPos);
+    }
+}

src/main/java/uk/debb/vanilla_disable/mixin/misc/MixinShulkerBoxBlock.java

@@ -0,0 +1,31 @@
+package uk.debb.vanilla_disable.mixin.misc;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.ShulkerBoxBlock;
+import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import uk.debb.vanilla_disable.gamerules.RegisterGamerules;
+
+@Mixin(ShulkerBoxBlock.class)
+public abstract class MixinShulkerBoxBlock {
+    /**
+     * @author DragonEggBedrockBreaking
+     * @param blockState the state of the shulker box
+     * @param level the level the shulker box is in
+     * @param blockPos the position of the shulker box
+     * @param shulkerBoxBlockEntity the block entity code for the shulker box
+     * @param cir the returnable callback info (Boolean)
+     */
+    @Inject(method = "canOpen", at = @At("HEAD"), cancellable = true)
+    private static void canAlwaysOpen(BlockState blockState, Level level, BlockPos blockPos, ShulkerBoxBlockEntity shulkerBoxBlockEntity, CallbackInfoReturnable<Boolean> cir) {
+        if (RegisterGamerules.getServer() == null) return;
+        if (!RegisterGamerules.getServer().getGameRules().getBoolean(RegisterGamerules.CONTAINER_OPENING_BLOCKED)) {
+            cir.setReturnValue(true);
+        }
+    }
+}

src/main/resources/assets/vanilla_disable/lang/en_us.json

@@ -355,6 +355,7 @@
     "gamerule.crossbowSpamming": "Toggle whether crossbows have no cooldown",
     "gamerule.creativeSwordCanBreakBlocks": "Toggle whether a sword can break blocks in creative mode",
     "gamerule.pushableBuddingAmethyst": "Toggle whether budding amethyst blocks can be pushed by pistons",
+    "gamerule.containerOpeningBlocked": "Toggle whether blocks or cats above containers block them",
 
     "gamerule.category.vd.damage": "VanillaDisable Damage",
     "gamerule.category.vd.knockback": "VanillaDisable Knockback",

src/main/resources/vanilla_disable.mixins.json

@@ -42,13 +42,16 @@
     "misc.MixinBlock",
     "misc.MixinBowItem",
     "misc.MixinBuddingAmethystBlock",
+    "misc.MixinChestBlock",
     "misc.MixinConduitBlockEntity",
     "misc.MixinCrossbowItem",
+    "misc.MixinEnderChestBlock",
     "misc.MixinEndPortalBlock",
     "misc.MixinEntity",
     "misc.MixinFarmBlock",
     "misc.MixinLivingEntity",
     "misc.MixinNetherPortalBlock",
+    "misc.MixinShulkerBoxBlock",
     "misc.MixinSwordItem",
     "misc.MixinTheEndGatewayBlockEntity",
     "misc.hunger.MixinFoodData",