Skip to content

Commit 9f27718

Browse files
committed
refactor(26.3)!: Remove BalmHooks#blockGrowFeature() due to limited use cases that would be better covered by a bidirectional event mapper
1 parent 7bf1396 commit 9f27718

4 files changed

Lines changed: 0 additions & 23 deletions

File tree

common/src/main/java/net/blay09/mods/balm/platform/BalmHooks.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,10 @@
1515
import net.minecraft.world.item.ItemStackTemplate;
1616
import net.minecraft.world.level.Level;
1717
import net.minecraft.world.level.block.state.BlockState;
18-
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
1918
import net.minecraft.world.phys.BlockHitResult;
2019
import org.jspecify.annotations.Nullable;
2120

2221
public interface BalmHooks {
23-
/**
24-
* Forge fires SaplingGrowTreeEvent, Fabric NOPs
25-
*/
26-
boolean blockGrowFeature(Level level, RandomSource random, BlockPos pos, @Nullable Holder<ConfiguredFeature<?, ?>> holder);
2722

2823
/**
2924
* Forge adds player-sensitive version, Fabric uses normal version

fabric/src/main/java/net/blay09/mods/balm/fabric/platform/internal/FabricBalmHooks.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import net.minecraft.world.level.Level;
2424
import net.minecraft.world.level.block.entity.BlockEntity;
2525
import net.minecraft.world.level.block.state.BlockState;
26-
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
2726
import net.minecraft.world.level.material.Fluid;
2827
import net.minecraft.world.level.material.Fluids;
2928
import net.minecraft.world.phys.BlockHitResult;
@@ -33,11 +32,6 @@
3332

3433
public class FabricBalmHooks implements BalmHooks {
3534

36-
@Override
37-
public boolean blockGrowFeature(Level level, RandomSource random, BlockPos pos, @Nullable Holder<ConfiguredFeature<?, ?>> holder) {
38-
return true;
39-
}
40-
4135
@Override
4236
public boolean growCrop(ItemStack itemStack, Level level, BlockPos pos, @Nullable Player player) {
4337
return BoneMealItem.growCrop(itemStack, level, pos);

forge/src/main/java/net/blay09/mods/balm/forge/platform/internal/ForgeBalmHooks.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import net.minecraft.world.item.*;
1616
import net.minecraft.world.level.Level;
1717
import net.minecraft.world.level.block.state.BlockState;
18-
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
1918
import net.minecraft.world.phys.BlockHitResult;
2019
import net.minecraftforge.common.util.Result;
2120
import net.minecraftforge.event.ForgeEventFactory;
@@ -41,11 +40,6 @@ private void furnaceFuelBurnTime(FurnaceFuelBurnTimeEvent event) {
4140
}
4241
}
4342

44-
@Override
45-
public boolean blockGrowFeature(Level level, RandomSource random, BlockPos pos, @Nullable Holder<ConfiguredFeature<?, ?>> holder) {
46-
return !ForgeEventFactory.blockGrowFeature(level, random, pos, holder).getResult().equals(Result.DENY);
47-
}
48-
4943
@Override
5044
public boolean growCrop(ItemStack itemStack, Level level, BlockPos pos, @Nullable Player player) {
5145
if (player != null) {

neoforge/src/main/java/net/blay09/mods/balm/neoforge/platform/internal/NeoForgeBalmHooks.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import net.minecraft.world.item.*;
1515
import net.minecraft.world.level.Level;
1616
import net.minecraft.world.level.block.state.BlockState;
17-
import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
1817
import net.minecraft.world.phys.BlockHitResult;
1918
import net.neoforged.neoforge.common.NeoForge;
2019
import net.neoforged.neoforge.common.util.FakePlayer;
@@ -41,11 +40,6 @@ private void furnaceFuelBurnTime(FurnaceFuelBurnTimeEvent event) {
4140
}
4241
}
4342

44-
@Override
45-
public boolean blockGrowFeature(Level level, RandomSource random, BlockPos pos, @Nullable Holder<ConfiguredFeature<?, ?>> holder) {
46-
return !EventHooks.fireBlockGrowFeature(level, random, pos, holder).isCanceled();
47-
}
48-
4943
@Override
5044
public boolean growCrop(ItemStack itemStack, Level level, BlockPos pos, @Nullable Player player) {
5145
if (player != null) {

0 commit comments

Comments
 (0)