Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private boolean validatePage(String value) {

private boolean validateBiome(String value) {
try {
Biome.valueOf(value);
Biome.valueOf(value.toUpperCase());
} catch (IllegalArgumentException | NullPointerException ignored) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class ListSub extends AbstractAdminSub {
@Getter private final String IDENTIFIER = "list";

public ListSub(BiomeMastery main) {
super(main, null, 1, 2);
super(main, null, 2, 2);
}

// /abm list worlds
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ private void createLog(String path, Exception error, Message invalidObject) {
messageManager.getWithPlaceholder(
Message.INVALIDREWARD,
pathParts[1],
pathParts[2],
(pathParts[2].equalsIgnoreCase("levels") ? pathParts[3] : pathParts[2]),
invalidObject));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import me.soapiee.biomemastery.utils.Languages;
import me.soapiee.biomemastery.utils.Message;
import me.soapiee.biomemastery.utils.Utils;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.YamlConfiguration;

Expand All @@ -25,38 +24,18 @@ public class MessageManager {
public MessageManager(BiomeMastery main) {
this.main = main;

//TODO: Revert code back in future updates
// file = new File(main.getDataFolder() + File.separator + "language", language + ".yml");
// contents = new YamlConfiguration();

// load(null);

String languageString = validateLanguage();
if (languageString == null) language = Languages.LANG_EN.toString().toLowerCase();
else language = languageString;

file = getFile();
file = new File(main.getDataFolder() + File.separator + "language", language + ".yml");
contents = new YamlConfiguration();

load(null);

if (languageString == null) Utils.consoleMsg(get(Message.INVALIDLANGUAGE));
}

private File getFile() {
File newLangFile = new File(main.getDataFolder() + File.separator + "language", language + ".yml");
if (!newLangFile.exists()) main.saveResource("language" + File.separator + language + ".yml", false);

File legacyFile = new File(main.getDataFolder() + File.separator + "messages.yml");
if (legacyFile.exists()) {
Utils.consoleMsg(ChatColor.RED.toString() + ChatColor.BOLD + "[IMPORTANT] " + ChatColor.RESET
+ ChatColor.RED + "Please transfer the contents of your messages.yml file to the new language file. Located in the \"language\" folder. Then delete the messages.yml file");
return legacyFile;
}

return newLangFile;
}

private String validateLanguage() {
String configString = main.getConfig().getString("settings.language", "lang_en");

Expand All @@ -71,8 +50,7 @@ private String validateLanguage() {
}

public boolean load(CommandSender sender) {
//TODO: Revert code back in future updates
// if (!file.exists()) main.saveResource("language" + File.separator + language + ".yml", false);
if (!file.exists()) main.saveResource("language" + File.separator + language + ".yml", false);

try {
contents.load(file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public enum Message {
INVALIDPOTIONAMP("invalid_field_potion_amplifier", "potion amplifier value"),
INVALIDPOTIONTYPE("invalid_field_potion_type", "potion type"),
INVALIDEFFECTTYPE("invalid_field_effect_type", "effect type"),
INVALIDVAULTHOOK("reward_invalid_vault_hook", "vault hook"),
INVALIDVAULTHOOK("reward_invalid_vault_hook", "reward, due to vault not being installed"),
INVALIDAMOUNT("invalid_field_amount", "amount"),
INVALIDQUANTITY("invalid_field_quantity", "quantity"),
INVALIDMATERIAL("invalid_field_material", "material"),
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/language/lang_de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ invalid_field_reward_type: "&cBiom %biome% auf Level %config_level% hat einen un
invalid_field_potion_amplifier: "Trank-Verstärker Wert"
invalid_field_potion_type: "Trank-Typ"
invalid_field_effect_type: "Effekt-Typ"
reward_invalid_vault_hook: "Vault-Verbindung"
reward_invalid_vault_hook: "Belohnung, da Vault nicht installiert ist"
invalid_field_amount: "Menge"
invalid_field_quantity: "Anzahl"
invalid_field_material: "Material"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/language/lang_en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ invalid_field_reward_type: "&cBiome %biome% at level %config_level% has an inval
invalid_field_potion_amplifier: "potion amplifier value"
invalid_field_potion_type: "potion type"
invalid_field_effect_type: "effect type"
reward_invalid_vault_hook: "vault hook"
reward_invalid_vault_hook: "reward, due to vault not being installed"
invalid_field_amount: "amount"
invalid_field_quantity: "quantity"
invalid_field_material: "material"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/language/lang_es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ invalid_field_reward_type: "&cEl bioma %biome% en el nivel %config_level% tiene
invalid_field_potion_amplifier: "valor del amplificador de poción"
invalid_field_potion_type: "tipo de poción"
invalid_field_effect_type: "tipo de efecto"
reward_invalid_vault_hook: "conexión con vault"
reward_invalid_vault_hook: "recompensa, debido a que Vault no está instalado"
invalid_field_amount: "cantidad"
invalid_field_quantity: "cantidad"
invalid_field_material: "material"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/language/lang_fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ invalid_field_reward_type: "&cle biome %biome% au niveau %config_level% a un typ
invalid_field_potion_amplifier: "valeur de l'amplificateur de potion"
invalid_field_potion_type: "type de potion"
invalid_field_effect_type: "type d'effet"
reward_invalid_vault_hook: "liaison vault"
reward_invalid_vault_hook: "récompense, car Vault n'est pas installé"
invalid_field_amount: "montant"
invalid_field_quantity: "quantité"
invalid_field_material: "matériau"
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/language/lang_nl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ invalid_field_reward_type: "&cBioom %biome% op niveau %config_level% heeft een o
invalid_field_potion_amplifier: "drankversterkingswaarde"
invalid_field_potion_type: "dranktype"
invalid_field_effect_type: "effecttype"
reward_invalid_vault_hook: "vault-koppeling"
reward_invalid_vault_hook: "beloning, omdat Vault niet geïnstalleerd is"
invalid_field_amount: "aantal"
invalid_field_quantity: "hoeveelheid"
invalid_field_material: "materiaal"
Expand Down