From 62325d9784a800f6c4f4a2e9c8b6fd5dac76f6e0 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 4 Jan 2021 20:54:37 -0500 Subject: [PATCH] Support features in iris biomes dimensions and regions --- src/main/java/com/volmit/iris/object/IrisBiome.java | 5 +++++ .../java/com/volmit/iris/object/IrisDimension.java | 11 ++++++++--- src/main/java/com/volmit/iris/object/IrisRegion.java | 5 +++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/object/IrisBiome.java index 64def931f..25cfb6797 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/object/IrisBiome.java @@ -41,6 +41,11 @@ public class IrisBiome extends IrisRegistrant implements IRare @ArrayType(min = 1, type = IrisEntitySpawnOverride.class) private KList entitySpawnOverrides = new KList<>(); + @DontObfuscate + @Desc("Add random chances for terrain features") + @ArrayType(min = 1, type = IrisFeaturePotential.class) + private KList features = new KList<>(); + @DontObfuscate @Desc("Entity spawns during generation") @ArrayType(min = 1, type = IrisEntityInitialSpawn.class) diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/object/IrisDimension.java index 0d9a6bb4c..111695851 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/object/IrisDimension.java @@ -57,15 +57,20 @@ public class IrisDimension extends IrisRegistrant private KList entitySpawnOverrides = new KList<>(); @DontObfuscate - @Desc("Add spatial effects to iris noise") - @ArrayType(min = 1, type = NoiseEffectZone.class) - private KList noiseEffectZones = new KList<>(); + @Desc("Add specific features in exact positions") + @ArrayType(min = 1, type = IrisFeaturePositional.class) + private KList specificFeatures = new KList<>(); @DontObfuscate @Desc("Entity spawns during generation") @ArrayType(min = 1, type = IrisEntityInitialSpawn.class) private KList entityInitialSpawns = new KList<>(); + @DontObfuscate + @Desc("Add random chances for terrain features") + @ArrayType(min = 1, type = IrisFeaturePotential.class) + private KList features = new KList<>(); + @DontObfuscate @Desc("Reference loot tables in this area") private IrisLootReference loot = new IrisLootReference(); diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/object/IrisRegion.java index 2ac2a2a6a..0762dc720 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/object/IrisRegion.java @@ -25,6 +25,11 @@ public class IrisRegion extends IrisRegistrant implements IRare @Desc("The name of the region") private String name = "A Region"; + @DontObfuscate + @Desc("Add random chances for terrain features") + @ArrayType(min = 1, type = IrisFeaturePotential.class) + private KList features = new KList<>(); + @ArrayType(min = 1, type = IrisEffect.class) @DontObfuscate @Desc("Effects are ambient effects such as potion effects, random sounds, or even particles around each player. All of these effects are played via packets so two players won't see/hear each others effects.\nDue to performance reasons, effects will play arround the player even if where the effect was played is no longer in the biome the player is in.")