mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-30 12:29:18 +00:00
56 lines
3.6 KiB
Diff
56 lines
3.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Mon, 17 Jul 2023 11:41:50 +0800
|
|
Subject: [PATCH] Container open passthrough
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/SignBlock.java b/src/main/java/net/minecraft/world/level/block/SignBlock.java
|
|
index b212fe323f048dab40c0ccbb9327c9fc73b9e03a..ccfa890b1c83fe9492cb4f5863911008536b46f0 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/SignBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/SignBlock.java
|
|
@@ -111,6 +111,18 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
|
|
} else {
|
|
return InteractionResult.TRY_WITH_EMPTY_HAND;
|
|
}
|
|
+ // Leaves start - signContainerPassthrough
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.containerPassthrough) {
|
|
+ BlockPos pos1 = pos.relative(hit.getDirection().getOpposite());
|
|
+ if (this instanceof WallSignBlock || this instanceof WallHangingSignBlock) {
|
|
+ pos1 = pos.relative(state.getValue(HorizontalDirectionalBlock.FACING).getOpposite());
|
|
+ }
|
|
+ if (world.getBlockEntity(pos1) instanceof net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity) {
|
|
+ BlockState state1 = world.getBlockState(pos1);
|
|
+ return state1.useItemOn(stack, world, player, hand, hit.withPosition(pos1));
|
|
+ }
|
|
+ return InteractionResult.PASS;
|
|
+ // Leaves end - signContainerPassthrough
|
|
} else {
|
|
return InteractionResult.TRY_WITH_EMPTY_HAND;
|
|
}
|
|
@@ -139,6 +151,25 @@ public abstract class SignBlock extends BaseEntityBlock implements SimpleWaterlo
|
|
return InteractionResult.SUCCESS_SERVER;
|
|
} else if (flag1) {
|
|
return InteractionResult.SUCCESS_SERVER;
|
|
+ // Leaves start - signContainerPassthrough
|
|
+ } else if (org.leavesmc.leaves.LeavesConfig.modify.containerPassthrough) {
|
|
+ if (player.isShiftKeyDown()) {
|
|
+ if (!this.otherPlayerIsEditingSign(player, tileentitysign) && player.mayBuild() && this.hasEditableText(player, tileentitysign, flag1)) {
|
|
+ this.openTextEdit(player, tileentitysign, flag1);
|
|
+ return InteractionResult.SUCCESS;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ BlockPos pos1 = pos.relative(hit.getDirection().getOpposite());
|
|
+ if (this instanceof WallSignBlock || this instanceof WallHangingSignBlock) {
|
|
+ pos1 = pos.relative(state.getValue(HorizontalDirectionalBlock.FACING).getOpposite());
|
|
+ }
|
|
+ if (world.getBlockEntity(pos1) instanceof net.minecraft.world.level.block.entity.RandomizableContainerBlockEntity) {
|
|
+ BlockState state1 = world.getBlockState(pos1);
|
|
+ return state1.useWithoutItem(world, player, hit.withPosition(pos1));
|
|
+ }
|
|
+ return InteractionResult.PASS;
|
|
+ // Leaves end - signContainerPassthrough
|
|
} else if (!this.otherPlayerIsEditingSign(player, tileentitysign) && player.mayBuild() && this.hasEditableText(player, tileentitysign, flag)) {
|
|
this.openTextEdit(player, tileentitysign, flag, io.papermc.paper.event.player.PlayerOpenSignEvent.Cause.INTERACT); // Paper - Add PlayerOpenSignEvent
|
|
return InteractionResult.SUCCESS_SERVER;
|