修复一个特殊环境下会出现的bug

可能优化了性能

Author: Circulate233

.github/workflows/deploy.yml

@@ -10,7 +10,7 @@ plugins {
     id 'java-library'
     id 'maven-publish'
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.9'
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.4.1'
+    id 'com.gtnewhorizons.retrofuturagradle' version '2.0.2'
     id 'org.jetbrains.changelog' version '2.2.1'
 }
 

build.gradle

@@ -15,7 +15,7 @@ show_testing_output = false
 
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
-mod_version = 1.2.4
+mod_version = 1.2.5
 root_package = com.circulation
 mod_id = only_one_item
 mod_name = OnlyOneItem
@@ -109,6 +109,7 @@ mixin_configs = ${mod_id}
 # A refmap is a json that denotes mapping conversions, this json is generated automatically, with the name `mixins.mod_id.refmap.json`
 # Use the property `mixin_refmap` if you want it to use a different name, only one name is accepted
 mixin_refmap = mixins.${mod_id}.refmap.json
+mixin_package = com.circulation.only_one_item.mixin.mc
 
 # Coremods
 # The most powerful way to change java classes at runtime, it is however very primitive with little documentation.
@@ -123,4 +124,4 @@ coremod_plugin_class_name = com.circulation.only_one_item.mixin.EarlyMixinLoader
 # Convenient way to allow downloading of assets from official vanilla Minecraft servers, CurseForge, or any direct links
 # Documentation: https://github.com/CleanroomMC/AssetMover
 use_asset_mover = false
-asset_mover_version = 2.5
+asset_mover_version = 2.5

gradle.properties

@@ -47,7 +47,7 @@ if (propertyBool('publish_to_curseforge')) {
             addGameVersion 'Forge'
             addGameVersion '1.12.2'
             releaseType = propertyString('release_type')
-            if (!propertyBool('publish_with_changelog')) {
+            if (propertyBool('publish_with_changelog')) {
                 changelog = parserChangelog()
                 changelogType = 'markdown'
             }
@@ -78,7 +78,7 @@ if (propertyBool('publish_to_modrinth')) {
     assertProperty('release_type')
     setDefaultProperty('modrinth_debug', false, false)
     modrinth {
-        token = System.getenv('MODRINTH_TOKEN') ? "" : System.getenv('MODRINTH_TOKEN')
+        token = System.getenv('MODRINTH_TOKEN') ?: ""
         projectId = propertyString('modrinth_project_id')
         versionNumber = propertyString('mod_version')
         versionType = propertyString('release_type')
@@ -96,12 +96,12 @@ if (propertyBool('publish_to_modrinth')) {
                 }
             }
         }
-        if (!propertyBool('publish_with_changelog')) {
+        if (propertyBool('publish_with_changelog')) {
             changelog = parserChangelog()
         }
         if (propertyBool('modrinth_sync_readme')) {
             syncBodyFrom = file('README.md').text
             tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
         }
     }
-}
+}

gradle/scripts/publishing.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -6,10 +6,13 @@
 import com.circulation.only_one_item.handler.MatchFluidHandler;
 import com.circulation.only_one_item.handler.MatchItemHandler;
 import com.circulation.only_one_item.util.BlackMatchItem;
+import com.circulation.only_one_item.util.MatchItem;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
+import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fml.common.Loader;
 
