update

Author: QiuShui1012

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v4
       - name: validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
       - name: setup jdk ${{ matrix.java }}
         uses: actions/setup-java@v4
         with:

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

@@ -26,8 +26,8 @@
 import zh.qiushui.mod.qca.QcaSettings;
 import zh.qiushui.mod.qca.api.parse.ItemPredicateParser;
 import zh.qiushui.mod.qca.api.section.AllSection;
-import zh.qiushui.mod.qca.api.section.AnySection;
 import zh.qiushui.mod.qca.api.section.ItemSection;
+import zh.qiushui.mod.qca.api.section.AnySection;
 import zh.qiushui.mod.qca.api.section.Section;
 import zh.qiushui.mod.qca.rule.util.EntityUtil;
 
@@ -41,7 +41,7 @@ public abstract class MixinCrafterBlock {
     @Final
     private static EnumProperty<Orientation> ORIENTATION;
     @Unique
-    private Section section = null;
+    private Section limitation = null;
 
     @Inject(
         method = "scheduledTick",
@@ -53,7 +53,7 @@ public abstract class MixinCrafterBlock {
                      + "Lnet/minecraft/util/math/BlockPos;)V")
     )
     @SuppressWarnings("LoggingSimilarMessage")
-    private void qca$updateRestriction(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) {
+    private void qca$updateLimitation(BlockState state, ServerWorld world, BlockPos pos, Random random, CallbackInfo ci) {
         if (!QcaSettings.canLimit(QcaSettings.crafterLimitation)) return;
         List<Section> sections = new ArrayList<>();
         if (QcaSettings.canLimitByItemFrame(QcaSettings.crafterLimitation)) {
@@ -76,27 +76,27 @@ public abstract class MixinCrafterBlock {
         }
 
         if (sections.isEmpty()) {
-            this.section = null;
+            this.limitation = null;
             if (QcaSettings.qcaDebugLog) {
                 QcaExtension.LOGGER.debug("A crafter located at {} reset its restrictor.", pos);
             }
             return;
         }
         if (sections.size() > 1) {
-            this.section = new AllSection(sections);
+            this.limitation = new AllSection(sections);
         }
-        this.section = sections.getFirst();
+        this.limitation = sections.getFirst();
         if (QcaSettings.qcaDebugLog) {
-            QcaExtension.LOGGER.debug("A crafter located at {} updated its limit source {}.", pos, this.section);
+            QcaExtension.LOGGER.debug("A crafter located at {} updated its limit source {}.", pos, this.limitation);
         }
     }
 
     @ModifyExpressionValue(
         method = "craft",
         at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;isEmpty()Z", ordinal = 0))
-    private boolean qca$restrictResult(boolean isEmpty, @Local(ordinal = 0) ItemStack stack) {
+    private boolean qca$limitResult(boolean isEmpty, @Local(ordinal = 0) ItemStack stack) {
         if (!QcaSettings.canLimit(QcaSettings.crafterLimitation)) return isEmpty;
-        boolean matched = this.section.test(stack);
+        boolean matched = this.limitation.test(stack);
         if (QcaSettings.qcaDebugLog) {
             QcaExtension.LOGGER.debug(
                 "A crafter just limited. Input: {}, Result: {}",

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

@@ -41,7 +41,7 @@ public abstract class MixinHopperBlockEntity extends LockableContainerBlockEntit
     @Unique
     private Text customNameCache = null;
     @Unique
-    private Section section = null;
+    private Section limitation = null;
 
     protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos blockPos, BlockState blockState) {
         super(blockEntityType, blockPos, blockState);
@@ -58,17 +58,17 @@ protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos bl
     }
 
     @Override
-    public Section qca$getSection() {
-        return this.section;
+    public Section qca$getLimitation() {
+        return this.limitation;
     }
 
     @Override
-    public void qca$setSection(Section section) {
-        this.section = section;
+    public void qca$setLimitation(Section limitation) {
+        this.limitation = limitation;
     }
 
     @Inject(method = "serverTick", at = @At("TAIL"))
-    private static void qca$updateRestrictionOnTick(
+    private static void qca$updateLimitationOnTick(
         World world, BlockPos pos, BlockState state, HopperBlockEntity hopper, CallbackInfo ci
     ) {
         if (!QcaSettings.canLimit(QcaSettings.easyHopperLimitation)) return;
@@ -100,9 +100,9 @@ protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos bl
                 });
         }
         if (sections.size() > 1) {
-            hopper.qca$setSection(new AllSection(sections));
+            hopper.qca$setLimitation(new AllSection(sections));
         } else if (sections.size() == 1) {
-            hopper.qca$setSection(sections.getFirst());
+            hopper.qca$setLimitation(sections.getFirst());
         }
     }
 
@@ -114,10 +114,10 @@ protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos bl
                      + "canTransferTo(Lnet/minecraft/inventory/Inventory;"
                      + "ILnet/minecraft/item/ItemStack;)Z"
         ))
-    private static boolean qca$restrictExtract(
+    private static boolean qca$limitExtract(
         Inventory instance, Inventory inventory, int i, ItemStack stack, Operation<Boolean> original
     ) {
-        return original.call(instance, inventory, i, stack) && qca$restrict(inventory, stack);
+        return original.call(instance, inventory, i, stack) && qca$limit(inventory, stack);
     }
 
     @WrapOperation(
@@ -127,14 +127,14 @@ protected MixinHopperBlockEntity(BlockEntityType<?> blockEntityType, BlockPos bl
             target = "Lnet/minecraft/inventory/Inventory;"
                      + "isValid(ILnet/minecraft/item/ItemStack;)Z"
         ))
-    private static boolean qca$restrictInsert(Inventory instance, int i, ItemStack stack, Operation<Boolean> original) {
-        return original.call(instance, i, stack) && qca$restrict(instance, stack);
+    private static boolean qca$limitInsert(Inventory instance, int i, ItemStack stack, Operation<Boolean> original) {
+        return original.call(instance, i, stack) && qca$limit(instance, stack);
     }
 
     @Unique
-    private static boolean qca$restrict(Inventory inventory, ItemStack stack) {
+    private static boolean qca$limit(Inventory inventory, ItemStack stack) {
         return !QcaSettings.canLimit(QcaSettings.easyHopperLimitation)
                || !(inventory instanceof HopperBlockEntity hopper)
-               || hopper.qca$getSection().test(stack);
+               || hopper.qca$getLimitation().test(stack);
     }
 }

src/main/java/zh/qiushui/mod/qca/rule/util/easyHopperLimitation/HopperCache.java

@@ -11,10 +11,10 @@ public interface HopperCache {
     default void qca$setCache(Text cache) {
     }
 
-    default Section qca$getSection() {
+    default Section qca$getLimitation() {
         return null;
     }
 
-    default void qca$setSection(Section section) {
+    default void qca$setLimitation(Section section) {
     }
 }