mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-24 08:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

add better backwards compat

Browse Source
This commit is contained in:
CrazyDev22
2024-05-25 15:34:51 +02:00
parent bee1973390
commit c9b26ebaff
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java
View File

@@ -62,12 +62,12 @@ public class IrisJigsawStructurePlacement implements IRare {
@Required @Required
@MinNumber(0) @MinNumber(0)
@Desc("Average distance in chunks between two neighboring generation attempts") @Desc("Average distance in chunks between two neighboring generation attempts")
private int spacing = 32; private int spacing = -1;
@Required @Required
@MinNumber(0) @MinNumber(0)
@Desc("Minimum distance in chunks between two neighboring generation attempts\nThe maximum distance of two neighboring generation attempts is 2*spacing - separation") @Desc("Minimum distance in chunks between two neighboring generation attempts\nThe maximum distance of two neighboring generation attempts is 2*spacing - separation")
private int separation = 16; private int separation = -1;
@Desc("The method used to spread the structure") @Desc("The method used to spread the structure")
private SpreadType spreadType = SpreadType.TRIANGULAR; private SpreadType spreadType = SpreadType.TRIANGULAR;
@@ -88,8 +88,21 @@ public class IrisJigsawStructurePlacement implements IRare {
return (int) Math.ceil(blocks / 16d); return (int) Math.ceil(blocks / 16d);
} }
private void calculateMissing(long seed) {
seed = seed + hashCode();
if (salt == 0) {
salt = new RNG(seed).nextLong(Integer.MIN_VALUE, Integer.MAX_VALUE);
}
if (separation == -1 || spacing == -1) {
separation = (int) Math.round(rarity / 20d);
spacing = new RNG(seed).nextInt(separation, separation * 2);
}
}
@ChunkCoordinates @ChunkCoordinates
public boolean shouldPlace(long seed, int x, int z) { public boolean shouldPlace(long seed, int x, int z) {
calculateMissing(seed);
if (separation > spacing) { if (separation > spacing) {
separation = spacing; separation = spacing;
Iris.warn("JigsawStructurePlacement: separation must be less than or equal to spacing"); Iris.warn("JigsawStructurePlacement: separation must be less than or equal to spacing");