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

c

Browse Source
This commit is contained in:
Brian Neumann-Fopiano
2026-06-08 00:20:23 -04:00
parent d20b3af9b9
commit cf2e7df298
3 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/art/arcane/iris/engine/object/IrisObject.java
+9 -3
View File
@@ -963,6 +963,7 @@ public class IrisObject extends IrisRegistrant {
int lowest = Integer.MAX_VALUE;
int topLayer = Integer.MIN_VALUE;
int vacuumLowest = Integer.MAX_VALUE;
int vacuumHighest = Integer.MIN_VALUE;
y += yrand;
readLock.lock();
@@ -1132,6 +1133,9 @@ public class IrisObject extends IrisRegistrant {
if (vacuuming && yy < vacuumLowest) {
vacuumLowest = yy;
}
if (vacuuming && yy > vacuumHighest) {
vacuumHighest = yy;
}
}
}
} catch (Throwable e) {
@@ -1370,7 +1374,7 @@ public class IrisObject extends IrisRegistrant {
int highZ = IrisObjectVacuum.footprintHigh(rotDim.getBlockZ());
int centerX = x + config.getTranslate().getX();
int centerZ = z + config.getTranslate().getZ();
vacuumTerrain(placer, config, centerX, centerZ, lowX, highX, lowZ, highZ, vacuumLowest);
vacuumTerrain(placer, config, centerX, centerZ, lowX, highX, lowZ, highZ, vacuumLowest, vacuumHighest);
}
if (heightmap != null) {
@@ -1409,7 +1413,7 @@ public class IrisObject extends IrisRegistrant {
+ "(forcePlace=false, fromBottom=false, mode!=FLOATING). Skipping to protect bedrock.");
}
private void vacuumTerrain(IObjectPlacer placer, IrisObjectPlacement config, int centerX, int centerZ, int lowX, int highX, int lowZ, int highZ, int baseY) {
private void vacuumTerrain(IObjectPlacer placer, IrisObjectPlacement config, int centerX, int centerZ, int lowX, int highX, int lowZ, int highZ, int baseY, int topY) {
ObjectPlaceMode mode = config.getMode();
IrisVacuumSettings settings = config.getVacuumSettings();
int radius = IrisObjectVacuum.resolveRadius(mode, settings);
@@ -1448,7 +1452,9 @@ public class IrisObject extends IrisRegistrant {
placer.set(cx, yy, cz, fill);
}
} else if (targetY < origY) {
for (int yy = origY; yy > targetY; yy--) {
boolean inside = IrisObjectVacuum.outset(dx, lowX, highX) == 0 && IrisObjectVacuum.outset(dz, lowZ, highZ) == 0;
int carveFloor = IrisObjectVacuum.carveFloorY(targetY, topY, inside);
for (int yy = origY; yy >= carveFloor; yy--) {
placer.set(cx, yy, cz, AIR);
}
}
core/src/main/java/art/arcane/iris/engine/object/IrisObjectVacuum.java
+8
View File
@@ -90,4 +90,12 @@ public final class IrisObjectVacuum {
double factor = Math.pow(t, Math.max(0.25, falloff));
return (int) Math.round(originalY + ((meetY - originalY) * factor));
}
public static int carveFloorY(int targetY, int objectTopY, boolean insideFootprint) {
int floor = targetY + 1;
if (insideFootprint) {
floor = Math.max(floor, objectTopY + 1);
}
return floor;
}
}