Merge pull request #105 from VolmitSoftware/Development

Development
VolmitSoftware · Sep 4, 2022 · 7d08e00 · 7d08e00
2 parents 2c7c463 + c5c6a75
commit 7d08e00
Show file tree

Hide file tree

Showing 12 changed files with 438 additions and 397 deletions.
diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ plugins {
 }
 
 
-version '1.0.8-1.19.2' // Needs to be version specific
+version '1.0.9-1.19.2' // Needs to be version specific
 def nmsVersion = "1.19.2"
 def apiVersion = '1.19'
 def spigotJarVersion = '1.19-R0.1-SNAPSHOT'

diff --git a/src/main/java/com/volmit/adapt/AdaptConfig.java b/src/main/java/com/volmit/adapt/AdaptConfig.java
@@ -43,6 +43,7 @@ public class AdaptConfig {
     private double playerXpPerSkillLevelUpLevelMultiplier = 44;
     private double powerPerLevel = 0.73;
     public boolean debug = false;
+    public String adaptActivatorBlock = "BOOKSHELF";
 
     @Getter
     public static class ValueConfig {

diff --git a/src/main/java/com/volmit/adapt/api/skill/Skill.java b/src/main/java/com/volmit/adapt/api/skill/Skill.java
@@ -29,13 +29,7 @@
 import com.volmit.adapt.api.world.PlayerData;
 import com.volmit.adapt.api.xp.XP;
 import com.volmit.adapt.content.gui.SkillsGui;
-import com.volmit.adapt.util.C;
-import com.volmit.adapt.util.Form;
-import com.volmit.adapt.util.J;
-import com.volmit.adapt.util.MaterialBlock;
-import com.volmit.adapt.util.UIElement;
-import com.volmit.adapt.util.UIWindow;
-import com.volmit.adapt.util.Window;
+import com.volmit.adapt.util.*;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -117,7 +111,10 @@ default void xp(Player p, Location at, double xp) {
     }
 
     default void xpSilent(Player p, double xp) {
-        XP.xpSilent(p, this, xp);
+        try {
+            XP.xpSilent(p, this, xp);
+        } catch (Exception ignored) { // Player was Given XP (Likely Teleportation) before i can see it because some plugin has higher priority than me and moves a player. so im not going to throw an error, as i know why it's happening.
+        }
     }
 
     default void xp(Location at, double xp, int rad, long duration) {

diff --git a/src/main/java/com/volmit/adapt/api/skill/SkillRegistry.java b/src/main/java/com/volmit/adapt/api/skill/SkillRegistry.java
@@ -18,6 +18,8 @@
 
 package com.volmit.adapt.api.skill;
 
+import com.volmit.adapt.Adapt;
+import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.recipe.AdaptRecipe;
 import com.volmit.adapt.api.tick.TickedObject;
 import com.volmit.adapt.api.world.AdaptPlayer;
@@ -88,7 +90,7 @@ public void on(PlayerExpChangeEvent e) {
     @EventHandler(priority = EventPriority.MONITOR)
     public void on(PlayerInteractEvent e) {
         if(!e.getBlockFace().equals(BlockFace.UP) && !e.getBlockFace().equals(BlockFace.DOWN) && !e.getPlayer().isSneaking() && e.getAction().equals(Action.RIGHT_CLICK_BLOCK)
-            && e.getClickedBlock().getType().equals(Material.BOOKSHELF) && (e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)
+            && e.getClickedBlock().getType().equals(Material.valueOf(AdaptConfig.get().adaptActivatorBlock)) && (e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)
             || !e.getPlayer().getInventory().getItemInMainHand().getType().isBlock()) &&
             (e.getPlayer().getInventory().getItemInOffHand().getType().equals(Material.AIR) || !e.getPlayer().getInventory().getItemInOffHand().getType().isBlock())) {
             e.getClickedBlock().getWorld().playSound(e.getClickedBlock().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 0.72f);

diff --git a/src/main/java/com/volmit/adapt/api/xp/XP.java b/src/main/java/com/volmit/adapt/api/xp/XP.java
@@ -40,7 +40,9 @@ public static void xpSilent(Player p, Skill skill, double xp) {
     }
 
     public static void xpSilent(AdaptPlayer p, Skill skill, double xp) {
-        p.getSkillLine(skill.getName()).giveXP(null, xp);
+        if (p.getSkillLine(skill.getName()) != null) {
+            p.getSkillLine(skill.getName()).giveXP(null, xp);
+        }
     }
 
     public static void spatialXP(Location l, Skill skill, double xp, int rad, long duration) {

diff --git a/src/main/java/com/volmit/adapt/commands/boost/CommandBoostPlayer.java b/src/main/java/com/volmit/adapt/commands/boost/CommandBoostPlayer.java
@@ -19,8 +19,11 @@
 package com.volmit.adapt.commands.boost;
 
 import com.volmit.adapt.Adapt;
+import com.volmit.adapt.api.skill.Skill;
 import com.volmit.adapt.api.world.AdaptPlayer;
 import com.volmit.adapt.api.world.AdaptServer;
+import com.volmit.adapt.api.xp.XP;
+import com.volmit.adapt.util.C;
 import com.volmit.adapt.util.MortarCommand;
 import com.volmit.adapt.util.MortarSender;
 import org.bukkit.Bukkit;
@@ -36,17 +39,23 @@ public CommandBoostPlayer() {
 
     @Override
     public boolean handle(MortarSender sender, String[] args) {
-        if (Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName).toList().contains(args[0])) {
-            Player p = Bukkit.getPlayer(args[0]);
-            AdaptPlayer ap = Adapt.instance.getAdaptServer().getPlayer(p);
-            AdaptServer as = Adapt.instance.getAdaptServer();
-            ap.boostXPToRecents(ap, Double.parseDouble(args[1]), Integer.parseInt(args[2])); // not working
-            p.sendMessage("BOOSTED " + args[1] + " XP TO " + args[2] + " ALL RECENT SKILL GAINS");
-            Adapt.info("BOOSTED " + args[1] + " XP TO " + args[2] + " ALL RECENT SKILL GAINS");
-        }
-        AdaptPlayer ap = Adapt.instance.getAdaptServer().getPlayer(sender.player());
+        try {
+            if (Bukkit.getOnlinePlayers().stream().map(HumanEntity::getName).toList().contains(args[0])) {
+                Player p = Bukkit.getPlayer(args[0]);
+                AdaptPlayer ap = Adapt.instance.getAdaptServer().getPlayer(p);
+                AdaptServer as = Adapt.instance.getAdaptServer();
+
+                ap.boostXPToRecents(ap, Double.parseDouble(args[1]), Integer.parseInt(args[2])); // not working
+                p.sendMessage("BOOSTED " + args[1] + " XP TO " + args[2] + " ALL RECENT SKILL GAINS");
+                Adapt.info("BOOSTED " + args[1] + " XP TO " + args[2] + " ALL RECENT SKILL GAINS");
+            }
+            AdaptPlayer ap = Adapt.instance.getAdaptServer().getPlayer(sender.player());
 
-        return true;
+            return true;
+        }  catch (Exception ignored) {
+            printHelp(sender);
+            return true;
+        }
     }
 
     @Override

diff --git a/src/main/java/com/volmit/adapt/commands/item/CommandItemExperienceOrb.java b/src/main/java/com/volmit/adapt/commands/item/CommandItemExperienceOrb.java
@@ -19,6 +19,7 @@
 package com.volmit.adapt.commands.item;
 
 import com.volmit.adapt.content.item.ExperienceOrb;
+import com.volmit.adapt.util.C;
 import com.volmit.adapt.util.MortarCommand;
 import com.volmit.adapt.util.MortarSender;
 import org.bukkit.Bukkit;
@@ -32,14 +33,23 @@ public CommandItemExperienceOrb() {
 
     @Override
     public boolean handle(MortarSender sender, String[] args) {
-        if (args.toList().size() > 2) {
-            if (Bukkit.getPlayer(args[2]) != null && Bukkit.getPlayer(args[2]).getPlayer() != null) {
-                Bukkit.getPlayer(args[2]).getPlayer().getInventory().addItem(ExperienceOrb.with(args[0], Integer.parseInt(args[1])));
+
+        try {
+            if (args.toList().size() > 2) {
+                if (Bukkit.getPlayer(args[2]) != null && Bukkit.getPlayer(args[2]).getPlayer() != null) {
+                    Bukkit.getPlayer(args[2]).getPlayer().getInventory().addItem(ExperienceOrb.with(args[0], Integer.parseInt(args[1])));
+                }
+            } else if (args.toList().size() == 2) {
+                sender.player().getInventory().addItem(ExperienceOrb.with(args[0], Integer.parseInt(args[1])));
             }
-        } else if (args.toList().size() == 2) {
-            sender.player().getInventory().addItem(ExperienceOrb.with(args[0], Integer.parseInt(args[1])));
+            return true;
+        } catch (Exception ignored) {
+            printHelp(sender);
+            sender.sendMessage(C.GRAY + "[" + C.DARK_RED + "Adapt" + C.GRAY + "]: " + C.RED + "Invalid arguments!" + C.GRAY + " Command: /adapt item knowledge <Skill> <XP Amount>");
+            return true;
         }
-        return true;
+
+
     }
 
     @Override

diff --git a/src/main/java/com/volmit/adapt/commands/item/CommandItemKnowledgeOrb.java b/src/main/java/com/volmit/adapt/commands/item/CommandItemKnowledgeOrb.java
@@ -19,6 +19,7 @@
 package com.volmit.adapt.commands.item;
 
 import com.volmit.adapt.content.item.KnowledgeOrb;
+import com.volmit.adapt.util.C;
 import com.volmit.adapt.util.MortarCommand;
 import com.volmit.adapt.util.MortarSender;
 
@@ -31,8 +32,14 @@ public CommandItemKnowledgeOrb() {
 
     @Override
     public boolean handle(MortarSender sender, String[] args) {
-        sender.player().getInventory().addItem(KnowledgeOrb.with(args[0], Integer.parseInt(args[1])));
-        return true;
+        try {
+            sender.player().getInventory().addItem(KnowledgeOrb.with(args[0], Integer.parseInt(args[1])));
+            return true;
+        } catch (Exception ignored) {
+            printHelp(sender);
+            sender.sendMessage(C.GRAY + "[" + C.DARK_RED + "Adapt" + C.GRAY + "]: " + C.RED + "Invalid arguments!" + C.GRAY + " Command: /adapt item knowledge <Skill> <XP Amount>");
+            return true;
+        }
     }
 
     @Override

diff --git a/src/main/java/com/volmit/adapt/commands/openGui/CommandOpenGUI.java b/src/main/java/com/volmit/adapt/commands/openGui/CommandOpenGUI.java
@@ -32,10 +32,15 @@ public CommandOpenGUI() {
 
     @Override
     public boolean handle(MortarSender sender, String[] args) {
+        try {
         sender.player().playSound(sender.player().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 0.72f);
         sender.player().playSound(sender.player().getLocation(), Sound.BLOCK_ENCHANTMENT_TABLE_USE, 0.35f, 0.755f);
         SkillsGui.open(sender.player());
         return true;
+        }  catch (Exception ignored) {
+            printHelp(sender);
+            return true;
+        }
     }
 
     @Override

diff --git a/src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectPlacement.java b/src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectPlacement.java
@@ -115,7 +115,7 @@ public void on(BlockPlaceEvent e) {
                         runPlayerViewport(getBlockFace(p), p.getTargetBlock(null, 5), p.getInventory().getItemInMainHand().getType(), p);
                     }
                 } else {
-                    p.sendMessage(C.RED + Adapt.dLocalize("Architect", "Placement", "Lore2") + C.GREEN + totalMap.get(p).size() + C.RED + " " +Adapt.dLocalize("Architect", "Placement", "Lore2"));
+                    p.sendMessage(C.RED + Adapt.dLocalize("Architect", "Placement", "Lore1") + C.GREEN + totalMap.get(p).size() + C.RED + " " +Adapt.dLocalize("Architect", "Placement", "Lore2"));
                 }
             }
         }

diff --git a/src/main/java/com/volmit/adapt/content/skill/SkillRift.java b/src/main/java/com/volmit/adapt/content/skill/SkillRift.java
@@ -58,8 +58,11 @@ public SkillRift() {
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void on(PlayerTeleportEvent e) {
-        if (!lasttp.containsKey(e.getPlayer())) { // any teleport. this was problematic when teleporting from a rift to a rift or using a rift to teleport to a rift inside of a dimension
-            xpSilent(e.getPlayer(), getConfig().teleportXP);
+        if (!lasttp.containsKey(e.getPlayer())) {
+            try {
+                xpSilent(e.getPlayer(), getConfig().teleportXP);
+            } catch (Exception ignored) {
+            }
             lasttp.put(e.getPlayer(), M.ms());
         }
     }