1.2.2

Author: QiuShui1012

gradle.properties

@@ -8,6 +8,6 @@ neo_version_range=[21.1.180,)
 loader_version_range=[1,)
 
 # Mod Properties
-version=1.2.0
+version=1.2.2
 group=zh.qiushui.mod
 archives_name=qca

latest-changelog.md

@@ -1,5 +1,5 @@
 ## What's new
-- **Add NeoForge 1.21.1 (rolling gate) support**
+- **Fixed hopper cannot be limited by item frame**
 -----------------------------------------------------------------
 ## 新更改
-- **添加NeoForge 1.21.1（卷帘门）的支持**
+- **修复了漏斗无法被物品展示框限类的问题**

src/main/java/zh/qiushui/mod/qca/Qca.java

@@ -27,4 +27,16 @@ public static ResourceLocation id(String path) {
     private static void onServerTick(ServerTickEvent.Post event) {
         BeaconUtil.tick();
     }
+
+    public static void debugLog(String message) {
+        if (QcaServerRules.qcaDebugLog) {
+            Qca.LOGGER.debug(message);
+        }
+    }
+
+    public static void debugLog(String message, Object... args) {
+        if (QcaServerRules.qcaDebugLog) {
+            Qca.LOGGER.debug(message, args);
+        }
+    }
 }

src/main/java/zh/qiushui/mod/qca/mixin/rule/beaconIncreaseInteractionRange/MixinBeaconBlockEntity.java

@@ -43,9 +43,7 @@ public MixinBeaconBlockEntity(
     @Inject(method = "<init>", at = @At("TAIL"))
     private void registerIdentifier(BlockPos blockPos, BlockState blockState, CallbackInfo ci) {
         BeaconUtil.TASKS.register(blockPos);
-        if (QcaServerRules.qcaDebugLog) {
-            Qca.LOGGER.debug("Tried to register an identifier to the beacon task manager.");
-        }
+        Qca.debugLog("Tried to register an identifier to the beacon task manager.");
     }
 
     @Inject(
@@ -72,9 +70,7 @@ private void registerIdentifier(BlockPos blockPos, BlockState blockState, Callba
             BeaconUtil.removeBeaconIncreaseModifiersForPlayer(this.getBlockPos(), player);
         }
         BeaconUtil.TASKS.remove(this.getBlockPos());
-        if (QcaServerRules.qcaDebugLog) {
-            Qca.LOGGER.debug("Tried to remove this identifier from the beacon task manager.");
-        }
+        Qca.debugLog("Tried to remove this identifier from the beacon task manager.");
     }
 
     @Unique
@@ -89,18 +85,14 @@ private void registerIdentifier(BlockPos blockPos, BlockState blockState, Callba
             for (Player player : ((IncreaseInteractionRange) beacon).qca$getIncreasedPlayers()) {
                 BeaconUtil.removeBeaconIncreaseModifiersForPlayer(beacon.getBlockPos(), player);
             }
-            if (QcaServerRules.qcaDebugLog) {
-                Qca.LOGGER.debug("(Tick) Tried to remove the modifier from the increased players.");
-            }
+            Qca.debugLog("(Tick) Tried to remove the modifier from the increased players.");
 
             for (Player player : inRangePlayers) {
                 BeaconUtil.addBeaconIncreaseModifiersForPlayer(beacon.getBlockPos(), player, levels);
 
                 ((IncreaseInteractionRange) beacon).qca$getIncreasedPlayers().add(player);
             }
-            if (QcaServerRules.qcaDebugLog) {
-                Qca.LOGGER.debug("(Tick) Tried to add the modifier to the players in range.");
-            }
+            Qca.debugLog("(Tick) Tried to add the modifier to the players in range.");
         }
     }
 }

src/main/java/zh/qiushui/mod/qca/mixin/rule/crafterLimitation/MixinCrafterBlock.java

