Improve support for old mc versions

Author: KotlinFactory

simplixcore-common/simplixcore-common-api/src/main/java/dev/simplix/core/common/inject/SimplixInstaller.java

@@ -454,33 +454,27 @@ public Optional<DependencyLoadingException> earlyLoadDependencies(
     return processRemoteDependencies(false, appClass, tempInfo);
   }
 
+  public Optional<DependencyLoadingException> earlyLoadDependencies(
+      @NonNull Platform platform,
+      @NonNull Class<?> appClass,
+      @NonNull DependencyManifest dependencyManifest
+  ) {
+    this.platform = platform;
+    ApplicationInfo tempInfo = new ApplicationInfo(appClass.getSimpleName(),
+        "1.0", new String[0], new File("."), new String[0]);
+    return processRemoteDependencies(false, appClass, dependencyManifest, tempInfo);
+  }
+
+
   private Optional<DependencyLoadingException> processRemoteDependencies(
       boolean isLibrary,
       @NonNull Class<?> appOwner,
+      @NonNull DependencyManifest dependencyManifest,
       @NonNull ApplicationInfo info) {
     if (this.dependencyLoader == null) {
       initDependencyLoader();
     }
-    if (this.dependenciesMap.containsKey(appOwner)) {
-      return Optional.empty();
-    }
-
-    Optional<DependencyManifest> optionalDependencies;
-
-    try {
-      optionalDependencies = loadDependencies(isLibrary, appOwner);
-    } catch (JsonParseException jsonParseException) {
-      log.error(
-          SIMPLIX_BOOTSTRAP + info.name() + ": Cannot parse dependencies.json",
-          jsonParseException);
-      optionalDependencies = Optional.empty();
-    }
 
-    if (!optionalDependencies.isPresent()) {
-      return Optional.empty();
-    }
-
-    DependencyManifest dependencyManifest = optionalDependencies.get();
     this.dependenciesMap.put(appOwner, dependencyManifest);
 
     List<Repository> repositories = Arrays.asList(dependencyManifest.repositories());
@@ -507,6 +501,35 @@ private Optional<DependencyLoadingException> processRemoteDependencies(
     return Optional.empty();
   }
 
+  private Optional<DependencyLoadingException> processRemoteDependencies(
+      boolean isLibrary,
+      @NonNull Class<?> appOwner,
+      @NonNull ApplicationInfo info) {
+    if (this.dependencyLoader == null) {
+      initDependencyLoader();
+    }
+    if (this.dependenciesMap.containsKey(appOwner)) {
+      return Optional.empty();
+    }
+
+    Optional<DependencyManifest> optionalDependencies;
+
+    try {
+      optionalDependencies = loadDependencies(isLibrary, appOwner);
+    } catch (JsonParseException jsonParseException) {
+      log.error(
+          SIMPLIX_BOOTSTRAP + info.name() + ": Cannot parse dependencies.json",
+          jsonParseException);
+      optionalDependencies = Optional.empty();
+    }
+
+    if (!optionalDependencies.isPresent()) {
+      return Optional.empty();
+    }
+
+    return processRemoteDependencies(isLibrary, appOwner, optionalDependencies.get(), info);
+  }
+
   private void initDependencyLoader() {
     try {
       String depLoaderClass = System.getProperty(
@@ -544,7 +567,7 @@ private void createAppInjector(@NonNull InstallationContext context) {
                + " by "
                + Arrays
                    .toString(context.applicationInfo.authors()));
-    } catch (CreationException exception) {
+    } catch (Exception exception) {
       log.error(SIMPLIX_BOOTSTRAP + "Cannot create injector for application "
                 + context.applicationInfo.name(), exception);
       context.onException.accept(exception);

simplixcore-minecraft/simplixcore-minecraft-spigot/simplixcore-minecraft-spigot-plugin/pom.xml

@@ -124,6 +124,7 @@
               <artifactSet>
                 <excludes>
                   <exclude>com.google.guava:guava*</exclude>
+                  <exclude>com.google.inject:guice*</exclude>
                   <exclude>org.apache.logging.log4j:log4j-api</exclude>
                   <exclude>org.jetbrains:annotations</exclude>
                   <exclude>com.google.code.findbugs:annotations</exclude>

simplixcore-minecraft/simplixcore-minecraft-spigot/simplixcore-minecraft-spigot-plugin/src/main/java/dev/simplix/core/minecraft/spigot/plugin/SimplixPlugin.java

@@ -3,6 +3,9 @@
 import dev.simplix.core.common.aop.ScanComponents;
 import dev.simplix.core.common.aop.SimplixApplication;
 import dev.simplix.core.common.deploader.ArtifactDependencyLoader;
+import dev.simplix.core.common.deploader.Dependency;
+import dev.simplix.core.common.deploader.DependencyManifest;
+import dev.simplix.core.common.deploader.Repository;
 import dev.simplix.core.common.inject.SimplixInstaller;
 import dev.simplix.core.common.platform.Platform;
 import dev.simplix.core.minecraft.spigot.dynamiclisteners.DynamicListenersSimplixModule;
@@ -53,9 +56,51 @@ public void onLoad() {
         "dev.simplix.core.libloader.ClassLoaderFabricator",
         "dev.simplix.core.minecraft.spigot.plugin.libloader.PluginClassLoaderFabricator");
     ArtifactDependencyLoader.registerTypeHandler("plugin", new PluginTypeHandler());
+
+    SimplixInstaller.instance().earlyLoadDependencies(
+        Platform.SPIGOT,
+        getClass(),
+        generateDependencyManifest()
+    );
+
     SimplixInstaller.instance().libraryLoader().loadLibraries(new File("libraries"));
   }
 
+  private DependencyManifest generateDependencyManifest() {
+    final String bukkitVersion = Bukkit.getBukkitVersion();
+
+    String guiceVersion;
+    if (
+        bukkitVersion.startsWith("1.8") ||
+        bukkitVersion.startsWith("1.9") ||
+        bukkitVersion.startsWith("1.10") ||
+        bukkitVersion.startsWith("1.11")
+    ) {
+      guiceVersion = "4.1.0";
+    } else {
+      guiceVersion = "5.0.1";
+    }
+
+    // Legacy
+    final DependencyManifest dependencyManifest = new DependencyManifest();
+    final Dependency dependency = new Dependency();
+    dependency.artifactId("guice");
+    dependency.groupId("com.google.inject");
+    dependency.version(guiceVersion);
+    dependencyManifest.dependencies(new Dependency[]{
+        dependency
+    });
+    final Repository repository = new Repository();
+    repository.id("central");
+    repository.url("https://repo1.maven.org/maven2/");
+
+    dependencyManifest.repositories(new Repository[]{
+        repository
+    });
+
+    return dependencyManifest;
+  }
+
   @Override
   public void onEnable() {
     Bukkit.getPluginManager().registerEvents(new SpigotListenerImpl(), this);

simplixcore-minecraft/simplixcore-minecraft-spigot/simplixcore-minecraft-spigot-plugin/src/main/resources/plugin.yml

@@ -1,4 +1,6 @@
 name: SimplixCore
 main: dev.simplix.core.minecraft.spigot.plugin.SimplixPlugin
 version: '${project.version}'
-author: SimplixSoftworks
+author: SimplixSoftworks
+softdepend:
+  - SimplixBridge