Pullbuild

This commit is contained in:
Daniel Mills 2021-07-22 19:43:30 -04:00
parent f0338b5247
commit 101d0212a7
2 changed files with 4 additions and 9 deletions

View File

@ -102,17 +102,14 @@ public class IrisMod extends IrisRegistrant {
private KList<IrisModObjectPlacementRegionInjector> regionObjectPlacementInjectors = new KList<>(); private KList<IrisModObjectPlacementRegionInjector> regionObjectPlacementInjectors = new KList<>();
@ArrayType(min = 1, type = IrisModRegionReplacer.class) @ArrayType(min = 1, type = IrisModRegionReplacer.class)
@Required
@Desc("Replace biomes with other biomes") @Desc("Replace biomes with other biomes")
private KList<IrisModRegionReplacer> regionReplacers = new KList<>(); private KList<IrisModRegionReplacer> regionReplacers = new KList<>();
@ArrayType(min = 1, type = IrisObjectReplace.class) @ArrayType(min = 1, type = IrisObjectReplace.class)
@Required
@Desc("Replace blocks with other blocks") @Desc("Replace blocks with other blocks")
private KList<IrisObjectReplace> blockReplacers = new KList<>(); private KList<IrisObjectReplace> blockReplacers = new KList<>();
@ArrayType(min = 1, type = IrisModNoiseStyleReplacer.class) @ArrayType(min = 1, type = IrisModNoiseStyleReplacer.class)
@Required
@Desc("Replace noise styles with other styles") @Desc("Replace noise styles with other styles")
private KList<IrisModNoiseStyleReplacer> styleReplacers = new KList<>(); private KList<IrisModNoiseStyleReplacer> styleReplacers = new KList<>();
} }

View File

@ -18,10 +18,7 @@
package com.volmit.iris.engine.object; package com.volmit.iris.engine.object;
import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.*;
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.util.collection.KList; import com.volmit.iris.util.collection.KList;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -36,11 +33,12 @@ import lombok.experimental.Accessors;
public class IrisModBiomeInjector { public class IrisModBiomeInjector {
@Required @Required
@Desc("The region to find") @Desc("The region to find")
@RegistryListBiome @RegistryListRegion
private String region = ""; private String region = "";
@Required @Required
@Desc("A biome to inject into the region") @Desc("A biome to inject into the region")
@RegistryListBiome @RegistryListBiome
private String replace = ""; @ArrayType(type = String.class, min = 1)
private KList<String> inject = new KList<>();
} }