mirror of
https://github.com/DieReicheErethons/Brewery.git
synced 2024-09-28 03:57:28 +02:00
Added some more Strings to LanguageReader
This commit is contained in:
parent
46e6ca9773
commit
54d4521b2b
@ -119,9 +119,9 @@ public class BCauldron {
|
||||
BCauldron bcauldron = get(block);
|
||||
if (bcauldron != null) {
|
||||
if (bcauldron.state > 1) {
|
||||
P.p.msg(player, P.p.languageReader.get(""));//"Dieser Kessel siedet nun seit " + bcauldron.state + " Minuten");
|
||||
P.p.msg(player, P.p.languageReader.get("Player_CauldronInfo1", "" + bcauldron.state));
|
||||
} else {
|
||||
P.p.msg(player, P.p.languageReader.get(""));//"Dieser Kessel siedet seit weniger als einer Minute");
|
||||
P.p.msg(player, P.p.languageReader.get("Player_CauldronInfo2"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -76,7 +76,7 @@ public class BIngredients {
|
||||
new Brew(uid, this);
|
||||
|
||||
if (state <= 1) {
|
||||
cookedName = "Schlammiger Sud";
|
||||
cookedName = P.p.languageReader.get("Brew_ThickBrew");
|
||||
potion.setDurability(Brew.PotionColor.BLUE.getColorId(false));
|
||||
} else {
|
||||
for (Material ingredient : ingredients.keySet()) {
|
||||
@ -92,7 +92,7 @@ public class BIngredients {
|
||||
}
|
||||
if (cookedName == null) {
|
||||
// if no name could be found
|
||||
cookedName = "Undefinierbarer Sud";
|
||||
cookedName = P.p.languageReader.get("Brew_Undefined");
|
||||
potion.setDurability(Brew.PotionColor.CYAN.getColorId(true));
|
||||
}
|
||||
|
||||
|
@ -108,7 +108,6 @@ public class BPlayer {
|
||||
} else {
|
||||
bPlayer.drinkCap(player);
|
||||
}
|
||||
P.p.msg(player, "Du bist nun " + bPlayer.drunkeness + "% betrunken, mit einer Qualität von " + bPlayer.getQuality());
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -204,7 +203,7 @@ public class BPlayer {
|
||||
}
|
||||
|
||||
public void passOut(Player player) {
|
||||
player.kickPlayer("Du hast zu viel getrunken und bist in Ohnmacht gefallen!");
|
||||
player.kickPlayer(P.p.languageReader.get("Player_DrunkPassOut"));
|
||||
offlineDrunk = drunkeness;
|
||||
passedOut = true;
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ public class BRecipe {
|
||||
if (mat != null) {
|
||||
this.ingredients.put(Material.matchMaterial(ingredParts[0]), P.p.parseInt(ingredParts[1]));
|
||||
} else {
|
||||
P.p.errorLog("Unbekanntes Material: " + ingredParts[0]);
|
||||
P.p.errorLog("Unknown Material: " + ingredParts[0]);
|
||||
this.ingredients = null;
|
||||
return;
|
||||
}
|
||||
|
@ -251,10 +251,10 @@ public class Brew {
|
||||
PotionMeta meta = (PotionMeta) item.getItemMeta();
|
||||
if (meta.hasLore()) {
|
||||
if (distillRuns > 0) {
|
||||
addOrReplaceLore(meta, P.p.color("&7"), "Destilliert");
|
||||
addOrReplaceLore(meta, P.p.color("&7"), P.p.languageReader.get("Brew_Distilled"));
|
||||
}
|
||||
if (ageTime >= 1) {
|
||||
addOrReplaceLore(meta, P.p.color("&7"), "Fassgereift");
|
||||
addOrReplaceLore(meta, P.p.color("&7"), P.p.languageReader.get("Brew_BarrelRiped"));
|
||||
}
|
||||
item.setItemMeta(meta);
|
||||
}
|
||||
@ -291,7 +291,7 @@ public class Brew {
|
||||
slotItem.setDurability(PotionColor.valueOf(recipe.getColor()).getColorId(canDistill()));
|
||||
} else {
|
||||
quality = 0;
|
||||
potionMeta.setDisplayName(P.p.color("&f" + "Undefinierbares Destillat"));
|
||||
potionMeta.setDisplayName(P.p.color("&f" + P.p.languageReader.get("Brew_DistillUndefined")));
|
||||
slotItem.setDurability(PotionColor.GREY.getColorId(canDistill()));
|
||||
}
|
||||
|
||||
@ -335,7 +335,7 @@ public class Brew {
|
||||
item.setDurability(PotionColor.valueOf(recipe.getColor()).getColorId(canDistill()));
|
||||
} else {
|
||||
quality = 0;
|
||||
potionMeta.setDisplayName(P.p.color("&f" + "Verdorbenes Getränk"));
|
||||
potionMeta.setDisplayName(P.p.color("&f" + P.p.languageReader.get("Brew_BadPotion")));
|
||||
item.setDurability(PotionColor.GREY.getColorId(canDistill()));
|
||||
}
|
||||
}
|
||||
@ -399,7 +399,7 @@ public class Brew {
|
||||
if (toQuality && !unlabeled) {
|
||||
quality = ingredients.getIngredientQuality(currentRecipe);
|
||||
prefix = getQualityColor(quality);
|
||||
lore = "Zutaten";
|
||||
lore = P.p.languageReader.get("Brew_Ingredients");
|
||||
addOrReplaceLore(meta, prefix, lore);
|
||||
}
|
||||
|
||||
@ -407,11 +407,11 @@ public class Brew {
|
||||
if (toQuality && !unlabeled) {
|
||||
if (distillRuns > 0 == currentRecipe.needsDistilling()) {
|
||||
quality = ingredients.getCookingQuality(currentRecipe, distillRuns > 0);
|
||||
prefix = getQualityColor(quality) + ingredients.getCookedTime() + " minute";
|
||||
prefix = getQualityColor(quality) + ingredients.getCookedTime() + " " + P.p.languageReader.get("Brew_minute");
|
||||
if (ingredients.getCookedTime() > 1) {
|
||||
prefix = prefix + "n";
|
||||
prefix = prefix + P.p.languageReader.get("Brew_MinutePluralPostfix");
|
||||
}
|
||||
lore = " gegärt";
|
||||
lore = " " + P.p.languageReader.get("Brew_fermented");
|
||||
addOrReplaceLore(meta, prefix, lore);
|
||||
}
|
||||
}
|
||||
@ -446,35 +446,35 @@ public class Brew {
|
||||
public void updateDistillLore(String prefix, PotionMeta meta) {
|
||||
if (!unlabeled) {
|
||||
if (distillRuns > 1) {
|
||||
prefix = prefix + distillRuns + "-fach ";
|
||||
prefix = prefix + distillRuns + P.p.languageReader.get("Brew_-times") + " ";
|
||||
}
|
||||
}
|
||||
addOrReplaceLore(meta, prefix, "Destilliert");
|
||||
addOrReplaceLore(meta, prefix, P.p.languageReader.get("Brew_Distilled"));
|
||||
}
|
||||
|
||||
// sets the AgeLore. Prefix is the color to be used
|
||||
public void updateAgeLore(String prefix, PotionMeta meta) {
|
||||
if (!unlabeled) {
|
||||
if (ageTime >= 1 && ageTime < 2) {
|
||||
prefix = prefix + "Ein Jahr ";
|
||||
prefix = prefix + P.p.languageReader.get("Brew_OneYear") + " ";
|
||||
} else if (ageTime < 201) {
|
||||
prefix = prefix + (int) Math.floor(ageTime) + " Jahre ";
|
||||
prefix = prefix + (int) Math.floor(ageTime) + " " + P.p.languageReader.get("Brew_Years") + " ";
|
||||
} else {
|
||||
prefix = prefix + "Hunderte Jahre ";
|
||||
prefix = prefix + P.p.languageReader.get("Brew_HundredsOfYears") + " ";
|
||||
}
|
||||
}
|
||||
addOrReplaceLore(meta, prefix, "Fassgereift");
|
||||
addOrReplaceLore(meta, prefix, P.p.languageReader.get("Brew_BarrelRiped"));
|
||||
}
|
||||
|
||||
// updates/sets the color on WoodLore
|
||||
public void updateWoodLore(PotionMeta meta) {
|
||||
if (currentRecipe.getWood() > 0) {
|
||||
int quality = ingredients.getWoodQuality(currentRecipe, wood);
|
||||
addOrReplaceLore(meta, getQualityColor(quality), "Holzart");
|
||||
addOrReplaceLore(meta, getQualityColor(quality), P.p.languageReader.get("Brew_Woodtype"));
|
||||
} else {
|
||||
if (meta.hasLore()) {
|
||||
List<String> existingLore = meta.getLore();
|
||||
int index = indexOfSubstring(existingLore, "Holzart");
|
||||
int index = indexOfSubstring(existingLore, P.p.languageReader.get("Brew_Woodtype"));
|
||||
if (index > -1) {
|
||||
existingLore.remove(index);
|
||||
meta.setLore(existingLore);
|
||||
|
@ -39,22 +39,39 @@ public class LanguageReader {
|
||||
defaults.put("Player_BarrelCreated", "Fass erfolgreich erstellt");
|
||||
defaults.put("Player_CauldronInfo1", "Dieser Kessel siedet nun seit &v1 Minuten");
|
||||
defaults.put("Player_CauldronInfo2", "Dieser Kessel siedet seit weniger als einer Minute");
|
||||
defaults.put("Player_DrunkInfo", "Du bist nun &v1% betrunken, mit einer Qualität von &v2");
|
||||
defaults.put("Player_CantDrink", "Du kannst nicht mehr trinken");
|
||||
defaults.put("Player_DrunkPassOut", "Du hast zu viel getrunken und bist in Ohnmacht gefallen!");
|
||||
defaults.put("Player_Wake", "Ohh nein! Ich kann mich nicht erinnern, wie ich hierhergekommen bin...");
|
||||
defaults.put("Player_WakeCreated", "&aAufwachpunkt mit id: &6&v1 &awurde erfolgreich erstellt!");
|
||||
defaults.put("Player_WakeNotExist", "&cDer Aufwachpunkt mit der id: &6&v1 &cexistiert nicht!");
|
||||
defaults.put("Player_WakeDeleted", "&aDer Aufwachpunkt mit der id: &6&v1 &awurde erfolgreich gelöscht!");
|
||||
defaults.put("Player_WakeAlreadyDeleted", "&cDer Aufwachpunkt mit der id: &6&v1 &cwurde bereits gelöscht!");
|
||||
defaults.put("Player_WakeFilled", "&cDer Aufwachpunkt mit der id: &6&v1&c an Position &6&v2 &v3, &4, &v5&c ist mit Blöcken gefüllt!");
|
||||
defaults.put("Player_WakeFilled", "&cDer Aufwachpunkt mit der id: &6&v1&c an Position &6&v2 &v3, &v4, &v5&c ist mit Blöcken gefüllt!");
|
||||
defaults.put("Player_WakeNoPoints", "&cEs wurden noch keine Aufwachpunkte erstellt!");
|
||||
defaults.put("Player_WakeLast", "&aDies war der letzte Aufwachpunkt");
|
||||
defaults.put("Player_WakeTeleport", "Teleport zu Aufwachpunkt mit der id: &6&v1&f An Position: &6&v2 &v3, &4, &v5");
|
||||
defaults.put("Player_WakeTeleport", "Teleport zu Aufwachpunkt mit der id: &6&v1&f An Position: &6&v2 &v3, &v4, &v5");
|
||||
defaults.put("Player_WakeHint1", "Zum nächsten Aufwachpunkt: Mit Faust in die Luft schlagen");
|
||||
defaults.put("Player_WakeHint2", "Zum Abbrechen: &9/br wakeup cancel");
|
||||
defaults.put("Player_WakeCancel", "&6Aufwachpunkte-Check wurde abgebrochen");
|
||||
defaults.put("Player_WakeNoCheck", "&cEs läuft kein Aufwachpunkte-Check");
|
||||
|
||||
/* Brew */
|
||||
defaults.put("Brew_Distilled", "Destilliert");
|
||||
defaults.put("Brew_BarrelRiped", "Fassgereift");
|
||||
defaults.put("Brew_Undefined", "Undefinierbarer Sud");
|
||||
defaults.put("Brew_DistillUndefined", "Undefinierbares Destillat");
|
||||
defaults.put("Brew_BadPotion", "Verdorbenes Getränk");
|
||||
defaults.put("Brew_Ingredients", "Zutaten");
|
||||
defaults.put("Brew_minute", "minute");
|
||||
defaults.put("Brew_MinutePluralPostfix", "n");
|
||||
defaults.put("Brew_fermented", "gegärt");
|
||||
defaults.put("Brew_-times", "-fach");
|
||||
defaults.put("Brew_OneYear", "Ein Jahr");
|
||||
defaults.put("Brew_Years", "Jahre");
|
||||
defaults.put("Brew_HundredsOfYears", "Hunderte Jahre");
|
||||
defaults.put("Brew_Woodtype", "Holzart");
|
||||
defaults.put("Brew_ThickBrew", "Schlammiger Sud");
|
||||
|
||||
/* Commands */
|
||||
defaults.put("CMD_Reload", "&aConfig wurde neu eingelesen");
|
||||
defaults.put("CMD_Player", "&a&v1 ist nun &6&v2% &abetrunken, mit einer Qualität von &6&v3");
|
||||
@ -70,6 +87,7 @@ public class LanguageReader {
|
||||
defaults.put("Error_ShowHelp", "benutze &6/br help &fum die Hilfe anzuzeigen");
|
||||
defaults.put("Error_PlayerCommand", "&cDieser Befehl kann nur als Spieler ausgeführt werden");
|
||||
defaults.put("Error_ItemNotPotion", "&cDas Item in deiner Hand konnte nicht als Trank identifiziert werden");
|
||||
defaults.put("Error_Recipeload", "&cEs konnten nicht alle Rezepte wiederhergesellt werden: Siehe Serverlog!");
|
||||
|
||||
/* Help */
|
||||
defaults.put("Help_Help", "&6/br help <Seite> &9Zeigt eine bestimmte Hilfeseite an");
|
||||
@ -89,6 +107,7 @@ public class LanguageReader {
|
||||
|
||||
/* Etc. */
|
||||
defaults.put("Etc_Usage", "Benutzung:");
|
||||
defaults.put("Etc_Page", "Seite");
|
||||
}
|
||||
|
||||
private void check() {
|
||||
|
@ -74,6 +74,7 @@ public class P extends JavaPlugin {
|
||||
p.getServer().getPluginManager().registerEvents(inventoryListener, p);
|
||||
p.getServer().getPluginManager().registerEvents(worldListener, p);
|
||||
|
||||
// Heartbeat
|
||||
p.getServer().getScheduler().runTaskTimer(p, new BreweryRunnable(), 650, 1200);
|
||||
p.getServer().getScheduler().runTaskTimer(p, new DrunkRunnable(), 120, 120);
|
||||
|
||||
@ -110,14 +111,21 @@ public class P extends JavaPlugin {
|
||||
}
|
||||
|
||||
public void reload(CommandSender sender) {
|
||||
// clear all existent config Data
|
||||
BIngredients.possibleIngredients.clear();
|
||||
BIngredients.recipes.clear();
|
||||
BIngredients.cookedNames.clear();
|
||||
Words.words.clear();
|
||||
BPlayer.drainItems.clear();
|
||||
|
||||
// load the Config
|
||||
readConfig();
|
||||
|
||||
// save and load LanguageReader
|
||||
languageReader.save();
|
||||
languageReader = new LanguageReader(new File(p.getDataFolder(), "languages/" + language + ".yml"));
|
||||
|
||||
// Reload Recipes
|
||||
Boolean successful = true;
|
||||
for (Brew brew : Brew.potions.values()) {
|
||||
if (!brew.reloadRecipe()) {
|
||||
@ -125,7 +133,7 @@ public class P extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
if (!successful) {
|
||||
msg(sender, "&cEs konnten nicht alle Rezepte wiederhergesellt werden: Siehe Serverlog!");
|
||||
msg(sender, p.languageReader.get("Error_Recipeload"));
|
||||
}
|
||||
}
|
||||
|
||||
@ -184,7 +192,7 @@ public class P extends JavaPlugin {
|
||||
if (recipe.isValid()) {
|
||||
BIngredients.recipes.add(recipe);
|
||||
} else {
|
||||
errorLog("Laden des Rezeptes mit id: '" + recipeId + "' fehlgeschlagen!");
|
||||
errorLog("Loading the Recipe with id: '" + recipeId + "' failed!");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -198,7 +206,7 @@ public class P extends JavaPlugin {
|
||||
BIngredients.cookedNames.put(mat, (configSection.getString(ingredient, null)));
|
||||
BIngredients.possibleIngredients.add(mat);
|
||||
} else {
|
||||
errorLog("Unbekanntes Material: " + ingredient);
|
||||
errorLog("Unknown Material: " + ingredient);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -524,7 +532,7 @@ public class P extends JavaPlugin {
|
||||
page = 1;
|
||||
}
|
||||
|
||||
sender.sendMessage(color("&7-------------- &fSeite &6" + page + "&f/&6" + pages + " &7--------------"));
|
||||
sender.sendMessage(color("&7-------------- &f" + languageReader.get("Etc_Page") + " &6" + page + "&f/&6" + pages + " &7--------------"));
|
||||
|
||||
ListIterator<String> iter = strings.listIterator((page - 1) * 7);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user