Updated dependancies

ME1312 · Feb 22, 2023 · e02093a · e02093a
1 parent 8a5a0cd
commit e02093a
Show file tree

Hide file tree

Showing 19 changed files with 75 additions and 73 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (C) 2015-2022 ME1312
+   Copyright (C) 2015-2023 ME1312
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/SubServers.Bungee/common/pom.xml b/SubServers.Bungee/common/pom.xml
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiBase</artifactId>
-            <version>22w50c</version>
+            <version>23w08a</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml
@@ -34,7 +34,7 @@
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Server</artifactId>
-            <version>22w11c</version>
+            <version>23w08a</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/SubServers.Bungee/src/META-INF/MANIFEST.MOD.MF b/SubServers.Bungee/src/META-INF/MANIFEST.MOD.MF
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: libraries/GalaxiEngine.jar libraries/SubDataServer.jar libraries/BungeeCord.jar
+Class-Path: libraries/GalaxiBase.jar libraries/SubDataServer.jar libraries/BungeeCord.jar
 Main-Class: net.ME1312.SubServers.Bungee.Launch
 Implementation-Title: SubServers.Bungee
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/FileScanner.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Library/FileScanner.java
@@ -74,9 +74,6 @@ protected void scan(File dir, String... whitelist) throws IOException {
                         literal = new StringBuilder();
                     }
                     switch (c) {
-                        case '\\':
-                            if (i.hasNext()) c = i.next();
-                            literal.appendCodePoint(c);
                         case '[':
                             for (boolean escaped = false; i.hasNext() && (c != ']' || escaped); c = i.next()) {
                                 if (c == '\\') escaped = !escaped;
@@ -95,6 +92,8 @@ protected void scan(File dir, String... whitelist) throws IOException {
                         case '?':
                             rule.append("[^/]");
                             break;
+                        case '\\':
+                            if (i.hasNext()) c = i.next();
                         default:
                             literal.appendCodePoint(c);
                             break;

diff --git a/...ervers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java b/...ervers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java
@@ -1,8 +1,8 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.Galaxi.Library.AsyncConsolidator;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Merger;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
@@ -82,7 +82,7 @@ public static void run(List<UUID> ids, String reason, IntConsumer callback) {
             if (requests.size() == 0) {
                 callback.accept(failures.value);
             } else {
-                AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                Merger merge = new Merger(() -> {
                     callback.accept(failures.value);
                 });
                 for (Map.Entry<Proxy, List<UUID>> entry : requests.entrySet()) {

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketMessagePlayer.java
@@ -1,9 +1,9 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.Galaxi.Library.AsyncConsolidator;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Merger;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
@@ -101,7 +101,7 @@ public static void run(List<UUID> ids, ContainedPair<String[], BaseComponent[][]
             if (requests.size() == 0) {
                 callback.accept(failures.value);
             } else {
-                AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                Merger merge = new Merger(() -> {
                     callback.accept(failures.value);
                 });
                 List<String> legacy, raw;

diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketTransferPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketTransferPlayer.java
@@ -1,8 +1,8 @@
 package net.ME1312.SubServers.Bungee.Network.Packet;
 
-import net.ME1312.Galaxi.Library.AsyncConsolidator;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Merger;
 import net.ME1312.SubData.Server.Protocol.PacketObjectIn;
 import net.ME1312.SubData.Server.Protocol.PacketObjectOut;
 import net.ME1312.SubData.Server.SubDataClient;
@@ -83,7 +83,7 @@ public static void run(List<UUID> ids, String name, IntConsumer callback) {
             if (requests.size() == 0) {
                 callback.accept(failures.value);
             } else {
-                AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                Merger merge = new Merger(() -> {
                     callback.accept(failures.value);
                 });
                 for (Map.Entry<Proxy, List<UUID>> entry : requests.entrySet()) {

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Graphic/UIRenderer.java
@@ -1,6 +1,5 @@
 package net.ME1312.SubServers.Client.Bukkit.Graphic;
 
-import net.ME1312.Galaxi.Library.Access;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Try;
@@ -18,6 +17,8 @@
 import org.bukkit.scheduler.BukkitRunnable;
 
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.util.*;
 import java.util.PrimitiveIterator.OfInt;
 import java.util.regex.Matcher;
@@ -55,7 +56,7 @@ public UIRenderer(SubPlugin plugin, UUID player) {
         if (plugin.api.getGameVersion().compareTo(new Version("1.13")) < 0) {
             MAPI_1_13 = null;
         } else {
-            MAPI_1_13 = Try.all.get(Access.shared.type(Material.class).method("getMaterial").parameters(String.class, boolean.class).returns(Material.class)::handle);
+            MAPI_1_13 = Try.all.get(() -> MethodHandles.publicLookup().findStatic(Material.class, "getMaterial", MethodType.methodType(Material.class, new Class[]{ String.class, boolean.class})));
         }
 
         // Detect Title API

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Placeholders.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/Library/Placeholders.java
@@ -1,11 +1,10 @@
 package net.ME1312.SubServers.Client.Bukkit.Library;
 
-import net.ME1312.Galaxi.Library.Access;
-import net.ME1312.Galaxi.Library.AsyncConsolidator;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Merger;
 import net.ME1312.Galaxi.Library.Try;
 import net.ME1312.Galaxi.Library.Util;
 import net.ME1312.SubServers.Client.Bukkit.Event.*;
@@ -22,6 +21,8 @@
 import org.bukkit.scheduler.BukkitTask;
 
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.regex.Matcher;
@@ -53,7 +54,7 @@ public Placeholders(SubPlugin plugin) {
     public void start() {
         if (!init) {
             init = true;
-            papi = Try.all.get(() -> Access.shared.type(Class.forName("me.clip.placeholderapi.PlaceholderAPI")).method(String.class, "setPlaceholders").parameters(OfflinePlayer.class, String.class).handle());
+            papi = Try.all.get(() -> MethodHandles.publicLookup().findStatic(Class.forName("me.clip.placeholderapi.PlaceholderAPI"), "setPlaceholders", MethodType.methodType(String.class, new Class[]{ OfflinePlayer.class, String.class })));
             Bukkit.getPluginManager().registerEvents(cache.events, plugin);
             Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> {
                 if (task == null) {
@@ -607,7 +608,7 @@ private void reset() {
         private void refresh(Runnable callback) {
             if (SubAPI.getInstance().getSubDataNetwork()[0] != null) {
                 Container<Boolean> order = new Container<>(null);
-                AsyncConsolidator async = new AsyncConsolidator(() -> {
+                Merger async = new Merger(() -> {
                     try {
                         Map<String, SubServer> servers;
                         for (Host host : hosts.values()) {

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubCommand.java
@@ -1,12 +1,12 @@
 package net.ME1312.SubServers.Client.Bukkit;
 
-import net.ME1312.Galaxi.Library.AsyncConsolidator;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Container.ContainedPair;
 import net.ME1312.Galaxi.Library.Container.Container;
 import net.ME1312.Galaxi.Library.Container.Pair;
 import net.ME1312.Galaxi.Library.Container.Value;
 import net.ME1312.Galaxi.Library.Map.ObjectMap;
+import net.ME1312.Galaxi.Library.Merger;
 import net.ME1312.Galaxi.Library.Platform;
 import net.ME1312.Galaxi.Library.Try;
 import net.ME1312.Galaxi.Library.Util;
@@ -350,7 +350,7 @@ public boolean execute(CommandSender sender, String label, String[] args) {
                                 if (select.subservers.length > 0) {
                                     Container<Integer> success = new Container<Integer>(0);
                                     Container<Integer> running = new Container<Integer>(0);
-                                    AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                    Merger merge = new Merger(() -> {
                                         if (running.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Start.Running").replace("$int$", running.value.toString()));
                                         if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Start").replace("$int$", success.value.toString()));
                                     });
@@ -448,7 +448,7 @@ public void accept(ObjectMap<String> json) {
 
                                     // Step 3: Receive command Responses
                                     Container<Integer> success = new Container<Integer>(0);
-                                    AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                    Merger merge = new Merger(() -> {
                                         if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Restart").replace("$int$", success.value.toString()));
                                     });
                                     Consumer<Pair<Integer, SubServer>> stopper = data -> {
@@ -501,7 +501,7 @@ public void accept(ObjectMap<String> json) {
                                 if (select.subservers.length > 0) {
                                     Container<Integer> success = new Container<Integer>(0);
                                     Container<Integer> running = new Container<Integer>(0);
-                                    AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                    Merger merge = new Merger(() -> {
                                         if (running.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Stop.Not-Running").replace("$int$", running.value.toString()));
                                         if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Stop").replace("$int$", success.value.toString()));
                                     });
@@ -548,7 +548,7 @@ public void accept(ObjectMap<String> json) {
                                 if (select.subservers.length > 0) {
                                     Container<Integer> success = new Container<Integer>(0);
                                     Container<Integer> running = new Container<Integer>(0);
-                                    AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                    Merger merge = new Merger(() -> {
                                         if (running.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Terminate.Not-Running").replace("$int$", running.value.toString()));
                                         if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Terminate").replace("$int$", success.value.toString()));
                                     });
@@ -602,7 +602,7 @@ public void accept(ObjectMap<String> json) {
 
                                         Container<Integer> success = new Container<Integer>(0);
                                         Container<Integer> running = new Container<Integer>(0);
-                                        AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                        Merger merge = new Merger(() -> {
                                             if (running.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Command.Not-Running").replace("$int$", running.value.toString()));
                                             if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Command").replace("$int$", success.value.toString()));
                                         });
@@ -686,7 +686,7 @@ public void accept(ObjectMap<String> json) {
                                     boolean ts = template == null;
 
                                     Container<Integer> success = new Container<Integer>(0);
-                                    AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                    Merger merge = new Merger(() -> {
                                         if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Update").replace("$int$", success.value.toString()));
                                     });
                                     for (SubServer server : select.subservers) {
@@ -741,7 +741,7 @@ public void accept(ObjectMap<String> json) {
                             selectServers(sender, args, 1, true, "subservers.subserver.%.delete", select -> {
                                 if (select.subservers.length > 0) {
                                     Container<Integer> success = new Container<Integer>(0);
-                                    AsyncConsolidator merge = new AsyncConsolidator(() -> {
+                                    Merger merge = new Merger(() -> {
                                         if (success.value > 0) sender.sendMessage(plugin.api.getLang("SubServers", "Command.Delete").replace("$int$", success.value.toString()));
                                     });
                                     for (SubServer server : select.subservers) {
@@ -964,7 +964,7 @@ private void selectServers(CommandSender sender, String[] rargs, int index, bool
         };
 
         // Step 2
-        AsyncConsolidator merge = new AsyncConsolidator(finished);
+        Merger merge = new Merger(finished);
         for (boolean run = true; run && ic.value() < rargs.length; ic.value(ic.value() + 1)) {
             String current = rargs[ic.value()];
             last.value(current);
@@ -1025,7 +1025,7 @@ private void selectServers(CommandSender sender, String[] rargs, int index, bool
 
                     if (current.equals(".")) {
                         plugin.api.getSubServer(plugin.api.getName(), self -> {
-                            AsyncConsolidator merge2 = new AsyncConsolidator(merge::release);
+                            Merger merge2 = new Merger(merge::release);
                             for (String name : self.getGroups()) {
                                 merge2.reserve();
                                 plugin.api.getGroup(name, group -> {

diff --git a/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java b/SubServers.Client/Bukkit/src/net/ME1312/SubServers/Client/Bukkit/SubPlugin.java
@@ -1,6 +1,5 @@
 package net.ME1312.SubServers.Client.Bukkit;
 
-import net.ME1312.Galaxi.Library.Access;
 import net.ME1312.Galaxi.Library.Config.YAMLConfig;
 import net.ME1312.Galaxi.Library.Config.YAMLSection;
 import net.ME1312.Galaxi.Library.Container.Pair;
@@ -30,6 +29,8 @@
 
 import java.io.*;
 import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetAddress;
 import java.net.URL;
@@ -68,7 +69,7 @@ public final class SubPlugin extends JavaPlugin {
     public SubPlugin() throws Throwable {
         super();
         Class<?> gson = Class.forName(((Try.all.get(() -> Class.forName("com.google.gson.Gson") != null, false)?"":"org.bukkit.craftbukkit.libs.")) + "com.google.gson.Gson");
-        this.gson = Access.shared.type(gson).method("fromJson").instance(gson.newInstance()).parameters(String.class, Class.class).returns(Object.class).handle();
+        this.gson = MethodHandles.publicLookup().findVirtual(gson, "fromJson", MethodType.methodType(Object.class, new Class[]{ String.class, Class.class })).bindTo(gson.newInstance());
         version = Version.fromString(getDescription().getVersion());
         subdata.put(0, null);
     }

diff --git a/SubServers.Client/Common/pom.xml b/SubServers.Client/Common/pom.xml
@@ -18,13 +18,13 @@
         <dependency>
             <groupId>net.ME1312.Galaxi</groupId>
             <artifactId>GalaxiBase</artifactId>
-            <version>22w50c</version>
+            <version>23w08a</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>net.ME1312.SubData</groupId>
             <artifactId>Client</artifactId>
-            <version>22w11c</version>
+            <version>23w08a</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>