Cleanup and fix minor issues

This commit is contained in:
dfsek
2020-12-01 19:36:23 -07:00
parent bc3d694f7f
commit 0f526ca616
5 changed files with 18 additions and 8 deletions

View File

@@ -1,4 +0,0 @@
package com.dfsek.terra;
public interface WorldObject {
}

View File

@@ -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;

View File

@@ -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<Feature> {
@Override
public Feature load(Type type, Object o, ConfigLoader configLoader) throws LoadException {
return null;
}
}

View File

@@ -101,7 +101,7 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
@Default
private Map<Material, Palette<BlockData>> slabPalettes;
@Value("stair-palettes")
@Value("slabs.stair-palettes")
@Abstractable
@Default
private Map<Material, Palette<BlockData>> stairPalettes;

View File

@@ -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;