Fix potion meta

GlowingInk · Jun 25, 2024 · a99b522 · a99b522
1 parent f0e32dd
commit a99b522
Show file tree

Hide file tree

Showing 24 changed files with 106 additions and 120 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <description>Simplest scripting engine for Paper</description>
     <properties>
         <build-suffix>-custom</build-suffix>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -38,11 +38,18 @@
 
     <build>
         <defaultGoal>clean package</defaultGoal>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.extensions</groupId>
+                <artifactId>maven-build-cache-extension</artifactId>
+                <version>1.2.0</version>
+            </extension>
+        </extensions>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
@@ -101,7 +108,7 @@
         <dependency>
             <groupId>io.papermc.paper</groupId>
             <artifactId>paper-api</artifactId>
-            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/reactions/pom.xml b/reactions/pom.xml
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -33,23 +33,19 @@
                             <relocations>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
-                                    <shadedPattern>fun.reactions.external.bstats</shadedPattern>
+                                    <shadedPattern>fun.reactions.metrics</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.quartz</pattern>
-                                    <shadedPattern>fun.reactions.external.time</shadedPattern>
+                                    <shadedPattern>fun.reactions.util.time.cron</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>ink.glowing.math</pattern>
-                                    <shadedPattern>fun.reactions.external.math</shadedPattern>
+                                    <shadedPattern>fun.reactions.util.num.math</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>ink.glowing.text</pattern>
-                                    <shadedPattern>fun.reactions.external.text</shadedPattern>
-                                </relocation>
-                                <relocation>
-                                    <pattern>org.spongepowered.configurate</pattern>
-                                    <shadedPattern>fun.reactions.external.config</shadedPattern>
+                                    <shadedPattern>fun.reactions.util.text</shadedPattern>
                                 </relocation>
                             </relocations>
                             <createDependencyReducedPom>false</createDependencyReducedPom>

diff --git a/reactions/src/main/java/fun/reactions/commands/CmdSet.java b/reactions/src/main/java/fun/reactions/commands/CmdSet.java
@@ -3,9 +3,9 @@
 import fun.reactions.ReActions;
 import fun.reactions.menu.InventoryMenu;
 import fun.reactions.time.CooldownManager;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

diff --git a/reactions/src/main/java/fun/reactions/module/basic/ContextManager.java b/reactions/src/main/java/fun/reactions/module/basic/ContextManager.java
@@ -33,11 +33,11 @@
 import fun.reactions.module.worldguard.activators.RegionLeaveActivator;
 import fun.reactions.module.worldguard.external.RaWorldGuard;
 import fun.reactions.util.BlockUtils;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.enums.DeathCause;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.mob.EntityUtils;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.type.Switch;

diff --git a/reactions/src/main/java/fun/reactions/module/basic/actions/CooldownActions.java b/reactions/src/main/java/fun/reactions/module/basic/actions/CooldownActions.java
@@ -25,9 +25,9 @@
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;
 import fun.reactions.time.CooldownManager;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.naming.Aliased;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/reactions/src/main/java/fun/reactions/module/basic/actions/DynamicActionAction.java b/reactions/src/main/java/fun/reactions/module/basic/actions/DynamicActionAction.java
@@ -10,7 +10,7 @@
 
 import java.util.List;
 
