aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/handler
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/core/handler')
-rw-r--r--src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java13
-rw-r--r--src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java2
2 files changed, 5 insertions, 10 deletions
diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
index 289446eb07..951f69723c 100644
--- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java
@@ -14,7 +14,7 @@ import net.minecraft.world.World;
public class Workbench_CraftingHandler {
private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler();
- private final List recipes = new ArrayList();
+ private final List<IRecipe> recipes = new ArrayList<IRecipe>();
public static final Workbench_CraftingHandler getInstance() {
return instance;
@@ -66,7 +66,7 @@ public class Workbench_CraftingHandler {
}
}
- final HashMap hashmap = new HashMap();
+ final HashMap<Character, ItemStack> hashmap = new HashMap<Character, ItemStack>();
for (; i < par2ArrayOfObj.length; i += 2)
{
@@ -110,7 +110,7 @@ public class Workbench_CraftingHandler {
public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[])
{
- final ArrayList arraylist = new ArrayList();
+ final ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>();
final Object aobj[] = par2ArrayOfObj;
final int i = aobj.length;
@@ -146,9 +146,6 @@ public class Workbench_CraftingHandler {
public ItemStack findMatchingRecipe(final InventoryCrafting par1InventoryCrafting, final World par2World)
{
int i = 0;
- ItemStack itemstack = null;
- ItemStack itemstack1 = null;
-
for (int j = 0; j < par1InventoryCrafting.getSizeInventory(); j++)
{
final ItemStack itemstack2 = par1InventoryCrafting.getStackInSlot(j);
@@ -160,12 +157,10 @@ public class Workbench_CraftingHandler {
if (i == 0)
{
- itemstack = itemstack2;
}
if (i == 1)
{
- itemstack1 = itemstack2;
}
i++;
@@ -202,7 +197,7 @@ public class Workbench_CraftingHandler {
}
- public List getRecipeList()
+ public List<IRecipe> getRecipeList()
{
return this.recipes;
}
diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
index b68ae89e5c..92a7dd56d3 100644
--- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
+++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java
@@ -4,7 +4,7 @@ import java.util.Comparator;
import net.minecraft.item.crafting.*;
-public class Workbench_RecipeSorter implements Comparator
+public class Workbench_RecipeSorter implements Comparator<Object>
{
final Workbench_CraftingHandler CraftingManagerCrafter;