diff --git a/common/src/main/java/com/dfsek/terra/commands/biome/BiomeInfoCommand.java b/common/src/main/java/com/dfsek/terra/commands/biome/BiomeInfoCommand.java index 19b426285..b1d0ffe1b 100644 --- a/common/src/main/java/com/dfsek/terra/commands/biome/BiomeInfoCommand.java +++ b/common/src/main/java/com/dfsek/terra/commands/biome/BiomeInfoCommand.java @@ -29,17 +29,24 @@ public class BiomeInfoCommand implements CommandTemplate { @Override public void execute(CommandSender sender) { - sender.sendMessage("Biome info for \"" + biome.getID() + "\"."); sender.sendMessage("Vanilla biome: " + biome.getVanillaBiomes()); if(biome instanceof UserDefinedBiome) { BiomeTemplate bio = ((UserDefinedBiome) biome).getConfig(); + if(bio.getExtended().size() == 0) { + sender.sendMessage("No Parent Biomes"); + } else { + sender.sendMessage("------Parent Biomes-----"); + bio.getExtended().forEach(id -> sender.sendMessage(" - " + id)); + } + List structureConfigs = bio.getStructures(); - if(structureConfigs.size() == 0) sender.sendMessage("No Structures"); - else { + if(structureConfigs.size() == 0) { + sender.sendMessage("No Structures"); + } else { sender.sendMessage("-------Structures-------"); for(TerraStructure c : structureConfigs) { sender.sendMessage(" - " + c.getTemplate().getID()); diff --git a/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index 6e6193467..f8f62a4db 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -30,6 +30,7 @@ import com.dfsek.terra.world.population.items.flora.FloraLayer; import com.dfsek.terra.world.population.items.ores.OreHolder; import com.dfsek.terra.world.population.items.tree.TreeLayer; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -39,12 +40,15 @@ import java.util.Set; @SuppressWarnings({"FieldMayBeFinal", "unused"}) public class BiomeTemplate extends AbstractableTemplate implements ValidatedConfigTemplate { - private final ConfigPack pack; @Value("id") private String id; + @Value("extends") + @Default + private List extended = Collections.emptyList(); + @Value("variables") @Abstractable @Default @@ -191,6 +195,10 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf @Default private Map colors = new HashMap<>(); // Plain ol' map, so platforms can decide what to do with colors (if anything). + public List getExtended() { + return extended; + } + public Set getTags() { return tags; }