Fix #173 Allow recipe types to be specified by interfaces

mezz · Feb 20, 2016 · 28866e5 · 28866e5
1 parent b90925a
commit 28866e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/changelog.html b/changelog.html
@@ -1,4 +1,4 @@
-<h2>2.27.3</h2>
+<h2>2.28.0</h2>
 <h4>Features:</h4>
 <ul>
     <li>Show JEI description pages last.</li>
@@ -8,6 +8,10 @@ <h4>Fixes:</h4>
 <ul>
     <li>Make search option names more clear.</li>
 </ul>
+<h4>API:</h4>
+<ul>
+    <li>Allow recipe types to be specified by interfaces.</li>
+</ul>
 <br/>
 <hr/>
 <h2>2.27.2</h2>

diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ mcp_mappings=snapshot_20160219
 curse_project_id=238222
 
 version_major=2
-version_minor=27
-version_patch=3
+version_minor=28
+version_patch=0
diff --git a/src/main/java/mezz/jei/RecipeRegistry.java b/src/main/java/mezz/jei/RecipeRegistry.java
@@ -265,12 +265,13 @@ public IRecipeHandler getRecipeHandler(@Nullable Class recipeClass) {
 			return null;
 		}
 
-		IRecipeHandler recipeHandler;
-		while ((recipeHandler = recipeHandlers.get(recipeClass)) == null && (recipeClass != Object.class)) {
-			recipeClass = recipeClass.getSuperclass();
+		for (Class<?> handledClass : recipeHandlers.keySet()) {
+			if (handledClass.isAssignableFrom(recipeClass)) {
+				return recipeHandlers.get(handledClass);
+			}
 		}
 
-		return recipeHandler;
+		return null;
 	}
 
 	@Nullable