mirrors/Iris
1
0 Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-10-25 21:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Perf Pass 1

Browse Source
This commit is contained in:
Brian Neumann-Fopiano committed 2026-05-30 22:39:51 -04:00
1 parent 9ff1c502ef
commit 7eb6e87a81
20 files changed
+787 -70
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

nms/v1_21_R7/src/main/java/art/arcane/iris/core/nms/v1_21_R7/IrisChunkGenerator.java
+31 -1
View File
@@ -46,7 +46,9 @@ import org.spigotmc.SpigotWorldConfig;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -173,15 +175,18 @@ public class IrisChunkGenerator extends CustomChunkGenerator {
BoundingBox area = writableArea(chunk);
int steps = GenerationStep.Decoration.values().length;
IrisVanillaStructureControl control = vanillaControl();
int undergroundShift = control.getUndergroundYShift();
for (int step = 0; step < steps; step++) {
int index = 0;
for (Structure structure : byStep.getOrDefault(step, List.of())) {
Object id = registry.getKey(structure);
if (control.shouldGenerate(id == null ? null : id.toString())) {
random.setFeatureSeed(decoSeed, index, step);
int yShift = (undergroundShift != 0 && isUndergroundStep(structure.step())) ? undergroundShift : 0;
WorldGenLevel target = yShift == 0 ? world : yShiftedLevel(world, yShift);
try {
structureManager.startsForStructure(sectionPos, structure)
.forEach(start -> start.placeInChunk(world, structureManager, this, random, area, chunkPos));
.forEach(start -> start.placeInChunk(target, structureManager, this, random, area, chunkPos));
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -191,6 +196,31 @@ public class IrisChunkGenerator extends CustomChunkGenerator {
}
}
private static boolean isUndergroundStep(GenerationStep.Decoration step) {
return step == GenerationStep.Decoration.UNDERGROUND_STRUCTURES
|| step == GenerationStep.Decoration.STRONGHOLDS;
}
private WorldGenLevel yShiftedLevel(WorldGenLevel world, int yShift) {
return (WorldGenLevel) Proxy.newProxyInstance(
WorldGenLevel.class.getClassLoader(),
new Class<?>[]{WorldGenLevel.class},
(proxy, method, args) -> {
if (args != null) {
for (int i = 0; i < args.length; i++) {
if (args[i] instanceof BlockPos bp) {
args[i] = new BlockPos(bp.getX(), bp.getY() + yShift, bp.getZ());
}
}
}
try {
return method.invoke(world, args);
} catch (InvocationTargetException e) {
throw e.getCause();
}
});
}
private BoundingBox writableArea(ChunkAccess chunk) {
ChunkPos cp = chunk.getPos();
int i = cp.getMinBlockX();
nms/v26_1_R1/src/main/java/art/arcane/iris/core/nms/v26_1_R1/IrisChunkGenerator.java
+31 -1
View File
@@ -46,7 +46,9 @@ import org.spigotmc.SpigotWorldConfig;
import javax.annotation.Nullable;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.*;
import java.util.concurrent.CompletableFuture;
@@ -173,15 +175,18 @@ public class IrisChunkGenerator extends CustomChunkGenerator {
BoundingBox area = writableArea(chunk);
int steps = GenerationStep.Decoration.values().length;
IrisVanillaStructureControl control = vanillaControl();
int undergroundShift = control.getUndergroundYShift();
for (int step = 0; step < steps; step++) {
int index = 0;
for (Structure structure : byStep.getOrDefault(step, List.of())) {
Object id = registry.getKey(structure);
if (control.shouldGenerate(id == null ? null : id.toString())) {
random.setFeatureSeed(decoSeed, index, step);
int yShift = (undergroundShift != 0 && isUndergroundStep(structure.step())) ? undergroundShift : 0;
WorldGenLevel target = yShift == 0 ? world : yShiftedLevel(world, yShift);
try {
structureManager.startsForStructure(sectionPos, structure)
.forEach(start -> start.placeInChunk(world, structureManager, this, random, area, chunkPos));
.forEach(start -> start.placeInChunk(target, structureManager, this, random, area, chunkPos));
} catch (Throwable e) {
Iris.reportError(e);
}
@@ -191,6 +196,31 @@ public class IrisChunkGenerator extends CustomChunkGenerator {
}
}
private static boolean isUndergroundStep(GenerationStep.Decoration step) {
return step == GenerationStep.Decoration.UNDERGROUND_STRUCTURES
|| step == GenerationStep.Decoration.STRONGHOLDS;
}
private WorldGenLevel yShiftedLevel(WorldGenLevel world, int yShift) {
return (WorldGenLevel) Proxy.newProxyInstance(
WorldGenLevel.class.getClassLoader(),
new Class<?>[]{WorldGenLevel.class},
(proxy, method, args) -> {
if (args != null) {
for (int i = 0; i < args.length; i++) {
if (args[i] instanceof BlockPos bp) {
args[i] = new BlockPos(bp.getX(), bp.getY() + yShift, bp.getZ());
}
}
}
try {
return method.invoke(world, args);
} catch (InvocationTargetException e) {
throw e.getCause();
}
});
}
private BoundingBox writableArea(ChunkAccess chunk) {
ChunkPos cp = chunk.getPos();
int i = cp.getMinBlockX();