Merge pull request #617 from diesieben07/innerclass-disc
Fix ModDiscoverer ignoring inner classes.
This commit is contained in:
commit
3bb9c6a92c
|
@ -38,7 +38,7 @@ public class DirectoryDiscoverer implements ITypeDiscoverer
|
||||||
@Override
|
@Override
|
||||||
public boolean accept(File file)
|
public boolean accept(File file)
|
||||||
{
|
{
|
||||||
return (file.isFile() && classFile.matcher(file.getName()).find()) || file.isDirectory();
|
return (file.isFile() && classFile.matcher(file.getName()).matches()) || file.isDirectory();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.ModContainer;
|
||||||
|
|
||||||
public interface ITypeDiscoverer
|
public interface ITypeDiscoverer
|
||||||
{
|
{
|
||||||
public static Pattern classFile = Pattern.compile("([^\\s$]+).class$");
|
public static Pattern classFile = Pattern.compile("[^\\s]+\\.class$");
|
||||||
|
|
||||||
public List<ModContainer> discover(ModCandidate candidate, ASMDataTable table);
|
public List<ModContainer> discover(ModCandidate candidate, ASMDataTable table);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue