diff --git a/LICENSE b/LICENSE index ad60f388..25b55b31 100644 --- 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 index 0026d870..cce0df17 100644 --- a/SubServers.Bungee/common/pom.xml +++ b/SubServers.Bungee/common/pom.xml @@ -28,7 +28,7 @@ net.ME1312.Galaxi GalaxiBase - 22w50c + 23w08a compile diff --git a/SubServers.Bungee/pom.xml b/SubServers.Bungee/pom.xml index 9f524518..cf1a66c7 100644 --- a/SubServers.Bungee/pom.xml +++ b/SubServers.Bungee/pom.xml @@ -34,7 +34,7 @@ net.ME1312.SubData Server - 22w11c + 23w08a compile diff --git a/SubServers.Bungee/src/META-INF/MANIFEST.MOD.MF b/SubServers.Bungee/src/META-INF/MANIFEST.MOD.MF index c582b9d9..531e4d67 100644 --- 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 index a0b3e925..b97ed24b 100644 --- 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/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java index db6f88b4..39277489 100644 --- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Network/Packet/PacketDisconnectPlayer.java +++ b/SubServers.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 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> 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 index 226c4ebd..13672a87 100644 --- 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 ids, ContainedPair { + Merger merge = new Merger(() -> { callback.accept(failures.value); }); List 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 index 78766b5b..e30ca994 100644 --- 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 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> 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 index d1ccb754..487c65a0 100644 --- 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 index 808f4840..dc74bfd5 100644 --- 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 order = new Container<>(null); - AsyncConsolidator async = new AsyncConsolidator(() -> { + Merger async = new Merger(() -> { try { Map 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 index 88290df2..8ea91e39 100644 --- 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 success = new Container(0); Container running = new Container(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 json) { // Step 3: Receive command Responses Container success = new Container(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> stopper = data -> { @@ -501,7 +501,7 @@ public void accept(ObjectMap json) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(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 json) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(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 json) { Container success = new Container(0); Container running = new Container(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 json) { boolean ts = template == null; Container success = new Container(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 json) { selectServers(sender, args, 1, true, "subservers.subserver.%.delete", select -> { if (select.subservers.length > 0) { Container success = new Container(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 index 50c4607f..56f0d196 100644 --- 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 index 6f9a493d..4be37813 100644 --- a/SubServers.Client/Common/pom.xml +++ b/SubServers.Client/Common/pom.xml @@ -18,13 +18,13 @@ net.ME1312.Galaxi GalaxiBase - 22w50c + 23w08a compile net.ME1312.SubData Client - 22w11c + 23w08a compile diff --git a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java index e9b0b6bf..a3bd1c84 100644 --- a/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java +++ b/SubServers.Client/Sponge/src/net/ME1312/SubServers/Client/Sponge/SubCommand.java @@ -1,11 +1,11 @@ package net.ME1312.SubServers.Client.Sponge; -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.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; @@ -669,7 +669,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Start.Running").replace("$int$", running.value.toString()))); if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Start").replace("$int$", success.value.toString()))); }); @@ -779,7 +779,7 @@ public void accept(ObjectMap json) { // Step 3: Receive command Responses Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Restart").replace("$int$", success.value.toString()))); }); Consumer> stopper = data -> { @@ -844,7 +844,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Stop.Not-Running").replace("$int$", running.value.toString()))); if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Stop").replace("$int$", success.value.toString()))); }); @@ -903,7 +903,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Terminate.Not-Running").replace("$int$", running.value.toString()))); if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Terminate").replace("$int$", success.value.toString()))); }); @@ -964,7 +964,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C if (command.isPresent()) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Command.Not-Running").replace("$int$", running.value.toString()))); if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Command").replace("$int$", success.value.toString()))); }); @@ -1093,7 +1093,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C boolean ts = ft == null; Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Update").replace("$int$", success.value.toString()))); }); for (SubServer server : select.subservers) { @@ -1161,7 +1161,7 @@ public CommandResult execute(CommandSource sender, CommandContext args) throws C selectServers(sender, s.get(), true, "subservers.subserver.%.delete", select -> { if (select.subservers.length > 0) { Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage(ChatColor.convertColor(plugin.api.getLang("SubServers", "Command.Delete").replace("$int$", success.value.toString()))); }); for (SubServer server : select.subservers) { @@ -1400,7 +1400,7 @@ private void selectServers(CommandSource sender, String[] selection, boolean mod }; // Step 2 - AsyncConsolidator merge = new AsyncConsolidator(finished); + Merger merge = new Merger(finished); for (Value ic = new Container(0); ic.value() < selection.length; ic.value(ic.value() + 1)) { String current = selection[ic.value()]; @@ -1454,7 +1454,7 @@ private void selectServers(CommandSource sender, String[] selection, boolean mod 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.Host/pom.xml b/SubServers.Host/pom.xml index 53f5ccce..b3f65b0b 100644 --- a/SubServers.Host/pom.xml +++ b/SubServers.Host/pom.xml @@ -30,13 +30,13 @@ net.ME1312.Galaxi GalaxiEngine - 22w50c + 23w08a compile net.ME1312.Galaxi GalaxiUI - 22w50c + 23w08a runtime diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java index d781825b..f72d93e3 100644 --- a/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java +++ b/SubServers.Host/src/net/ME1312/SubServers/Host/SubCommand.java @@ -6,11 +6,11 @@ import net.ME1312.Galaxi.Command.CompletionHandler; import net.ME1312.Galaxi.Engine.CommandParser; import net.ME1312.Galaxi.Engine.GalaxiEngine; -import net.ME1312.Galaxi.Library.AsyncConsolidator; 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.Try; import net.ME1312.Galaxi.Library.Version.Version; import net.ME1312.SubData.Client.SubDataClient; @@ -458,7 +458,7 @@ public void command(CommandSender sender, String label, String[] args) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running"); if (success.value > 0) sender.sendMessage("Started " + success.value + " subserver"+((success.value == 1)?"":"s")); }); @@ -573,7 +573,7 @@ public void run() { // Step 1-3: Restart Servers / Receive command Responses Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage("Restarting " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -617,7 +617,7 @@ public void command(CommandSender sender, String handle, String[] args) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("Stopping " + success.value + " subserver"+((success.value == 1)?"":"s")); }); @@ -661,7 +661,7 @@ public void command(CommandSender sender, String handle, String[] args) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("Terminated " + success.value + " subserver"+((success.value == 1)?"":"s")); }); @@ -715,7 +715,7 @@ public void command(CommandSender sender, String handle, String[] args) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(running.value + " server"+((running.value == 1)?" was":"s were") + " offline"); if (success.value > 0) sender.sendMessage("Sent command to " + success.value + " server"+((success.value == 1)?"":"s")); }); @@ -850,7 +850,7 @@ public void command(CommandSender sender, String handle, String[] args) { boolean ts = template == null; Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage("Updating " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -934,7 +934,7 @@ public void command(CommandSender sender, String handle, String[] args) { selectServers(sender, args, 0, true, select -> { if (select.subservers.length > 0) { Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage("Removing " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -1037,7 +1037,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); diff --git a/SubServers.Sync/src/META-INF/MANIFEST.MOD.MF b/SubServers.Sync/src/META-INF/MANIFEST.MOD.MF index 91b751dd..6e0b801b 100644 --- a/SubServers.Sync/src/META-INF/MANIFEST.MOD.MF +++ b/SubServers.Sync/src/META-INF/MANIFEST.MOD.MF @@ -1,4 +1,4 @@ Manifest-Version: 1.0 -Class-Path: libraries/GalaxiEngine.jar libraries/SubDataClient.jar libraries/BungeeCord.jar +Class-Path: libraries/GalaxiBase.jar libraries/SubDataClient.jar libraries/BungeeCord.jar Main-Class: net.ME1312.SubServers.Sync.Launch Implementation-Title: SubServers.Sync diff --git a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java index 009b6bd6..82573eac 100644 --- a/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java +++ b/SubServers.Sync/src/net/ME1312/SubServers/Sync/SubCommand.java @@ -1,11 +1,11 @@ package net.ME1312.SubServers.Sync; -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.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; @@ -345,7 +345,7 @@ public void execute(CommandSender sender, String[] args) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running"); if (success.value > 0) sender.sendMessage("SubServers > Started " + success.value + " subserver"+((success.value == 1)?"":"s")); }); @@ -448,7 +448,7 @@ public void run() { // Step 1-3: Restart Servers / Receive command Responses Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage("SubServers > Restarting " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -481,7 +481,7 @@ public void run() { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("SubServers > Stopping " + success.value + " subserver"+((success.value == 1)?"":"s")); }); @@ -514,7 +514,7 @@ public void run() { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline"); if (success.value > 0) sender.sendMessage("SubServers > Terminated " + success.value + " subserver"+((success.value == 1)?"":"s")); }); @@ -554,7 +554,7 @@ public void run() { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage("SubServers > " + running.value + " server"+((running.value == 1)?" was":"s were") + " offline"); if (success.value > 0) sender.sendMessage("SubServers > Sent command to " + success.value + " server"+((success.value == 1)?"":"s")); }); @@ -634,7 +634,7 @@ public void run() { boolean ts = template == null; Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage("SubServers > Updating " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -689,7 +689,7 @@ public void run() { selectServers(sender, args, 1, true, select -> { if (select.subservers.length > 0) { Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage("SubServers > Removing " + success.value + " subserver"+((success.value == 1)?"":"s")); }); for (SubServer server : select.subservers) { @@ -794,7 +794,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); diff --git a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java index 1f8643bc..4f5df62b 100644 --- a/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java +++ b/SubServers.Sync/velocity/src/net/ME1312/SubServers/Velocity/SubCommand.java @@ -1,11 +1,11 @@ package net.ME1312.SubServers.Velocity; -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.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; @@ -352,7 +352,7 @@ public void execute(Invocation invocation) { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(Component.text("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already running")); if (success.value > 0) sender.sendMessage(Component.text("SubServers > Started " + success.value + " subserver"+((success.value == 1)?"":"s"))); }); @@ -455,7 +455,7 @@ public void run() { // Step 1-3: Restart Servers / Receive command Responses Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage(Component.text("SubServers > Restarting " + success.value + " subserver"+((success.value == 1)?"":"s"))); }); for (SubServer server : select.subservers) { @@ -488,7 +488,7 @@ public void run() { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(Component.text("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline")); if (success.value > 0) sender.sendMessage(Component.text("SubServers > Stopping " + success.value + " subserver"+((success.value == 1)?"":"s"))); }); @@ -521,7 +521,7 @@ public void run() { if (select.subservers.length > 0) { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(Component.text("SubServers > " + running.value + " subserver"+((running.value == 1)?" was":"s were") + " already offline")); if (success.value > 0) sender.sendMessage(Component.text("SubServers > Terminated " + success.value + " subserver"+((success.value == 1)?"":"s"))); }); @@ -561,7 +561,7 @@ public void run() { Container success = new Container(0); Container running = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (running.value > 0) sender.sendMessage(Component.text("SubServers > " + running.value + " server"+((running.value == 1)?" was":"s were") + " offline")); if (success.value > 0) sender.sendMessage(Component.text("SubServers > Sent command to " + success.value + " server"+((success.value == 1)?"":"s"))); }); @@ -641,7 +641,7 @@ public void run() { boolean ts = template == null; Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage(Component.text("SubServers > Updating " + success.value + " subserver"+((success.value == 1)?"":"s"))); }); for (SubServer server : select.subservers) { @@ -696,7 +696,7 @@ public void run() { selectServers(sender, args, 1, true, select -> { if (select.subservers.length > 0) { Container success = new Container(0); - AsyncConsolidator merge = new AsyncConsolidator(() -> { + Merger merge = new Merger(() -> { if (success.value > 0) sender.sendMessage(Component.text("SubServers > Removing " + success.value + " subserver"+((success.value == 1)?"":"s"))); }); for (SubServer server : select.subservers) { @@ -801,7 +801,7 @@ private void selectServers(CommandSource 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);