Handles default root advancement scoring and better presentation.

BentoBoxWorld · Mar 20, 2021 · c39ded9 · c39ded9
1 parent c747378
commit c39ded9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/world/bentobox/boxed/AdvancementsManager.java b/src/main/java/world/bentobox/boxed/AdvancementsManager.java
@@ -153,8 +153,14 @@ public int addAdvancement(Player p, Advancement advancement) {
             // Wrong world
             return 0;
         }
+        String adv = "advancements." + advancement.getKey().toString();
         // Check score of advancement
-        int score = advConfig.getInt("advancements." + advancement.getKey().toString(), this.unknownAdvChange);
+        int score = 0;
+        if (!advConfig.contains(adv) && adv.endsWith("/root")) {
+            score = advConfig.getInt("settings.default-root-increase");
+        } else {
+            score = advConfig.getInt(adv, this.unknownAdvChange);
+        }
         if (score == 0) {
             return 0;
         }

diff --git a/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java b/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java
@@ -104,7 +104,7 @@ public void syncAdvancements(User user) {
 
     private void informPlayer(User user, NamespacedKey key, int score) {
         user.getPlayer().playSound(user.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1F, 2F);
-        String adv = user.getTranslation("boxed.advancements." + key.toString());
+        String adv = user.getTranslationOrNothing("boxed.advancements." + key.toString());
         if (adv.isEmpty()) {
             adv = Util.prettifyText(key.getKey().substring(key.getKey().lastIndexOf("/") + 1, key.getKey().length()));
         }

diff --git a/src/main/resources/advancements.yml b/src/main/resources/advancements.yml
@@ -1,5 +1,6 @@
 # Lists how many blocks the box will increase when advancement occurs
 settings:
+  default-root-increase: 0
   unknown-advancement-increase: 1
 advancements:
   'minecraft:adventure/adventuring_time': 1