Option to make doors require redstone

patches/server/0144-Option-to-make-doors-require-redstone.patch

@@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Wed, 24 Mar 2021 04:40:11 -0500
-Subject: [PATCH] Option to make doors require redstone
-
-
-diff --git a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
-index 3513b15f6622bfc134ecfcd9129f81a8acc2c601..2768e2a61ab7fbd82c2b8787e715163a7b0450b9 100644
---- a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
-+++ b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
-@@ -57,7 +57,7 @@ public class InteractWithDoor {
- 
-                         if (iblockdata.is(BlockTags.MOB_INTERACTABLE_DOORS, (blockbase_blockdata) -> {
-                             return blockbase_blockdata.getBlock() instanceof DoorBlock;
--                        })) {
-+                        }) && !DoorBlock.requiresRedstone(entityliving.level(), iblockdata, blockposition)) { // Purpur - Option to make doors require redstone
-                             DoorBlock blockdoor = (DoorBlock) iblockdata.getBlock();
- 
-                             if (!blockdoor.isOpen(iblockdata)) {
-@@ -79,7 +79,7 @@ public class InteractWithDoor {
- 
-                         if (iblockdata1.is(BlockTags.MOB_INTERACTABLE_DOORS, (blockbase_blockdata) -> {
-                             return blockbase_blockdata.getBlock() instanceof DoorBlock;
--                        })) {
-+                        }) && !DoorBlock.requiresRedstone(entityliving.level(), iblockdata, blockposition1)) { // Purpur - Option to make doors require redstone
-                             DoorBlock blockdoor1 = (DoorBlock) iblockdata1.getBlock();
- 
-                             if (!blockdoor1.isOpen(iblockdata1)) {
-@@ -122,7 +122,7 @@ public class InteractWithDoor {
- 
-                     if (!iblockdata.is(BlockTags.MOB_INTERACTABLE_DOORS, (blockbase_blockdata) -> {
-                         return blockbase_blockdata.getBlock() instanceof DoorBlock;
--                    })) {
-+                    }) || DoorBlock.requiresRedstone(entity.level(), iblockdata, blockposition)) { // Purpur - Option to make doors require redstone
-                         iterator.remove();
-                     } else {
-                         DoorBlock blockdoor = (DoorBlock) iblockdata.getBlock();
-diff --git a/net/minecraft/world/level/block/DoorBlock.java b/net/minecraft/world/level/block/DoorBlock.java
-index 077b99caf0ec0ee098786d23194d88e1dc4481ce..f8356e468841137dcc92b2fe5db1cafa24619eaf 100644
---- a/net/minecraft/world/level/block/DoorBlock.java
-+++ b/net/minecraft/world/level/block/DoorBlock.java
-@@ -200,6 +200,7 @@ public class DoorBlock extends Block {
-     protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
-         if (!this.type.canOpenByHand()) {
-             return InteractionResult.PASS;
-+        } else if (requiresRedstone(world, state, pos)) { return InteractionResult.CONSUME; // Purpur - Option to make doors require redstone
-         } else {
-             state = (BlockState) state.cycle(DoorBlock.OPEN);
-             world.setBlock(pos, state, 10);
-@@ -301,4 +302,18 @@ public class DoorBlock extends Block {
-         flag = false;
-         return flag;
-     }
-+
-+    // Purpur start - Option to make doors require redstone
-+    public static boolean requiresRedstone(Level level, BlockState state, BlockPos pos) {
-+        if (level.purpurConfig.doorRequiresRedstone.contains(state.getBlock())) {
-+            // force update client
-+            BlockPos otherPos = pos.relative(state.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER ? Direction.UP : Direction.DOWN);
-+            BlockState otherState = level.getBlockState(otherPos);
-+            level.sendBlockUpdated(pos, state, state, 3);
-+            level.sendBlockUpdated(otherPos, otherState, otherState, 3);
-+            return true;
-+        }
-+        return false;
-+    }
-+    // Purpur end - Option to make doors require redstone
- }
-diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 0c3438c1914d6ec828c270fecfc7cf101fcfd211..88f2cf0023540a2fed5be6f7929e46dc7144673c 100644
---- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -466,6 +466,16 @@ public class PurpurWorldConfig {
-         dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
-     }
- 
-+    public List<Block> doorRequiresRedstone = new ArrayList<>();
-+    private void doorSettings() {
-+        getList("blocks.door.requires-redstone", new ArrayList<String>()).forEach(key -> {
-+            Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(key.toString()));
-+            if (!block.defaultBlockState().isAir()) {
-+                doorRequiresRedstone.add(block);
-+            }
-+        });
-+    }
-+
-     public boolean baselessEndCrystalExplode = true;
-     public double baselessEndCrystalExplosionPower = 6.0D;
-     public boolean baselessEndCrystalExplosionFire = false;

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java.patch

@@ -0,0 +1,29 @@
+--- a/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
++++ b/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
+@@ -55,7 +_,7 @@
+                             Node nextNode = path.getNextNode();
+                             BlockPos blockPos = previousNode.asBlockPos();
+                             BlockState blockState = level.getBlockState(blockPos);
+-                            if (blockState.is(BlockTags.MOB_INTERACTABLE_DOORS, state -> state.getBlock() instanceof DoorBlock)) {
++                            if (blockState.is(BlockTags.MOB_INTERACTABLE_DOORS, state -> state.getBlock() instanceof DoorBlock)&& !DoorBlock.requiresRedstone(entity.level(), blockState, blockPos)) { // Purpur - Option to make doors require redstone
+                                 DoorBlock doorBlock = (DoorBlock)blockState.getBlock();
+                                 if (!doorBlock.isOpen(blockState)) {
+                                     // CraftBukkit start - entities opening doors
+@@ -72,7 +_,7 @@
+ 
+                             BlockPos blockPos1 = nextNode.asBlockPos();
+                             BlockState blockState1 = level.getBlockState(blockPos1);
+-                            if (blockState1.is(BlockTags.MOB_INTERACTABLE_DOORS, state -> state.getBlock() instanceof DoorBlock)) {
++                            if (blockState1.is(BlockTags.MOB_INTERACTABLE_DOORS, state -> state.getBlock() instanceof DoorBlock) && !DoorBlock.requiresRedstone(entity.level(), blockState1, blockPos1)) { // Purpur - Option to make doors require redstone
+                                 DoorBlock doorBlock1 = (DoorBlock)blockState1.getBlock();
+                                 if (!doorBlock1.isOpen(blockState1)) {
+                                     // CraftBukkit start - entities opening doors
+@@ -118,7 +_,7 @@
+                     iterator.remove();
+                 } else {
+                     BlockState blockState = level.getBlockState(blockPos);
+-                    if (!blockState.is(BlockTags.MOB_INTERACTABLE_DOORS, state -> state.getBlock() instanceof DoorBlock)) {
++                    if (!blockState.is(BlockTags.MOB_INTERACTABLE_DOORS, state -> state.getBlock() instanceof DoorBlock) || DoorBlock.requiresRedstone(entity.level(), blockState, blockPos)) { // Purpur - Option to make doors require redstone
+                         iterator.remove();
+                     } else {
+                         DoorBlock doorBlock = (DoorBlock)blockState.getBlock();

purpur-server/minecraft-patches/sources/net/minecraft/world/level/block/DoorBlock.java.patch

@@ -0,0 +1,29 @@
+--- a/net/minecraft/world/level/block/DoorBlock.java
++++ b/net/minecraft/world/level/block/DoorBlock.java
+@@ -206,6 +_,7 @@
+     protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
+         if (!this.type.canOpenByHand()) {
+             return InteractionResult.PASS;
++        } else if (requiresRedstone(level, state, pos)) { return InteractionResult.CONSUME; // Purpur - Option to make doors require redstone
+         } else {
+             state = state.cycle(OPEN);
+             level.setBlock(pos, state, 10);
+@@ -294,4 +_,18 @@
+     public static boolean isWoodenDoor(BlockState state) {
+         return state.getBlock() instanceof DoorBlock doorBlock && doorBlock.type().canOpenByHand();
+     }
++
++    // Purpur start - Option to make doors require redstone
++    public static boolean requiresRedstone(Level level, BlockState state, BlockPos pos) {
++        if (level.purpurConfig.doorRequiresRedstone.contains(state.getBlock())) {
++            // force update client
++            BlockPos otherPos = pos.relative(state.getValue(DoorBlock.HALF) == DoubleBlockHalf.LOWER ? Direction.UP : Direction.DOWN);
++            BlockState otherState = level.getBlockState(otherPos);
++            level.sendBlockUpdated(pos, state, state, 3);
++            level.sendBlockUpdated(otherPos, otherState, otherState, 3);
++            return true;
++        }
++        return false;
++    }
++    // Purpur end - Option to make doors require redstone
+ }

purpur-server/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java

@@ -458,6 +458,16 @@ public class PurpurWorldConfig {
         dispenserPlaceAnvils = getBoolean("blocks.dispenser.place-anvils", dispenserPlaceAnvils);
     }
 
+    public List<Block> doorRequiresRedstone = new ArrayList<>();
+    private void doorSettings() {
+        getList("blocks.door.requires-redstone", new ArrayList<String>()).forEach(key -> {
+            Block block = BuiltInRegistries.BLOCK.getValue(ResourceLocation.parse(key.toString()));
+            if (!block.defaultBlockState().isAir()) {
+                doorRequiresRedstone.add(block);
+            }
+        });
+    }
+
     public boolean baselessEndCrystalExplode = true;
     public double baselessEndCrystalExplosionPower = 6.0D;
     public boolean baselessEndCrystalExplosionFire = false;