Fix json plugin loading

WHY DOES THIS FIX IT?? WHY IS IT BROKEN??? WHAT THE HELL???
GalliumPowered · Mar 21, 2024 · ac2b285 · ac2b285
1 parent 1c6e191
commit ac2b285
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/lib/src/main/java/org/galliumpowered/plugin/loader/PluginLoader.java b/lib/src/main/java/org/galliumpowered/plugin/loader/PluginLoader.java
@@ -36,7 +36,7 @@ public Optional<PluginContainer> loadPlugin(@Nonnull File jar) {
                 PluginMetadata meta = metaOptional.get();
 
                 if (meta.getId().equals("gallium") || meta.getId().equals("minecraft") || meta.getId().equals("gtest")) {
-                    throw new BadPluginException("Plugin IDs 'gallium', 'minecraft' and 'gtest' are reserved!");
+                    throw new BadPluginException("Plugin IDs 'gallium', 'minecraft' and 'gtest' are reserved! Found plugin id '" + meta.getId() + "'");
                 }
 
                 if (meta.getId().contains(" ")) {

diff --git a/lib/src/main/java/org/galliumpowered/plugin/metadata/PluginMetadataLoader.java b/lib/src/main/java/org/galliumpowered/plugin/metadata/PluginMetadataLoader.java
@@ -78,7 +78,7 @@ public static PluginMetadata getPluginMetadataFromJson(InputStreamReader configR
         String[] authors = new String[authorsJSON.length()];
         for (int i = 0; i < authorsJSON.length(); i++) {
             authors[i] = (String) authorsJSON.get(i);
-        }
+        }:
 
         return new DefaultPluginMeta(name, id, description, authors, version, mainClass);
     }

diff --git a/server/src/main/java/org/galliumpowered/bridge/BridgeImpl.java b/server/src/main/java/org/galliumpowered/bridge/BridgeImpl.java
@@ -203,9 +203,8 @@ public void loadInternalPlugin() {
 
     @Override
     public void loadTestPlugin() {
-        InputStream inputStream = TestPlugin.class.getResourceAsStream("/plugin.json");
-        InputStreamReader reader = new InputStreamReader(inputStream);
-        PluginMetadata pluginMetadata = PluginMetadataLoader.getPluginMetadataFromJson(reader);
+        // load the test plugin manually.
+        PluginMetadata pluginMetadata = PluginMetadataLoader.getPluginMetaFromAnnotation(TestPlugin.class);
 
         PluginContainer pluginContainer = new PluginContainer();
         pluginContainer.setMetadata(pluginMetadata);

diff --git a/testplugin/src/main/java/org/galliumpowered/testplugin/TestPlugin.java b/testplugin/src/main/java/org/galliumpowered/testplugin/TestPlugin.java
@@ -3,6 +3,7 @@
 import com.google.inject.Inject;
 import org.apache.logging.log4j.Logger;
 import org.galliumpowered.Gallium;
+import org.galliumpowered.annotation.Plugin;
 import org.galliumpowered.annotation.PluginLifecycleListener;
 import org.galliumpowered.plugin.PluginContainer;
 import org.galliumpowered.plugin.PluginLifecycleState;
@@ -11,6 +12,13 @@
 import org.galliumpowered.testplugin.listeners.BlockPlaceListener;
 import org.galliumpowered.testplugin.listeners.PlayerDeathListener;
 
+@Plugin(
+        name = "Gallium Test Plugin",
+        id = "gtest",
+        description = "Gallium plugin for testing features",
+        authors = "GalliumPowered",
+        version = "1.0"
+)
 public class TestPlugin {
     @Inject
     private PluginContainer pluginContainer;

diff --git a/testplugin/src/main/resources/plugin.json b/testplugin/src/main/resources/plugin.json