Merge pull request #496 from VolmitSoftware/Development

Development

Author: NextdoorPsycho

src/main/java/com/volmit/adapt/Adapt.java

@@ -177,6 +177,7 @@ public void stop() {
         services.values().forEach(AdaptService::onDisable);
         sqlManager.closeConnection();
         stopSim();
+        glowingEntities.disable();
         protectorRegistry.unregisterAll();
         services.clear();
     }

src/main/java/com/volmit/adapt/api/adaptation/Adaptation.java

@@ -384,6 +384,11 @@ default boolean openGui(Player player, boolean checkPermissions) {
     }
 
     default void openGui(Player player) {
+        if (!Bukkit.isPrimaryThread()) {
+            J.s(() -> openGui(player));
+            return;
+        }
+
         player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
         player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 0.655f);
         player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 0.855f);

src/main/java/com/volmit/adapt/api/skill/Skill.java

@@ -31,6 +31,7 @@
 import com.volmit.adapt.api.xp.XP;
 import com.volmit.adapt.content.gui.SkillsGui;
 import com.volmit.adapt.util.*;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -199,6 +200,11 @@ default void openGui(Player player) {
         if (!player.getClass().getSimpleName().equals("CraftPlayer")) {
             return;
         }
+        if (!Bukkit.isPrimaryThread()) {
+            J.s(() -> openGui(player));
+            return;
+        }
+
         player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 1.255f);
         player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.7f, 1.455f);
         player.getWorld().playSound(player.getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 0.3f, 1.855f);

src/main/java/com/volmit/adapt/command/CommandAdapt.java

@@ -72,9 +72,9 @@ public void gui(
             return;
         }
 
-        if (guiTarget.startsWith("[Skill]")) {
+        if (guiTarget.startsWith("[Skill]-")) {
             for (Skill<?> skill : SkillRegistry.skills.sortV()) {
-                if (guiTarget.equals("[Skill]" + skill.getName())) {
+                if (guiTarget.equals("[Skill]-" + skill.getName())) {
                     if (force || skill.openGui(targetPlayer, true)) {
                         FConst.success("Opened GUI for " + skill.getName() + " for " + targetPlayer.getName()).send(sender());
                     } else {
@@ -85,10 +85,10 @@ public void gui(
             }
         }
 
-        if (guiTarget.startsWith("[Adaptation]")) {
+        if (guiTarget.startsWith("[Adaptation]-")) {
             for (Skill<?> skill : SkillRegistry.skills.sortV()) {
                 for (Adaptation<?> adaptation : skill.getAdaptations()) {
-                    if (guiTarget.equals("[Adaptation]" + adaptation.getName())) {
+                    if (guiTarget.equals("[Adaptation]-" + adaptation.getName())) {
                         if (force || adaptation.openGui(targetPlayer, true)) {
                             FConst.success("Opened GUI for " + adaptation.getName() + " for " + targetPlayer.getName()).send(sender());
                         } else {
@@ -141,7 +141,7 @@ public void experience(
             return;
         }
 
-        Skill<?> skill = SkillRegistry.skills.get(skillName.toString());
+        Skill<?> skill = SkillRegistry.skills.get(skillName.name());
         if (skill != null) {
             targetPlayer.getInventory().addItem(ExperienceOrb.with(skill.getName(), amount));
             FConst.success("Giving " + skill.getName() + " orb").send(sender());

src/main/java/com/volmit/adapt/content/gui/SkillsGui.java

@@ -26,12 +26,18 @@
 import com.volmit.adapt.api.world.PlayerSkillLine;
 import com.volmit.adapt.api.xp.XP;
 import com.volmit.adapt.util.*;
+import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 
 public class SkillsGui {
     public static void open(Player player) {
+        if (!Bukkit.isPrimaryThread()) {
+            J.s(() -> open(player));
+            return;
+        }
+
         Window w = new UIWindow(player);
         w.setTag("/");
         w.setDecorator((window, position, row) -> new UIElement("bg")

src/main/java/com/volmit/adapt/nms/GlowingEntities.java

@@ -1015,7 +1015,6 @@ private enum ProtocolMappings {
               "id",
               "packedItems"
       ),
-      // remapping not complete: should also use remapped class names
       V1_21(
               21,
               0,
@@ -1032,6 +1031,23 @@ private enum ProtocolMappings {
               null,
               null,
               null
+      ),
+      V1_21_REMAPPED(
+              21,
+              0,
+              true,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null,
+              null
       )
       ;
 

src/main/java/com/volmit/adapt/util/decree/context/AdaptationListingHandler.java

@@ -32,11 +32,11 @@ public static KList<AdaptationList> getAdaptionListings() {
         adaptationLists.add(main);
 
         for (Skill<?> skill : SkillRegistry.skills.sortV()) {
-            AdaptationList skillList = new AdaptationList("[Skill] " + skill.getName());
+            AdaptationList skillList = new AdaptationList("[Skill]-" + skill.getName());
             adaptationLists.add(skillList);
 
             for (Adaptation<?> adaptation : skill.getAdaptations()) {
-                AdaptationList adaptationList = new AdaptationList("[Adaptation] " + adaptation.getName());
+                AdaptationList adaptationList = new AdaptationList("[Adaptation]-" + adaptation.getName());
                 adaptationLists.add(adaptationList);
             }
         }
@@ -46,7 +46,7 @@ public static KList<AdaptationList> getAdaptionListings() {
     public static KList<AdaptationSkillList> getAdaptionSkillListings() {
         if (adaptationSkillLists.isNotEmpty()) return adaptationSkillLists;
 
-        AdaptationSkillList t1 = new AdaptationSkillList("[All]");
+        AdaptationSkillList t1 = new AdaptationSkillList("[all]");
         adaptationSkillLists.add(t1);
         AdaptationSkillList t2 = new AdaptationSkillList("[random]");
         adaptationSkillLists.add(t2);
@@ -85,7 +85,7 @@ public boolean startsWith(String prefix) {
         }
 
         public boolean equals(String prefix) {
-            return name.startsWith(prefix);
+            return name.equalsIgnoreCase(prefix);
         }
     }
 
@@ -95,7 +95,7 @@ public boolean startsWith(String prefix) {
         }
 
         public boolean equals(String prefix) {
-            return name.startsWith(prefix);
+            return name.equalsIgnoreCase(prefix);
         }
     }
 
@@ -105,7 +105,7 @@ public boolean startsWith(String prefix) {
         }
 
         public boolean equals(String prefix) {
-            return name.startsWith(prefix);
+            return name.equalsIgnoreCase(prefix);
         }
     }
 
@@ -115,7 +115,7 @@ public boolean startsWith(String prefix) {
         }
 
         public boolean equals(String prefix) {
-            return name.startsWith(prefix);
+            return name.equalsIgnoreCase(prefix);
         }
     }
 }