Skip to content

Commit 2a4b8ac

Browse files
committed
* Re-created anvil gui backend. Java versioning differences require it now.
1 parent 27feb38 commit 2a4b8ac

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

labyrinth-gui/src/main/java/com/github/sanctum/labyrinth/gui/printer/AnvilBuilder.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.github.sanctum.labyrinth.gui.printer;
22

3+
import com.github.sanctum.labyrinth.Labyrinth;
34
import java.util.function.Consumer;
45

56
/**
@@ -60,6 +61,11 @@ public AnvilMenu get() {
6061
try {
6162
return new AnvilMenu(title, left, right);
6263
} catch (InstantiationException e) {
64+
e.printStackTrace();
65+
Labyrinth.getInstance().getLogger().severe("============================================");
66+
Labyrinth.getInstance().getLogger().severe("An issue occurred while retrieving the version wrapper.");
67+
Labyrinth.getInstance().getLogger().severe("Contact the Labyrinth developers.");
68+
Labyrinth.getInstance().getLogger().severe("============================================");
6369
return null;
6470
}
6571
}

labyrinth-plugin/src/main/java/com/github/sanctum/labyrinth/data/service/ServiceHandshake.java

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,42 @@
11
package com.github.sanctum.labyrinth.data.service;
22

33
import com.github.sanctum.labyrinth.Labyrinth;
4-
import com.github.sanctum.labyrinth.data.FileList;
54
import com.github.sanctum.labyrinth.data.FileManager;
65
import com.github.sanctum.labyrinth.data.Registry;
6+
import java.io.File;
77
import java.io.InputStream;
88
import org.bukkit.Bukkit;
99
import org.bukkit.plugin.ServicePriority;
1010

1111
public class ServiceHandshake {
1212

1313
public static void locate() {
14-
FileManager fm = FileList.search(Labyrinth.getInstance()).find("Test", "Service");
1514
String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3].substring(1);
1615
InputStream stream = Labyrinth.getInstance().getResource(version + ".jar");
16+
1717
if (stream == null) {
1818
Labyrinth.getInstance().getLogger().severe("===================================================================");
1919
Labyrinth.getInstance().getLogger().severe("- Version service " + version + " not found. Consult labyrinth developers.");
2020
Labyrinth.getInstance().getLogger().severe("===================================================================");
2121
return;
2222
}
23-
FileManager.copy(stream, fm.getFile());
24-
Labyrinth.getInstance().getLogger().info("===================================================================");
25-
Labyrinth.getInstance().getLogger().info("- Version service " + version + " injected into directory.");
26-
Labyrinth.getInstance().getLogger().info("===================================================================");
23+
24+
File file = new File("plugins/Labyrinth/Service/" + version + ".jar");
25+
26+
for (File f : file.getParentFile().listFiles()) {
27+
if (f.isFile()) {
28+
if (f.delete()) {
29+
Labyrinth.getInstance().getLogger().info("- Deleting old version traces.");
30+
}
31+
}
32+
}
33+
34+
if (!file.exists()) {
35+
FileManager.copy(stream, file);
36+
Labyrinth.getInstance().getLogger().info("===================================================================");
37+
Labyrinth.getInstance().getLogger().info("- Compiling version " + version + ".");
38+
Labyrinth.getInstance().getLogger().info("===================================================================");
39+
}
2740
}
2841

2942
public static void register() {

labyrinth-plugin/src/main/java/com/github/sanctum/labyrinth/event/custom/VentMap.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import com.github.sanctum.labyrinth.task.Schedule;
44
import java.util.LinkedList;
5+
import java.util.List;
6+
import java.util.stream.Collectors;
7+
import org.bukkit.plugin.Plugin;
58

69
public final class VentMap {
710

@@ -28,6 +31,10 @@ public <T extends Vent> void unsubscribeAll(Class<T> eventType, String key) {
2831
}
2932
}
3033

34+
public List<Vent.Subscription<?>> getSubscriptions(Plugin plugin) {
35+
return SUBSCRIPTIONS.stream().filter(s -> s.getUser().equals(plugin)).collect(Collectors.toList());
36+
}
37+
3138
public <T extends Vent> Vent.Subscription<?> getSubscription(Class<T> eventType, String key) {
3239
return SUBSCRIPTIONS.stream().filter(s -> s.getEventType().isAssignableFrom(eventType) && s.getKey().isPresent() && s.getKey().get().equals(key)).findFirst().orElse(null);
3340
}
30 KB
Binary file not shown.

0 commit comments

Comments
 (0)