From 93508d7514f6122a98d83eca09d264baea449e62 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 12 Jan 2021 05:57:42 -0500 Subject: [PATCH] Rename to jigsawStructures --- src/main/java/com/volmit/iris/object/IrisBiome.java | 7 +------ src/main/java/com/volmit/iris/object/IrisDimension.java | 8 -------- src/main/java/com/volmit/iris/object/IrisRegion.java | 5 ----- .../iris/scaffold/engine/EngineParallaxManager.java | 4 ++-- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java index cd100bae3..63baaca1f 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/object/IrisBiome.java @@ -133,7 +133,7 @@ public class IrisBiome extends IrisRegistrant implements IRare @ArrayType(min = 1, type = IrisJigsawStructurePlacement.class) @DontObfuscate @Desc("Jigsaw structures") - private KList jigsaw = new KList<>(); + private KList jigsawStructures = new KList<>(); @RegistryListBiome @DontObfuscate @@ -175,11 +175,6 @@ public class IrisBiome extends IrisRegistrant implements IRare @Desc("Generators for this biome. Multiple generators with different interpolation sizes will mix with other biomes how you would expect. This defines your biome height relative to the fluid height. Use negative for oceans.") private KList generators = new KList().qadd(new IrisBiomeGeneratorLink()); - @ArrayType(min = 1, type = IrisStructurePlacement.class) - @DontObfuscate - @Desc("A list of structure tilesets") - private KList structures = new KList<>(); - @ArrayType(min = 1, type = IrisDepositGenerator.class) @DontObfuscate @Desc("Define biome deposit generators that add onto the existing regional and global deposit generators") diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index 1101f43c4..bfb89b56e 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -152,14 +152,6 @@ public class IrisDimension extends IrisRegistrant @Desc("Carve terrain or not") private boolean carving = true; - @DontObfuscate - @Desc("Generate vanilla caves") - private boolean vanillaCaves = false; - - @DontObfuscate - @Desc("Generate vanilla structures") - private boolean vanillaStructures = false; - @DontObfuscate @Desc("If defined, If air is defined below the area, this fluid will always place") private IrisCaveFluid forceFluid = new IrisCaveFluid(); diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index 0762dc720..37e539b7b 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -122,11 +122,6 @@ public class IrisRegion extends IrisRegistrant implements IRare @Desc("The biome implosion ratio, how much to implode biomes into children (chance)") private double biomeImplosionRatio = 0.4; - @ArrayType(min = 1, type = IrisStructurePlacement.class) - @DontObfuscate - @Desc("A list of structure tilesets") - private KList structures = new KList<>(); - @RegistryListBiome @Required @ArrayType(min = 1, type = String.class) diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java index b487a37b0..b660a18ad 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java @@ -336,7 +336,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { default KList generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome) { KList placeAfter = new KList<>(); - for (IrisJigsawStructurePlacement i : biome.getJigsaw()) + for (IrisJigsawStructurePlacement i : biome.getJigsawStructures()) { if(rng.nextInt(i.getRarity()) == 0) { @@ -526,7 +526,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { objects.addAll(j.getPlace()); } - for(IrisJigsawStructurePlacement j : i.getJigsaw()) + for(IrisJigsawStructurePlacement j : i.getJigsawStructures()) { jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); Iris.info("Jig -> " + jig);