Skip to content

Commit 813c99e

Browse files
committed
chore: load all dependencies in cache
1 parent 87e5002 commit 813c99e

1 file changed

Lines changed: 4 additions & 8 deletions

File tree

stickynote-loader/stickynote-loader-common/src/main/java/org/sayandev/loader/common/StickyNoteLoader.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,18 @@ public void load(String id, File dataFolder, Logger logger, LibraryManager libra
5858
Set<Dependency> cachedDependencies = dependencyCache.loadCache();
5959
Set<Dependency> missingDependencies = getMissingDependencies(dependencies, cachedDependencies);
6060

61-
List<Dependency> allDependencies = new ArrayList<>(dependencies);
61+
Set<Dependency> allDependencies = new HashSet<>(dependencies);
6262
allDependencies.addAll(cachedDependencies);
63+
allDependencies.addAll(missingDependencies);
6364

64-
// Don't care about duplication in cachedDependency and missingDependency loop duplication. it works with mcauth and i'm too afraid to change anything now. I need my sanity.
6565
for (Dependency cachedDependency : allDependencies) {
6666
if (cachedDependency.getName().equals("sqlite-jdbc")) {
6767
try {
6868
Class.forName("org.sqlite.JDBC");
6969
continue;
7070
} catch (Exception ignored) {}
7171
}
72+
7273
String name = cachedDependency.getName();
7374
String group = cachedDependency.getGroup();
7475
if (name.contains("packetevents")) {
@@ -101,7 +102,7 @@ public void load(String id, File dataFolder, Logger logger, LibraryManager libra
101102
if (!missingDependencies.isEmpty()) {
102103
loadMissingDependencies(id, logger, libraryManager, transitiveDependencyHelper, dependencyCache, dependencies, missingDependencies, relocationFrom, relocationTo);
103104
}
104-
loadCachedDependencies(id, logger, libraryManager, cachedDependencies, relocationFrom, relocationTo);
105+
loadCachedDependencies(id, logger, libraryManager, new HashSet<>(allDependencies), relocationFrom, relocationTo);
105106

106107
long endTime = System.currentTimeMillis();
107108
logger.info("Loaded " + dependencies.size() + " library in " + (endTime - startTime) + " ms.");
@@ -182,11 +183,6 @@ private void loadCachedDependencies(String id, Logger logger, LibraryManager lib
182183
e.printStackTrace();
183184
}
184185
});
185-
libraryManager.loadLibrary(Library.builder()
186-
.groupId("com.google.code.gson")
187-
.artifactId("gson")
188-
.version("2.11.0")
189-
.build());
190186
}
191187

192188
private List<Dependency> getDependencies(Class<?> stickyNotes) {

0 commit comments

Comments
 (0)