mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-11-01 17:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master

Browse Source 
# Conflicts:
#	core/src/main/java/art/arcane/iris/world/pregen/AsyncPregenMethod.java
This commit is contained in:
Brian Neumann-Fopiano committed 2026-09-29 00:30:12 -04:00
2 parents ce1aad8a35 6c7796f12f
commit 73af3efe12
34 files changed
+688 -63
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedEngineBootstrap.java
+1 -4
View File
@@ -391,10 +391,7 @@ public final class ModdedEngineBootstrap {
BlockDataMergeSupport.StateMerger previousMerger = BlockDataMergeSupport.bindPlatformMerger(new NativeStateMerger(ModdedBlockResolution.BLOCKS)::merge);
rollback.add(() -> BlockDataMergeSupport.restorePlatformMerger(previousMerger));
NativeTileReader nativeTileReader = new NativeTileReader(() -> {
NativeModdedServer server = boundLoader.currentServer();
return server == null ? null : server.registryAccess();
});
NativeTileReader nativeTileReader = NativeTileReader.forServer(boundLoader::currentServer);
TileData.TileReader previousTileReader = TileData.bindPlatformReader(in -> ModdedTileData.wrap(nativeTileReader.read(in)));
rollback.add(() -> TileData.restorePlatformReader(previousTileReader));
adapters/modded-common/src/main/java/art/arcane/iris/modded/ModdedPlatform.java
+1 -13
View File
@@ -38,8 +38,6 @@ import art.arcane.iris.spi.PlatformScheduler;
import art.arcane.iris.spi.PlatformStructureHooks;
import art.arcane.volmlib.nativelib.terrain.NativeWorld;
import net.minecraft.core.HolderLookup;
import java.io.File;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -64,7 +62,7 @@ public final class ModdedPlatform implements IrisPlatform {
this.loader = loader;
this.registries = new ModdedRegistries(
new NativeRegistryAccess(new NativeRegistryAccess.Configuration(
ModdedPlatform::nativeRegistries, ModdedPlatform::reloadableRegistries,
ModdedEngineBootstrap::currentServer,
ModdedRegistries::warnNotReady)),
ModdedPlatform::generationRegistry);
this.scheduler = new ModdedScheduler();
@@ -72,16 +70,6 @@ public final class ModdedPlatform implements IrisPlatform {
this.biomeWriter = new ModdedBiomeWriter(new NativeBiomeRegistry(ModdedEngineBootstrap::currentServer, "minecraft:plains"));
}
private static HolderLookup.Provider nativeRegistries() {
NativeModdedServer server = ModdedEngineBootstrap.currentServer();
return server == null ? null : server.registryAccess();
}
private static HolderLookup.Provider reloadableRegistries() {
NativeModdedServer server = ModdedEngineBootstrap.currentServer();
return server == null ? null : server.reloadableRegistries();
}
public static void errorSink(Consumer<Throwable> sink) {
ERROR_SINK = sink;
}
adapters/modded-common/src/main/resources/pack.mcmeta
+7
View File
@@ -0,0 +1,7 @@
{
"pack": {
"description": "Iris client resources and mod data",
"min_format": [88, 0],
"max_format": [107, 1]
}
}