diff --git a/src/main/java/carpet/mixins/Bootstrap_cactusMixin.java b/src/main/java/carpet/mixins/Bootstrap_cactusMixin.java deleted file mode 100644 index 6002743c..00000000 --- a/src/main/java/carpet/mixins/Bootstrap_cactusMixin.java +++ /dev/null @@ -1,25 +0,0 @@ -package carpet.mixins; - -import carpet.helpers.BlockRotator; -import net.minecraft.Bootstrap; -import net.minecraft.block.Blocks; -import net.minecraft.block.DispenserBlock; -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.CallbackInfo; - -@Mixin(Bootstrap.class) -public abstract class Bootstrap_cactusMixin -{ - @Inject(method = "initialize", at = @At( - value = "INVOKE", - target = "Lnet/minecraft/block/dispenser/DispenserBehavior;registerDefaults()V", - shift = At.Shift.AFTER - )) - private static void registerCactus(CallbackInfo ci) - { - DispenserBlock.registerBehavior(Blocks.CACTUS.asItem(), new BlockRotator.CactusDispenserBehaviour()); - } - -} diff --git a/src/main/java/carpet/mixins/DispenserBehaviour_cactusMixin.java b/src/main/java/carpet/mixins/DispenserBehaviour_cactusMixin.java index 39535c64..d2695686 100644 --- a/src/main/java/carpet/mixins/DispenserBehaviour_cactusMixin.java +++ b/src/main/java/carpet/mixins/DispenserBehaviour_cactusMixin.java @@ -9,10 +9,10 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -//UNUSED - used Bootstrap_cactus instead cause mixins @Mixin(DispenserBehavior.class) public interface DispenserBehaviour_cactusMixin { + @SuppressWarnings("PublicStaticMixinMember") @Inject(method = "registerDefaults", at = @At("HEAD")) static void addBlockRotator(CallbackInfo ci) { diff --git a/src/main/resources/carpet.mixins.json b/src/main/resources/carpet.mixins.json index 89f9771e..5fc17beb 100644 --- a/src/main/resources/carpet.mixins.json +++ b/src/main/resources/carpet.mixins.json @@ -62,7 +62,7 @@ "ServerPlayerInteractionManager_cactusMixin", "HopperBlock_cactusMixin", "ItemUsageContext_cactusMixin", - "Bootstrap_cactusMixin", + "DispenserBehaviour_cactusMixin", "HopperBlockEntityMixin", "ContainerMixin",