@@ -26,19 +29,23 @@ public class OOIConfig {
     public static final List<FluidConversionTarget> fluids = new ObjectArrayList<>();
     public static final Set<BlackMatchItem> blackList = new ObjectOpenHashSet<>();
 
-    public static void readConfig() throws IOException {
+    public static void readConfig() {
         var configPath = Loader.instance().getConfigDir().toPath().resolve("ooi");
         var ooiPath = configPath.resolve("ooi_item.json");
         var blackPath = configPath.resolve("ooi_item_black_list.json");
         var ooiFluidPath = configPath.resolve("ooi_fluid.json");
 
-        Files.createDirectories(configPath);
+        try {
+            Files.createDirectories(configPath);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         var config = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create();
 
         if (Files.exists(ooiPath)) {
             try {
-                items.addAll(config.fromJson(new String(Files.readAllBytes(ooiPath), StandardCharsets.UTF_8), (new TypeToken<Set<ItemConversionTarget>>() {
+                addItemTargets(config.fromJson(new String(Files.readAllBytes(ooiPath), StandardCharsets.UTF_8), (new TypeToken<Set<ItemConversionTarget>>() {
                 }).getType()));
             } catch (Exception ignored) {
                 OnlyOneItem.LOGGER.error("[OOI]The config/ooi/ooi_item.json file is incorrect!");
@@ -50,24 +57,30 @@ public static void readConfig() throws IOException {
                 if (inputStream != null) {
                     Files.copy(inputStream, ooiPath);
                 }
+            } catch (IOException e) {
+                throw new RuntimeException(e);
             }
         }
 
         if (Files.exists(ooiFluidPath)) {
             try {
-                fluids.addAll(config.fromJson(new String(Files.readAllBytes(ooiFluidPath), StandardCharsets.UTF_8), (new TypeToken<Set<FluidConversionTarget>>() {
+                addFluidTargets(config.fromJson(new String(Files.readAllBytes(ooiFluidPath), StandardCharsets.UTF_8), (new TypeToken<Set<FluidConversionTarget>>() {
                 }).getType()));
             } catch (Exception ignored) {
                 OnlyOneItem.LOGGER.error("[OOI]The config/ooi/ooi_fluid.json file is incorrect!");
             }
         } else {
             fluids.add(new FluidConversionTarget(FluidRegistry.WATER.getName()).addMatchFluid(FluidRegistry.WATER.getName()));
-            Files.write(ooiFluidPath, config.toJson(fluids).getBytes(StandardCharsets.UTF_8));
+            try {
+                Files.write(ooiFluidPath, config.toJson(fluids).getBytes(StandardCharsets.UTF_8));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
 
         if (Files.exists(blackPath)) {
             try {
-                blackList.addAll(config.fromJson(new String(Files.readAllBytes(blackPath), StandardCharsets.UTF_8), (new TypeToken<Set<BlackMatchItem>>() {
+                addBlackList(config.fromJson(new String(Files.readAllBytes(blackPath), StandardCharsets.UTF_8), (new TypeToken<Set<BlackMatchItem>>() {
                 }).getType()));
             } catch (Exception ignored) {
                 OnlyOneItem.LOGGER.error("[OOI]The config/ooi/ooi_item_black_list.json file is incorrect!");
@@ -76,9 +89,91 @@ public static void readConfig() throws IOException {
             blackList.add(BlackMatchItem.getInstance("minecraft:gold_ingot", 0));
             blackList.add(BlackMatchItem.getInstance(Type.OreDict, "ingotGold"));
             blackList.add(BlackMatchItem.getInstance(Type.ModID, "minecraft"));
-            Files.write(blackPath, config.toJson(blackList).getBytes(StandardCharsets.UTF_8));
+            try {
+                Files.write(blackPath, config.toJson(blackList).getBytes(StandardCharsets.UTF_8));
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         MatchItemHandler.InitTarget();
         MatchFluidHandler.Init(OOIConfig.fluids);
     }
-}
+
+    private static void addItemTargets(Set<ItemConversionTarget> targets) {
+        if (targets == null) return;
+        for (ItemConversionTarget target : targets) {
+            if (target == null || !isRegisteredItem(target.getTargetID()) || target.getMatchItems() == null) {
+                continue;
+            }
+            Set<MatchItem> validMatches = new ObjectOpenHashSet<>();
+            for (MatchItem matchItem : target.getMatchItems()) {
+                if (isValidMatchItem(matchItem)) {
+                    validMatches.add(matchItem);
+                }
+            }
+            if (!validMatches.isEmpty()) {
+                items.add(target.setMatchItem(validMatches));
+            }
+        }
+    }
+
+    private static void addFluidTargets(Set<FluidConversionTarget> targets) {
+        if (targets == null) return;
+        for (FluidConversionTarget target : targets) {
+            if (target == null || target.getTarget() == null || target.getMatchFluids() == null) {
+                continue;
+            }
+            Set<String> validMatches = new ObjectOpenHashSet<>();
+            for (String fluid : target.getMatchFluids()) {
+                if (isNotBlank(fluid)) {
+                    validMatches.add(fluid);
+                }
+            }
+            if (!validMatches.isEmpty()) {
+                fluids.add(target.setMatchFluids(validMatches));
+            }
+        }
+    }
+
+    private static void addBlackList(Set<BlackMatchItem> targets) {
+        if (targets == null) return;
+        for (BlackMatchItem target : targets) {
+            if (isValidBlackList(target)) {
+                blackList.add(target);
+            }
+        }
+    }
+
+    private static boolean isValidMatchItem(MatchItem matchItem) {
+        if (matchItem == null) return false;
+        if (isNotBlank(matchItem.oreName())) return true;
+        return isValidResourceLocation(matchItem.id());
+    }
+
+    private static boolean isValidBlackList(BlackMatchItem target) {
+        if (target == null || target.type() == null || !isNotBlank(target.name())) return false;
+        return switch (target.type()) {
+            case Item -> isValidResourceLocation(target.name());
+            case OreDict, ModID -> true;
+        };
+    }
+
+    private static boolean isRegisteredItem(String id) {
+        if (!isValidResourceLocation(id)) return false;
+        return Item.getByNameOrId(id) != null;
+    }
+
+    private static boolean isValidResourceLocation(String id) {
+        if (!isNotBlank(id)) return false;
+        try {
+            new ResourceLocation(id);
+            return true;
+        } catch (RuntimeException ignored) {
+            return false;
+        }
+    }
+
+    private static boolean isNotBlank(String value) {
+        return value != null && !value.trim().isEmpty();
+    }
+}

src/main/java/com/circulation/only_one_item/OOIConfig.java

@@ -6,7 +6,6 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -15,8 +14,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.IOException;
-
 @Mod(modid = OnlyOneItem.MOD_ID, name = Tags.MOD_NAME, version = Tags.VERSION,
     dependencies = "required-after:mixinbooter@[8.0,);"
 )
@@ -33,22 +30,12 @@ public class OnlyOneItem {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         MinecraftForge.EVENT_BUS.register(new OreDictionaryHandler());
-        try {
-            OOIConfig.readConfig();
-        } catch (IOException ignored) {
-
-        }
-    }
-
-    @Mod.EventHandler
-    public void init(FMLInitializationEvent event) {
-        if (!Loader.isModLoaded("crafttweaker")) {
-            InitHandler.allPreInit();
-        }
+        OOIConfig.readConfig();
     }
 
     @Mod.EventHandler
     public void postInit(FMLPostInitializationEvent event) {
+        InitHandler.allPreInit();
         if (!Loader.isModLoaded("unidict")) {
             MatchItemHandler.clearRecipe();
         }
@@ -59,4 +46,4 @@ public void loadComplete(FMLLoadCompleteEvent event) {
         MatchItemHandler.postODProcess();
     }
 
-}
+}

src/main/java/com/circulation/only_one_item/OnlyOneItem.java

@@ -8,6 +8,7 @@
 public class InitHandler {
 
     public static void allPreInit() {
+        MatchFluidHandler.lock();
         MatchItemHandler.preItemStackInit();
         MatchFluidHandler.preFluidStackInit();