From 2d24a7bf008510e335a28a7dce0c8515d7d48dc1 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Sat, 5 Dec 2020 17:53:35 -0700
Subject: [PATCH] Add more info to biome info command

---
 .../terra/command/biome/BiomeInfoCommand.java   | 17 ++++++++++++++++-
 .../terra/config/templates/BiomeTemplate.java   |  9 +++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java b/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java
index bcf1cc99d..546989ac2 100644
--- a/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java
+++ b/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java
@@ -2,6 +2,7 @@ package com.dfsek.terra.command.biome;
 
 import com.dfsek.terra.TerraWorld;
 import com.dfsek.terra.biome.UserDefinedBiome;
+import com.dfsek.terra.carving.UserDefinedCarver;
 import com.dfsek.terra.config.base.ConfigPack;
 import com.dfsek.terra.config.lang.LangUtil;
 import com.dfsek.terra.config.templates.BiomeTemplate;
@@ -16,6 +17,7 @@ import org.polydev.gaea.command.WorldCommand;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 public class BiomeInfoCommand extends WorldCommand {
@@ -36,10 +38,13 @@ public class BiomeInfoCommand extends WorldCommand {
         }
         sender.sendMessage("Biome info for \"" + b.getID() + "\".");
         sender.sendMessage("Vanilla biome: " + b.getVanillaBiome());
-        sender.sendMessage("Eroded by: " + b.getErode());
+        sender.sendMessage("Eroded by: " + b.getErode().getConfig().getID());
 
 
         BiomeTemplate bio = b.getConfig();
+
+        if(bio.getExtend() != null) sender.sendMessage("Extends: " + bio.getExtend());
+
         List<TerraStructure> structureConfigs = bio.getStructures();
 
         if(structureConfigs.size() == 0) sender.sendMessage("No Structures");
@@ -50,6 +55,16 @@ public class BiomeInfoCommand extends WorldCommand {
             }
         }
 
+        Map<UserDefinedCarver, Integer> carverConfigs = bio.getCarvers();
+
+        if(structureConfigs.size() == 0) sender.sendMessage("No Carvers");
+        else {
+            sender.sendMessage("---------Carvers--------");
+            for(Map.Entry<UserDefinedCarver, Integer> entry : carverConfigs.entrySet()) {
+                sender.sendMessage(" - " + entry.getKey().getConfig().getID() + ": " + entry.getValue() + "%");
+            }
+        }
+
         return true;
     }
 
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 7cdf6ed8c..824d7e310 100644
--- a/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
+++ b/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java
@@ -33,6 +33,11 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
     private final ConfigPack pack;
     @Value("id")
     private String id;
+
+    @Value("extends")
+    @Default
+    private String extend = null;
+
     @Value("palette")
     @Abstractable
     private PaletteHolder palette;
@@ -120,6 +125,10 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf
         return interpolateElevation;
     }
 
+    public String getExtend() {
+        return extend;
+    }
+
     public double getSlantThreshold() {
         return slantThreshold;
     }