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

Rename to jigsawStructures

Browse Source
This commit is contained in:
Daniel Mills 2021-01-12 05:57:42 -05:00
parent 1493beb79b
commit 93508d7514
4 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/volmit/iris/object/IrisBiome.java
View File

@ -133,7 +133,7 @@ public class IrisBiome extends IrisRegistrant implements IRare
@ArrayType(min = 1, type = IrisJigsawStructurePlacement.class) @ArrayType(min = 1, type = IrisJigsawStructurePlacement.class)
@DontObfuscate @DontObfuscate
@Desc("Jigsaw structures") @Desc("Jigsaw structures")
private KList<IrisJigsawStructurePlacement> jigsaw = new KList<>(); private KList<IrisJigsawStructurePlacement> jigsawStructures = new KList<>();
@RegistryListBiome @RegistryListBiome
@DontObfuscate @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.") @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<IrisBiomeGeneratorLink> generators = new KList<IrisBiomeGeneratorLink>().qadd(new IrisBiomeGeneratorLink()); private KList<IrisBiomeGeneratorLink> generators = new KList<IrisBiomeGeneratorLink>().qadd(new IrisBiomeGeneratorLink());
@ArrayType(min = 1, type = IrisStructurePlacement.class)
@DontObfuscate
@Desc("A list of structure tilesets")
private KList<IrisStructurePlacement> structures = new KList<>();
@ArrayType(min = 1, type = IrisDepositGenerator.class) @ArrayType(min = 1, type = IrisDepositGenerator.class)
@DontObfuscate @DontObfuscate
@Desc("Define biome deposit generators that add onto the existing regional and global deposit generators") @Desc("Define biome deposit generators that add onto the existing regional and global deposit generators")

8
src/main/java/com/volmit/iris/object/IrisDimension.java
View File

@ -152,14 +152,6 @@ public class IrisDimension extends IrisRegistrant
@Desc("Carve terrain or not") @Desc("Carve terrain or not")
private boolean carving = true; private boolean carving = true;
@DontObfuscate
@Desc("Generate vanilla caves")
private boolean vanillaCaves = false;
@DontObfuscate
@Desc("Generate vanilla structures")
private boolean vanillaStructures = false;
@DontObfuscate @DontObfuscate
@Desc("If defined, If air is defined below the area, this fluid will always place") @Desc("If defined, If air is defined below the area, this fluid will always place")
private IrisCaveFluid forceFluid = new IrisCaveFluid(); private IrisCaveFluid forceFluid = new IrisCaveFluid();

5
src/main/java/com/volmit/iris/object/IrisRegion.java
View File

@ -122,11 +122,6 @@ public class IrisRegion extends IrisRegistrant implements IRare
@Desc("The biome implosion ratio, how much to implode biomes into children (chance)") @Desc("The biome implosion ratio, how much to implode biomes into children (chance)")
private double biomeImplosionRatio = 0.4; private double biomeImplosionRatio = 0.4;
@ArrayType(min = 1, type = IrisStructurePlacement.class)
@DontObfuscate
@Desc("A list of structure tilesets")
private KList<IrisStructurePlacement> structures = new KList<>();
@RegistryListBiome @RegistryListBiome
@Required @Required
@ArrayType(min = 1, type = String.class) @ArrayType(min = 1, type = String.class)

4
src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java
View File

@ -336,7 +336,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
default KList<Runnable> generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome) { default KList<Runnable> generateParallaxJigsaw(RNG rng, int x, int z, IrisBiome biome) {
KList<Runnable> placeAfter = new KList<>(); KList<Runnable> placeAfter = new KList<>();
for (IrisJigsawStructurePlacement i : biome.getJigsaw()) for (IrisJigsawStructurePlacement i : biome.getJigsawStructures())
{ {
if(rng.nextInt(i.getRarity()) == 0) if(rng.nextInt(i.getRarity()) == 0)
{ {
@ -526,7 +526,7 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer {
objects.addAll(j.getPlace()); objects.addAll(j.getPlace());
} }
for(IrisJigsawStructurePlacement j : i.getJigsaw()) for(IrisJigsawStructurePlacement j : i.getJigsawStructures())
{ {
jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension()); jig = Math.max(jig, getData().getJigsawStructureLoader().load(j.getStructure()).getMaxDimension());
Iris.info("Jig -> " + jig); Iris.info("Jig -> " + jig);