- Fix NPE in CachedRGBFontRenderer#L55.

- ResourceExistStateCache now no longer works on all states.
- StitcherCache now cleans up its own memory when it finishes loading.
- Improved keySet() performance of BlockPos2ValueMap.

Author: KasumiNova

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
 
 // Project properties
 group = "github.kasuminova.stellarcore"
-version = "1.2.1"
+version = "1.3.0"
 
 // Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
 java {
@@ -278,6 +278,8 @@ dependencies {
     compileOnly(rfg.deobf("curse.maven:random-psideas-302313:3215550"))
     compileOnly(rfg.deobf("curse.maven:journeymap-32274:5172461"))
     compileOnly(rfg.deobf("curse.maven:abyssalcraft-53686:5330323"))
+    compileOnly(rfg.deobf("curse.maven:vintagefix-871198:5536276"))
+    compileOnly(rfg.deobf("curse.maven:lolasm-460609:5257348"))
 }
 
 // IDE Settings

src/main/java/github/kasuminova/stellarcore/client/gui/font/CachedRGBFontRenderer.java

@@ -52,7 +52,7 @@ public static List<String> mapListedString(List<String> listed, LinkedList<Strin
                 final char ch = charArray[j];
                 mapping.append(ch);
 
-                String strFirst = strList.getFirst();
+                String strFirst = strList.peekFirst();
                 if (strFirst == null || colors.getFirst() == null) {
                     sb.append(ch);
                     continue;

src/main/java/github/kasuminova/stellarcore/client/model/ModelLoaderRegistryRef.java

@@ -0,0 +1,9 @@
+package github.kasuminova.stellarcore.client.model;
+
+import github.kasuminova.stellarcore.mixin.util.ConcurrentModelLoaderRegistry;
+
+public class ModelLoaderRegistryRef {
+
+    public static ConcurrentModelLoaderRegistry instance = null;
+
+}

src/main/java/github/kasuminova/stellarcore/client/resource/ResourceExistingCache.java

@@ -0,0 +1,30 @@
+package github.kasuminova.stellarcore.client.resource;
+
+import github.kasuminova.stellarcore.mixin.util.StellarCoreResourcePack;
+import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
+
+import java.util.Set;
+
+public class ResourceExistingCache {
+
+    private static final Set<StellarCoreResourcePack> RESOURCE_PACKS = new ReferenceOpenHashSet<>();
+
+    public static void addResourcePack(StellarCoreResourcePack resourcePack) {
+        RESOURCE_PACKS.add(resourcePack);
+        resourcePack.stellar_core$onReload();
+    }
+
+    public static void clear() {
+        RESOURCE_PACKS.forEach(StellarCoreResourcePack::stellar_core$disableCache);
+        RESOURCE_PACKS.clear();
+    }
+
+    public static void enableCache() {
+        RESOURCE_PACKS.forEach(StellarCoreResourcePack::stellar_core$enableCache);
+    }
+
+    public static void disableCache() {
+        RESOURCE_PACKS.forEach(StellarCoreResourcePack::stellar_core$disableCache);
+    }
+
+}

src/main/java/github/kasuminova/stellarcore/client/texture/StitcherCache.java

@@ -181,6 +181,15 @@ public void cache(Set<Stitcher.Holder> holders, List<Stitcher.Slot> slots, int w
         this.height = height;
         this.cacheState = State.AVAILABLE;
     }
+    
+    public void clear() {
+        this.holders.clear();
+        this.slots.clear();
+        this.readTag = null;
+        this.width = 0;
+        this.height = 0;
+        this.cacheState = State.UNKNOWN;
+    }
 
     public String getName() {
         return name;

src/main/java/github/kasuminova/stellarcore/common/config/StellarCoreConfig.java

@@ -598,6 +598,16 @@ public static class Vanilla {
             @Config.Name("ParallelModelLoader")
             public boolean parallelModelLoader = true;
 
+            @Config.Comment({
+                    "(Client Performance) Clearing the cache after loading a model, significantly reduce memory usage.",
+                    "But it may cause some mod's models to be messed up after reloading ResourcePacks,",
+                    "Turning this option off will use more memory.",
+                    "If you installed FoamFix, FoamFix does the same thing but StellarCore is faster, you may need to turn off the `wipeModelCache` option in foamfix.cfg."
+            })
+            @Config.RequiresMcRestart
+            @Config.Name("WipeModelCache")
+            public boolean wipeModelCache = true;
+
             @Config.Comment({
                     "Defining which ModelLoader cannot be safely asynchronized to allow StellarCore to load models",
                     "using a synchronous approach, usually requires no modification to it."
@@ -664,14 +674,11 @@ public static class Vanilla {
 
             @Config.Comment({
                     "(Client Performance) Caches the state of existence of each resource file in the ResourcePack,",
-                    "avoiding the use of the resourceExists method with its excessive overhead to improve game loading performance.",
-                    "Effective in large ModPacks and optimises the impact on startup time when installing with Optifine, with good compatibility.",
-                    "If you encounter some resources that don't load properly (which they usually don't), reload the resource packs, this will reset the cache.",
-                    "Incompatible with GroovyScript, and I don't know why."
+                    "improve the speed of model loading, if you encounter the game can not be loaded or display anomaly, turn off this option."
             })
             @Config.RequiresMcRestart
             @Config.Name("ResourceExistStateCache")
-            public boolean resourceExistStateCache = false;
+            public boolean resourceExistStateCache = true;
 
         }
 

src/main/java/github/kasuminova/stellarcore/common/util/BlockPos2ValueMap.java

@@ -7,12 +7,12 @@
 
 import javax.annotation.Nonnull;
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class BlockPos2ValueMap<V> implements Map<BlockPos, V> {
 
     protected final Long2ObjectMap<V> internal = new Long2ObjectLinkedOpenHashMap<>();
     protected EntrySet entrySet = null;
+    protected KeySet keySet = null;
 
     @Override
     public int size() {
@@ -71,7 +71,7 @@ public void clear() {
     @Nonnull
     @Override
     public Set<BlockPos> keySet() {
-        return internal.keySet().stream().map(BlockPos::fromLong).collect(Collectors.toSet());
+        return keySet == null ? keySet = new KeySet() : keySet;
     }
 
     @Nonnull
@@ -117,6 +117,21 @@ public Iterator<Map.Entry<BlockPos, V>> iterator() {
         }
     }
 
+    public class KeySet extends AbstractSet<BlockPos> {
+
+        @Nonnull
+        @Override
+        public Iterator<BlockPos> iterator() {
+            return Iterators.transform(entrySet().iterator(), Map.Entry::getKey);
+        }
+
+        @Override
+        public int size() {
+            return internal.size();
+        }
+
+    }
+
     public static class Entry<V> implements Map.Entry<BlockPos, V> {
         private final Long2ObjectMap.Entry<V> parent;