Merge pull request #550 from VolmitSoftware/Development

AvianAeternum · web-flow · commit 32facfae0261 · 2025-04-14T17:38:03.000-04:00
1.16.9
diff --git a/src/main/java/com/volmit/adapt/Adapt.java b/src/main/java/com/volmit/adapt/Adapt.java
@@ -102,6 +102,9 @@ public static <T> T service(Class<T> c) {
     @Override
     public void onLoad() {
         manager = new AdvancementManager();
+        if (getServer().getPluginManager().getPlugin("WorldGuard") != null) {
+            WorldGuardProtector.registerFlag();
+        }
     }
 
     @Override
@@ -241,9 +244,11 @@ public static KList<Object> initialize(String s, Class<? extends Annotation> sli
         for (Class<?> i : js.getClasses()) {
             if (slicedClass == null || i.isAnnotationPresent(slicedClass)) {
                 try {
+                    Adapt.verbose("Found class: " + i.getName());
                     v.add(i.getDeclaredConstructor().newInstance());
-                } catch (Throwable ignored) {
-
+                } catch (Throwable e) {
+                    Adapt.verbose("Failed to load class: " + i.getName());
+                    e.printAsStrings().forEach(Adapt::verbose);
                 }
             }
         }
diff --git a/src/main/java/com/volmit/adapt/command/CommandAdapt.java b/src/main/java/com/volmit/adapt/command/CommandAdapt.java
@@ -4,8 +4,8 @@
 import com.volmit.adapt.api.adaptation.Adaptation;
 import com.volmit.adapt.api.skill.Skill;
 import com.volmit.adapt.api.skill.SkillRegistry;
-import com.volmit.adapt.api.world.AdaptPlayer;
 import com.volmit.adapt.api.world.AdaptServer;
+import com.volmit.adapt.api.world.PlayerData;
 import com.volmit.adapt.content.gui.SkillsGui;
 import com.volmit.adapt.content.item.ExperienceOrb;
 import com.volmit.adapt.content.item.KnowledgeOrb;
@@ -24,28 +24,50 @@
 public class CommandAdapt implements DecreeExecutor {
     private CommandDebug debug;
 
-    @Decree(description = "Boost Target player, or Global Experience gain.")
+    @Decree(description = "Boost Target player Experience gain.")
     public void boost(
         @Param(aliases = "seconds", description = "Amount of seconds", defaultValue = "10")
         int seconds,
         @Param(aliases = "multiplier", description = "Strength of the boost ", defaultValue = "10")
-        int multiplier,
+        double multiplier,
         @Param(description = "player", defaultValue = "---", customHandler = NullablePlayerHandler.class)
         Player player
-
     ) {
         if (!sender().hasPermission("adapt.boost")) {
             FConst.error("You lack the Permission 'adapt.boost'").send(sender());
             return;
         }
 
+        Player targetPlayer = player;
+        if (targetPlayer == null && sender().isConsole()) {
+            FConst.error("You must specify a player when using this command from console.").send(sender());
+            return;
+        } else if (targetPlayer == null) {
+            targetPlayer = player();
+        }
+
         AdaptServer adaptServer = Adapt.instance.getAdaptServer();
-        if (player() == null) {
-            adaptServer.boostXP(multiplier, seconds * 1000);
-        } else {
-            AdaptPlayer adaptPlayer = adaptServer.getPlayer(player);
-            adaptPlayer.boostXPToRecents(multiplier, seconds * 1000);
+        PlayerData playerData = adaptServer.getPlayer(targetPlayer).getData();
+        playerData.globalXPMultiplier(multiplier, seconds * 1000);
+
+        FConst.success("Boosted XP by " + multiplier + " for " + seconds + " seconds").send(sender());
+    }
+
+    @Decree(description = "Boost Global Experience gain.", name = "global-boost")
+    public void globalBoost(
+            @Param(aliases = "seconds", description = "Amount of seconds", defaultValue = "10")
+            int seconds,
+            @Param(aliases = "multiplier", description = "Strength of the boost ", defaultValue = "10")
+            double multiplier
+    ) {
+        if (!sender().hasPermission("adapt.boost.global")) {
+            FConst.error("You lack the Permission 'adapt.boost.global'").send(sender());
+            return;
         }
+
+        AdaptServer adaptServer = Adapt.instance.getAdaptServer();
+        adaptServer.boostXP(multiplier, seconds * 1000);
+
         FConst.success("Boosted XP by " + multiplier + " for " + seconds + " seconds").send(sender());
     }
 
@@ -66,6 +88,7 @@ public void gui(
         Player targetPlayer = player;
         if (targetPlayer == null && sender().isConsole()) {
             FConst.error("You must specify a player when using this command from console.").send(sender());
+            return;
         } else if (targetPlayer == null) {
             targetPlayer = player();
         }
@@ -220,7 +243,7 @@ public void determine(
         }
 
         Player targetPlayer = player;
-        if (targetPlayer == null && sender().isPlayer()) {
+        if (targetPlayer == null && sender().isConsole()) {
             FConst.error("You must specify a player when using this command from console.").send(sender());
         } else if (targetPlayer == null) {
             targetPlayer = player();
diff --git a/src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectElevator.java b/src/main/java/com/volmit/adapt/content/adaptation/architect/ArchitectElevator.java
@@ -124,7 +124,7 @@ public void on(PlayerMoveEvent e) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void on(PlayerToggleSneakEvent event) {
-        if (!event.isSneaking()) return;
+        if (!event.isSneaking() || event.getPlayer().isInsideVehicle()) return;
         Player player = event.getPlayer();
         Block block = findElevator(player);
         if (block == null) return;
@@ -292,7 +292,7 @@ private boolean checkElevator(Block block, NamespacedKey key, int source) {
     }
 
     private void handleElevatorMovement(Block block, Player player, boolean down) {
-        if (!isElevator(block))
+        if (!isElevator(block) || player.isInsideVehicle())
             return;
 
         CustomBlockData data = new CustomBlockData(block, Adapt.instance);
diff --git a/src/main/java/com/volmit/adapt/content/protector/WorldGuardProtector.java b/src/main/java/com/volmit/adapt/content/protector/WorldGuardProtector.java
@@ -22,13 +22,13 @@
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.association.DelayedRegionOverlapAssociation;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
+import com.volmit.adapt.Adapt;
 import com.volmit.adapt.AdaptConfig;
 import com.volmit.adapt.api.adaptation.Adaptation;
 import com.volmit.adapt.api.protection.Protector;
@@ -41,25 +41,7 @@
 public class WorldGuardProtector implements Protector {
 
     private final RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
-    private final StateFlag flag;
-
-    public WorldGuardProtector() {
-        this.flag = new StateFlag("use-adaptations", false);
-        FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry();
-
-        try {
-            // Access the flags field of the registry
-            Field field = registry.getClass().getDeclaredField("flags");
-            // This line makes the private field accessible
-            field.setAccessible(true);
-            // Get the flags from the registry
-            ConcurrentMap<String, Flag<?>> flags = (ConcurrentMap<String, Flag<?>>) field.get(registry);
-            // Add it to the registry
-            flags.put(flag.getName().toLowerCase(), flag);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
+    private final StateFlag flag = registerFlag();
 
 
     @Override
@@ -69,44 +51,37 @@ public boolean checkRegion(Player player, Location location, Adaptation<?> adapt
 
     @Override
     public boolean canBlockBreak(Player player, Location blockLocation, Adaptation<?> adaptation) {
-        return checkRegion(player, blockLocation, adaptation) && checkPerm(blockLocation, Flags.BLOCK_BREAK);
+        return checkRegion(player, blockLocation, adaptation) && checkPerm(player, blockLocation, Flags.BLOCK_BREAK);
     }
 
     @Override
     public boolean canBlockPlace(Player player, Location blockLocation, Adaptation<?> adaptation) {
-        return checkRegion(player, blockLocation, adaptation) && checkPerm(blockLocation, Flags.BLOCK_PLACE);
+        return checkRegion(player, blockLocation, adaptation) && checkPerm(player, blockLocation, Flags.BLOCK_PLACE);
     }
 
     @Override
     public boolean canPVP(Player player, Location entityLocation, Adaptation<?> adaptation) {
-        return checkRegion(player, entityLocation, adaptation) && checkPerm(entityLocation, Flags.PVP);
+        return checkRegion(player, entityLocation, adaptation) && checkPerm(player, entityLocation, Flags.PVP);
     }
 
     @Override
     public boolean canPVE(Player player, Location entityLocation, Adaptation<?> adaptation) {
-        return checkRegion(player, entityLocation, adaptation) && checkPerm(entityLocation, Flags.DAMAGE_ANIMALS);
+        return checkRegion(player, entityLocation, adaptation) && checkPerm(player, entityLocation, Flags.DAMAGE_ANIMALS);
     }
 
     @Override
     public boolean canInteract(Player player, Location targetLocation, Adaptation<?> adaptation) {
-        return checkRegion(player, targetLocation, adaptation) && checkPerm(targetLocation, Flags.INTERACT);
+        return checkRegion(player, targetLocation, adaptation) && checkPerm(player, targetLocation, Flags.INTERACT);
     }
 
     @Override
     public boolean canAccessChest(Player player, Location chestLocation, Adaptation<?> adaptation) {
-        return checkRegion(player, chestLocation, adaptation) && checkPerm(chestLocation, Flags.CHEST_ACCESS);
-    }
-
-    private boolean checkPerm(Location location, StateFlag flag) {
-        return checkPerm(null, location, flag);
+        return checkRegion(player, chestLocation, adaptation) && checkPerm(player, chestLocation, Flags.CHEST_ACCESS);
     }
 
     private boolean checkPerm(Player player, Location location, StateFlag flag) {
         RegionQuery regionQuery = container.createQuery();
         com.sk89q.worldedit.util.Location loc = BukkitAdapter.adapt(location);
-        if (player == null) {
-            return regionQuery.queryState(loc, new DelayedRegionOverlapAssociation(regionQuery, loc), flag) != StateFlag.State.DENY;
-        }
         if (!hasBypass(player, location))
             return regionQuery.queryState(loc, WorldGuardPlugin.inst().wrapPlayer(player), flag) != StateFlag.State.DENY;
         return true;
@@ -127,4 +102,30 @@ private boolean hasBypass(Player p, Location l) {
         com.sk89q.worldedit.world.World world = BukkitAdapter.adapt(l.getWorld());
         return WorldGuard.getInstance().getPlatform().getSessionManager().hasBypass(localPlayer, world);
     }
+
+    public static StateFlag registerFlag() {
+        FlagRegistry registry = WorldGuard.getInstance().getFlagRegistry();
+        StateFlag flag = (StateFlag) registry.get("use-adaptations");
+        if (flag != null) return flag;
+        flag = new StateFlag("use-adaptations", false);
+
+        try {
+            registry.register(flag);
+        } catch (IllegalStateException ignored) {
+            Adapt.warn("WorldGuard flag was not registered! Injecting it now...");
+            try {
+                // Access the flags field of the registry
+                Field field = registry.getClass().getDeclaredField("flags");
+                // This line makes the private field accessible
+                field.setAccessible(true);
+                // Get the flags from the registry
+                ConcurrentMap<String, Flag<?>> flags = (ConcurrentMap<String, Flag<?>>) field.get(registry);
+                // Add it to the registry
+                flags.put(flag.getName().toLowerCase(), flag);
+            } catch (NoSuchFieldException | IllegalAccessException e) {
+                e.printStackTrace();
+            }
+        }
+        return flag;
+    }
 }
diff --git a/src/main/java/com/volmit/adapt/service/CommandSVC.java b/src/main/java/com/volmit/adapt/service/CommandSVC.java
@@ -26,6 +26,7 @@
 import com.volmit.adapt.util.collection.KMap;
 import com.volmit.adapt.util.decree.DecreeSystem;
 import com.volmit.adapt.util.decree.virtual.VirtualDecreeCommand;
+import org.bukkit.command.PluginCommand;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.player.PlayerCommandPreprocessEvent;
 import org.bukkit.event.server.ServerCommandEvent;
@@ -40,7 +41,13 @@ public class CommandSVC implements AdaptService, DecreeSystem {
 
     @Override
     public void onEnable() {
-        Adapt.instance.getCommand("adapt").setExecutor(this);
+        Adapt.verbose("Initializing Commands...");
+        PluginCommand command = Adapt.instance.getCommand("adapt");
+        if (command == null) {
+            Adapt.warn("Failed to find command 'adapt'");
+            return;
+        }
+        command.setExecutor(this);
         J.a(() -> getRoot().cacheAll());
     }
 
diff --git a/src/main/java/com/volmit/adapt/util/decree/DecreeSystem.java b/src/main/java/com/volmit/adapt/util/decree/DecreeSystem.java
@@ -138,6 +138,7 @@ default boolean call(VolmitSender sender, String[] args) {
     @Nullable
     @Override
     default List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
+        Adapt.verbose("Received Tab Complete from %s for %s".formatted(sender.getName(), "/" + alias + String.join(" ", args)));
         List<String> enhanced = new ArrayList<>(List.of(args));
         KList<String> v = getRoot().tabComplete(enhanced, enhanced.toString(" "));
         v.removeDuplicates();
@@ -152,6 +153,7 @@ default List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comma
 
     @Override
     default boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
+        Adapt.verbose("Received Command from %s: /%s".formatted(sender.getName(), label + String.join(" ", args)));
         if (!sender.hasPermission("adapt.main")) {
             sender.sendMessage("You lack the Permission 'adapt.main'");
             return true;
diff --git a/src/main/java/com/volmit/adapt/util/decree/virtual/VirtualDecreeCommand.java b/src/main/java/com/volmit/adapt/util/decree/virtual/VirtualDecreeCommand.java
@@ -40,10 +40,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Data
@@ -281,8 +278,8 @@ private void tab(List<String> args, List<String> tabs) {
      * @param in     The input
      * @return A map of all the parameter names and their values
      */
-    private KMap<String, Object> map(VolmitSender sender, List<String> in) {
-        KMap<String, Object> data = new KMap<>();
+    private KMap<String, Optional<Object>> map(VolmitSender sender, List<String> in) {
+        KMap<String, Optional<Object>> data = new KMap<>();
         List<Integer> nowhich = new ArrayList<>();
 
         List<String> unknownInputs = new ArrayList<>(in.stream().filter(s -> !s.contains("=")).collect(Collectors.toList()));
@@ -331,7 +328,7 @@ private KMap<String, Object> map(VolmitSender sender, List<String> in) {
             key = param.getName();
 
             try {
-                data.put(key, param.getHandler().parse(value, nowhich.contains(original))); //Parse and put
+                data.put(key, Optional.ofNullable(param.getHandler().parse(value, nowhich.contains(original)))); //Parse and put
             } catch (DecreeParsingException e) {
                 Adapt.debug("Can't parse parameter value for " + key + "=" + value + " in " + getPath() + " using handler " + param.getHandler().getClass().getSimpleName());
                 sender.sendMessage(C.RED + "Cannot convert \"" + value + "\" into a " + param.getType().getSimpleName());
@@ -351,7 +348,7 @@ private KMap<String, Object> map(VolmitSender sender, List<String> in) {
                 DecreeParameter par = decreeParameters.get(x);
 
                 try {
-                    data.put(par.getName(), par.getHandler().parse(stringParam, nowhich.contains(original)));
+                    data.put(par.getName(), Optional.ofNullable(par.getHandler().parse(stringParam, nowhich.contains(original))));
                 } catch (DecreeParsingException e) {
                     Adapt.debug("Can't parse parameter value for " + par.getName() + "=" + stringParam + " in " + getPath() + " using handler " + par.getHandler().getClass().getSimpleName());
                     sender.sendMessage(C.RED + "Cannot convert \"" + stringParam + "\" into a " + par.getType().getSimpleName());
@@ -408,15 +405,15 @@ public boolean invoke(VolmitSender sender, List<String> args, List<Integer> skip
         return false;
     }
 
-    private boolean invokeNode(VolmitSender sender, KMap<String, Object> map) {
+    private boolean invokeNode(VolmitSender sender, KMap<String, Optional<Object>> map) {
         if (map == null) {
             return false;
         }
 
         Object[] params = new Object[getNode().getMethod().getParameterCount()];
         int vm = 0;
         for (DecreeParameter i : getNode().getParameters()) {
-            Object value = map.get(i.getName());
+            Object value = map.getOrDefault(i.getName(), Optional.empty()).orElse(null);
 
             try {
                 if (value == null && i.hasDefault()) {

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,9 @@ public static <T> T service(Class<T> c) {`
`102`	`102`	`@Override`
`103`	`103`	`public void onLoad() {`
`104`	`104`	`manager = new AdvancementManager();`
	`105`	`+ if (getServer().getPluginManager().getPlugin("WorldGuard") != null) {`
	`106`	`+ WorldGuardProtector.registerFlag();`
	`107`	`+ }`
`105`	`108`	`}`
`106`	`109`
`107`	`110`	`@Override`
`@@ -241,9 +244,11 @@ public static KList<Object> initialize(String s, Class<? extends Annotation> sli`
`241`	`244`	`for (Class<?> i : js.getClasses()) {`
`242`	`245`	`if (slicedClass == null \|\| i.isAnnotationPresent(slicedClass)) {`
`243`	`246`	`try {`
	`247`	`+ Adapt.verbose("Found class: " + i.getName());`
`244`	`248`	`v.add(i.getDeclaredConstructor().newInstance());`
`245`		`- } catch (Throwable ignored) {`
`246`		`-`
	`249`	`+ } catch (Throwable e) {`
	`250`	`+ Adapt.verbose("Failed to load class: " + i.getName());`
	`251`	`+ e.printAsStrings().forEach(Adapt::verbose);`
`247`	`252`	`}`
`248`	`253`	`}`
`249`	`254`	`}`