From 77005b14391d508afd68338cb572355564b51ae3 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Mon, 2 Dec 2024 10:21:15 -0500 Subject: [PATCH] Remove Super Calls in Fabric Block mixins Signed-off-by: Joseph T. McQuigg --- .../fabric/mixin/AttachedStemBlockMixin.java | 7 +------ .../biomeswevegone/fabric/mixin/CropBlockMixin.java | 6 +----- .../fabric/mixin/PitcherCropBlockMixin.java | 8 +------- .../biomeswevegone/fabric/mixin/PrairieGrassMixin.java | 9 +-------- .../biomeswevegone/fabric/mixin/StemBlockMixin.java | 8 +------- 5 files changed, 5 insertions(+), 33 deletions(-) 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 index 53feaf37b..04a3246b6 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/AttachedStemBlockMixin.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/AttachedStemBlockMixin.java @@ -3,7 +3,6 @@ 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; @@ -12,11 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(AttachedStemBlock.class) -public abstract class AttachedStemBlockMixin extends BushBlock { - protected AttachedStemBlockMixin(Properties properties) { - super(properties); - } - +public abstract class AttachedStemBlockMixin { /** * @reason Allows crops to be placed on Blocks that extend FarmBlock * @author Joseph T. McQuigg diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/CropBlockMixin.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/CropBlockMixin.java index b9398b07f..dc5ff37f1 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/CropBlockMixin.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/CropBlockMixin.java @@ -10,11 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(CropBlock.class) -public abstract class CropBlockMixin extends BushBlock implements BonemealableBlock { - public CropBlockMixin(Properties properties) { - super(properties); - } - +public abstract class CropBlockMixin { /** * @reason Allows crops to be placed on Blocks that extend FarmBlock * @author Joseph T. McQuigg 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 index 85d8c1018..9b5126640 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PitcherCropBlockMixin.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PitcherCropBlockMixin.java @@ -2,8 +2,6 @@ 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; @@ -13,11 +11,7 @@ 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); - } - +public abstract class PitcherCropBlockMixin { /** * @reason Allows crops to be placed on Blocks that extend FarmBlock * @author Joseph T. McQuigg diff --git a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PrairieGrassMixin.java b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PrairieGrassMixin.java index 7dc96499b..4cb2afa00 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PrairieGrassMixin.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/PrairieGrassMixin.java @@ -5,9 +5,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.BonemealableBlock; import net.minecraft.world.level.block.GrassBlock; -import net.minecraft.world.level.block.SpreadingSnowyDirtBlock; import net.minecraft.world.level.block.state.BlockState; import net.potionstudios.biomeswevegone.util.BoneMealHandler; import net.potionstudios.biomeswevegone.world.level.block.BWGBlocks; @@ -19,12 +17,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(GrassBlock.class) -public abstract class PrairieGrassMixin extends SpreadingSnowyDirtBlock implements BonemealableBlock { - - protected PrairieGrassMixin(Properties properties) { - super(properties); - } - +public abstract class PrairieGrassMixin { /** * @reason Allows for Bonemealing of Prairie Grass to spawn Prairie Grass and other features. * @see GrassBlock#performBonemeal(ServerLevel, RandomSource, BlockPos, BlockState) 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 index 1ece0af1c..3785bb416 100644 --- a/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/StemBlockMixin.java +++ b/Fabric/src/main/java/net/potionstudios/biomeswevegone/fabric/mixin/StemBlockMixin.java @@ -2,8 +2,6 @@ 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; @@ -13,11 +11,7 @@ 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); - } - +public abstract class StemBlockMixin { /** * @reason Allows crops to be placed on Blocks that extend FarmBlock * @author Joseph T. McQuigg