aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild.gradle2
-rwxr-xr-xsrc/main/java/me/shedaniel/api/IRecipe.java2
-rwxr-xr-xsrc/main/java/me/shedaniel/impl/REIRecipeManager.java8
3 files changed, 9 insertions, 3 deletions
diff --git a/build.gradle b/build.gradle
index 9e7d56470..c11b7d3dd 100755
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8
archivesBaseName = "RoughlyEnoughItems"
-version = "1.5.1-19"
+version = "1.5.1-20"
minecraft {
}
diff --git a/src/main/java/me/shedaniel/api/IRecipe.java b/src/main/java/me/shedaniel/api/IRecipe.java
index a79123ddd..096c6fe1f 100755
--- a/src/main/java/me/shedaniel/api/IRecipe.java
+++ b/src/main/java/me/shedaniel/api/IRecipe.java
@@ -15,6 +15,6 @@ public interface IRecipe<T> {
public List<List<T>> getInput();
- public List<List<T>> getRecipeRequiredInput();
+ public List<List<ItemStack>> getRecipeRequiredInput();
}
diff --git a/src/main/java/me/shedaniel/impl/REIRecipeManager.java b/src/main/java/me/shedaniel/impl/REIRecipeManager.java
index 2f5ed50c6..edccce8ba 100755
--- a/src/main/java/me/shedaniel/impl/REIRecipeManager.java
+++ b/src/main/java/me/shedaniel/impl/REIRecipeManager.java
@@ -10,6 +10,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.Gui;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
import net.minecraft.recipe.RecipeManager;
import java.awt.*;
@@ -153,7 +154,12 @@ public class REIRecipeManager implements IRecipeManager {
for(List<IRecipe> value : recipeList.values())
for(IRecipe iRecipe : value) {
int slotsCraftable = 0;
- for(List<ItemStack> slot : ((List<List<ItemStack>>) iRecipe.getRecipeRequiredInput())) {
+ List<List<ItemStack>> requiredInput = (List<List<ItemStack>>) iRecipe.getRecipeRequiredInput();
+ for(List<ItemStack> slot : requiredInput) {
+ if (slot.isEmpty()) {
+ slotsCraftable++;
+ continue;
+ }
boolean slotDone = false;
for(ItemStack possibleType : types) {
for(ItemStack slotPossible : slot)