From 0261ecdcbb791b9a9af995a79885d97b9c88db08 Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 11 Dec 2020 17:31:06 -0700 Subject: [PATCH] for some reason these werent in the changelist --- .../com/dfsek/terra/api/generic/generator/ChunkGenerator.java | 4 ++++ .../java/com/dfsek/terra/config/templates/BiomeTemplate.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) rename {src => common/src}/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java (95%) rename {src => common/src}/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java (99%) diff --git a/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java b/common/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java similarity index 95% rename from src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java rename to common/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java index 09593b2f8..4b939c4ce 100644 --- a/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java +++ b/common/src/main/java/com/dfsek/terra/api/generic/generator/ChunkGenerator.java @@ -5,6 +5,7 @@ import com.dfsek.terra.api.generic.world.BiomeGrid; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.block.BlockData; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Random; @@ -25,6 +26,9 @@ public interface ChunkGenerator extends Handle { List getDefaultPopulators(World world); + @Nullable + TerraChunkGenerator getTerraGenerator(); + interface ChunkData { Object getHandle(); diff --git a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java similarity index 99% rename from src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java rename to common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index f31a012e4..2f9183dd6 100644 --- a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -85,7 +85,7 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf @Default private List flora = new GlueList<>(); - @Value("trees") + //@Value("trees") @Abstractable @Default private List trees = new GlueList<>();