mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
90 lines
5.2 KiB
Diff
90 lines
5.2 KiB
Diff
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/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java b/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
|
|
index 3513b15f6622bfc134ecfcd9129f81a8acc2c601..2768e2a61ab7fbd82c2b8787e715163a7b0450b9 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/InteractWithDoor.java
|
|
+++ b/src/main/java/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/src/main/java/net/minecraft/world/level/block/DoorBlock.java b/src/main/java/net/minecraft/world/level/block/DoorBlock.java
|
|
index 077b99caf0ec0ee098786d23194d88e1dc4481ce..f8356e468841137dcc92b2fe5db1cafa24619eaf 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/DoorBlock.java
|
|
+++ b/src/main/java/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;
|