@@ -75,18 +75,14 @@ public abstract class MixinCrafterBlock {
 
         if (sections.isEmpty()) {
             this.qca$limitation = null;
-            if (QcaServerRules.qcaDebugLog) {
-                Qca.LOGGER.debug("A crafter located at {} reset its restrictor.", pos);
-            }
+            Qca.debugLog("A crafter located at {} reset its restrictor.", pos);
             return;
         }
         if (sections.size() > 1) {
             this.qca$limitation = new AllSection(sections);
         }
         this.qca$limitation = sections.getFirst();
-        if (QcaServerRules.qcaDebugLog) {
-            Qca.LOGGER.debug("A crafter located at {} updated its limit source {}.", pos, this.qca$limitation);
-        }
+        Qca.debugLog("A crafter located at {} updated its limit source {}.", pos, this.qca$limitation);
     }
 
     @ModifyExpressionValue(
@@ -95,12 +91,10 @@ public abstract class MixinCrafterBlock {
     private boolean qca$limitResult(boolean isEmpty, @Local(ordinal = 0) ItemStack stack) {
         if (!QcaServerRules.canLimit(QcaServerRules.crafterLimitation)) return isEmpty;
         boolean matched = this.qca$limitation.test(stack);
-        if (QcaServerRules.qcaDebugLog) {
-            Qca.LOGGER.debug(
-                "A crafter just limited. Input: {}, Result: {}",
-                stack, isEmpty ? "Failed. The instance is empty." : matched ? "Successfully limited." : "Failed."
-            );
-        }
+        Qca.debugLog(
+            "A crafter just limited. Input: {}, Result: {}",
+            stack, isEmpty ? "Failed. The instance is empty." : matched ? "Successfully limited." : "Failed."
+        );
         return isEmpty || !matched;
     }
 }

src/main/java/zh/qiushui/mod/qca/mixin/rule/easyHopperLimitation/HopperAccessor.java

@@ -74,17 +74,14 @@ protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos bl
         if (!QcaServerRules.canLimit(QcaServerRules.easyHopperLimitation)) return;
         List<Section> sections = new ArrayList<>();
         if (QcaServerRules.canLimitByItemFrame(QcaServerRules.easyHopperLimitation)) {
-            Direction facing = UnsafeUtil.<HopperAccessor>cast(hopper).qca$getFacing();
             List<ItemFrame> frames = EntityUtil.getEntitiesIf(
-                level, pos.relative(facing),
-                frame -> !frame.getDirection().equals(facing) || frame.getItem().isEmpty(),
+                level, pos.above(),
+                frame -> !frame.getDirection().equals(Direction.UP) || frame.getItem().isEmpty(),
                 EntityType.ITEM_FRAME, EntityType.GLOW_ITEM_FRAME
             );
             if (!frames.isEmpty()) {
                 sections.add(new AnySection(Lists.transform(frames, frame -> new ItemSection(frame.getItem()))));
-                if (QcaServerRules.qcaDebugLog) {
-                    Qca.LOGGER.debug("(Tick) Tried to set the restrictor from the item frame.");
-                }
+                Qca.debugLog("(Tick) Tried to set the restrictor from the item frame.");
             }
         }
         if (QcaServerRules.canLimitByCustomName(QcaServerRules.easyHopperLimitation)) {
@@ -93,9 +90,7 @@ protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos bl
                     if (!Objects.equals(UnsafeUtil.<HopperCache>cast(hopper).qca$getCache(), name)) {
                         UnsafeUtil.<HopperCache>cast(hopper).qca$setCache(name);
                         sections.add(ItemPredicateParser.parseItemPredicate(name.getString()).orElse(null));
-                        if (QcaServerRules.qcaDebugLog) {
-                            Qca.LOGGER.debug("(Tick) Tried to set the restrictor from the custom name.");
-                        }
+                        Qca.debugLog("(Tick) Tried to set the restrictor from the custom name.");
                     }
                 });
         }

src/main/java/zh/qiushui/mod/qca/mixin/rule/easyHopperLimitation/MixinHopperBlockEntity.java

@@ -8,7 +8,6 @@
     "rule.boneMealDoubleSmallFlowers.MixinFlowerBlock",
     "rule.breakDripleafKeepStem.MixinBigDripleafStemBlock",
     "rule.crafterLimitation.MixinCrafterBlock",
-    "rule.easyHopperLimitation.HopperAccessor",
     "rule.easyHopperLimitation.MixinHopperBlockEntity",
     "rule.itemsCanPassThroughChains.MixinChainBlock",
     "rule.pvpDoNotDamageEquipment.MixinLivingEntity",