mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-07-23 15:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patches

Browse Source
This commit is contained in:
Brian Neumann-Fopiano
2026-06-12 06:58:32 -04:00
parent b98a341dc7
commit e2f6061f98
29 changed files with 4405 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/art/arcane/iris/core/structure/StructureIndexService.java
+3 -4
View File
@@ -19,10 +19,9 @@
package art.arcane.iris.core.structure;
import art.arcane.iris.spi.IrisLogging;
import art.arcane.iris.spi.IrisPlatforms;
import art.arcane.iris.core.loader.IrisData;
import art.arcane.iris.core.nms.INMS;
import art.arcane.iris.util.project.matter.IrisMatterSupport;
import art.arcane.volmlib.util.collection.KList;
import com.google.gson.GsonBuilder;
import java.io.File;
@@ -64,8 +63,8 @@ public final class StructureIndexService {
}
public static File write(IrisData data) {
KList<String> structures = INMS.get().getStructureKeys();
KList<String> sets = INMS.get().getStructureSetKeys();
List<String> structures = IrisPlatforms.get().structureHooks().structureKeys();
List<String> sets = IrisPlatforms.get().structureHooks().structureSetKeys();
List<String> vanilla = new ArrayList<>();
List<String> datapack = new ArrayList<>();
core/src/main/java/art/arcane/iris/engine/framework/IrisStructureLocator.java
+3 -10
View File
@@ -27,14 +27,13 @@ import art.arcane.iris.engine.object.IrisStructurePlacement;
import art.arcane.iris.engine.object.StructureDistribution;
import art.arcane.volmlib.util.collection.KList;
import art.arcane.volmlib.util.math.RNG;
import com.github.benmanes.caffeine.cache.Caffeine;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.WeakHashMap;
/**
* Finds where IRIS_PLACED structures generate. A structure key matches either the iris
@@ -51,7 +50,7 @@ import java.util.WeakHashMap;
* exhaustive per-chunk ring scan.
*/
public final class IrisStructureLocator {
private static final Map<IrisData, PlacementIndex> INDEX_CACHE = Collections.synchronizedMap(new WeakHashMap<>());
private static final com.github.benmanes.caffeine.cache.Cache<IrisData, PlacementIndex> INDEX_CACHE = Caffeine.newBuilder().weakKeys().build();
private IrisStructureLocator() {
}
@@ -280,13 +279,7 @@ public final class IrisStructureLocator {
private static PlacementIndex index(Engine engine) {
IrisData data = engine.getData();
PlacementIndex cached = INDEX_CACHE.get(data);
if (cached != null) {
return cached;
}
PlacementIndex built = build(engine, data);
INDEX_CACHE.put(data, built);
return built;
return INDEX_CACHE.get(data, (IrisData keyData) -> build(engine, keyData));
}
private static PlacementIndex build(Engine engine, IrisData data) {