Skip to content
This repository was archived by the owner on Jul 4, 2022. It is now read-only.

Commit dcf3817

Browse files
committed
Don't load guava dynamically
1 parent 60f181d commit dcf3817

File tree

2 files changed

+1
-47
lines changed
  • simplixcore-minecraft/simplixcore-minecraft-spigot/simplixcore-minecraft-spigot-plugin

2 files changed

+1
-47
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@
124124
<artifactSet>
125125
<excludes>
126126
<exclude>com.google.guava:guava*</exclude>
127-
<exclude>com.google.inject:guice*</exclude>
128127
<exclude>org.apache.logging.log4j:log4j-api</exclude>
129128
<exclude>org.jetbrains:annotations</exclude>
130129
<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

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import dev.simplix.core.common.aop.ScanComponents;
44
import dev.simplix.core.common.aop.SimplixApplication;
55
import dev.simplix.core.common.deploader.ArtifactDependencyLoader;
6-
import dev.simplix.core.common.deploader.Dependency;
7-
import dev.simplix.core.common.deploader.DependencyManifest;
8-
import dev.simplix.core.common.deploader.Repository;
96
import dev.simplix.core.common.inject.SimplixInstaller;
107
import dev.simplix.core.common.platform.Platform;
118
import dev.simplix.core.minecraft.spigot.dynamiclisteners.DynamicListenersSimplixModule;
@@ -56,51 +53,9 @@ public void onLoad() {
5653
"dev.simplix.core.libloader.ClassLoaderFabricator",
5754
"dev.simplix.core.minecraft.spigot.plugin.libloader.PluginClassLoaderFabricator");
5855
ArtifactDependencyLoader.registerTypeHandler("plugin", new PluginTypeHandler());
59-
60-
SimplixInstaller.instance().earlyLoadDependencies(
61-
Platform.SPIGOT,
62-
getClass(),
63-
generateDependencyManifest()
64-
);
65-
6656
SimplixInstaller.instance().libraryLoader().loadLibraries(new File("libraries"));
6757
}
6858

69-
private DependencyManifest generateDependencyManifest() {
70-
final String bukkitVersion = Bukkit.getBukkitVersion();
71-
72-
String guiceVersion;
73-
if (
74-
bukkitVersion.startsWith("1.8") ||
75-
bukkitVersion.startsWith("1.9") ||
76-
bukkitVersion.startsWith("1.10") ||
77-
bukkitVersion.startsWith("1.11")
78-
) {
79-
guiceVersion = "4.1.0";
80-
} else {
81-
guiceVersion = "5.0.1";
82-
}
83-
84-
// Legacy
85-
final DependencyManifest dependencyManifest = new DependencyManifest();
86-
final Dependency dependency = new Dependency();
87-
dependency.artifactId("guice");
88-
dependency.groupId("com.google.inject");
89-
dependency.version(guiceVersion);
90-
dependencyManifest.dependencies(new Dependency[]{
91-
dependency
92-
});
93-
final Repository repository = new Repository();
94-
repository.id("central");
95-
repository.url("https://repo1.maven.org/maven2/");
96-
97-
dependencyManifest.repositories(new Repository[]{
98-
repository
99-
});
100-
101-
return dependencyManifest;
102-
}
103-
10459
@Override
10560
public void onEnable() {
10661
Bukkit.getPluginManager().registerEvents(new SpigotListenerImpl(), this);
@@ -146,4 +101,4 @@ private String waitForRegistration() {
146101
}
147102
return null;
148103
}
149-
}
104+
}

0 commit comments

Comments
 (0)