From 961570f253f9832f11b446141d80909a4790598e Mon Sep 17 00:00:00 2001
From: diesieben07 <diesieben07@gmail.com>
Date: Sat, 21 Mar 2015 19:15:26 +0100
Subject: [PATCH] Fix ModDiscoverer ignoring inner classes.

---
 .../fml/common/discovery/DirectoryDiscoverer.java               | 2 +-
 .../minecraftforge/fml/common/discovery/ITypeDiscoverer.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
index 4608233bd..2ed403cbf 100644
--- a/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
+++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/DirectoryDiscoverer.java
@@ -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();
         }
     }
 
diff --git a/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
index 144526a72..844d21bc0 100644
--- a/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
+++ b/fml/src/main/java/net/minecraftforge/fml/common/discovery/ITypeDiscoverer.java
@@ -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);
 }