Skip to content

Commit b91d3e8

Browse files
authored
Merge pull request #48 from ifydev/revamp/modules
Cleanup module loader
2 parents 830e9d0 + 832e4da commit b91d3e8

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

API/src/main/java/me/innectic/permissify/api/module/PermissifyModules.java

Lines changed: 0 additions & 15 deletions
This file was deleted.

API/src/main/java/me/innectic/permissify/api/module/registry/ModuleLoader.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,13 @@ public void loadModules(Object plugin) {
2929
if (potentialModules == null) return;
3030

3131
Gson gson = new Gson();
32-
Arrays.stream(potentialModules).forEach(file -> {
32+
Arrays.stream(potentialModules).map(File::getName).filter(n -> n.endsWith(".jar")).filter(n -> n.contains("."))
33+
.map(n -> n.split("\\.")[0]).forEach(file -> {
3334
File jarFile;
34-
if (!file.getName().endsWith(".jar")) return;
35-
36-
String baseName = file.getName().contains(".") ? file.getName().split("\\.")[0] : null;
37-
if (baseName == null) return;
38-
39-
jarFile = new File(moduleDirectory + "/" + baseName + ".jar");
35+
jarFile = new File(moduleDirectory + "/" + file + ".jar");
4036
try {
4137
URLClassLoader child = new URLClassLoader(new URL[]{jarFile.toURL()}, this.getClass().getClassLoader());
42-
InputStream pmodStream = child.findResource(baseName + ".pmod").openStream();
38+
InputStream pmodStream = child.findResource(file + ".pmod").openStream();
4339
if (pmodStream == null) return;
4440

4541
BufferedInputStream inputStream = new BufferedInputStream(pmodStream);

0 commit comments

Comments
 (0)