pre-release for public testing

BreweryTeam · Nov 22, 2024 · 28c6f47 · 28c6f47
1 parent 8a3b54d
commit 28c6f47
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 26 deletions.
diff --git a/src/main/java/com/dre/brewery/configuration/configurer/TranslationManager.java b/src/main/java/com/dre/brewery/configuration/configurer/TranslationManager.java
@@ -47,6 +47,8 @@ private TranslationManager(File dataFolder) {
 
 				if (trans != null) {
 					this.activeTranslation = trans;
+				} else {
+					BreweryPlugin.getInstance().warningLog("Invalid language in config.yml: &6" + data.get("language"));
 				}
 			}
 		} catch (IOException e) {

diff --git a/src/main/java/com/dre/brewery/configuration/files/CauldronFile.java b/src/main/java/com/dre/brewery/configuration/files/CauldronFile.java
@@ -11,7 +11,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-@Header("!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten!!!")
+@Header("!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten !!!")
 @OkaeriConfigFileOptions("cauldron.yml")
 public class CauldronFile extends AbstractOkaeriConfigFile {
 

diff --git a/src/main/java/com/dre/brewery/configuration/files/Config.java b/src/main/java/com/dre/brewery/configuration/files/Config.java
@@ -24,7 +24,7 @@
 
 
 @OkaeriConfigFileOptions("config.yml")
-@Header({"!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten!!!",
+@Header({"!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten !!!",
 		"Our proper config guide can be found at: https://brewery.lumamc.net/en/guide/edit_config/",
 		"Still have questions? Join our Discord: https://discord.gg/ZTGCzeKg45"})
 @Footer({"", "Yep, that's it! The end of config.yml! I had so much fun! And you?..."})

diff --git a/src/main/java/com/dre/brewery/configuration/files/CustomItemsFile.java b/src/main/java/com/dre/brewery/configuration/files/CustomItemsFile.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-@Header("!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten!!!")
+@Header("!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten !!!")
 @OkaeriConfigFileOptions("custom-items.yml")
 @Setter
 public class CustomItemsFile extends AbstractOkaeriConfigFile {

diff --git a/src/main/java/com/dre/brewery/configuration/files/Lang.java b/src/main/java/com/dre/brewery/configuration/files/Lang.java
@@ -18,7 +18,7 @@
 
 // Our bind file for this class should vary based on what language the user has set in the config.
 @OkaeriConfigFileOptions(useLangFileName = true)
-@Header({"!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten!!!",
+@Header({"!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten !!!",
         "Translations for BreweryX"})
 @DefaultCommentSpace(1)
 @SuppressWarnings("unused")

diff --git a/src/main/java/com/dre/brewery/configuration/files/RecipesFile.java b/src/main/java/com/dre/brewery/configuration/files/RecipesFile.java
@@ -13,8 +13,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-@Header("!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten!!!")
-@Footer({
+@Header("!!! IMPORTANT: BreweryX configuration files do NOT support external comments! If you add any comments, they will be overwritten !!!")
+@Footer({"",
 	"More recipe ideas:",
 	"Dandelion Liquor",
 	"Beetroot Spirit",

diff --git a/src/main/resources/config-langs/es.yml b/src/main/resources/config-langs/es.yml
@@ -1,2 +1,4 @@
 # Spanish config translation for BreweryX
-# Author:
+# Author:
+
+# The original spanish config wasn't translated, so I'm going to leave this blank until someone PRs a translation.
diff --git a/src/main/resources/languages/ru.yml b/src/main/resources/languages/ru.yml
@@ -1,23 +1,23 @@
 # Russian translation for BreweryX
 # Author: Vutka1
 # Brew
-Brew_-times: -раз
-Brew_BadPotion: Испорченное зелье
-Brew_BarrelRiped: Настоявшееся в бочке
-Brew_DistillUndefined: Мутнодистиллированный
-Brew_Distilled: Дистиллированный
-Brew_LessDistilled: Малодистиллированный
-Brew_HundredsOfYears: вековой
-Brew_Ingredients: Ингредиенты
-Brew_MinutePluralPostfix: ы
-Brew_OneYear: Один год
-Brew_ThickBrew: Мутная бражка
-Brew_Undefined: Котельная бражка
-Brew_Woodtype: тип дерева
-Brew_Years: года
-Brew_fermented: ферментировано
-Brew_minute: минут
-Brew_Alc: Алк &v1мл
+Brew_-times: "-раз"
+Brew_BadPotion: "Испорченное зелье"
+Brew_BarrelRiped: "Настоявшееся в бочке"
+Brew_DistillUndefined: "Мутнодистиллированный"
+Brew_Distilled: "Дистиллированный"
+Brew_LessDistilled: "Малодистиллированный"
+Brew_HundredsOfYears: "вековой"
+Brew_Ingredients: "Ингредиенты"
+Brew_MinutePluralPostfix: "ы"
+Brew_OneYear: "Один год"
+Brew_ThickBrew: "Мутная бражка"
+Brew_Undefined: "Котельная бражка"
+Brew_Woodtype: "тип дерева"
+Brew_Years: "года"
+Brew_fermented: "ферментировано"
+Brew_minute: "минут"
+Brew_Alc: "Алк &v1мл"
 Brew_Brewer: 'Сварил: &v1'
 
 # CMD
@@ -47,8 +47,8 @@ Error_NoBrewName: '&cРецепта с названием: ''&v1&c'' не най
 Error_NoPermissions: '&cУ тебя нет прав на это!'
 Error_PlayerCommand: '&cЭту команду можно вписать только как игрок!'
 Error_Recipeload: '&cНе все рецепты были загружены: проверь консоль!'
-Error_ShowHelp: Использование &6/brew help &fдля отображения помощи
-Error_UnknownCommand: Неизвестная команда
+Error_ShowHelp: "Использование &6/brew help &fдля отображения помощи"
+Error_UnknownCommand: "Неизвестная команда"
 Error_YmlRead: 'не могу прочитать config.yml, пожалуйста, проверь, что там всё верно. (Корректируй пробелы, используя '' '' и др.)'
 Error_NoPlayer: 'Игрок не найден: &v1'