diff --git a/src/main/java/com/dfsek/terra/WorldObject.java b/src/main/java/com/dfsek/terra/WorldObject.java deleted file mode 100644 index d03219499..000000000 --- a/src/main/java/com/dfsek/terra/WorldObject.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.dfsek.terra; - -public interface WorldObject { -} diff --git a/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java b/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java index 7da44d7f3..295772b59 100644 --- a/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java +++ b/src/main/java/com/dfsek/terra/biome/UserDefinedBiome.java @@ -1,6 +1,5 @@ package com.dfsek.terra.biome; -import com.dfsek.terra.WorldObject; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.builder.GeneratorBuilder; import com.dfsek.terra.config.templates.BiomeTemplate; @@ -16,7 +15,7 @@ import java.util.List; /** * Class representing a config-defined biome */ -public class UserDefinedBiome implements Biome, WorldObject { +public class UserDefinedBiome implements Biome { private final GeneratorBuilder gen; private final UserDefinedDecorator decorator; private final org.bukkit.block.Biome vanilla; diff --git a/src/main/java/com/dfsek/terra/config/loaders/config/StructureFeatureLoader.java b/src/main/java/com/dfsek/terra/config/loaders/config/StructureFeatureLoader.java new file mode 100644 index 000000000..ea39d70a4 --- /dev/null +++ b/src/main/java/com/dfsek/terra/config/loaders/config/StructureFeatureLoader.java @@ -0,0 +1,15 @@ +package com.dfsek.terra.config.loaders.config; + +import com.dfsek.tectonic.exception.LoadException; +import com.dfsek.tectonic.loading.ConfigLoader; +import com.dfsek.tectonic.loading.TypeLoader; +import com.dfsek.terra.structure.features.Feature; + +import java.lang.reflect.Type; + +public class StructureFeatureLoader implements TypeLoader { + @Override + public Feature load(Type type, Object o, ConfigLoader configLoader) throws LoadException { + return null; + } +} diff --git a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index 8a369b04d..bdce4bb93 100644 --- a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -101,7 +101,7 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf @Default private Map> slabPalettes; - @Value("stair-palettes") + @Value("slabs.stair-palettes") @Abstractable @Default private Map> stairPalettes; diff --git a/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java b/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java index 5b15e9f39..fb1eef343 100644 --- a/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java +++ b/src/main/java/com/dfsek/terra/generation/items/flora/TerraFlora.java @@ -52,7 +52,7 @@ public class TerraFlora implements Flora { current = current.getRelative(search.equals(Search.UP) ? BlockFace.UP : BlockFace.DOWN); if((spawnBlacklist != spawnable.contains(current.getType())) && isIrrigated(current) && valid(size, current)) { blocks.add(current); - if(maxPlacements > 0 && blocks.size() > maxPlacements) break; + if(maxPlacements > 0 && blocks.size() >= maxPlacements) break; } } return blocks;