From 21a99b5143518be98b331fced60f04e794c70d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Sun, 5 May 2024 11:55:57 +0200 Subject: [PATCH] Add cooldowns --- .../brn/regexinghoppers/RegexingHoppers.java | 41 +++++++++++++++---- .../mixin/HopperBlockEntityInvoker.java | 11 +++++ .../mixin/RegexingHopperMixin.java | 11 ++++- 3 files changed, 52 insertions(+), 11 deletions(-) create mode 100644 src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java diff --git a/src/main/java/systems/brn/regexinghoppers/RegexingHoppers.java b/src/main/java/systems/brn/regexinghoppers/RegexingHoppers.java index 5dc1fa6..d94d01a 100644 --- a/src/main/java/systems/brn/regexinghoppers/RegexingHoppers.java +++ b/src/main/java/systems/brn/regexinghoppers/RegexingHoppers.java @@ -26,17 +26,40 @@ public class RegexingHoppers implements ModInitializer { } public static boolean shouldNotMove(Inventory hopper, String itemName) { - NamedScreenHandlerFactory factory = (NamedScreenHandlerFactory) hopper; - String customName = factory.getDisplayName().getLiteralString(); - if (customName != null) { - try { - Pattern pattern = Pattern.compile(customName); - // Check if the text matches the regex - Matcher matcher = pattern.matcher(itemName); - return !matcher.matches(); - } catch (PatternSyntaxException ignored) { + // Log entering the method with given parameters + LOGGER.debug("Entering shouldNotMove with itemName: {}", itemName); + + if (hopper instanceof NamedScreenHandlerFactory) { + NamedScreenHandlerFactory factory = (NamedScreenHandlerFactory) hopper; + String customName = factory.getDisplayName().getLiteralString(); + + // Log the custom name used for matching + LOGGER.info("Custom regex pattern from hopper: {}", customName); + + if (customName != null && !customName.isEmpty()) { + try { + Pattern pattern = Pattern.compile(customName); + Matcher matcher = pattern.matcher(itemName); + + // Log the result of the regex matching + boolean matches = matcher.matches(); + LOGGER.info("Regex matching result: {}", matches); + + return !matches; + } catch (PatternSyntaxException e) { + // Log exception if regex pattern is invalid + LOGGER.info("Invalid regex pattern: {}", customName, e); + } + } else { + // Log case when custom name is null or empty + LOGGER.info("Custom name is null or empty, not performing regex matching."); } + } else { + // Log if hopper is not an instance of NamedScreenHandlerFactory + LOGGER.info("Hopper is not an instance of NamedScreenHandlerFactory."); } + + // Default return value in case no conditions are met return false; } } \ No newline at end of file diff --git a/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java b/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java new file mode 100644 index 0000000..9d100c5 --- /dev/null +++ b/src/main/java/systems/brn/regexinghoppers/mixin/HopperBlockEntityInvoker.java @@ -0,0 +1,11 @@ +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 0340dd7..8f564b9 100644 --- a/src/main/java/systems/brn/regexinghoppers/mixin/RegexingHopperMixin.java +++ b/src/main/java/systems/brn/regexinghoppers/mixin/RegexingHopperMixin.java @@ -7,15 +7,15 @@ 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; import systems.brn.regexinghoppers.RegexingHoppers; -@Debug(export = true) // Enables exporting for the targets of this mixin @Mixin(HopperBlockEntity.class) public class RegexingHopperMixin { - @Inject(method = "transfer(Lnet/minecraft/inventory/Inventory;Lnet/minecraft/inventory/Inventory;Lnet/minecraft/item/ItemStack;ILnet/minecraft/util/math/Direction;)Lnet/minecraft/item/ItemStack;", at = @At(value = "HEAD"), cancellable = true @@ -25,14 +25,21 @@ public class RegexingHopperMixin { if(from != null) { if (RegexingHoppers.shouldNotMove(from, itemName)) { cir.setReturnValue(stack); + if(from instanceof HopperBlockEntity) { + ((HopperBlockEntityInvoker) from).setTransferCooldown(8); + } return; } } if(_to != null) { if (RegexingHoppers.shouldNotMove(_to, itemName)) { cir.setReturnValue(stack); + if(_to instanceof HopperBlockEntity) { + ((HopperBlockEntityInvoker) _to).setTransferCooldown(8); + } return; } } } } +