Merge pull request #207 from VolmitSoftware/Development

Development
VolmitSoftware · Sep 24, 2022 · 51d592b · 51d592b
2 parents 584b03b + d1cf653
commit 51d592b
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 25 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
 }
 
 
-version '1.3.4-1.19.2' // Needs to be version specific
+version '1.3.5-1.19.2' // Needs to be version specific
 def nmsVersion = "1.19.2" //[NMS]
 def apiVersion = '1.19'
 def specialSourceVersion = '1.11.0' //[NMS]

diff --git a/src/main/java/com/volmit/adapt/AdaptConfig.java b/src/main/java/com/volmit/adapt/AdaptConfig.java
@@ -50,6 +50,9 @@ public class AdaptConfig {
     private double powerPerLevel = 0.73;
     private boolean requireBuildPermissionToUseSkills = true;
     private boolean hardcoreResetOnPlayerDeath = false;
+    private boolean hardcoreNoRefunds = false;
+    private boolean loginBonus = true;
+    private boolean advancements = true;
     private boolean useSql = false;
     private SqlSettings sql = new SqlSettings();
 

diff --git a/src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java b/src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java
@@ -310,12 +310,12 @@ default void openGui(Player player) {
                     .setEnchanted(mylevel >= lvl)
                     .setProgress(1D)
                     .addLore(Form.wrapWordsPrefixed(getDescription(), "" + C.GRAY, 40))
-                    .addLore(mylevel >= lvl ? ("") : ("" + C.WHITE + c + C.GRAY + " " + Adapt.dLocalize("snippets", "adaptmenu", "knowledgecost")))
-                    .addLore(mylevel >= lvl ? (C.GREEN + Adapt.dLocalize("snippets", "adaptmenu", "alreadylearned") + " " + C.GRAY + Adapt.dLocalize("snippets", "adaptmenu", "unlearnrefund") + "" + C.GREEN + rc + " " + Adapt.dLocalize("snippets", "adaptmenu", "knowledgecost")) : (k >= c ? (C.BLUE + Adapt.dLocalize("snippets", "adaptmenu", "clicklearn") + " " + getDisplayName(i)) : (k == 0 ? (C.RED + Adapt.dLocalize("snippets", "adaptmenu", "noknowledge")) : (C.RED + "(" + Adapt.dLocalize("snippets", "adaptmenu", "youonlyhave") + " " + C.WHITE + k + C.RED + " " + Adapt.dLocalize("snippets", "adaptmenu", "knowledgecost") + ")"))))
-                    .addLore(mylevel < lvl && getPlayer(player).getData().hasPowerAvailable(pc) ? C.GREEN + "" + lvl + " " + Adapt.dLocalize("snippets", "adaptmenu", "power") : mylevel >= lvl ? C.GREEN + "" + lvl + " " + Adapt.dLocalize("snippets", "adaptmenu", "power") : C.RED + Adapt.dLocalize("snippets", "adaptmenu", "notenoughpower") + "\n" + C.RED + Adapt.dLocalize("snippets", "adaptmenu", "howtolevelup"))
+                    .addLore(mylevel >= lvl ? ("") : ("" + C.WHITE + c + C.GRAY + " " + Adapt.dLocalize("snippets", "adaptmenu", "knowledgecost") + " " + (AdaptConfig.get().isHardcoreNoRefunds() ? C.DARK_RED + "" + C.BOLD + Adapt.dLocalize("snippets", "adaptmenu", "norefunds"): "")))
+                    .addLore(mylevel >= lvl ? AdaptConfig.get().isHardcoreNoRefunds() ?(C.GREEN + Adapt.dLocalize("snippets", "adaptmenu", "alreadylearned") + " " + C.DARK_RED +"" + C.BOLD + Adapt.dLocalize("snippets", "adaptmenu", "norefunds")):(C.GREEN + Adapt.dLocalize("snippets", "adaptmenu", "alreadylearned") + " " + C.GRAY + Adapt.dLocalize("snippets", "adaptmenu", "unlearnrefund") + " " + C.GREEN + rc + " " + Adapt.dLocalize("snippets", "adaptmenu", "knowledgecost")) : (k >= c ? (C.BLUE + Adapt.dLocalize("snippets", "adaptmenu", "clicklearn") + " " + getDisplayName(i)) : (k == 0 ? (C.RED + Adapt.dLocalize("snippets", "adaptmenu", "noknowledge")) : (C.RED + "(" + Adapt.dLocalize("snippets", "adaptmenu", "youonlyhave") + " " + C.WHITE + k + C.RED + " " + Adapt.dLocalize("snippets", "adaptmenu", "knowledgecost") + ")"))))
+                    .addLore(mylevel < lvl && getPlayer(player).getData().hasPowerAvailable(pc) ? C.GREEN + "" + lvl + " " + Adapt.dLocalize("snippets", "adaptmenu", "powerdrain") : mylevel >= lvl ? C.GREEN + "" + lvl + " " + Adapt.dLocalize("snippets", "adaptmenu", "powerdrain") : C.RED + Adapt.dLocalize("snippets", "adaptmenu", "notenoughpower") + "\n" + C.RED + Adapt.dLocalize("snippets", "adaptmenu", "howtolevelup"))
                     .onLeftClick((e) -> {
                         if (mylevel >= lvl) {
-                            getPlayer(player).getData().getSkillLine(getSkill().getName()).giveKnowledge(rc);
+                            if (!AdaptConfig.get().isHardcoreNoRefunds()) {getPlayer(player).getData().getSkillLine(getSkill().getName()).giveKnowledge(rc);}
                             getPlayer(player).getData().getSkillLine(getSkill().getName()).setAdaptation(this, lvl - 1);
                             player.getWorld().playSound(player.getLocation(), Sound.BLOCK_NETHER_GOLD_ORE_PLACE, 0.7f, 1.355f);
                             player.getWorld().playSound(player.getLocation(), Sound.BLOCK_BEACON_DEACTIVATE, 0.4f, 0.755f);

diff --git a/src/main/java/com/volmit/adapt/api/skill/Skill.java b/src/main/java/com/volmit/adapt/api/skill/Skill.java
@@ -19,6 +19,7 @@
 package com.volmit.adapt.api.skill;
 
 import com.volmit.adapt.Adapt;
+import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.Component;
 import com.volmit.adapt.api.adaptation.Adaptation;
 import com.volmit.adapt.api.advancement.AdaptAdvancement;
@@ -71,10 +72,9 @@ default void checkStatTrackers(AdaptPlayer player) {
         if (player.getPlayer().getClass().getSimpleName().equals("PlayerNPC")) {
             return;
         }
-        if (!player.getAdvancementHandler().isReady()) {
+        if (!player.getAdvancementHandler().isReady() && AdaptConfig.get().isAdvancements()) {
             return;
         }
-
         PlayerData d = player.getData();
 
         for (AdaptStatTracker i : getStatTrackers()) {

diff --git a/src/main/java/com/volmit/adapt/api/world/AdaptPlayer.java b/src/main/java/com/volmit/adapt/api/world/AdaptPlayer.java
@@ -20,6 +20,7 @@
 
 import com.google.gson.Gson;
 import com.volmit.adapt.Adapt;
+import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.notification.AdvancementNotification;
 import com.volmit.adapt.api.notification.Notifier;
 import com.volmit.adapt.api.skill.Skill;
@@ -262,21 +263,21 @@ public void boostXPToRecents(AdaptPlayer p, double boost, int ms) {
     }
 
     public void loggedIn() {
-        long timeGone = M.ms() - getData().getLastLogin();
-        boolean first = getData().getLastLogin() == 0;
-        getData().setLastLogin(M.ms());
-        long boostTime = (long) Math.min(timeGone / 12D, TimeUnit.HOURS.toMillis(1));
-
-        if (boostTime < TimeUnit.MINUTES.toMillis(5)) {
-            return;
+        if (AdaptConfig.get().isLoginBonus()) {
+            long timeGone = M.ms() - getData().getLastLogin();
+            boolean first = getData().getLastLogin() == 0;
+            getData().setLastLogin(M.ms());
+            long boostTime = (long) Math.min(timeGone / 12D, TimeUnit.HOURS.toMillis(1));
+            if (boostTime < TimeUnit.MINUTES.toMillis(5)) {
+                return;
+            }
+            double boostAmount = M.lerp(0.1, 0.25, (double) boostTime / (double) TimeUnit.HOURS.toMillis(1));
+            getData().globalXPMultiplier(boostAmount, (int) boostTime);
+            getNot().queue(AdvancementNotification.builder()
+                    .title(first ? Adapt.dLocalize("snippets", "gui", "welcome") : Adapt.dLocalize("snippets", "gui", "welcomeback"))
+                    .description("+" + C.GREEN + Form.pc(boostAmount, 0) + C.GRAY + " " + Adapt.dLocalize("snippets", "gui", "xpbonusfortime") + " " + C.AQUA + Form.duration(boostTime, 0))
+                    .build());
         }
-
-        double boostAmount = M.lerp(0.1, 0.25, (double) boostTime / (double) TimeUnit.HOURS.toMillis(1));
-        getData().globalXPMultiplier(boostAmount, (int) boostTime);
-        getNot().queue(AdvancementNotification.builder()
-                .title(first ? Adapt.dLocalize("snippets", "gui", "welcome") : Adapt.dLocalize("snippets", "gui", "welcomeback"))
-                .description("+" + C.GREEN + Form.pc(boostAmount, 0) + C.GRAY + " " + Adapt.dLocalize("snippets", "gui", "xpbonusfortime") + " " + C.AQUA + Form.duration(boostTime, 0))
-                .build());
     }
 
     public boolean hasSkill(Skill s) {

diff --git a/src/main/java/com/volmit/adapt/api/world/AdvancementHandler.java b/src/main/java/com/volmit/adapt/api/world/AdvancementHandler.java
@@ -19,6 +19,7 @@
 package com.volmit.adapt.api.world;
 
 import com.volmit.adapt.Adapt;
+import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.advancement.AdaptAdvancement;
 import com.volmit.adapt.api.skill.Skill;
 import com.volmit.adapt.util.J;
@@ -47,6 +48,9 @@ public AdvancementHandler(AdaptPlayer player) {
     }
 
     public void activate() {
+        if (!AdaptConfig.get().isAdvancements()) {
+            return;
+        }
         J.s(() -> {
             removeAllAdvancements();
 
@@ -76,7 +80,7 @@ public void grant(String key, boolean toast) {
         J.s(() -> getManager().grantAdvancement(player.getPlayer(), real.get(key)), 5);
 
         if (toast) {
-            if (getPlayer().getPlayer() != null) {
+            if (getPlayer() != null && getPlayer().getPlayer() != null) {
                 real.get(key).displayToast(getPlayer().getPlayer());
             }
         }

diff --git a/src/main/java/com/volmit/adapt/api/world/PlayerSkillLine.java b/src/main/java/com/volmit/adapt/api/world/PlayerSkillLine.java
@@ -103,12 +103,12 @@ public Skill getRawSkill(AdaptPlayer p) {
     }
 
     public void update(AdaptPlayer p, String line, PlayerData data) {
-        if (!p.getData().isGranted("skill_" + line)) {
+        if (!p.getData().isGranted("skill_" + line) && AdaptConfig.get().isAdvancements()) {
             p.getAdvancementHandler().grant("skill_" + line);
         }
 
         for (String i : getAdaptations().k()) {
-            if (!p.getData().isGranted("adaptation_" + i)) {
+            if (!p.getData().isGranted("adaptation_" + i) && AdaptConfig.get().isAdvancements()) {
                 p.getAdvancementHandler().grant("adaptation_" + i);
             }
         }

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/ranged/RangedForce.java b/src/main/java/com/volmit/adapt/content/adaptation/ranged/RangedForce.java
@@ -19,6 +19,7 @@
 package com.volmit.adapt.content.adaptation.ranged;
 
 import com.volmit.adapt.Adapt;
+import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.adaptation.SimpleAdaptation;
 import com.volmit.adapt.api.advancement.AdaptAdvancement;
 import com.volmit.adapt.util.C;
@@ -80,7 +81,7 @@ public void on(EntityDamageByEntityEvent e) {
             b.setY(0);
             xp(p, 5);
 
-            if (a.distanceSquared(b) > 10) {
+            if (a.distanceSquared(b) > 10 && AdaptConfig.get().isAdvancements()) {
                 getPlayer(p).getAdvancementHandler().grant("challenge_force_30");
                 getSkill().xp(p, getConfig().challengeRewardLongShotReward);
             }

diff --git a/src/main/java/com/volmit/adapt/util/advancements/advancement/Advancement.java b/src/main/java/com/volmit/adapt/util/advancements/advancement/Advancement.java
@@ -18,6 +18,7 @@
 
 package com.volmit.adapt.util.advancements.advancement;
 
+import com.volmit.adapt.Adapt;
 import com.volmit.adapt.util.advancements.NameKey;
 import com.volmit.adapt.util.advancements.advancement.AdvancementDisplay.AdvancementFrame;
 import com.volmit.adapt.util.advancements.advancement.criteria.Criteria;
@@ -348,6 +349,10 @@ public AdvancementProgress getProgress(Player player) {
      * @return The Player's progress
      */
     public AdvancementProgress getProgress(UUID uuid) {
+        if (uuid == null) {
+            Adapt.error("AdvancementProgress.getProgress(UUID) was called with a null UUID!");
+            return null;
+        }
         if (!progressMap.containsKey(uuid.toString())) {
             progressMap.put(uuid.toString(), new AdvancementProgress(getCriteria().getCriteria(), getCriteria().getRequirements()));
         }

diff --git a/src/main/resources/en_US.json b/src/main/resources/en_US.json
@@ -15,13 +15,15 @@
       "knowledgecost": "Knowledge Cost",
       "alreadylearned": "Already Learned",
       "unlearnrefund": "Click to Unlearn & Refund",
+      "norefunds": "HARDCORE, REFUNDS DISABLED",
       "knowledge": "knowledge",
       "clicklearn": "Click to Learn",
       "noknowledge": "(You don't have any Knowledge)",
       "youonlyhave": "You only have",
       "howtolevelup": "Level up skills to increase your max power.",
       "notenoughpower": "Not enough power! Each Ability Level costs 1 power.",
       "power": "power",
+      "powerdrain": "Power Drain",
       "learned": "Learned ",
       "unlearned": "Unlearned "
     },