File tree 2 files changed +10
-2
lines changed
cpw/mods/jarhandling/impl
net/minecraftforge/securemodules
2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change @@ -357,7 +357,7 @@ private Set<String> gatherPackages() {
357
357
var ret = new HashSet <String >();
358
358
for (var file : files ) {
359
359
int idx = file .lastIndexOf ('/' );
360
- if (!file .endsWith (".class" ) || idx == - 1 )
360
+ if (idx == - 1 || !file .endsWith (".class" ))
361
361
continue ;
362
362
ret .add (file .substring (0 , idx ).replace ('/' , '.' ));
363
363
}
Original file line number Diff line number Diff line change 24
24
public class SecureModuleFinder implements ModuleFinder {
25
25
private final Map <String , ModuleReference > references = new HashMap <>();
26
26
27
- protected SecureModuleFinder (final SecureJar ... jars ) {
27
+ protected SecureModuleFinder (final Iterable < SecureJar > jars ) {
28
28
for (var jar : jars ) {
29
29
var data = jar .moduleDataProvider ();
30
30
if (references .containsKey (data .name ()))
@@ -34,6 +34,10 @@ protected SecureModuleFinder(final SecureJar... jars) {
34
34
}
35
35
}
36
36
37
+ protected SecureModuleFinder (final SecureJar ... jars ) {
38
+ this (Arrays .asList (jars ));
39
+ }
40
+
37
41
@ Override
38
42
public Optional <ModuleReference > find (final String name ) {
39
43
return Optional .ofNullable (references .get (name ));
@@ -48,6 +52,10 @@ public static SecureModuleFinder of(SecureJar... jars) {
48
52
return new SecureModuleFinder (jars );
49
53
}
50
54
55
+ public static SecureModuleFinder of (Iterable <SecureJar > jars ) {
56
+ return new SecureModuleFinder (jars );
57
+ }
58
+
51
59
private static class Reference extends SecureModuleReference {
52
60
private final SecureJar .ModuleDataProvider jar ;
53
61
private final Manifest manifest ;
You can’t perform that action at this time.
0 commit comments