From bb35582de4f89f8c2c4255106c3f6ea3d92e8ecc Mon Sep 17 00:00:00 2001 From: Scott Killen Date: Thu, 3 Oct 2013 23:05:02 -0400 Subject: [PATCH 1/6] Converted raw types to parameterized types --- .../mods/metallurgy/api/MetallurgyAPI.java | 2 +- .../abstractor/AbstractorRecipes.java | 4 +++- .../enchanter/MaxEnchanterHelper.java | 24 ++++++++++--------- .../utilityItems/tnt/ExplosionMiners.java | 22 +++++++++-------- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/common/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java b/common/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java index 3334387..2229e54 100644 --- a/common/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java +++ b/common/rebelkeithy/mods/metallurgy/api/MetallurgyAPI.java @@ -11,7 +11,7 @@ public static IMetalSet getMetalSet(String name) { try { - final Class metallurgyMetals = Class.forName("rebelkeithy.mods.metallurgy.metals.MetallurgyMetals"); + final Class metallurgyMetals = Class.forName("rebelkeithy.mods.metallurgy.metals.MetallurgyMetals"); final Field set = metallurgyMetals.getField(name + "Set"); return (IMetalSet) set.get(null); } catch (final NoSuchFieldException e) diff --git a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java index 1a7055e..aa0df83 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java @@ -4,6 +4,8 @@ import java.util.HashMap; import java.util.Map; +import com.google.common.collect.Maps; + import net.minecraft.item.ItemStack; public class AbstractorRecipes @@ -11,7 +13,7 @@ public class AbstractorRecipes private static final AbstractorRecipes smeltingBase = new AbstractorRecipes(); /** The list of smelting results. */ - private static Map smeltingList = new HashMap(); + private static Map smeltingList = Maps.newHashMap(); private static Map metaSmeltingList = new HashMap(); private static Map fuelList = new HashMap(); diff --git a/common/rebelkeithy/mods/metallurgy/machines/enchanter/MaxEnchanterHelper.java b/common/rebelkeithy/mods/metallurgy/machines/enchanter/MaxEnchanterHelper.java index 5fd9361..c3b1629 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/enchanter/MaxEnchanterHelper.java +++ b/common/rebelkeithy/mods/metallurgy/machines/enchanter/MaxEnchanterHelper.java @@ -7,6 +7,8 @@ import java.util.Map; import java.util.Random; +import com.google.common.collect.Lists; + import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; import net.minecraft.item.Item; @@ -23,7 +25,7 @@ public class MaxEnchanterHelper * * @param catalyst */ - public static List buildEnchantmentList(Random par0Random, ItemStack par1ItemStack, int par2, int catalyst) + public static List buildEnchantmentList(Random par0Random, ItemStack par1ItemStack, int par2, int catalyst) { final Item item = par1ItemStack.getItem(); int j = item.getItemEnchantability(); @@ -45,8 +47,8 @@ public static List buildEnchantmentList(Random par0Random, ItemStack par1ItemSta l = 1; } - ArrayList arraylist = null; - final Map map = mapEnchantmentData(l, par1ItemStack); + ArrayList arraylist = null; + final Map map = mapEnchantmentData(l, par1ItemStack); if (map != null && !map.isEmpty()) { @@ -54,24 +56,24 @@ public static List buildEnchantmentList(Random par0Random, ItemStack par1ItemSta if (enchantmentdata != null) { - arraylist = new ArrayList(); + arraylist = Lists.newArrayList(); arraylist.add(enchantmentdata); for (int i1 = l; par0Random.nextInt(50) <= i1; i1 >>= 1) { - final Iterator iterator = map.keySet().iterator(); + final Iterator iterator = map.keySet().iterator(); while (iterator.hasNext()) { - final Integer integer = (Integer) iterator.next(); + final Integer integer = iterator.next(); boolean flag = true; - final Iterator iterator1 = arraylist.iterator(); + final Iterator iterator1 = arraylist.iterator(); while (true) { if (iterator1.hasNext()) { - final EnchantmentData enchantmentdata1 = (EnchantmentData) iterator1.next(); + final EnchantmentData enchantmentdata1 = iterator1.next(); if (enchantmentdata1.enchantmentobj.canApplyTogether(Enchantment.enchantmentsList[integer.intValue()])) { @@ -132,10 +134,10 @@ public static int calcItemStackEnchantability(Random par0Random, int shelves, It * Creates a 'Map' of EnchantmentData (enchantments) possible to add on the * ItemStack and the enchantability level passed. */ - public static Map mapEnchantmentData(int par0, ItemStack par1ItemStack) + public static Map mapEnchantmentData(int par0, ItemStack par1ItemStack) { par1ItemStack.getItem(); - HashMap hashmap = null; + HashMap hashmap = null; final boolean flag = par1ItemStack.itemID == Item.book.itemID; final Enchantment[] aenchantment = Enchantment.enchantmentsList; final int j = aenchantment.length; @@ -154,7 +156,7 @@ public static Map mapEnchantmentData(int par0, ItemStack par1ItemStack) { if (hashmap == null) { - hashmap = new HashMap(); + hashmap = new HashMap(); } hashmap.put(Integer.valueOf(enchantment.effectId), new EnchantmentData(enchantment, l)); diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/ExplosionMiners.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/ExplosionMiners.java index cd1afe3..a30b608 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/ExplosionMiners.java +++ b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/ExplosionMiners.java @@ -8,6 +8,8 @@ import java.util.Map; import java.util.Random; +import com.google.common.collect.Lists; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -24,11 +26,11 @@ public class ExplosionMiners extends Explosion { - private static ArrayList oreBlockIDs; + private static ArrayList oreBlockIDs; public static void initializeOreList() { - oreBlockIDs = new ArrayList(); + oreBlockIDs = Lists.newArrayList(); oreBlockIDs.add(Block.oreCoal.blockID); oreBlockIDs.add(Block.oreIron.blockID); oreBlockIDs.add(Block.oreGold.blockID); @@ -64,9 +66,9 @@ public static void initializeOreList() public double explosionZ; public Entity exploder; public float explosionSize; - public List affectedBlockPositions = new ArrayList(); + public List affectedBlockPositions = new ArrayList(); - private final Map field_77288_k = new HashMap(); + private final Map field_77288_k = new HashMap(); public ExplosionMiners(World par1World, Entity par2Entity, double par3, double par5, double par7, float par9) { @@ -86,7 +88,7 @@ public ExplosionMiners(World par1World, Entity par2Entity, double par3, double p public void doExplosionA() { final float var1 = explosionSize; - final HashSet var2 = new HashSet(); + final HashSet var2 = new HashSet(); int var3; int var4; int var5; @@ -155,7 +157,7 @@ public void doExplosionA() final int var28 = MathHelper.floor_double(explosionY + explosionSize + 1.0D); final int var7 = MathHelper.floor_double(explosionZ - explosionSize - 1.0D); final int var29 = MathHelper.floor_double(explosionZ + explosionSize + 1.0D); - final List var9 = worldObj.getEntitiesWithinAABBExcludingEntity(exploder, AxisAlignedBB.getAABBPool().getAABB(var3, var5, var7, var4, var28, var29)); + final List var9 = worldObj.getEntitiesWithinAABBExcludingEntity(exploder, AxisAlignedBB.getAABBPool().getAABB(var3, var5, var7, var4, var28, var29)); final Vec3 var30 = worldObj.getWorldVec3Pool().getVecFromPool(explosionX, explosionY, explosionZ); for (int var11 = 0; var11 < var9.size(); ++var11) @@ -210,7 +212,7 @@ public void doExplosionB(boolean par1) worldObj.spawnParticle("largeexplode", explosionX, explosionY, explosionZ, 1.0D, 0.0D, 0.0D); } - Iterator var2; + Iterator var2; ChunkPosition var3; int var4; int var5; @@ -223,7 +225,7 @@ public void doExplosionB(boolean par1) while (var2.hasNext()) { - var3 = (ChunkPosition) var2.next(); + var3 = var2.next(); var4 = var3.x; var5 = var3.y; var6 = var3.z; @@ -271,7 +273,7 @@ public void doExplosionB(boolean par1) while (var2.hasNext()) { - var3 = (ChunkPosition) var2.next(); + var3 = var2.next(); var4 = var3.x; var5 = var3.y; var6 = var3.z; @@ -287,7 +289,7 @@ public void doExplosionB(boolean par1) } @Override - public Map func_77277_b() + public Map func_77277_b() { return field_77288_k; } From 2535e77f0b6526f896bae85f8f40e6ee21c86ae5 Mon Sep 17 00:00:00 2001 From: Scott Killen Date: Thu, 3 Oct 2013 23:05:31 -0400 Subject: [PATCH 2/6] Commented dead code --- .../mods/metallurgy/metals/MetallurgyPotion.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/rebelkeithy/mods/metallurgy/metals/MetallurgyPotion.java b/common/rebelkeithy/mods/metallurgy/metals/MetallurgyPotion.java index d283d92..1d49a8a 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/MetallurgyPotion.java +++ b/common/rebelkeithy/mods/metallurgy/metals/MetallurgyPotion.java @@ -33,17 +33,17 @@ public void performEffect(EntityLivingBase par1EntityLiving, int par2) final double vz = par1EntityLiving.motionZ; // TODO: access isJumping // if(par1EntityLiving.isJumping || vy < 0) - if (false) - { + // if (false) + // { + // vy += 0.0734000015258789; // vy += 0.0734000015258789; - vy += 0.0734000015258789; // vy *= 1.260504; - System.out.println(vy); - } - else - { + // System.out.println(vy); + // } + // else + // { vy += 0.0734000015258789 / 1.5; - } + // } if (par1EntityLiving.isSprinting() && par1EntityLiving.onGround) { From 8e5b072e2f27484d6573c23d90d1d813c5d18116 Mon Sep 17 00:00:00 2001 From: Scott Killen Date: Thu, 3 Oct 2013 23:06:39 -0400 Subject: [PATCH 3/6] Changed Array keyed maps to more efficient and intuitive guava provided Table types --- .../machines/abstractor/AbstractorRecipes.java | 17 ++++++++++------- .../machines/crusher/CrusherRecipes.java | 9 ++++++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java index aa0df83..e3d6beb 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java @@ -4,7 +4,10 @@ import java.util.HashMap; import java.util.Map; +import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; +import com.google.common.collect.Table; +import com.google.common.collect.Tables; import net.minecraft.item.ItemStack; @@ -14,8 +17,8 @@ public class AbstractorRecipes /** The list of smelting results. */ private static Map smeltingList = Maps.newHashMap(); - private static Map metaSmeltingList = new HashMap(); - private static Map fuelList = new HashMap(); + private static Table metaSmeltingList = HashBasedTable.create(); + private static Table fuelList = HashBasedTable.create(); /** * Add a metadata-sensitive furnace recipe @@ -29,12 +32,12 @@ public class AbstractorRecipes */ public static void addEssence(int itemID, int metadata, int amount) { - metaSmeltingList.put(Arrays.asList(itemID, metadata), amount); + metaSmeltingList.put(itemID, metadata, amount); } public static void addFuel(int itemID, int metadata, int amount) { - fuelList.put(Arrays.asList(itemID, metadata), amount); + fuelList.put(itemID, metadata, amount); } /** @@ -47,9 +50,9 @@ public static final AbstractorRecipes essence() public static int getFuelAmount(ItemStack itemStack) { - if (fuelList.containsKey(Arrays.asList(itemStack.itemID, itemStack.getItemDamage()))) + if (fuelList.contains(itemStack.itemID, itemStack.getItemDamage())) { - return (Integer) fuelList.get(Arrays.asList(itemStack.itemID, itemStack.getItemDamage())); + return (Integer) fuelList.get(itemStack.itemID, itemStack.getItemDamage()); } else { @@ -87,7 +90,7 @@ public int getEssenceResult(ItemStack item) { return 0; } - Integer ret = (Integer) metaSmeltingList.get(Arrays.asList(item.itemID, item.getItemDamage())); + Integer ret = (Integer) metaSmeltingList.get(item.itemID, item.getItemDamage()); if (ret != null) { return ret; diff --git a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java index 8f0265a..d89135a 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java @@ -5,6 +5,9 @@ import java.util.List; import java.util.Map; +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Table; + import rebelkeithy.mods.metallurgy.machines.MetallurgyMachines; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,7 +19,7 @@ public class CrusherRecipes /** The list of smelting results. */ private static Map smeltingList = new HashMap(); - private static Map metaSmeltingList = new HashMap(); + private static Table metaSmeltingList = HashBasedTable.create(); /** * Add a metadata-sensitive furnace recipe @@ -30,7 +33,7 @@ public class CrusherRecipes */ public static void addCrushing(int itemID, int metadata, ItemStack itemstack) { - metaSmeltingList.put(Arrays.asList(itemID, metadata), itemstack); + metaSmeltingList.put(itemID, metadata, itemstack); } /** @@ -82,7 +85,7 @@ public ItemStack getCrushingResult(ItemStack item) return null; } - ItemStack ret = (ItemStack) metaSmeltingList.get(Arrays.asList(item.itemID, item.getItemDamage())); + ItemStack ret = (ItemStack) metaSmeltingList.get(item.itemID, item.getItemDamage()); if (ret != null) { From 6e38029f571b7b39a9a55e4f1c9c4dcefd26cca5 Mon Sep 17 00:00:00 2001 From: Scott Killen Date: Thu, 3 Oct 2013 23:19:02 -0400 Subject: [PATCH 4/6] Fixed raw types --- .../machines/chests/BlockPreciousChest.java | 2 +- .../metallurgy/machines/crusher/CrusherRecipes.java | 11 ++++++----- .../enchanter/ContainerMetallurgyEnchantment.java | 2 +- .../mods/metallurgy/machines/mint/MintRecipes.java | 10 ++++++---- .../mods/metallurgy/machines/pylon/BlockPylon.java | 1 + .../metals/utilityItems/tnt/EntityLargeTNTPrimed.java | 4 ++-- .../utilityItems/tnt/EntityMinersTNTPrimed.java | 4 ++-- 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/common/rebelkeithy/mods/metallurgy/machines/chests/BlockPreciousChest.java b/common/rebelkeithy/mods/metallurgy/machines/chests/BlockPreciousChest.java index ec6f28d..fc94954 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/chests/BlockPreciousChest.java +++ b/common/rebelkeithy/mods/metallurgy/machines/chests/BlockPreciousChest.java @@ -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; diff --git a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java index d89135a..58836cf 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java @@ -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; @@ -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 smeltingList = Maps.newHashMap(); private static Table metaSmeltingList = HashBasedTable.create(); /** @@ -56,7 +57,7 @@ public void addCrushing(int par1, ItemStack par2ItemStack) smeltingList.put(Integer.valueOf(par1), par2ItemStack); } - public Map getCrushingList() + public Map getCrushingList() { return smeltingList; } @@ -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)); } /** @@ -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; diff --git a/common/rebelkeithy/mods/metallurgy/machines/enchanter/ContainerMetallurgyEnchantment.java b/common/rebelkeithy/mods/metallurgy/machines/enchanter/ContainerMetallurgyEnchantment.java index 5bedeee..30604ac 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/enchanter/ContainerMetallurgyEnchantment.java +++ b/common/rebelkeithy/mods/metallurgy/machines/enchanter/ContainerMetallurgyEnchantment.java @@ -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 list = MaxEnchanterHelper.buildEnchantmentList(rand, itemstack, enchantLevels, catalyst); final boolean flag = itemstack.itemID == Item.book.itemID; if (list != null) diff --git a/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java index 7d324c3..e57bf5c 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java @@ -3,6 +3,8 @@ import java.util.HashMap; import java.util.Map; +import com.google.common.collect.Maps; + import net.minecraft.item.ItemStack; public class MintRecipes @@ -10,8 +12,8 @@ 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 metaMintingList = Maps.newHashMap(); + private static Map mintingImage = Maps.newHashMap(); /** * Add a metadata-sensitive furnace recipe @@ -56,7 +58,7 @@ public String getImage(int ingotID) { if (mintingImage.containsKey(ingotID)) { - return (String) mintingImage.get(ingotID); + return mintingImage.get(ingotID); } return ""; } @@ -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; diff --git a/common/rebelkeithy/mods/metallurgy/machines/pylon/BlockPylon.java b/common/rebelkeithy/mods/metallurgy/machines/pylon/BlockPylon.java index 6e04abd..086f139 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/pylon/BlockPylon.java +++ b/common/rebelkeithy/mods/metallurgy/machines/pylon/BlockPylon.java @@ -49,6 +49,7 @@ public int getRenderType() return renderId; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List) { diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java index 6d23e38..134e422 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java +++ b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java @@ -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()) { @@ -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()) { diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java index 121cd96..0b2cb66 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java +++ b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java @@ -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()) { @@ -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()) { From 5ccaa1afdd97715f0bf08ae4d48a3cb9bfadf258 Mon Sep 17 00:00:00 2001 From: Scott Killen Date: Thu, 3 Oct 2013 23:25:49 -0400 Subject: [PATCH 5/6] Fixed raw types and replaced iterator with more efficient for...each loop --- .../metals/utilityItems/tnt/EntityLargeTNTPrimed.java | 7 +++---- .../metals/utilityItems/tnt/EntityMinersTNTPrimed.java | 6 ++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java index 134e422..a1bf03c 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java +++ b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityLargeTNTPrimed.java @@ -74,6 +74,7 @@ protected void entityInit() { } + @SuppressWarnings("unchecked") private void explode() { final float strength = 20.0F; @@ -154,7 +155,7 @@ protected void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) fuse = par1NBTTagCompound.getByte("Fuse"); } - public void sendPacket(double posX, double posY, double posZ, float strength, List list, Vec3 vec3) + public void sendPacket(double posX, double posY, double posZ, float strength, List list, Vec3 vec3) { if (worldObj.isRemote) { @@ -175,11 +176,9 @@ 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(); - while (var5.hasNext()) + for (final ChunkPosition var6 : list) { - final ChunkPosition var6 = (ChunkPosition) var5.next(); final int var7 = var6.x - var2; final int var8 = var6.y - var3; final int var9 = var6.z - var4; diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java index 0b2cb66..a137fac 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java +++ b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/EntityMinersTNTPrimed.java @@ -153,7 +153,7 @@ protected void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) fuse = par1NBTTagCompound.getByte("Fuse"); } - public void sendPacket(double posX, double posY, double posZ, float strength, List list, Vec3 vec3) + public void sendPacket(double posX, double posY, double posZ, float strength, List list, Vec3 vec3) { if (worldObj.isRemote) { @@ -174,11 +174,9 @@ 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(); - while (var5.hasNext()) + for (final ChunkPosition var6 : list) { - final ChunkPosition var6 = (ChunkPosition) var5.next(); final int var7 = var6.x - var2; final int var8 = var6.y - var3; final int var9 = var6.z - var4; From f97360205bf4a49b564e35faa701320ff8c19091 Mon Sep 17 00:00:00 2001 From: Scott Killen Date: Thu, 3 Oct 2013 23:47:43 -0400 Subject: [PATCH 6/6] - Replaced raw types with parameterized types - Removed unused code (in some cases reducing memory use by removing unused created objects) --- .../mods/metallurgy/core/MetallurgyCore.java | 10 +++--- .../core/metalsets/ItemMetallurgySword.java | 1 + .../metallurgy/core/metalsets/OreInfo.java | 2 +- .../metallurgy/core/metalsets/SortedList.java | 34 ------------------- .../machines/MetallurgyMachines.java | 1 - .../abstractor/AbstractorRecipes.java | 9 ++--- .../abstractor/TileEntityAbstractor.java | 4 +-- .../chests/ItemBlockPreciousChest.java | 1 + .../machines/crusher/CrusherRecipes.java | 12 +++---- .../enchanter/GuiMetallurgyEnchantment.java | 3 -- .../lantern/ItemBlockColoredGlass.java | 1 + .../machines/lantern/ItemGlassDust.java | 1 + .../metallurgy/machines/mint/MintRecipes.java | 5 ++- .../metallurgy/machines/orbs/ItemOrb.java | 2 ++ .../machines/storage/GuiStorage.java | 2 -- .../metallurgy/metals/MetallurgyMetals.java | 16 ++++----- .../utilityItems/tnt/BlockLargeTNT.java | 1 - .../metallurgy/vanilla/MetallurgyVanilla.java | 3 -- 18 files changed, 29 insertions(+), 79 deletions(-) delete mode 100644 common/rebelkeithy/mods/metallurgy/core/metalsets/SortedList.java diff --git a/common/rebelkeithy/mods/metallurgy/core/MetallurgyCore.java b/common/rebelkeithy/mods/metallurgy/core/MetallurgyCore.java index 96a852b..207dc6e 100644 --- a/common/rebelkeithy/mods/metallurgy/core/MetallurgyCore.java +++ b/common/rebelkeithy/mods/metallurgy/core/MetallurgyCore.java @@ -117,11 +117,11 @@ public void preInit(FMLPreInitializationEvent event) log = event.getModLog(); - for (final MetalSet set : getMetalSetList()) - { - // set.initConfig(); - // set.init(); - } +// for (final MetalSet set : getMetalSetList()) +// { +// // set.initConfig(); +// // set.init(); +// } initConfig(); diff --git a/common/rebelkeithy/mods/metallurgy/core/metalsets/ItemMetallurgySword.java b/common/rebelkeithy/mods/metallurgy/core/metalsets/ItemMetallurgySword.java index adbb08e..8913b47 100644 --- a/common/rebelkeithy/mods/metallurgy/core/metalsets/ItemMetallurgySword.java +++ b/common/rebelkeithy/mods/metallurgy/core/metalsets/ItemMetallurgySword.java @@ -24,6 +24,7 @@ public void addHitListener(ISwordHitListener hl) hlList.add(hl); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/common/rebelkeithy/mods/metallurgy/core/metalsets/OreInfo.java b/common/rebelkeithy/mods/metallurgy/core/metalsets/OreInfo.java index 9ba1282..d87a369 100644 --- a/common/rebelkeithy/mods/metallurgy/core/metalsets/OreInfo.java +++ b/common/rebelkeithy/mods/metallurgy/core/metalsets/OreInfo.java @@ -275,7 +275,7 @@ public void addRecipes() { // System.out.println("Adding alloy recipe " + alloyRecipe[0] + // " + " + alloyRecipe[1] + " for " + name); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(dust, 2), alloyRecipe)); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(dust, 2), (Object[])alloyRecipe)); } } diff --git a/common/rebelkeithy/mods/metallurgy/core/metalsets/SortedList.java b/common/rebelkeithy/mods/metallurgy/core/metalsets/SortedList.java deleted file mode 100644 index 9165449..0000000 --- a/common/rebelkeithy/mods/metallurgy/core/metalsets/SortedList.java +++ /dev/null @@ -1,34 +0,0 @@ -package rebelkeithy.mods.metallurgy.core.metalsets; - -import java.util.ArrayList; -import java.util.Comparator; - -public class SortedList extends ArrayList -{ - /** - * - */ - private static final long serialVersionUID = -3816680929059512706L; - Comparator comp; - - public SortedList(Comparator comp) - { - this.comp = comp; - } - - @Override - public boolean add(T o) - { - for (int n = 0; n < size(); n++) - { - if (comp.compare(get(n), o) >= 0) - { - this.add(n + 1, o); - return true; - } - } - - this.add(size(), o); - return true; - } -} \ No newline at end of file diff --git a/common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java b/common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java index 57effd1..7087282 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java +++ b/common/rebelkeithy/mods/metallurgy/machines/MetallurgyMachines.java @@ -56,7 +56,6 @@ import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PreInit; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; diff --git a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java index e3d6beb..cd19819 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/abstractor/AbstractorRecipes.java @@ -1,15 +1,12 @@ package rebelkeithy.mods.metallurgy.machines.abstractor; -import java.util.Arrays; -import java.util.HashMap; import java.util.Map; +import net.minecraft.item.ItemStack; + import com.google.common.collect.HashBasedTable; import com.google.common.collect.Maps; import com.google.common.collect.Table; -import com.google.common.collect.Tables; - -import net.minecraft.item.ItemStack; public class AbstractorRecipes { @@ -72,7 +69,7 @@ public void addEssenceAmount(int itemID, int amount) smeltingList.put(Integer.valueOf(itemID), amount); } - public Map getEssenceList() + public Map getEssenceList() { return smeltingList; } diff --git a/common/rebelkeithy/mods/metallurgy/machines/abstractor/TileEntityAbstractor.java b/common/rebelkeithy/mods/metallurgy/machines/abstractor/TileEntityAbstractor.java index 8fa4773..a7d150c 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/abstractor/TileEntityAbstractor.java +++ b/common/rebelkeithy/mods/metallurgy/machines/abstractor/TileEntityAbstractor.java @@ -3,7 +3,6 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.util.List; import java.util.Random; import net.minecraft.entity.item.EntityXPOrb; @@ -13,7 +12,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.network.packet.Packet250CustomPayload; -import rebelkeithy.mods.keithyutils.Coord; import rebelkeithy.mods.metallurgy.core.MetallurgyCore; import rebelkeithy.mods.metallurgy.machines.ConfigMachines; import rebelkeithy.mods.metallurgy.machines.TileEntityMachineBase; @@ -457,7 +455,7 @@ public void smeltItem() furnaceItemStacks[0] = null; } - final List coords = Coord.get4AdjacentSides(xCoord, yCoord, zCoord); +// final List coords = Coord.get4AdjacentSides(xCoord, yCoord, zCoord); // for (final Coord coord : coords) // { diff --git a/common/rebelkeithy/mods/metallurgy/machines/chests/ItemBlockPreciousChest.java b/common/rebelkeithy/mods/metallurgy/machines/chests/ItemBlockPreciousChest.java index dc65ca6..403ae0b 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/chests/ItemBlockPreciousChest.java +++ b/common/rebelkeithy/mods/metallurgy/machines/chests/ItemBlockPreciousChest.java @@ -14,6 +14,7 @@ public ItemBlockPreciousChest(int i) setHasSubtypes(true); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { diff --git a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java index 58836cf..79a3e09 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/crusher/CrusherRecipes.java @@ -1,18 +1,16 @@ package rebelkeithy.mods.metallurgy.machines.crusher; -import java.util.Arrays; -import java.util.HashMap; import java.util.List; 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; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import rebelkeithy.mods.metallurgy.machines.MetallurgyMachines; + +import com.google.common.collect.HashBasedTable; +import com.google.common.collect.Maps; +import com.google.common.collect.Table; public class CrusherRecipes { diff --git a/common/rebelkeithy/mods/metallurgy/machines/enchanter/GuiMetallurgyEnchantment.java b/common/rebelkeithy/mods/metallurgy/machines/enchanter/GuiMetallurgyEnchantment.java index ef16e54..1ebcf34 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/enchanter/GuiMetallurgyEnchantment.java +++ b/common/rebelkeithy/mods/metallurgy/machines/enchanter/GuiMetallurgyEnchantment.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.model.ModelBook; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -28,8 +27,6 @@ public class GuiMetallurgyEnchantment extends GuiContainer private static final ResourceLocation background = new ResourceLocation("metallurgy:textures/guis/enchant.png"); private static final ResourceLocation book = new ResourceLocation("textures/entity/enchanting_table_book.png"); - /** The book model used on the GUI. */ - private static ModelBook bookModel = new ModelBook(); private final Random rand = new Random(); /** ContainerEnchantment object associated with this gui */ diff --git a/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemBlockColoredGlass.java b/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemBlockColoredGlass.java index ae673ad..21fdad7 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemBlockColoredGlass.java +++ b/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemBlockColoredGlass.java @@ -22,6 +22,7 @@ public int getMetadata(int i) return i; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) /** * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) diff --git a/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemGlassDust.java b/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemGlassDust.java index 6b0abb8..e1d2a3d 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemGlassDust.java +++ b/common/rebelkeithy/mods/metallurgy/machines/lantern/ItemGlassDust.java @@ -40,6 +40,7 @@ public int getMetadata(int i) return i; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) /** * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) diff --git a/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java b/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java index e57bf5c..2c0d47e 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java +++ b/common/rebelkeithy/mods/metallurgy/machines/mint/MintRecipes.java @@ -1,12 +1,11 @@ package rebelkeithy.mods.metallurgy.machines.mint; -import java.util.HashMap; import java.util.Map; -import com.google.common.collect.Maps; - import net.minecraft.item.ItemStack; +import com.google.common.collect.Maps; + public class MintRecipes { private static final MintRecipes smeltingBase = new MintRecipes(); diff --git a/common/rebelkeithy/mods/metallurgy/machines/orbs/ItemOrb.java b/common/rebelkeithy/mods/metallurgy/machines/orbs/ItemOrb.java index ad447b9..15bffdc 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/orbs/ItemOrb.java +++ b/common/rebelkeithy/mods/metallurgy/machines/orbs/ItemOrb.java @@ -31,6 +31,7 @@ public ItemOrb(int par1) setMaxStackSize(1); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) { @@ -104,6 +105,7 @@ public int getMaxItemUseDuration(ItemStack par1ItemStack) return 72000; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @SideOnly(Side.CLIENT) @Override public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) diff --git a/common/rebelkeithy/mods/metallurgy/machines/storage/GuiStorage.java b/common/rebelkeithy/mods/metallurgy/machines/storage/GuiStorage.java index 25640cc..767888a 100644 --- a/common/rebelkeithy/mods/metallurgy/machines/storage/GuiStorage.java +++ b/common/rebelkeithy/mods/metallurgy/machines/storage/GuiStorage.java @@ -9,7 +9,6 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import org.lwjgl.input.Keyboard; @@ -281,7 +280,6 @@ protected void mouseClicked(int par1, int par2, int par3) { final int var4 = par1 - guiLeft; final int var5 = par2 - guiTop; - final CreativeTabs[] var6 = CreativeTabs.creativeTabArray; if (var5 < 0 && var5 > -32) { if (var4 >= 0 && var4 < 29 * Math.min(6, tabList.size()) && var4 % 29 < 28) diff --git a/common/rebelkeithy/mods/metallurgy/metals/MetallurgyMetals.java b/common/rebelkeithy/mods/metallurgy/metals/MetallurgyMetals.java index e30c74e..dacba69 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/MetallurgyMetals.java +++ b/common/rebelkeithy/mods/metallurgy/metals/MetallurgyMetals.java @@ -20,7 +20,6 @@ import rebelkeithy.mods.metallurgy.core.metalsets.ISwordHitListener; import rebelkeithy.mods.metallurgy.core.metalsets.ItemMetallurgy; import rebelkeithy.mods.metallurgy.core.metalsets.MetalSet; -import rebelkeithy.mods.metallurgy.integration.AppliedEnergestics; import rebelkeithy.mods.metallurgy.integration.ComputerCraftIntegration; import rebelkeithy.mods.metallurgy.integration.IndustrialCraftIntegration; import rebelkeithy.mods.metallurgy.integration.RailcraftIntegration; @@ -32,13 +31,10 @@ import rebelkeithy.mods.metallurgy.metals.utilityItems.tnt.BlockMinersTNT; import rebelkeithy.mods.metallurgy.metals.utilityItems.tnt.EntityLargeTNTPrimed; import rebelkeithy.mods.metallurgy.metals.utilityItems.tnt.EntityMinersTNTPrimed; +import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Init; import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; -import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; @@ -105,11 +101,11 @@ private void addRailRecipes() } - private void addEnderRecipes() - { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.enderPearl, 4), " E ", "E E", " E ", 'E', "ingotMeutoite")); - - } +// private void addEnderRecipes() +// { +// GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.enderPearl, 4), " E ", "E E", " E ", 'E', "ingotMeutoite")); +// +// } public void addSwordEffects() { diff --git a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/BlockLargeTNT.java b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/BlockLargeTNT.java index e3557d2..f31fb0a 100644 --- a/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/BlockLargeTNT.java +++ b/common/rebelkeithy/mods/metallurgy/metals/utilityItems/tnt/BlockLargeTNT.java @@ -3,7 +3,6 @@ import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.item.Item; diff --git a/common/rebelkeithy/mods/metallurgy/vanilla/MetallurgyVanilla.java b/common/rebelkeithy/mods/metallurgy/vanilla/MetallurgyVanilla.java index 7519689..89995dc 100644 --- a/common/rebelkeithy/mods/metallurgy/vanilla/MetallurgyVanilla.java +++ b/common/rebelkeithy/mods/metallurgy/vanilla/MetallurgyVanilla.java @@ -15,9 +15,6 @@ import rebelkeithy.mods.metallurgy.core.metalsets.MetalSet; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Init; -import cpw.mods.fml.common.Mod.PostInit; -import cpw.mods.fml.common.Mod.PreInit; import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent;