From 5318d70c18425865bab0f777ac8b4aa59cc85885 Mon Sep 17 00:00:00 2001 From: agnor99 <36055315+agnor99@users.noreply.github.com> Date: Tue, 20 Jun 2023 23:03:35 +0200 Subject: [PATCH] Add piston push reaction overrides to Block class (#9538) --- .../block/state/BlockBehaviour.java.patch | 9 ++++++++ .../common/extensions/IForgeBlock.java | 21 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch b/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch index 7adb882537..e2b94363fb 100644 --- a/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/state/BlockBehaviour.java.patch @@ -92,6 +92,15 @@ public BlockState m_60717_(Rotation p_60718_) { return this.m_60734_().m_6843_(this.m_7160_(), p_60718_); } +@@ -623,6 +_,8 @@ + } + + public PushReaction m_60811_() { ++ PushReaction reaction = m_60734_().getPistonPushReaction(m_7160_()); ++ if (reaction != null) return reaction; + return this.f_278134_; + } + @@ -972,8 +_,9 @@ boolean f_243850_ = true; NoteBlockInstrument f_279538_ = NoteBlockInstrument.HARP; diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index 448b0f4ab3..cf409a900f 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -30,6 +30,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; import net.minecraft.world.level.pathfinder.BlockPathTypes; import net.minecraft.tags.BlockTags; import net.minecraft.core.Direction; @@ -971,4 +972,24 @@ public interface IForgeBlock { return state; } + + /** + * Returns the reaction of the block when pushed or pulled by a piston. This method should be not called directly, instead via {@link BlockState#getPistonPushReaction()}. + *