Merge branch 'master' into 1.15

src/main/java/carpet/mixins/DispenserBehaviour_cactusMixin.java

@@ -1,21 +0,0 @@
-package carpet.mixins;
-
-import carpet.helpers.BlockRotator;
-import net.minecraft.block.Blocks;
-import net.minecraft.block.DispenserBlock;
-import net.minecraft.block.dispenser.DispenserBehavior;
-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(DispenserBehavior.class)
-public interface DispenserBehaviour_cactusMixin
-{
-    @SuppressWarnings("PublicStaticMixinMember")
-    @Inject(method = "registerDefaults", at = @At("HEAD"))
-    static void addBlockRotator(CallbackInfo ci)
-    {
-        DispenserBlock.registerBehavior(Blocks.CACTUS.asItem(), new BlockRotator.CactusDispenserBehaviour());
-    }
-}

src/main/java/carpet/mixins/DispenserBlock_cactusMixin.java

@@ -0,0 +1,24 @@
+package carpet.mixins;
+
+import carpet.helpers.BlockRotator;
+import net.minecraft.block.DispenserBlock;
+import net.minecraft.block.dispenser.DispenserBehavior;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+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(DispenserBlock.class)
+public abstract class DispenserBlock_cactusMixin
+{
+    @Inject(method = "getBehaviorForItem", at = @At("HEAD"), cancellable = true)
+    private void registerCarpetBehaviors(ItemStack stack, CallbackInfoReturnable<DispenserBehavior> cir)
+    {
+        Item item = stack.getItem();
+        if (item == Items.CACTUS)
+            cir.setReturnValue(new BlockRotator.CactusDispenserBehaviour());
+    }
+}

src/main/resources/carpet.mixins.json

@@ -81,7 +81,7 @@
     "ServerPlayerInteractionManager_cactusMixin",
     "HopperBlock_cactusMixin",
     "ItemUsageContext_cactusMixin",
-    "DispenserBehaviour_cactusMixin",
+    "DispenserBlock_cactusMixin",
 
     "ServerPlayNetworkHandler_antiCheatDisabledMixin",