diff --git a/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityAccessor.java b/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityAccessor.java new file mode 100644 index 0000000..8b750d4 --- /dev/null +++ b/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityAccessor.java @@ -0,0 +1,15 @@ +package systems.brn.regexinghoppers.mixin; + +import net.minecraft.block.entity.HopperBlockEntity; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(HopperBlockEntity.class) +interface HopperBlockEntityAccessor { + @Accessor("transferCooldown") + int getTransferCooldown(); + + @Accessor("transferCooldown") + void setTransferCooldown(int cooldown); +} diff --git a/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java b/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java deleted file mode 100644 index 9d100c5..0000000 --- a/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java +++ /dev/null @@ -1,11 +0,0 @@ -package systems.brn.regexinghoppers.mixin; - -import net.minecraft.block.entity.HopperBlockEntity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(HopperBlockEntity.class) -interface HopperBlockEntityInvoker { - @Invoker("setTransferCooldown") - void setTransferCooldown(int transferCooldown); -} diff --git a/src/main/java/systems/brn/regexinghoppers/mixin/RegexingHopperMixin.java b/src/main/java/systems/brn/regexinghoppers/mixin/RegexingHopperMixin.java index 8f564b9..4f95e9a 100644 --- a/src/main/java/systems/brn/regexinghoppers/mixin/RegexingHopperMixin.java +++ b/src/main/java/systems/brn/regexinghoppers/mixin/RegexingHopperMixin.java @@ -5,10 +5,7 @@ import net.minecraft.inventory.Inventory; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.util.math.Direction; -import org.spongepowered.asm.mixin.Debug; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @@ -26,7 +23,7 @@ public class RegexingHopperMixin { if (RegexingHoppers.shouldNotMove(from, itemName)) { cir.setReturnValue(stack); if(from instanceof HopperBlockEntity) { - ((HopperBlockEntityInvoker) from).setTransferCooldown(8); + ((HopperBlockEntityAccessor) from).setTransferCooldown(8); } return; } @@ -35,7 +32,7 @@ public class RegexingHopperMixin { if (RegexingHoppers.shouldNotMove(_to, itemName)) { cir.setReturnValue(stack); if(_to instanceof HopperBlockEntity) { - ((HopperBlockEntityInvoker) _to).setTransferCooldown(8); + ((HopperBlockEntityAccessor) _to).setTransferCooldown(8); } return; } diff --git a/src/main/resources/regexinghoppers.mixins.json b/src/main/resources/regexinghoppers.mixins.json index 7f0be60..ad5a8a5 100644 --- a/src/main/resources/regexinghoppers.mixins.json +++ b/src/main/resources/regexinghoppers.mixins.json @@ -4,7 +4,8 @@ "package": "systems.brn.regexinghoppers.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ - "RegexingHopperMixin" + "RegexingHopperMixin", + "HopperBlockEntityAccessor" ], "client": [ ],