From 256761eb5be6458f5e2ab08fba8ce1d36a5d03d4 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Fri, 1 Jan 2021 17:43:10 -0700
Subject: [PATCH] fix version command

---
 .../main/java/com/dfsek/terra/api/platform/TerraPlugin.java  | 2 ++
 .../main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java  | 5 +++++
 .../dfsek/terra/bukkit/command/command/VersionCommand.java   | 2 +-
 platforms/bukkit/src/main/resources/lang/en_us.yml           | 2 +-
 .../main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java  | 5 +++++
 5 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java b/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java
index 317fa40f8..07afd428b 100644
--- a/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java
+++ b/common/src/main/java/com/dfsek/terra/api/platform/TerraPlugin.java
@@ -36,4 +36,6 @@ public interface TerraPlugin extends LoaderRegistrar {
     ItemHandle getItemHandle();
 
     void saveDefaultConfig();
+
+    String platformName();
 }
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
index ef88d6ace..fa3f8fb32 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
@@ -73,6 +73,11 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
         return itemHandle;
     }
 
+    @Override
+    public String platformName() {
+        return "Bukkit";
+    }
+
     public void setHandle(WorldHandle handle) {
         getLogger().warning("|-------------------------------------------------------|");
         getLogger().warning("A third-party addon has injected a custom WorldHandle!");
diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/VersionCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/VersionCommand.java
index 6513fe48d..b9686d186 100644
--- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/VersionCommand.java
+++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/VersionCommand.java
@@ -28,7 +28,7 @@ public class VersionCommand extends Command {
     @Override
     public boolean execute(@NotNull CommandSender sender, org.bukkit.command.@NotNull Command command, @NotNull String label, @NotNull String[] args) {
         String terraVersion = ((TerraBukkitPlugin) getMain()).getDescription().getVersion();
-        LangUtil.send("command.version", new BukkitCommandSender(sender), terraVersion);
+        LangUtil.send("command.version", new BukkitCommandSender(sender), terraVersion, getMain().platformName());
         return true;
     }
 
diff --git a/platforms/bukkit/src/main/resources/lang/en_us.yml b/platforms/bukkit/src/main/resources/lang/en_us.yml
index 1e3d5f5f3..048e36e0f 100644
--- a/platforms/bukkit/src/main/resources/lang/en_us.yml
+++ b/platforms/bukkit/src/main/resources/lang/en_us.yml
@@ -12,7 +12,7 @@ command:
   world: "This command must be executed in a Terra world!"
   reload: "Reloaded Terra config."
   reload-error: "Errors occurred while reloading Terra configurations. See logs for more information."
-  version: "This server is running Terra version \"%1$s\", implementing Gaea version \"%2$s\""
+  version: "This server is running Terra version \"%1$s\", on platform \"%2$s\""
   main-menu:
     - "--------------------Terra--------------------"
     - "reload    - Reload configuration data"
diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
index 310ee1985..090beacb8 100644
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -177,6 +177,11 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
         }
     }
 
+    @Override
+    public String platformName() {
+        return "Fabric";
+    }
+
     Transformer<String, Biome> biomeFixer = new Transformer.Builder<String, Biome>()
             .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse(id)), new NotNullValidator<>())
             .addTransform(id -> BuiltinRegistries.BIOME.get(Identifier.tryParse("minecraft:" + id.toLowerCase())), new NotNullValidator<>()).build();