3.3

Fix #58
Close #134
Close #158
Fix #227

1 files changed, 64 insertions, 64 deletions

diff --git a/src/main/java/me/shedaniel/rei/server/RecipeFinder.java b/src/main/java/me/shedaniel/rei/server/RecipeFinder.java
index 8bf5c0407..a6dccd6f9 100644
--- a/src/main/java/me/shedaniel/rei/server/RecipeFinder.java
+++ b/src/main/java/me/shedaniel/rei/server/RecipeFinder.java
@@ -21,39 +21,39 @@ import java.util.stream.Collectors;
 
 public class RecipeFinder {
     public final Int2IntMap idToAmountMap = new Int2IntOpenHashMap();
-
+    
     public static int getItemId(ItemStack itemStack_1) {
         return Registry.ITEM.getRawId(itemStack_1.getItem());
     }
-
+    
     public static ItemStack getStackFromId(int int_1) {
         return int_1 == 0 ? ItemStack.EMPTY : new ItemStack(Item.byRawId(int_1));
     }
-
+    
     public void addNormalItem(ItemStack itemStack_1) {
         if (!itemStack_1.isDamaged() && !itemStack_1.hasEnchantments() && !itemStack_1.hasCustomName()) {
             this.addItem(itemStack_1);
         }
-
+        
     }
-
+    
     public void addItem(ItemStack itemStack_1) {
         this.addItem(itemStack_1, 64);
     }
-
+    
     public void addItem(ItemStack itemStack_1, int int_1) {
         if (!itemStack_1.isEmpty()) {
             int itemId = getItemId(itemStack_1);
             int itemCount = Math.min(int_1, itemStack_1.getCount());
             this.addItem(itemId, itemCount);
         }
-
+        
     }
-
+    
     private boolean contains(int itemId) {
         return this.idToAmountMap.get(itemId) > 0;
     }
-
+    
     /**
      * Takes an amount from the finder
      *
@@ -68,31 +68,31 @@ public class RecipeFinder {
             return 0;
         }
     }
-
+    
     private void addItem(int itemId, int itemCount) {
         this.idToAmountMap.put(itemId, this.idToAmountMap.get(itemId) + itemCount);
     }
-
+    
     public boolean findRecipe(DefaultedList<Ingredient> ingredients, @Nullable IntList intList_1) {
         return this.findRecipe(ingredients, intList_1, 1);
     }
-
+    
     public boolean findRecipe(DefaultedList<Ingredient> ingredients, @Nullable IntList intList_1, int int_1) {
         return (new RecipeFinder.Filter(ingredients)).find(int_1, intList_1);
     }
-
+    
     public int countRecipeCrafts(DefaultedList<Ingredient> ingredients, @Nullable IntList intList_1) {
         return this.countRecipeCrafts(ingredients, Integer.MAX_VALUE, intList_1);
     }
-
+    
     public int countRecipeCrafts(DefaultedList<Ingredient> ingredients, int int_1, @Nullable IntList intList_1) {
         return (new RecipeFinder.Filter(ingredients)).countCrafts(int_1, intList_1);
     }
-
+    
     public void clear() {
         this.idToAmountMap.clear();
     }
-
+    
     class Filter {
         private final List<Ingredient> ingredients = Lists.newArrayList();
         private final int ingredientCount;
@@ -101,7 +101,7 @@ public class RecipeFinder {
         private final BitSet bitSet;
         private final IntList field_7557 = new IntArrayList();
         private final DefaultedList<Ingredient> ingredientsInput;
-
+        
         public Filter(DefaultedList<Ingredient> ingredientsInput) {
             this.ingredientsInput = ingredientsInput;
             this.ingredients.addAll(ingredientsInput.stream().collect(Collectors.toList()));
@@ -110,10 +110,10 @@ public class RecipeFinder {
             this.usableIngredientItemIds = this.getUsableIngredientItemIds();
             this.usableIngredientSize = this.usableIngredientItemIds.length;
             this.bitSet = new BitSet(this.ingredientCount + this.usableIngredientSize + this.ingredientCount + this.ingredientCount * this.usableIngredientSize);
-
+            
             for (int ingredientIndex = 0; ingredientIndex < this.ingredients.size(); ++ingredientIndex) {
-                IntList possibleStacks = ((Ingredient) this.ingredients.get(ingredientIndex)).getIds();
-
+                IntList possibleStacks = this.ingredients.get(ingredientIndex).getIds();
+                
                 // Loops over usable ingredients
                 for (int usableIngredientIndex = 0; usableIngredientIndex < this.usableIngredientSize; ++usableIngredientIndex) {
                     if (possibleStacks.contains(this.usableIngredientItemIds[usableIngredientIndex])) {
@@ -121,9 +121,9 @@ public class RecipeFinder {
                     }
                 }
             }
-
+            
         }
-
+        
         @SuppressWarnings("deprecation")
         public boolean find(int int_1, @Nullable IntList intList_1) {
             if (int_1 <= 0) {
@@ -134,27 +134,27 @@ public class RecipeFinder {
                     RecipeFinder.this.take(this.usableIngredientItemIds[this.field_7557.getInt(0)], int_1);
                     int int_3 = this.field_7557.size() - 1;
                     this.method_7421(this.field_7557.getInt(int_3));
-
+                    
                     for (int int_4 = 0; int_4 < int_3; ++int_4) {
                         this.method_7414((int_4 & 1) == 0, this.field_7557.get(int_4), this.field_7557.get(int_4 + 1));
                     }
-
+                    
                     this.field_7557.clear();
                     this.bitSet.clear(0, this.ingredientCount + this.usableIngredientSize);
                 }
-
+                
                 boolean boolean_1 = int_2 == this.ingredientCount;
                 boolean boolean_2 = boolean_1 && intList_1 != null;
                 if (boolean_2) {
                     intList_1.clear();
                 }
-
+                
                 this.bitSet.clear(0, this.ingredientCount + this.usableIngredientSize + this.ingredientCount);
                 int int_5 = 0;
                 List<Ingredient> list_1 = ingredientsInput.stream().collect(Collectors.toList());
-
+                
                 for (int int_6 = 0; int_6 < list_1.size(); ++int_6) {
-                    if (boolean_2 && ((Ingredient) list_1.get(int_6)).isEmpty()) {
+                    if (boolean_2 && list_1.get(int_6).isEmpty()) {
                         intList_1.add(0);
                     } else {
                         for (int int_7 = 0; int_7 < this.usableIngredientSize; ++int_7) {
@@ -166,42 +166,42 @@ public class RecipeFinder {
                                 }
                             }
                         }
-
+                        
                         ++int_5;
                     }
                 }
-
+                
                 return boolean_1;
             }
         }
-
+        
         private int[] getUsableIngredientItemIds() {
             IntCollection intCollection_1 = new IntAVLTreeSet();
             Iterator var2 = this.ingredients.iterator();
-
+            
             while (var2.hasNext()) {
                 Ingredient ingredient_1 = (Ingredient) var2.next();
                 intCollection_1.addAll(ingredient_1.getIds());
             }
-
+            
             IntIterator intIterator_1 = intCollection_1.iterator();
-
+            
             while (intIterator_1.hasNext()) {
                 if (!RecipeFinder.this.contains(intIterator_1.nextInt())) {
                     intIterator_1.remove();
                 }
             }
-
+            
             return intCollection_1.toIntArray();
         }
-
+        
         private boolean method_7423(int int_1) {
             int usableIngredientSize = this.usableIngredientSize;
-
+            
             for (int int_3 = 0; int_3 < usableIngredientSize; ++int_3) {
                 if (RecipeFinder.this.idToAmountMap.get(this.usableIngredientItemIds[int_3]) >= int_1) {
                     this.method_7413(false, int_3);
-
+                    
                     while (!this.field_7557.isEmpty()) {
                         int int_4 = this.field_7557.size();
                         boolean boolean_1 = (int_4 & 1) == 1;
@@ -209,9 +209,9 @@ public class RecipeFinder {
                         if (!boolean_1 && !this.method_7416(int_5)) {
                             break;
                         }
-
+                        
                         int int_6 = boolean_1 ? this.ingredientCount : usableIngredientSize;
-
+                        
                         int int_8;
                         for (int_8 = 0; int_8 < int_6; ++int_8) {
                             if (!this.method_7426(boolean_1, int_8) && this.method_7418(boolean_1, int_5, int_8) && this.method_7425(boolean_1, int_5, int_8)) {
@@ -219,80 +219,80 @@ public class RecipeFinder {
                                 break;
                             }
                         }
-
+                        
                         int_8 = this.field_7557.size();
                         if (int_8 == int_4) {
                             this.field_7557.removeInt(int_8 - 1);
                         }
                     }
-
+                    
                     if (!this.field_7557.isEmpty()) {
                         return true;
                     }
                 }
             }
-
+            
             return false;
         }
-
+        
         private boolean method_7416(int int_1) {
             return this.bitSet.get(this.method_7419(int_1));
         }
-
+        
         private void method_7421(int int_1) {
             this.bitSet.set(this.method_7419(int_1));
         }
-
+        
         private int method_7419(int int_1) {
             return this.ingredientCount + this.usableIngredientSize + int_1;
         }
-
+        
         private boolean method_7418(boolean boolean_1, int int_1, int int_2) {
             return this.bitSet.get(this.method_7420(boolean_1, int_1, int_2));
         }
-
+        
         private boolean method_7425(boolean boolean_1, int int_1, int int_2) {
             return boolean_1 != this.bitSet.get(1 + this.method_7420(boolean_1, int_1, int_2));
         }
-
+        
         private void method_7414(boolean boolean_1, int int_1, int int_2) {
             this.bitSet.flip(1 + this.method_7420(boolean_1, int_1, int_2));
         }
-
+        
         private int method_7420(boolean boolean_1, int int_1, int int_2) {
             int int_3 = boolean_1 ? int_1 * this.ingredientCount + int_2 : int_2 * this.ingredientCount + int_1;
             return this.ingredientCount + this.usableIngredientSize + this.ingredientCount + 2 * int_3;
         }
-
+        
         private void method_7413(boolean boolean_1, int int_1) {
             this.bitSet.set(this.method_7424(boolean_1, int_1));
             this.field_7557.add(int_1);
         }
-
+        
         private boolean method_7426(boolean boolean_1, int int_1) {
             return this.bitSet.get(this.method_7424(boolean_1, int_1));
         }
-
+        
         private int method_7424(boolean boolean_1, int int_1) {
             return (boolean_1 ? 0 : this.ingredientCount) + int_1;
         }
-
+        
         public int countCrafts(int int_1, @Nullable IntList intList_1) {
             int int_2 = 0;
             int int_3 = Math.min(int_1, this.method_7415()) + 1;
-
+            
             while (true) {
                 while (true) {
                     int int_4 = (int_2 + int_3) / 2;
-                    if (this.find(int_4, (IntList) null)) {
+                    if (this.find(int_4, null)) {
                         if (int_3 - int_2 <= 1) {
                             if (int_4 > 0) {
                                 this.find(int_4, intList_1);
                             }
-
+                            
                             return int_4;
                         }
-
+                        
                         int_2 = int_4;
                     } else {
                         int_3 = int_4;
@@ -300,26 +300,26 @@ public class RecipeFinder {
                 }
             }
         }
-
+        
         @SuppressWarnings("deprecation")
         private int method_7415() {
             int int_1 = Integer.MAX_VALUE;
             Iterator var2 = this.ingredients.iterator();
-
+            
             while (var2.hasNext()) {
                 Ingredient ingredient_1 = (Ingredient) var2.next();
                 int int_2 = 0;
-
+                
                 int int_3;
                 for (IntListIterator var5 = ingredient_1.getIds().iterator(); var5.hasNext(); int_2 = Math.max(int_2, RecipeFinder.this.idToAmountMap.get(int_3))) {
-                    int_3 = (Integer) var5.next();
+                    int_3 = var5.next();
                 }
-
+                
                 if (int_1 > 0) {
                     int_1 = Math.min(int_1, int_2);
                 }
             }
-
+            
             return int_1;
         }
     }