mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2026-08-29 13:20:32 +00:00
Cleanup and fix minor issues
This commit is contained in:
@@ -1,4 +0,0 @@
|
|||||||
package com.dfsek.terra;
|
|
||||||
|
|
||||||
public interface WorldObject {
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
package com.dfsek.terra.biome;
|
package com.dfsek.terra.biome;
|
||||||
|
|
||||||
import com.dfsek.terra.WorldObject;
|
|
||||||
import com.dfsek.terra.config.base.ConfigPack;
|
import com.dfsek.terra.config.base.ConfigPack;
|
||||||
import com.dfsek.terra.config.builder.GeneratorBuilder;
|
import com.dfsek.terra.config.builder.GeneratorBuilder;
|
||||||
import com.dfsek.terra.config.templates.BiomeTemplate;
|
import com.dfsek.terra.config.templates.BiomeTemplate;
|
||||||
@@ -16,7 +15,7 @@ import java.util.List;
|
|||||||
/**
|
/**
|
||||||
* Class representing a config-defined biome
|
* Class representing a config-defined biome
|
||||||
*/
|
*/
|
||||||
public class UserDefinedBiome implements Biome, WorldObject {
|
public class UserDefinedBiome implements Biome {
|
||||||
private final GeneratorBuilder gen;
|
private final GeneratorBuilder gen;
|
||||||
private final UserDefinedDecorator decorator;
|
private final UserDefinedDecorator decorator;
|
||||||
private final org.bukkit.block.Biome vanilla;
|
private final org.bukkit.block.Biome vanilla;
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -101,7 +101,7 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
|
|||||||
@Default
|
@Default
|
||||||
private Map<Material, Palette<BlockData>> slabPalettes;
|
private Map<Material, Palette<BlockData>> slabPalettes;
|
||||||
|
|
||||||
@Value("stair-palettes")
|
@Value("slabs.stair-palettes")
|
||||||
@Abstractable
|
@Abstractable
|
||||||
@Default
|
@Default
|
||||||
private Map<Material, Palette<BlockData>> stairPalettes;
|
private Map<Material, Palette<BlockData>> stairPalettes;
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class TerraFlora implements Flora {
|
|||||||
current = current.getRelative(search.equals(Search.UP) ? BlockFace.UP : BlockFace.DOWN);
|
current = current.getRelative(search.equals(Search.UP) ? BlockFace.UP : BlockFace.DOWN);
|
||||||
if((spawnBlacklist != spawnable.contains(current.getType())) && isIrrigated(current) && valid(size, current)) {
|
if((spawnBlacklist != spawnable.contains(current.getType())) && isIrrigated(current) && valid(size, current)) {
|
||||||
blocks.add(current);
|
blocks.add(current);
|
||||||
if(maxPlacements > 0 && blocks.size() > maxPlacements) break;
|
if(maxPlacements > 0 && blocks.size() >= maxPlacements) break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return blocks;
|
return blocks;
|
||||||
|
|||||||
Reference in New Issue
Block a user