From b44fd1ca7619c399786237d1d38f910ca8d6e0bf Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Sun, 1 Dec 2024 23:36:22 -0500 Subject: [PATCH] Fix StemBlock/AttachedStemBlock/PitcherCropBlock not being placeable on BWG Farmland (Fabric Only). Closes #176 Signed-off-by: Joseph T. McQuigg --- CHANGELOG.md | 1 + .../fabric/mixin/AttachedStemBlockMixin.java | 28 ++++++++++++++++++ .../fabric/mixin/PitcherCropBlockMixin.java | 29 +++++++++++++++++++ .../fabric/mixin/StemBlockMixin.java | 29 +++++++++++++++++++ .../main/resources/biomeswevegone.mixins.json | 5 +++- 5 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/AttachedStemBlockMixin.java create mode 100644 Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PitcherCropBlockMixin.java create mode 100644 Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/StemBlockMixin.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 849d4014b..09b7d0ded 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # 1.4.5 - Add Spanish (Chile) Translations (es_cl) (Credits: Ganbare-Lucifer) (#172) - Generalize Particle Registration +- Fix StemBlock/AttachedStemBlock/PitcherCropBlock not being placeable on BWG Farmland (Fabric Only) # 1.4.4 - Add Russian Translations (ru_ru) (Credits: j-tap) diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/AttachedStemBlockMixin.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/AttachedStemBlockMixin.java new file mode 100644 index 000000000..53feaf37b --- /dev/null +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/AttachedStemBlockMixin.java @@ -0,0 +1,28 @@ +package net.potionstudios.biomeswevegone.fabric.mixin; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.AttachedStemBlock; +import net.minecraft.world.level.block.BushBlock; +import net.minecraft.world.level.block.FarmBlock; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(AttachedStemBlock.class) +public abstract class AttachedStemBlockMixin extends BushBlock { + protected AttachedStemBlockMixin(Properties properties) { + super(properties); + } + + /** + * @reason Allows crops to be placed on Blocks that extend FarmBlock + * @author Joseph T. McQuigg + */ + @Inject(method = "mayPlaceOn", at = @At("RETURN"), cancellable = true) + protected void mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos, CallbackInfoReturnable cir) { + cir.setReturnValue(state.getBlock() instanceof FarmBlock); + } +} diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PitcherCropBlockMixin.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PitcherCropBlockMixin.java new file mode 100644 index 000000000..85d8c1018 --- /dev/null +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PitcherCropBlockMixin.java @@ -0,0 +1,29 @@ +package net.potionstudios.biomeswevegone.fabric.mixin; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.DoublePlantBlock; +import net.minecraft.world.level.block.FarmBlock; +import net.minecraft.world.level.block.PitcherCropBlock; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(PitcherCropBlock.class) +public abstract class PitcherCropBlockMixin extends DoublePlantBlock implements BonemealableBlock { + public PitcherCropBlockMixin(Properties properties) { + super(properties); + } + + /** + * @reason Allows crops to be placed on Blocks that extend FarmBlock + * @author Joseph T. McQuigg + */ + @Inject(method = "mayPlaceOn", at = @At("RETURN"), cancellable = true) + protected void mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos, CallbackInfoReturnable cir) { + cir.setReturnValue(state.getBlock() instanceof FarmBlock); + } +} diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/StemBlockMixin.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/StemBlockMixin.java new file mode 100644 index 000000000..1ece0af1c --- /dev/null +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/StemBlockMixin.java @@ -0,0 +1,29 @@ +package net.potionstudios.biomeswevegone.fabric.mixin; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.BushBlock; +import net.minecraft.world.level.block.FarmBlock; +import net.minecraft.world.level.block.StemBlock; +import net.minecraft.world.level.block.state.BlockState; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(StemBlock.class) +public abstract class StemBlockMixin extends BushBlock implements BonemealableBlock { + protected StemBlockMixin(Properties properties) { + super(properties); + } + + /** + * @reason Allows crops to be placed on Blocks that extend FarmBlock + * @author Joseph T. McQuigg + */ + @Inject(method = "mayPlaceOn", at = @At("RETURN"), cancellable = true) + protected void mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos, CallbackInfoReturnable cir) { + cir.setReturnValue(state.getBlock() instanceof FarmBlock); + } +} diff --git a/Fabric/src/main/resources/biomeswevegone.mixins.json b/Fabric/src/main/resources/biomeswevegone.mixins.json index f47639252..63a75d486 100644 --- a/Fabric/src/main/resources/biomeswevegone.mixins.json +++ b/Fabric/src/main/resources/biomeswevegone.mixins.json @@ -6,8 +6,11 @@ "client": [ ], "mixins": [ + "AttachedStemBlockMixin", "CropBlockMixin", - "PrairieGrassMixin" + "PitcherCropBlockMixin", + "PrairieGrassMixin", + "StemBlockMixin" ], "injectors": { "defaultRequire": 1