Automatically add missing translation keys

src/main/java/com/dre/brewery/BreweryPlugin.java

@@ -111,14 +111,16 @@ public void onEnable() {
 		SimpleItem.registerItemLoader(this);
 		PluginItem.registerItemLoader(this);
 
-		// Load config and lang
+		// Load config
 		Config config = ConfigManager.getConfig(Config.class);
-		ConfigManager.newInstance(Lang.class, false);
-
 		if (config.isFirstCreation()) {
 			config.onFirstCreation();
 		}
 
+		// Load lang
+		TranslationManager.getInstance().updateTranslationFiles();
+		ConfigManager.newInstance(Lang.class, false);
+
 		BSealer.registerRecipe(); // Sealing table recipe
 		ConfigManager.registerDefaultPluginItems(); // Register plugin items
 

src/main/java/com/dre/brewery/commands/subcommands/ReloadCommand.java

@@ -53,6 +53,7 @@ public void execute(BreweryPlugin breweryPlugin, Lang lang, CommandSender sender
 		try {
 			// Reload translation manager
 			TranslationManager.newInstance(breweryPlugin.getDataFolder());
+			TranslationManager.getInstance().updateTranslationFiles();
 
 			// Reload each config
 			for (var file : ConfigManager.LOADED_CONFIGS.values()) {

src/main/java/com/dre/brewery/configuration/ConfigHead.java

@@ -152,10 +152,11 @@ public <T extends AbstractOkaeriConfigFile> T createConfig(Class<T> configClass,
     /**
      * Create a new config instance using a config class' annotation
      * @param configClass The class of the config to create
+	 * @param file The file to use
      * @return The new config instance
      * @param <T> The type of the config
      */
-    public <T extends AbstractOkaeriConfigFile> T createConfig(Class<T> configClass) {
+    public <T extends AbstractOkaeriConfigFile> T createConfig(Class<T> configClass, Path file) {
         OkaeriConfigFileOptions options = getOkaeriConfigFileOptions(configClass);
 
         Configurer configurer = CONFIGURERS.get(options.configurer());
@@ -164,9 +165,19 @@ public <T extends AbstractOkaeriConfigFile> T createConfig(Class<T> configClass)
             configurer = CONFIGURERS.get(BreweryXConfigurer.class);
         }
 
-        return createConfig(configClass, getFilePath(configClass), configurer, new StandardSerdes(), options.update(), options.removeOrphans());
+        return createConfig(configClass, file, configurer, new StandardSerdes(), options.update(), options.removeOrphans());
     }
 
+	/**
+	 * Create a new config instance using a config class' annotation
+	 * @param configClass The class of the config to create
+	 * @return The new config instance
+	 * @param <T> The type of the config
+	 */
+	public <T extends AbstractOkaeriConfigFile> T createConfig(Class<T> configClass) {
+		return createConfig(configClass, getFilePath(configClass));
+	}
+
     @Nullable
     public <T extends AbstractOkaeriConfigFile> T createBlankConfigInstance(Class<T> configClass) {
         try {

src/main/java/com/dre/brewery/configuration/configurer/TranslationManager.java

@@ -21,8 +21,10 @@
 package com.dre.brewery.configuration.configurer;
 
 import com.dre.brewery.BreweryPlugin;
+import com.dre.brewery.configuration.ConfigHead;
 import com.dre.brewery.configuration.ConfigManager;
 import com.dre.brewery.configuration.files.Config;
+import com.dre.brewery.configuration.files.Lang;
 import com.dre.brewery.utility.BUtil;
 import com.dre.brewery.utility.Logging;
 import lombok.Getter;
@@ -33,6 +35,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.Map;
 
 @Getter
@@ -108,6 +111,50 @@ public void createLanguageFile(Translation translation) {
 		ConfigManager.createFileFromResources("languages/" + translation.getFilename(), dataFolder.toPath().resolve("languages").resolve(translation.getFilename()));
 	}
 
+	// Okaeri would do this normally, but since default values in Lang changes based on language,
+	// we have to manually go through each file.
+	/**
+	 * Updates all translation files by adding all missing keys.
+	 * If a key hasn't been translated yet, english is used as a fallback.
+	 */
+	public void updateTranslationFiles() {
+		ConfigHead tempHead = new ConfigHead(); // Prevent polluting ConfigManager global state
+
+		Lang fallback = loadFromResources(tempHead, Translation.EN);
+		for (Translation trans : Translation.values()) {
+			if (trans == Translation.EN) {
+				continue;
+			}
+
+			String langFilePathStr = "languages/" + trans.getFilename();
+			Path langFilePath = dataFolder.toPath().resolve(langFilePathStr);
+
+			Lang langFromFile = tempHead.createConfig(Lang.class, langFilePath);
+			Lang langFromResources = loadFromResources(tempHead, trans);
+
+			langFromFile.updateMissingValuesFrom(langFromResources);
+			langFromFile.updateMissingValuesFrom(fallback);
+			langFromFile.save();
+		}
+	}
+
+	// Loads a lang from resources... by loading from file then overwriting with resources InputStream
+	// A bit of a hack, but avoids having to modify Okaeri
+	@Nullable
+	private Lang loadFromResources(ConfigHead tempHead, Translation translation) {
+		String langFilePathStr = "languages/" + translation.getFilename();
+		Path langFilePath = dataFolder.toPath().resolve(langFilePathStr);
+
+		Lang langFromResources = tempHead.createConfig(Lang.class, langFilePath);
+		try (InputStream inputStream = BreweryPlugin.class.getClassLoader().getResourceAsStream(langFilePathStr)) {
+			langFromResources.load(inputStream);
+			return langFromResources;
+		} catch (IOException e) {
+			Logging.errorLog("Failed to load " + langFilePathStr + " from resources", e);
+			return null;
+		}
+	}
+
 
 	public static void newInstance(File dataFolder) {
 		newInstance(dataFolder, false);

src/main/java/com/dre/brewery/configuration/files/Lang.java

@@ -33,6 +33,7 @@
 import eu.okaeri.configs.annotation.Header;
 import lombok.SneakyThrows;
 import org.bukkit.command.CommandSender;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.lang.reflect.Field;
@@ -70,6 +71,28 @@ public void reload() {
         this.mapStrings();
     }
 
+	public void updateMissingValuesFrom(@Nullable Lang other) {
+		if (other == null) {
+			return;
+		}
+
+		for (Field field : this.getClass().getDeclaredFields()) {
+			if (field.getType() != String.class) {
+				continue;
+			}
+
+			try {
+				String thisValue = (String) field.get(this);
+				String otherValue = (String) field.get(other);
+				if (thisValue == null && otherValue != null) {
+					field.set(this, otherValue);
+				}
+			} catch (IllegalAccessException e) {
+				Logging.errorLog("Lang failed to get a field value! &6(" + field.getName() + ")", e);
+			}
+		}
+	}
+
     public void mapStrings() {
         BreweryPlugin plugin = BreweryPlugin.getInstance();
         Logging.log("Using language&7: &a" + this.getBindFile().getFileName());

src/main/resources/languages/ru.yml

@@ -67,7 +67,6 @@ Help_Delete: '&6/brew delete &9Удаляет зелье в твоей руке'
 Help_Help: '&6/brew help [Page] &9Показывает определённую страницу помощи'
 Help_Info: '&6/brew info&9 Показывает твоё текущее опьянение и качество'
 Help_InfoOther: '&6/brew info [Player]&9 показывает текущее опьянение и качество [Player]'
-Help_Player: '&6/brew <Player> <%Drunkeness> [Quality]&9 Даёт опьянение (и качество) игроку'
 Help_Reload: '&6/brew reload &9Перезагружает конфиг'
 Help_Configname: '&6/brew ItemName &9Показывает название предмета в руке для конфига'
 Help_Static: '&6/brew static &9Make Статичная бражка -> Не будет стареть, не будет дистиллироваться'

src/main/resources/languages/zh.yml

@@ -66,7 +66,6 @@ Help_Delete: '&6/brew delete &9删除手中的饮品.'
 Help_Help: '&6/brew help [页数] &9显示某一页的帮助.'
 Help_Info: '&6/brew info &9显示你目前的醉酒程度与质量, 醉酒质量将会影响宿醉程度.'
 Help_InfoOther: '&6/brew info [指定玩家] &9显示指定玩家目前的醉酒程度与质量.'
-Help_Player: '&6/brew <目标玩家> <%醉酒程度> [醉酒质量] &9设定目标玩家的醉酒程度与质量.'
 Help_Reload: '&6/brew reload &9重载插件配置, 可用以重载饮品配方.'
 Help_Configname: '&6/brew ItemName &9显示手中物品的配置名称'
 Help_Static: '&6/brew static &9将手中饮品静滞化, 这将阻止其被蒸馏或继续熟成.'