From f29ba54069de40d01279e176c2269814b4eecfd3 Mon Sep 17 00:00:00 2001 From: ErdbeerbaerLP <27149563+ErdbeerbaerLP@users.noreply.github.com> Date: Thu, 15 Oct 2020 22:00:27 +0200 Subject: [PATCH 1/3] Add german translation --- src/main/resources/config.yml | 2 +- src/main/resources/locale/de.yml | 90 ++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/locale/de.yml diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index bea81be..946d516 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,6 +1,6 @@ # Language Settings # -# Available locale: en, fr, pt, zh_cn, hu +# Available locale: en, fr, pt, zh_cn, hu, de # # If you want to create your own, the file name must match the locale name. # Example: diff --git a/src/main/resources/locale/de.yml b/src/main/resources/locale/de.yml new file mode 100644 index 0000000..542e1c6 --- /dev/null +++ b/src/main/resources/locale/de.yml @@ -0,0 +1,90 @@ +#################### +# Yes or no +#################### +text_yes: "&aJa" +text_no: "&cNein" + +################### +# Beehive GUI +################### +beehive_info_gui_title: "&8Bienenstockinformationen" + +beehive_info_gui_honey_capacity: "&fHonig-Lager" + +beehive_info_gui_honey_capacity_desc: "&aKapazität: &7%current%/%maximum%" + +beehive_info_gui_bee_capacity: "&fBienenwohnraum" + +beehive_info_gui_bee_capacity_desc: "&aKapazität: &7%current%/%maximum% Bienen" + +beehive_info_gui_sedated: "&aSediert" +beehive_info_gui_not_sedated: "&cNicht sediert" + +beehive_info_gui_flower: "&fBlume" + +# Use || to a create a new line +beehive_info_gui_no_target_flower_desc: "&aDieser Bienenstock hat||&anoch keine Zielblume!" + +honey_low: "Wenig" +honey_medium: "Mittel" +honey_high: "Viel" +honey_very_high: "Sehr Viel" + +################### +# Bee GUI +################### +bee_info_gui_title: "&8Bienen-Info" + +bee_info_gui_age: "&fAlter" +bee_info_gui_age_adult: "&aErwachsen" +bee_info_gui_age_baby: "&aBaby" + +bee_info_gui_anger: "&fWut" + +# Use %level% as a placeholder for the bee's anger level +bee_info_gui_anger_level_desc: "&aWut-level: &7%level%" + +bee_info_gui_hive_location: "&fBienenstock-Ort" + +# Use || to a create a new line +bee_info_gui_no_hive_desc: "&aDiese Biene hat||&anoch keinen Stock!" + +bee_info_gui_ride: "&fReiten" +bee_info_gui_ride_no_permission: "&cDu hast nicht die Erlaubnis auf Bienen zu reiten!" +bee_info_gui_ride_angry: "&cDu kannst keine wütenden Bienen reiten!" +bee_info_gui_ride_already: "&cDiese Biene ist bereits besetzt!" +bee_info_gui_ride_too_far: "&cDu bist zu weit von der Biene entfernt!" + +bee_info_gui_has_stung: "&fHat gestochen?" +bee_info_gui_has_nectar: "&fHat Nektar?" + +bee_info_gui_health: "&fGesundheit" + +# Use %health% to represent the bee's health +bee_info_gui_health_desc: "&a&7%health% ❤" + +################### +# Riding a bee title +# Use %name% as a placeholder for the player's name +################### +ride_bee_title: "&6Du reitest nun" +ride_bee_subtitle: "&6eine Biene, &8%name%&6!" + +################### +# Protection suit name +################### +bee_protection_helmet: "&6Bienenschutzhelm" +bee_protection_chestplate: "&6Bienenschutzhemd" +bee_protection_leggings: "&6Bienenschutzhose" +bee_protection_boots: "&6Bienenschutzschuhe" + +################### +# Beehive upgrade item +################### +beehive_upgrade_item_name: "&6Bienenstock Upgrade" + +# Use || to a create a new line +beehive_upgrade_item_lore: "&7Bienenwohnraum: &a+3||&8(Zum verwenden rechtsklicken)" + +beehive_upgrade_success: "&aBienenstock verbessert! Neuer Wohnraum: &7%beesno%&a Bienen" +beehive_upgrade_max: "&cFehler: Dieser Bienenstock hat bereits den maximalen Wohnraum erreicht!" \ No newline at end of file From 0fb9f945f4509544ef74a23aa733bf1fe69341a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20F?= Date: Tue, 22 Jun 2021 19:42:32 +0100 Subject: [PATCH 2/3] Extract upgrade to separate method --- .../tomff/beesplus/items/BeeHiveUpgrade.java | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java b/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java index 11dfcc5..31db075 100644 --- a/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java +++ b/src/main/java/com/tomff/beesplus/items/BeeHiveUpgrade.java @@ -103,24 +103,28 @@ public class BeeHiveUpgrade implements CustomItem, Listener { return; } - if (beehive.getMaxEntities() >= maxPopulation) { - Localization.sendMessage(player, Localization.BEEHIVE_UPGRADE_MAX); - player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 2, 2); - - return; - } - - beehive.setMaxEntities(beehive.getMaxEntities() + 3); - beehive.update(); - - Localization.sendMessage(player, Localization.BEEHIVE_UPGRADE_SUCCESS, beehive.getMaxEntities()); - player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 2, 2); - - ItemStack upgradeAmountRemove = handItem.clone(); - upgradeAmountRemove.setAmount(1); - - player.getInventory().removeItem(upgradeAmountRemove); + upgradeBeehive(player, beehive, handItem); } } } + + public void upgradeBeehive(Player player, Beehive beehive, ItemStack handItem) { + if (beehive.getMaxEntities() >= maxPopulation) { + Localization.sendMessage(player, Localization.BEEHIVE_UPGRADE_MAX); + player.playSound(player.getLocation(), Sound.BLOCK_NOTE_BLOCK_PLING, 2, 2); + + return; + } + + beehive.setMaxEntities(beehive.getMaxEntities() + 3); + beehive.update(); + + Localization.sendMessage(player, Localization.BEEHIVE_UPGRADE_SUCCESS, beehive.getMaxEntities()); + player.playSound(player.getLocation(), Sound.ENTITY_ARROW_HIT_PLAYER, 2, 2); + + ItemStack upgradeAmountRemove = handItem.clone(); + upgradeAmountRemove.setAmount(1); + + player.getInventory().removeItem(upgradeAmountRemove); + } } From 3882d3e21b1db8ae316f889668528cb7becb1d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20F?= Date: Tue, 22 Jun 2021 19:46:20 +0100 Subject: [PATCH 3/3] Update project version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index edfc587..138d3be 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.tomff.beesplus BeesPlus - 1.5.2 + 1.6.0 UTF-8