From 101d0212a76cc05960ef5ac5549fb99e3179d322 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Thu, 22 Jul 2021 19:43:30 -0400 Subject: [PATCH] Pullbuild --- .../java/com/volmit/iris/engine/object/IrisMod.java | 3 --- .../iris/engine/object/IrisModBiomeInjector.java | 10 ++++------ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/object/IrisMod.java b/src/main/java/com/volmit/iris/engine/object/IrisMod.java index eb37223e6..ea1510ab1 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisMod.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMod.java @@ -102,17 +102,14 @@ public class IrisMod extends IrisRegistrant { private KList regionObjectPlacementInjectors = new KList<>(); @ArrayType(min = 1, type = IrisModRegionReplacer.class) - @Required @Desc("Replace biomes with other biomes") private KList regionReplacers = new KList<>(); @ArrayType(min = 1, type = IrisObjectReplace.class) - @Required @Desc("Replace blocks with other blocks") private KList blockReplacers = new KList<>(); @ArrayType(min = 1, type = IrisModNoiseStyleReplacer.class) - @Required @Desc("Replace noise styles with other styles") private KList styleReplacers = new KList<>(); } diff --git a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java index 4905b9ffc..6dfaf80fd 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java @@ -18,10 +18,7 @@ package com.volmit.iris.engine.object; -import com.volmit.iris.engine.object.annotations.ArrayType; -import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.annotations.RegistryListBiome; -import com.volmit.iris.engine.object.annotations.Required; +import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; @@ -36,11 +33,12 @@ import lombok.experimental.Accessors; public class IrisModBiomeInjector { @Required @Desc("The region to find") - @RegistryListBiome + @RegistryListRegion private String region = ""; @Required @Desc("A biome to inject into the region") @RegistryListBiome - private String replace = ""; + @ArrayType(type = String.class, min = 1) + private KList inject = new KList<>(); }