From b63ea991678aa29a1c52032658e5af9c29418242 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 13 Jun 2021 01:53:13 -0700 Subject: [PATCH 1/4] bump tectonic version --- common/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 311054dd7..ca834dd81 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { "shadedApi"("commons-io:commons-io:2.4") "shadedApi"("com.dfsek:Paralithic:0.3.2") - "shadedApi"("com.dfsek:Tectonic:1.3.1") + "shadedApi"("com.dfsek:Tectonic:1.4.0") "shadedApi"("net.jafama:jafama:2.3.2") "shadedApi"("org.yaml:snakeyaml:1.27") "shadedApi"("org.ow2.asm:asm:9.0") From 8d3b3c702464f3f79961f1fa8a95e6011c390fe3 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 13 Jun 2021 13:23:58 -0700 Subject: [PATCH 2/4] remove extends value from biome config --- .../com/dfsek/terra/commands/biome/BiomeInfoCommand.java | 2 -- .../com/dfsek/terra/config/templates/BiomeTemplate.java | 8 -------- 2 files changed, 10 deletions(-) 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 4fe3fe2ac..19b426285 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 @@ -36,8 +36,6 @@ public class BiomeInfoCommand implements CommandTemplate { if(biome instanceof UserDefinedBiome) { BiomeTemplate bio = ((UserDefinedBiome) biome).getConfig(); - if(bio.getExtend() != null) sender.sendMessage("Extends: " + bio.getExtend()); - List structureConfigs = bio.getStructures(); if(structureConfigs.size() == 0) sender.sendMessage("No Structures"); 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 69ee69122..6e6193467 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 @@ -45,10 +45,6 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf @Value("id") private String id; - @Value("extends") - @Default - private String extend = null; - @Value("variables") @Abstractable @Default @@ -227,10 +223,6 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf return interpolateElevation; } - public String getExtend() { - return extend; - } - public double getSlantThreshold() { return slantThreshold; } From 0ad03552506e25c175a626644124d96e6566b2ac Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 13 Jun 2021 13:24:32 -0700 Subject: [PATCH 3/4] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 60ac2571e..c800414ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,6 @@ import com.dfsek.terra.getGitHash -val versionObj = Version("5", "3", "3", true) +val versionObj = Version("5", "4", "0", true) allprojects { version = versionObj From 1f56673c77afb163c6ce4ef51a840a71ce0b8198 Mon Sep 17 00:00:00 2001 From: dfsek Date: Sun, 13 Jun 2021 13:58:22 -0700 Subject: [PATCH 4/4] add parent info to BiomeInfoCommand --- .../terra/commands/biome/BiomeInfoCommand.java | 13 ++++++++++--- .../dfsek/terra/config/templates/BiomeTemplate.java | 10 +++++++++- 2 files changed, 19 insertions(+), 4 deletions(-) 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; }