From 8f5bb75ef2be40acf694533d3515f9e6a4773589 Mon Sep 17 00:00:00 2001
From: diesieben07 <diesieben07@gmail.com>
Date: Sat, 28 Mar 2015 16:00:50 +0100
Subject: [PATCH] Fix scala mods, Closes #621

---
 .../minecraftforge/fml/common/discovery/ITypeDiscoverer.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 844d21bc0..885fd85a9 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,8 @@ import net.minecraftforge.fml.common.ModContainer;
 
 public interface ITypeDiscoverer
 {
-    public static Pattern classFile = Pattern.compile("[^\\s]+\\.class$");
+    // main class part, followed by an optional $ and an "inner class" part. $ cannot be last, otherwise scala breaks
+    public static Pattern classFile = Pattern.compile("[^\\s\\$]+(\\$[^\\s]+)?\\.class$");
 
     public List<ModContainer> discover(ModCandidate candidate, ASMDataTable table);
 }