update 1.2.2

Author: QiuShui1012

build.gradle

@@ -1,5 +1,7 @@
 plugins {
+	id 'idea'
 	alias libs.plugins.fabric.loom
+	alias libs.plugins.lombok
 	alias libs.plugins.modpublish
 }
 
@@ -22,10 +24,7 @@ loom {
 
 dependencies {
 	minecraft libs.minecraft
-	mappings libs.mappings.yarn
-
-	compileOnly libs.lombok
-	annotationProcessor libs.lombok
+	mappings loom.officialMojangMappings()
 
 	modImplementation libs.bundles.fabric
 
@@ -57,35 +56,15 @@ jar {
 	}
 }
 
-publishMods {
-	file = remapJar.archiveFile
-	additionalFiles.from(remapSourcesJar.archiveFile)
-	changelog = file("latest-changelog.md").text
-	type = STABLE
-	modLoaders.add("fabric")
-
-	curseforge {
-		projectId = "1166675"
-		projectSlug = "qualia-carpet-addition"
-		accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-		requires("fabric-api")
-		requires("carpet")
-		minecraftVersions.add("1.21.6")
-		displayName = rootProject.version
-	}
-	modrinth {
-		projectId = "JyI4tI00"
-		accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-		requires("fabric-api")
-		requires("carpet")
-		minecraftVersions.add("1.21.6")
-		displayName = rootProject.version
-	}
-	github {
-		repository = "QiuShui1012/Qualia-Carpet-Addition"
-		accessToken = providers.environmentVariable("GITHUB_TOKEN")
-		commitish = "fabric/1.21.6"
-		displayName = project.version
-		tagName = project.version
+apply from: "$rootDir/gradle/scripts/publish.gradle"
+
+lombok {
+	version = "1.18.34"
+}
+
+idea {
+	module {
+		downloadJavadoc = true
+		downloadSources = true
 	}
 }

gradle.properties

@@ -4,6 +4,6 @@ org.gradle.parallel=true
 
 
 # Mod Properties
-version=1.2.1
+version=1.2.2
 group=zh.qiushui.mod
 archives_name=qca

gradle/libs.versions.toml

@@ -4,28 +4,23 @@
 minecraft = "1.21.6"
 fabric-loader = "0.16.14"
 
-mappings-yarn = "1.21.6+build.1"
-
 # Dependency Properties
 fabric-api = "0.127.0+1.21.6"
 fabric-carpet = "1.21.6-1.4.176+v250617"
 
-lombok = "1.18.30"
-
 # Gradle Plugin Properties
 fabric-loom = "1.10-SNAPSHOT"
+lombok = "8.7.1"
 modpublish = "0.8.4"
 
 [libraries]
 
 # Common
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
-lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok"}
 
 # Fabric
 fabric-loader = { group = "net.fabricmc", name = "fabric-loader", version.ref = "fabric-loader" }
 fabric-api = { group = "net.fabricmc.fabric-api", name = "fabric-api", version.ref = "fabric-api" }
-mappings-yarn = { group = "net.fabricmc", name = "yarn", version.ref = "mappings-yarn" }
 
 # Carpet
 fabric-carpet = { group = "carpet", name = "fabric-carpet", version.ref = "fabric-carpet" }
@@ -37,4 +32,5 @@ fabric = ["fabric-loader", "fabric-api"]
 [plugins]
 
 fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
+lombok = { id = "io.freefair.lombok", version.ref = "lombok" }
 modpublish = { id = "me.modmuss50.mod-publish-plugin", version.ref = "modpublish"}

gradle/scripts/publish.gradle

@@ -0,0 +1,32 @@
+publishMods {
+    file = remapJar.archiveFile
+    additionalFiles.from(remapSourcesJar.archiveFile)
+    changelog = file("latest-changelog.md").text
+    type = STABLE
+    modLoaders.add("fabric")
+
+    curseforge {
+        projectId = "1166675"
+        projectSlug = "qualia-carpet-addition"
+        accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
+        requires("fabric-api")
+        requires("carpet")
+        minecraftVersions.add("1.21.6")
+        displayName = rootProject.version
+    }
+    modrinth {
+        projectId = "JyI4tI00"
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        requires("fabric-api")
+        requires("carpet")
+        minecraftVersions.add("1.21.6")
+        displayName = rootProject.version
+    }
+    github {
+        repository = "QiuShui1012/Qualia-Carpet-Addition"
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        commitish = "fabric/1.21.6"
+        displayName = project.version
+        tagName = project.version
+    }
+}

latest-changelog.md

@@ -1,5 +1,5 @@
 ## What's new
-- Updated to 1.21.6
+- **Fixed hopper cannot be limited by item frame**
 -----------------------------------------------------------------
 ## 新更改
-- 更新至1.21.6
+- **修复了漏斗无法被物品展示框限类的问题**

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

@@ -2,12 +2,9 @@
 
 import carpet.CarpetExtension;
 import carpet.CarpetServer;
-import com.mojang.brigadier.CommandDispatcher;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
-import net.minecraft.command.CommandRegistryAccess;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.util.Identifier;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import zh.qiushui.mod.qca.rule.util.beaconIncreaseInteractionRange.BeaconUtil;
@@ -21,35 +18,44 @@ public class QcaExtension implements CarpetExtension, ModInitializer {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(MOD_NAME);
 
-    public static Identifier id(String path) {
-        return Identifier.of(MOD_ID, path);
+    public static ResourceLocation id(String path) {
+        return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
     }
 
     @Override
     public void onInitialize() {
         CarpetServer.manageExtension(this);
-
-        ServerTickEvents.END_WORLD_TICK.register(world -> BeaconUtil.tick());
     }
 
     @Override
-    public void onGameStarted() {
-        CarpetServer.settingsManager.parseSettingsClass(QcaSettings.class);
+    public String version() {
+        return MOD_ID;
     }
 
     @Override
-    public void registerCommands(
-        CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess commandBuildContext
-    ) {
+    public void onTick(MinecraftServer server) {
+        BeaconUtil.tick();
     }
 
     @Override
-    public String version() {
-        return MOD_ID;
+    public void onGameStarted() {
+        CarpetServer.settingsManager.parseSettingsClass(QcaSettings.class);
     }
 
     @Override
     public Map<String, String> canHasTranslations(String lang) {
         return TranslationsUtil.getTranslations(lang);
     }
+
+    public static void debugLog(String message) {
+        if (QcaSettings.qcaDebugLog) {
+            QcaExtension.LOGGER.debug(message);
+        }
+    }
+
+    public static void debugLog(String message, Object... args) {
+        if (QcaSettings.qcaDebugLog) {
+            QcaExtension.LOGGER.debug(message, args);
+        }
+    }
 }

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

@@ -1,13 +1,16 @@
 package zh.qiushui.mod.qca;
 
 import carpet.api.settings.Rule;
-import net.minecraft.block.Block;
+import net.minecraft.world.entity.ai.attributes.AttributeModifier;
+import net.minecraft.world.level.block.Block;
 import zh.qiushui.mod.qca.rule.util.PlantTransformUtil;
 
 import java.util.Arrays;
 import java.util.Set;
 
-import static carpet.api.settings.RuleCategory.*;
+import static carpet.api.settings.RuleCategory.EXPERIMENTAL;
+import static carpet.api.settings.RuleCategory.FEATURE;
+import static carpet.api.settings.RuleCategory.SURVIVAL;
 
 public class QcaSettings {
     public static final String QCA = "qca";
@@ -129,11 +132,19 @@ public static boolean beaconIncreaseIsEnabled() {
         return !beaconIncreaseInteractionRange.equals("false");
     }
 
-    public static boolean beaconIncreaseModeIsAdd() {
+    public static AttributeModifier.Operation beaconIncreaseMode() {
+        return QcaSettings.beaconIncreaseModeIsAdd()
+               ? AttributeModifier.Operation.ADD_VALUE
+               : QcaSettings.beaconIncreaseModeIsBase()
+                 ? AttributeModifier.Operation.ADD_MULTIPLIED_BASE
+                 : AttributeModifier.Operation.ADD_MULTIPLIED_TOTAL;
+    }
+
+    private static boolean beaconIncreaseModeIsAdd() {
         return beaconIncreaseInteractionRange.contains("add");
     }
 
-    public static boolean beaconIncreaseModeIsBase() {
+    private static boolean beaconIncreaseModeIsBase() {
         return beaconIncreaseInteractionRange.contains("Base");
     }
 
@@ -151,24 +162,17 @@ public static double getBeaconIncreaseInteractionRangeValue(int level) {
         boolean isAdd = beaconIncreaseModeIsAdd();
         return beaconIncreaseModeIsWithoutLevel()
                ? beaconIncreaseInteractionRangeValue
-               : (
-                   isAdd
-                   ? (level + beaconIncreaseInteractionRangeValue)
-                   : (level * beaconIncreaseInteractionRangeValue)
-               );
+               : isAdd
+                 ? (level + beaconIncreaseInteractionRangeValue)
+                 : (level * beaconIncreaseInteractionRangeValue);
     }
 
-    @Rule(
-        categories = {QCA, PVP, SURVIVAL, FEATURE, EXPERIMENTAL}
-    )
+    @Rule(categories = {QCA, PVP, SURVIVAL, FEATURE, EXPERIMENTAL})
     public static boolean pvpDoNotDamageEquipment = false;
-    @Rule(
-        categories = {QCA, PVP, SURVIVAL, FEATURE, EXPERIMENTAL}
-    )
+
+    @Rule(categories = {QCA, PVP, SURVIVAL, FEATURE, EXPERIMENTAL})
     public static boolean pvpDoNotDamageWeapon = false;
 
-    @Rule(
-        categories = {QCA, SURVIVAL, FEATURE, EXPERIMENTAL}
-    )
+    @Rule(categories = {QCA, SURVIVAL, FEATURE, EXPERIMENTAL})
     public static boolean boneMealDoubleSmallFlowers = false;
 }

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

@@ -3,7 +3,7 @@
 import carpet.api.settings.CarpetRule;
 import carpet.api.settings.Validator;
 import com.google.common.collect.ImmutableSet;
-import net.minecraft.server.command.ServerCommandSource;
+import net.minecraft.commands.CommandSourceStack;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -14,9 +14,7 @@ public static class PlantTransform extends Validator<String> {
         private static final Set<String> OPTIONS = Set.of("enable", "grasses", "dripleaf", "flowers", "disable");
 
         @Override
-        public String validate(
-            @Nullable ServerCommandSource serverCommandSource, CarpetRule<String> carpetRule, String newValue, String userInput
-        ) {
+        public String validate(@Nullable CommandSourceStack source, CarpetRule<String> carpetRule, String newValue, String userInput) {
             String[] options = newValue.trim().split(",");
             return !OPTIONS.containsAll(Arrays.stream(options).toList()) ? null : newValue;
         }
@@ -29,9 +27,7 @@ public String description() {
 
     public static class TooExpensiveLevel extends Validator<Integer> {
         @Override
-        public Integer validate(
-            @Nullable ServerCommandSource serverCommandSource, CarpetRule<Integer> carpetRule, Integer newValue, String userInput
-        ) {
+        public Integer validate(@Nullable CommandSourceStack source, CarpetRule<Integer> carpetRule, Integer newValue, String userInput) {
             return newValue < -1 ? 39 : newValue;
         }
 
@@ -45,9 +41,7 @@ public static class LimitationSources extends Validator<String> {
         private static final Set<String> OPTIONS = Set.of("disabled", "itemFrame", "customName");
 
         @Override
-        public String validate(
-            @Nullable ServerCommandSource serverCommandSource, CarpetRule<String> carpetRule, String newValue, String userInput
-        ) {
+        public String validate(@Nullable CommandSourceStack source, CarpetRule<String> carpetRule, String newValue, String userInput) {
             String[] options = newValue.trim().split(",");
             return !OPTIONS.containsAll(Arrays.stream(options).toList()) ? null : newValue;
         }
@@ -66,9 +60,7 @@ public static class BeaconIncreaseInteractionRangeMode extends Validator<String>
         );
 
         @Override
-        public String validate(
-            @Nullable ServerCommandSource serverCommandSource, CarpetRule<String> carpetRule, String newValue, String userInput
-        ) {
+        public String validate(@Nullable CommandSourceStack source, CarpetRule<String> carpetRule, String newValue, String userInput) {
             return !MODES.contains(newValue) ? null : newValue;
         }
 
@@ -80,10 +72,7 @@ public String description() {
 
     public static class BeaconIncreaseInteractionRangeValue extends Validator<Double> {
         @Override
-        public Double validate(
-            @Nullable ServerCommandSource serverCommandSource, CarpetRule<Double> carpetRule,
-            Double newValue, String userInput
-        ) {
+        public Double validate(@Nullable CommandSourceStack source, CarpetRule<Double> carpetRule, Double newValue, String userInput) {
             return (QcaSettings.beaconIncreaseIsEnabled() && newValue < 0) ? 0 : newValue;
         }
 
@@ -92,4 +81,4 @@ public String description() {
             return "This value represents the addend or multiplier will be used in calculate increase value. Rule beaconIncreaseInteractionRange must be enabled. Value must be positive.";
         }
     }
-}
+}

src/main/java/zh/qiushui/mod/qca/api/parse/ItemPredicateParser.java

@@ -1,10 +1,10 @@
 package zh.qiushui.mod.qca.api.parse;
 
-import net.minecraft.item.Item;
+import net.minecraft.world.item.Item;
 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.NotSection;
-import zh.qiushui.mod.qca.api.section.AnySection;
 import zh.qiushui.mod.qca.api.section.Section;
 import zh.qiushui.mod.qca.api.section.TagSection;
 import zh.qiushui.mod.qca.util.ParseUtil;
@@ -160,7 +160,7 @@ private Optional<Section> primary() {
 
             if (this.match(TokenType.ID)) {
                 return ParseUtil.parseItem(this.tokens.get(this.current - 1).value())
-                    .map(Item::getDefaultStack)
+                    .map(Item::getDefaultInstance)
                     .map(ItemSection::new);
             }
             if (this.match(TokenType.TAG)) {