Skip to content

Commit

Permalink
Fixed raw types
Browse files Browse the repository at this point in the history
  • Loading branch information
ScottKillen committed Oct 4, 2013
1 parent 8e5b072 commit 6e38029
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class BlockPreciousChest extends BlockContainer
*/
private static boolean isOcelotBlockingChest(World par0World, int par1, int par2, int par3)
{
final Iterator var4 = par0World.getEntitiesWithinAABB(EntityOcelot.class, AxisAlignedBB.getAABBPool().getAABB(par1, par2 + 1, par3, par1 + 1, par2 + 2, par3 + 1))
final Iterator<?> var4 = par0World.getEntitiesWithinAABB(EntityOcelot.class, AxisAlignedBB.getAABBPool().getAABB(par1, par2 + 1, par3, par1 + 1, par2 + 2, par3 + 1))
.iterator();
EntityOcelot var6;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.util.Map;

import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Maps;
import com.google.common.collect.Table;

import rebelkeithy.mods.metallurgy.machines.MetallurgyMachines;
Expand All @@ -18,7 +19,7 @@ public class CrusherRecipes
private static final CrusherRecipes smeltingBase = new CrusherRecipes();

/** The list of smelting results. */
private static Map smeltingList = new HashMap();
private static Map<Integer, ItemStack> smeltingList = Maps.newHashMap();
private static Table<Integer, Integer, ItemStack> metaSmeltingList = HashBasedTable.create();

/**
Expand Down Expand Up @@ -56,7 +57,7 @@ public void addCrushing(int par1, ItemStack par2ItemStack)
smeltingList.put(Integer.valueOf(par1), par2ItemStack);
}

public Map getCrushingList()
public Map<Integer, ItemStack> getCrushingList()
{
return smeltingList;
}
Expand All @@ -68,7 +69,7 @@ public Map getCrushingList()
@Deprecated
public ItemStack getCrushingResult(int par1)
{
return (ItemStack) smeltingList.get(Integer.valueOf(par1));
return smeltingList.get(Integer.valueOf(par1));
}

/**
Expand All @@ -85,14 +86,14 @@ public ItemStack getCrushingResult(ItemStack item)
return null;
}

ItemStack ret = (ItemStack) metaSmeltingList.get(item.itemID, item.getItemDamage());
ItemStack ret = metaSmeltingList.get(item.itemID, item.getItemDamage());

if (ret != null)
{
return ret;
}

ret = (ItemStack) smeltingList.get(Integer.valueOf(item.itemID));
ret = smeltingList.get(Integer.valueOf(item.itemID));
if (ret != null)
{
return ret;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ else if (item.itemID == MetallurgyMetals.fantasySet.getOreInfo("Carmot").dust.it
}
}

final List list = MaxEnchanterHelper.buildEnchantmentList(rand, itemstack, enchantLevels, catalyst);
final List<EnchantmentData> list = MaxEnchanterHelper.buildEnchantmentList(rand, itemstack, enchantLevels, catalyst);
final boolean flag = itemstack.itemID == Item.book.itemID;

if (list != null)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,17 @@
import java.util.HashMap;
import java.util.Map;

import com.google.common.collect.Maps;

import net.minecraft.item.ItemStack;

public class MintRecipes
{
private static final MintRecipes smeltingBase = new MintRecipes();

/** The list of smelting results. */
private static Map metaMintingList = new HashMap();
private static Map mintingImage = new HashMap();
private static Map<Integer, Integer> metaMintingList = Maps.newHashMap();
private static Map<Integer, String> mintingImage = Maps.newHashMap();

/**
* Add a metadata-sensitive furnace recipe
Expand Down Expand Up @@ -56,7 +58,7 @@ public String getImage(int ingotID)
{
if (mintingImage.containsKey(ingotID))
{
return (String) mintingImage.get(ingotID);
return mintingImage.get(ingotID);
}
return "";
}
Expand All @@ -74,7 +76,7 @@ public int getMintingResult(ItemStack item)
{
return 0;
}
final Integer ret = (Integer) metaMintingList.get(item.itemID);
final Integer ret = metaMintingList.get(item.itemID);
if (ret == null)
{
return 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public int getRenderType()
return renderId;
}

@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private void explode()

if (!worldObj.isRemote)
{
final Iterator var12 = worldObj.playerEntities.iterator();
final Iterator<?> var12 = worldObj.playerEntities.iterator();

while (var12.hasNext())
{
Expand Down Expand Up @@ -175,7 +175,7 @@ public void sendPacket(double posX, double posY, double posZ, float strength, Li
final int var2 = (int) posX;
final int var3 = (int) posY;
final int var4 = (int) posZ;
final Iterator var5 = list.iterator();
final Iterator<?> var5 = list.iterator();

while (var5.hasNext())
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ private void explode()

if (!worldObj.isRemote)
{
final Iterator var12 = worldObj.playerEntities.iterator();
final Iterator<?> var12 = worldObj.playerEntities.iterator();

while (var12.hasNext())
{
Expand Down Expand Up @@ -174,7 +174,7 @@ public void sendPacket(double posX, double posY, double posZ, float strength, Li
final int var2 = (int) posX;
final int var3 = (int) posY;
final int var4 = (int) posZ;
final Iterator var5 = list.iterator();
final Iterator<?> var5 = list.iterator();

while (var5.hasNext())
{
Expand Down

0 comments on commit 6e38029

Please sign in to comment.