-import static fun.reactions.util.TimeUtils.addOffset;
+import static fun.reactions.util.time.TimeUtils.addOffset;
 
 @Aliased.Names({
         "ACTDELAY", "DELAYED_ACTION", "ACTION_DELAYED",

diff --git a/reactions/src/main/java/fun/reactions/module/basic/actions/ExecuteAction.java b/reactions/src/main/java/fun/reactions/module/basic/actions/ExecuteAction.java
@@ -35,7 +35,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static fun.reactions.util.TimeUtils.addOffset;
+import static fun.reactions.util.time.TimeUtils.addOffset;
 
 @Aliased.Names({"RUN", "EXEC"})
 public class ExecuteAction implements Action {

diff --git a/reactions/src/main/java/fun/reactions/module/basic/actions/MessageAction.java b/reactions/src/main/java/fun/reactions/module/basic/actions/MessageAction.java
@@ -24,10 +24,10 @@
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.naming.Aliased;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.jetbrains.annotations.NotNull;

diff --git a/reactions/src/main/java/fun/reactions/module/basic/actions/PotionEffectAction.java b/reactions/src/main/java/fun/reactions/module/basic/actions/PotionEffectAction.java
@@ -24,12 +24,12 @@
 
 import fun.reactions.model.activity.actions.Action;
 import fun.reactions.model.environment.Environment;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.naming.Aliased;
 import fun.reactions.util.num.Is;
 import fun.reactions.util.num.NumberUtils;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;

diff --git a/reactions/src/main/java/fun/reactions/module/basic/actions/WaitAction.java b/reactions/src/main/java/fun/reactions/module/basic/actions/WaitAction.java
@@ -10,7 +10,7 @@
 
 import java.util.List;
 
-import static fun.reactions.util.TimeUtils.addOffset;
+import static fun.reactions.util.time.TimeUtils.addOffset;
 
 @Aliased.Names("PAUSE")
 public class WaitAction implements Action, Interrupting {

diff --git a/reactions/src/main/java/fun/reactions/module/basic/flags/PvpFlag.java b/reactions/src/main/java/fun/reactions/module/basic/flags/PvpFlag.java
@@ -25,8 +25,8 @@
 import fun.reactions.model.activity.Activity;
 import fun.reactions.model.activity.flags.Flag;
 import fun.reactions.model.environment.Environment;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/reactions/src/main/java/fun/reactions/module/basic/placeholders/TimePlaceholders.java b/reactions/src/main/java/fun/reactions/module/basic/placeholders/TimePlaceholders.java
@@ -7,8 +7,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static fun.reactions.util.TimeUtils.formatIngameTime;
-import static fun.reactions.util.TimeUtils.formatTime;
+import static fun.reactions.util.time.TimeUtils.formatIngameTime;
+import static fun.reactions.util.time.TimeUtils.formatTime;
 
 @Aliased.Names({"time_ingame", "curtime", "time_server", "servertime", "timestamp", "stamp"})
 public class TimePlaceholders implements Placeholder { // TODO World selection

diff --git a/reactions/src/main/java/fun/reactions/time/CooldownManager.java b/reactions/src/main/java/fun/reactions/time/CooldownManager.java
@@ -25,8 +25,8 @@
 import fun.reactions.ReActions;
 import fun.reactions.model.environment.Environment;
 import fun.reactions.util.ConfigUtils;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.message.Msg;
+import fun.reactions.util.time.TimeUtils;
 import it.unimi.dsi.fastutil.objects.Object2LongMap;
 import it.unimi.dsi.fastutil.objects.Object2LongOpenHashMap;
 import org.bukkit.command.CommandSender;

diff --git a/reactions/src/main/java/fun/reactions/time/timers/Timer.java b/reactions/src/main/java/fun/reactions/time/timers/Timer.java
@@ -22,9 +22,9 @@
 
 package fun.reactions.time.timers;
 
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.quartz.CronExpression;
 
 import java.text.ParseException;

diff --git a/reactions/src/main/java/fun/reactions/time/timers/TimersManager.java b/reactions/src/main/java/fun/reactions/time/timers/TimersManager.java
@@ -25,10 +25,10 @@
 import fun.reactions.ReActions;
 import fun.reactions.module.basic.ContextManager;
 import fun.reactions.util.ConfigUtils;
-import fun.reactions.util.TimeUtils;
 import fun.reactions.util.collections.CaseInsensitiveMap;
 import fun.reactions.util.message.Msg;
 import fun.reactions.util.parameter.Parameters;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;

diff --git a/reactions/src/main/java/fun/reactions/time/wait/WaitingManager.java b/reactions/src/main/java/fun/reactions/time/wait/WaitingManager.java
@@ -6,7 +6,7 @@
 import fun.reactions.model.environment.Variables;
 import fun.reactions.save.Saveable;
 import fun.reactions.util.ConfigUtils;
-import fun.reactions.util.TimeUtils;
+import fun.reactions.util.time.TimeUtils;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.scheduler.BukkitTask;
@@ -18,8 +18,8 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static fun.reactions.util.TimeUtils.offsetUntil;
-import static fun.reactions.util.TimeUtils.timeToTicks;
+import static fun.reactions.util.time.TimeUtils.offsetUntil;
+import static fun.reactions.util.time.TimeUtils.timeToTicks;
 
 public class WaitingManager implements Saveable {
     private final ReActions.Platform rea;

diff --git a/reactions/src/main/java/fun/reactions/util/Utils.java b/reactions/src/main/java/fun/reactions/util/Utils.java
@@ -28,10 +28,7 @@
 import fun.reactions.util.parameter.Parameters;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
-import org.bukkit.Bukkit;
-import org.bukkit.Color;
-import org.bukkit.Location;
-import org.bukkit.Sound;
+import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.Permissible;
 import org.jetbrains.annotations.Contract;
@@ -314,4 +311,9 @@ public static <T> T searchNotNull(@Nullable T def, @Nullable T @NotNull ... obj)
             return null;
         }
     }
+
+    public static <T extends Keyed> @Nullable T searchRegistry(@NotNull String keyStr, @NotNull Registry<T> registry) {
+        NamespacedKey key = NamespacedKey.fromString(keyStr.toLowerCase(Locale.ROOT));
+        return key == null ? null : registry.get(key);
+    }
 }
diff --git a/reactions/src/main/java/fun/reactions/util/item/ItemUtils.java b/reactions/src/main/java/fun/reactions/util/item/ItemUtils.java
@@ -6,7 +6,6 @@
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
@@ -18,19 +17,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.function.Function;
 
 public final class ItemUtils {
     private ItemUtils() {}
 
-    public static <T> @Nullable T searchByKey(@NotNull String key, @NotNull Function<NamespacedKey, T> search) {
-        try {
-            return search.apply(NamespacedKey.minecraft(key.toLowerCase(Locale.ROOT)));
-        } catch (Exception ignored) {
-            return null;
-        }
-    }
-
     public static int getDurability(@NotNull ItemStack item) {
         return item.hasItemMeta() && item.getItemMeta() instanceof Damageable damageMeta
                 ? damageMeta.getDamage()

diff --git a/reactions/src/main/java/fun/reactions/util/item/aspects/EnchantmentsAspect.java b/reactions/src/main/java/fun/reactions/util/item/aspects/EnchantmentsAspect.java
@@ -1,15 +1,15 @@
 package fun.reactions.util.item.aspects;
 
-import fun.reactions.util.item.ItemUtils;
+import fun.reactions.util.Utils;
 import fun.reactions.util.naming.Aliased;
 import fun.reactions.util.num.NumberUtils;
+import org.bukkit.Registry;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.meta.EnchantmentStorageMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.function.ToIntFunction;
 
@@ -41,11 +41,8 @@ public class EnchantmentsAspect implements MetaAspect {
                 enchKey = enchValue.substring(0, index);
                 levelStr = enchValue.substring(index + 1);
             }
-            Enchantment enchantment = ItemUtils.searchByKey(enchKey, Enchantment::getByKey);
-            if (enchantment == null) {
-                enchantment = Enchantment.getByName(enchKey.toUpperCase(Locale.ROOT));
-                if (enchantment == null) continue;
-            }
+            Enchantment enchantment = Utils.searchRegistry(enchKey, Registry.ENCHANTMENT);
+            if (enchantment == null) continue;
             int level = NumberUtils.asInteger(levelStr, 0);
             enchantments.put(enchantment, level > 0 ? level : null);
         }