From f06727a205c348693094adb6d1f44cca866d8e46 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Wed, 10 Sep 2025 23:17:42 -0400 Subject: [PATCH] Replace Blocks.FARMLAND checks with instanceof FarmBlock (#10647) Signed-off-by: Joseph T. McQuigg --- .../world/entity/animal/Rabbit.java.patch | 9 +++++++++ .../level/block/AttachedStemBlock.java.patch | 11 +++++++++++ .../level/block/CactusFlowerBlock.java.patch | 11 +++++++++++ .../level/block/PitcherCropBlock.java.patch | 11 +++++++++++ .../world/level/block/StemBlock.java.patch | 17 ++++++++++++++++- .../level/block/VegetationBlock.java.patch | 9 +++++++++ .../common/extensions/IForgeBlock.java | 2 +- 7 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/level/block/AttachedStemBlock.java.patch create mode 100644 patches/minecraft/net/minecraft/world/level/block/CactusFlowerBlock.java.patch create mode 100644 patches/minecraft/net/minecraft/world/level/block/PitcherCropBlock.java.patch diff --git a/patches/minecraft/net/minecraft/world/entity/animal/Rabbit.java.patch b/patches/minecraft/net/minecraft/world/entity/animal/Rabbit.java.patch index 2164bb6968..f78e9b8fe0 100644 --- a/patches/minecraft/net/minecraft/world/entity/animal/Rabbit.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/animal/Rabbit.java.patch @@ -9,3 +9,12 @@ return false; } +@@ -604,7 +_,7 @@ + @Override + protected boolean isValidTarget(LevelReader p_29785_, BlockPos p_29786_) { + BlockState blockstate = p_29785_.getBlockState(p_29786_); +- if (blockstate.is(Blocks.FARMLAND) && this.wantsToRaid && !this.canRaid) { ++ if (blockstate.getBlock() instanceof net.minecraft.world.level.block.FarmBlock && this.wantsToRaid && !this.canRaid) { + blockstate = p_29785_.getBlockState(p_29786_.above()); + if (blockstate.getBlock() instanceof CarrotBlock && ((CarrotBlock)blockstate.getBlock()).isMaxAge(blockstate)) { + this.canRaid = true; diff --git a/patches/minecraft/net/minecraft/world/level/block/AttachedStemBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/AttachedStemBlock.java.patch new file mode 100644 index 0000000000..dd5de85507 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/AttachedStemBlock.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/AttachedStemBlock.java ++++ b/net/minecraft/world/level/block/AttachedStemBlock.java +@@ -81,7 +_,7 @@ + + @Override + protected boolean mayPlaceOn(BlockState p_48863_, BlockGetter p_48864_, BlockPos p_48865_) { +- return p_48863_.is(Blocks.FARMLAND); ++ return p_48863_.getBlock() instanceof net.minecraft.world.level.block.FarmBlock; + } + + @Override diff --git a/patches/minecraft/net/minecraft/world/level/block/CactusFlowerBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/CactusFlowerBlock.java.patch new file mode 100644 index 0000000000..d5c1e8e2b8 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/CactusFlowerBlock.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/CactusFlowerBlock.java ++++ b/net/minecraft/world/level/block/CactusFlowerBlock.java +@@ -31,7 +_,7 @@ + protected boolean mayPlaceOn(BlockState p_395694_, BlockGetter p_391810_, BlockPos p_391352_) { + BlockState blockstate = p_391810_.getBlockState(p_391352_); + return blockstate.is(Blocks.CACTUS) +- || blockstate.is(Blocks.FARMLAND) ++ || blockstate.getBlock() instanceof net.minecraft.world.level.block.FarmBlock + || blockstate.isFaceSturdy(p_391810_, p_391352_, Direction.UP, SupportType.CENTER); + } + } diff --git a/patches/minecraft/net/minecraft/world/level/block/PitcherCropBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/PitcherCropBlock.java.patch new file mode 100644 index 0000000000..608854560a --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/PitcherCropBlock.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/level/block/PitcherCropBlock.java ++++ b/net/minecraft/world/level/block/PitcherCropBlock.java +@@ -107,7 +_,7 @@ + + @Override + protected boolean mayPlaceOn(BlockState p_277418_, BlockGetter p_277461_, BlockPos p_277608_) { +- return p_277418_.is(Blocks.FARMLAND); ++ return p_277418_.getBlock() instanceof net.minecraft.world.level.block.FarmBlock; + } + + @Override diff --git a/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch index 942774ce62..e20f611ea8 100644 --- a/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch @@ -1,6 +1,12 @@ --- a/net/minecraft/world/level/block/StemBlock.java +++ b/net/minecraft/world/level/block/StemBlock.java -@@ -69,9 +_,11 @@ +@@ -64,14 +_,16 @@ + + @Override + protected boolean mayPlaceOn(BlockState p_57053_, BlockGetter p_57054_, BlockPos p_57055_) { +- return p_57053_.is(Blocks.FARMLAND); ++ return p_57053_.getBlock() instanceof net.minecraft.world.level.block.FarmBlock; + } @Override protected void randomTick(BlockState p_222538_, ServerLevel p_222539_, BlockPos p_222540_, RandomSource p_222541_) { @@ -13,6 +19,15 @@ int i = p_222538_.getValue(AGE); if (i < 7) { p_222538_ = p_222538_.setValue(AGE, i + 1); +@@ -80,7 +_,7 @@ + Direction direction = Direction.Plane.HORIZONTAL.getRandomDirection(p_222541_); + BlockPos blockpos = p_222540_.relative(direction); + BlockState blockstate = p_222539_.getBlockState(blockpos.below()); +- if (p_222539_.getBlockState(blockpos).isAir() && (blockstate.is(Blocks.FARMLAND) || blockstate.is(BlockTags.DIRT))) { ++ if (p_222539_.getBlockState(blockpos).isAir() && (blockstate.getBlock() instanceof net.minecraft.world.level.block.FarmBlock || blockstate.is(BlockTags.DIRT))) { + Registry registry = p_222539_.registryAccess().lookupOrThrow(Registries.BLOCK); + Optional optional = registry.getOptional(this.fruit); + Optional optional1 = registry.getOptional(this.attachedStem); @@ -90,6 +_,7 @@ } } diff --git a/patches/minecraft/net/minecraft/world/level/block/VegetationBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/VegetationBlock.java.patch index 2a6ca59561..9bc1678f90 100644 --- a/patches/minecraft/net/minecraft/world/level/block/VegetationBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/VegetationBlock.java.patch @@ -9,6 +9,15 @@ protected VegetationBlock(BlockBehaviour.Properties p_395394_) { super(p_395394_); } +@@ -21,7 +_,7 @@ + protected abstract MapCodec codec(); + + protected boolean mayPlaceOn(BlockState p_395950_, BlockGetter p_394817_, BlockPos p_393668_) { +- return p_395950_.is(BlockTags.DIRT) || p_395950_.is(Blocks.FARMLAND); ++ return p_395950_.is(BlockTags.DIRT) || p_395950_.getBlock() instanceof net.minecraft.world.level.block.FarmBlock; + } + + @Override @@ -43,6 +_,9 @@ @Override protected boolean canSurvive(BlockState p_397664_, LevelReader p_395119_, BlockPos p_393561_) { diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index 53b0da2c53..c13b07afd1 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -355,7 +355,7 @@ public interface IForgeBlock { * @return True if the soil should be considered fertile. */ default boolean isFertile(BlockState state, BlockGetter level, BlockPos pos) { - if (state.is(Blocks.FARMLAND)) + if (state.getBlock() instanceof FarmBlock) return state.getValue(FarmBlock.MOISTURE) > 0; return false;