keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge pull request #617 from diesieben07/innerclass-disc 

Fix ModDiscoverer ignoring inner classes.
This commit is contained in:
LexManos 2015-03-21 13:15:43 -07:00
parent 5ac394de0e 961570f253
commit 3bb9c6a92c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
View File

@ -38,7 +38,7 @@ public class DirectoryDiscoverer implements ITypeDiscoverer
@Override
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();
}
}

2
fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
View File

@ -19,7 +19,7 @@ import net.minecraftforge.fml.common.ModContainer;
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);
}