Minor Changes

- Fix DynaTech build - Added 1.16+ compatibility to new DynaTech version - PaperRequirementLevel system to loadAddon method
UniverseNetwork · Feb 25, 2024 · d615e82 · d615e82
1 parent c642de5
commit d615e82
Show file tree

Hide file tree

Showing 2 changed files with 145 additions and 96 deletions.
diff --git a/Loader/src/id/universenetwork/sfa_loader/AddonsLoader.java b/Loader/src/id/universenetwork/sfa_loader/AddonsLoader.java
@@ -88,6 +88,8 @@ else if (addonClass.isAnnotationPresent(AddonLibraries.class))
                     }
             }
 
+            if (!PaperLib.isPaper()) if (!passPaperRequirements(addonClass, name)) return;
+
             addon.onLoad();
             loadedAddons.add(addon);
 
@@ -108,8 +110,8 @@ private void loadAddonWithHooks(Iterator<Class<? extends AddonTemplate>> addonIt
         for (Iterator<String> iterator = hooks.iterator(); iterator.hasNext(); ) {
             String hook = iterator.next();
             if (AbstractAddon.config().getBoolean("addons." + hook.toLowerCase())) {
-                addonIterator.remove();
                 if (isAddonLoaded(hook)) continue;
+                addonIterator.remove();
                 addonsWithHooksClasses.add(addonClass);
                 return;
             }