* Re-created anvil gui backend. Java versioning differences require i…

…t now.
the-h-team · Jun 21, 2021 · 2a4b8ac · 2a4b8ac
1 parent 27feb38
commit 2a4b8ac
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/printer/AnvilBuilder.java b/labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/printer/AnvilBuilder.java
@@ -1,5 +1,6 @@
 package com.github.sanctum.labyrinth.gui.printer;
 
+import com.github.sanctum.labyrinth.Labyrinth;
 import java.util.function.Consumer;
 
 /**
@@ -60,6 +61,11 @@ public AnvilMenu get() {
 		try {
 			return new AnvilMenu(title, left, right);
 		} catch (InstantiationException e) {
+			e.printStackTrace();
+			Labyrinth.getInstance().getLogger().severe("============================================");
+			Labyrinth.getInstance().getLogger().severe("An issue occurred while retrieving the version wrapper.");
+			Labyrinth.getInstance().getLogger().severe("Contact the Labyrinth developers.");
+			Labyrinth.getInstance().getLogger().severe("============================================");
 			return null;
 		}
 	}

diff --git a/...inth-plugin/src/main/java/com/github/sanctum/labyrinth/data/service/ServiceHandshake.java b/...inth-plugin/src/main/java/com/github/sanctum/labyrinth/data/service/ServiceHandshake.java
@@ -1,29 +1,42 @@
 package com.github.sanctum.labyrinth.data.service;
 
 import com.github.sanctum.labyrinth.Labyrinth;
-import com.github.sanctum.labyrinth.data.FileList;
 import com.github.sanctum.labyrinth.data.FileManager;
 import com.github.sanctum.labyrinth.data.Registry;
+import java.io.File;
 import java.io.InputStream;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.ServicePriority;
 
 public class ServiceHandshake {
 
 	public static void locate() {
-		FileManager fm = FileList.search(Labyrinth.getInstance()).find("Test", "Service");
 		String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3].substring(1);
 		InputStream stream = Labyrinth.getInstance().getResource(version + ".jar");
+
 		if (stream == null) {
 			Labyrinth.getInstance().getLogger().severe("===================================================================");
 			Labyrinth.getInstance().getLogger().severe("- Version service " + version + " not found. Consult labyrinth developers.");
 			Labyrinth.getInstance().getLogger().severe("===================================================================");
 			return;
 		}
-		FileManager.copy(stream, fm.getFile());
-		Labyrinth.getInstance().getLogger().info("===================================================================");
-		Labyrinth.getInstance().getLogger().info("- Version service " + version + " injected into directory.");
-		Labyrinth.getInstance().getLogger().info("===================================================================");
+
+		File file = new File("plugins/Labyrinth/Service/" + version + ".jar");
+
+		for (File f : file.getParentFile().listFiles()) {
+			if (f.isFile()) {
+				if (f.delete()) {
+					Labyrinth.getInstance().getLogger().info("- Deleting old version traces.");
+				}
+			}
+		}
+
+		if (!file.exists()) {
+			FileManager.copy(stream, file);
+			Labyrinth.getInstance().getLogger().info("===================================================================");
+			Labyrinth.getInstance().getLogger().info("- Compiling version " + version + ".");
+			Labyrinth.getInstance().getLogger().info("===================================================================");
+		}
 	}
 
 	public static void register() {

diff --git a/labyrinth-plugin/src/main/java/com/github/sanctum/labyrinth/event/custom/VentMap.java b/labyrinth-plugin/src/main/java/com/github/sanctum/labyrinth/event/custom/VentMap.java
@@ -2,6 +2,9 @@
 
 import com.github.sanctum.labyrinth.task.Schedule;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.bukkit.plugin.Plugin;
 
 public final class VentMap {
 
@@ -28,6 +31,10 @@ public <T extends Vent> void unsubscribeAll(Class<T> eventType, String key) {
 		}
 	}
 
+	public List<Vent.Subscription<?>> getSubscriptions(Plugin plugin) {
+		return SUBSCRIPTIONS.stream().filter(s -> s.getUser().equals(plugin)).collect(Collectors.toList());
+	}
+
 	public <T extends Vent> Vent.Subscription<?> getSubscription(Class<T> eventType, String key) {
 		return SUBSCRIPTIONS.stream().filter(s -> s.getEventType().isAssignableFrom(eventType) && s.getKey().isPresent() && s.getKey().get().equals(key)).findFirst().orElse(null);
 	}

diff --git a/out/artifacts/Labyrinth_jar/Labyrinth.jar b/out/artifacts/Labyrinth_jar/Labyrinth.jar