From 9cfd723ea3bec46befca65ce173a25b0d31fad9c Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Wed, 25 Jan 2023 23:23:08 +0100 Subject: [PATCH] quick fix : Raw use of parameterized class --- .../java/tconstruct/items/tools/BowBase.java | 67 +++++++++---------- .../library/TConstructRegistry.java | 6 +- .../library/component/TankLayerScan.java | 4 +- .../tconstruct/modifiers/tools/ModBlaze.java | 2 +- .../modifiers/tools/ModButtertouch.java | 2 +- .../tconstruct/modifiers/tools/ModLapis.java | 4 +- .../tconstruct/modifiers/tools/ModPiston.java | 2 +- .../modifiers/tools/ModRedstone.java | 2 +- .../tconstruct/modifiers/tools/ModWindup.java | 2 +- src/main/java/tconstruct/util/ItemHelper.java | 2 +- .../tconstruct/util/config/PHConstruct.java | 4 +- 11 files changed, 48 insertions(+), 49 deletions(-) diff --git a/src/main/java/tconstruct/items/tools/BowBase.java b/src/main/java/tconstruct/items/tools/BowBase.java index 0dbba2a1..9e62ccf1 100644 --- a/src/main/java/tconstruct/items/tools/BowBase.java +++ b/src/main/java/tconstruct/items/tools/BowBase.java @@ -1,6 +1,5 @@ package tconstruct.items.tools; -import cpw.mods.fml.relauncher.*; import java.util.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.enchantment.*; @@ -234,40 +233,40 @@ public abstract class BowBase extends ToolCore { accessoryIcons1.clear(); extraIcons1.clear(); effectIcons1.clear(); - Iterator iterOne = headStrings.entrySet().iterator(); + Iterator> iterOne = headStrings.entrySet().iterator(); while (iterOne.hasNext()) { - Map.Entry pairs = (Map.Entry) iterOne.next(); - headIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + Map.Entry pairs = iterOne.next(); + headIcons1.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_1")); } iterOne = handleStrings.entrySet().iterator(); while (iterOne.hasNext()) { - Map.Entry pairs = (Map.Entry) iterOne.next(); - handleIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + Map.Entry pairs = iterOne.next(); + handleIcons1.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_1")); } if (getPartAmount() > 2) { iterOne = accessoryStrings.entrySet().iterator(); while (iterOne.hasNext()) { - Map.Entry pairs = (Map.Entry) iterOne.next(); + Map.Entry pairs = iterOne.next(); accessoryIcons1.put( - (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_1")); } } if (getPartAmount() > 3) { iterOne = extraStrings.entrySet().iterator(); while (iterOne.hasNext()) { - Map.Entry pairs = (Map.Entry) iterOne.next(); + Map.Entry pairs = iterOne.next(); extraIcons1.put( - (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_1")); } } iterOne = effectStrings.entrySet().iterator(); while (iterOne.hasNext()) { - Map.Entry pairs = (Map.Entry) iterOne.next(); - effectIcons1.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_1")); + Map.Entry pairs = iterOne.next(); + effectIcons1.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_1")); } headIcons2.clear(); @@ -275,40 +274,40 @@ public abstract class BowBase extends ToolCore { accessoryIcons2.clear(); extraIcons2.clear(); effectIcons2.clear(); - Iterator iterTwo = headStrings.entrySet().iterator(); + Iterator> iterTwo = headStrings.entrySet().iterator(); while (iterTwo.hasNext()) { - Map.Entry pairs = (Map.Entry) iterTwo.next(); - headIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + Map.Entry pairs = iterTwo.next(); + headIcons2.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_2")); } iterTwo = handleStrings.entrySet().iterator(); while (iterTwo.hasNext()) { - Map.Entry pairs = (Map.Entry) iterTwo.next(); - handleIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + Map.Entry pairs = iterTwo.next(); + handleIcons2.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_2")); } if (getPartAmount() > 2) { iterTwo = accessoryStrings.entrySet().iterator(); while (iterTwo.hasNext()) { - Map.Entry pairs = (Map.Entry) iterTwo.next(); + Map.Entry pairs = iterTwo.next(); accessoryIcons2.put( - (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_2")); } } if (getPartAmount() > 3) { iterTwo = extraStrings.entrySet().iterator(); while (iterTwo.hasNext()) { - Map.Entry pairs = (Map.Entry) iterTwo.next(); + Map.Entry pairs = iterTwo.next(); extraIcons2.put( - (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_2")); } } iterTwo = effectStrings.entrySet().iterator(); while (iterTwo.hasNext()) { - Map.Entry pairs = (Map.Entry) iterTwo.next(); - effectIcons2.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_2")); + Map.Entry pairs = iterTwo.next(); + effectIcons2.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_2")); } headIcons3.clear(); @@ -316,40 +315,40 @@ public abstract class BowBase extends ToolCore { accessoryIcons3.clear(); extraIcons3.clear(); effectIcons3.clear(); - Iterator iterThree = headStrings.entrySet().iterator(); + Iterator> iterThree = headStrings.entrySet().iterator(); while (iterThree.hasNext()) { - Map.Entry pairs = (Map.Entry) iterThree.next(); - headIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + Map.Entry pairs = iterThree.next(); + headIcons3.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3")); } iterThree = handleStrings.entrySet().iterator(); while (iterThree.hasNext()) { - Map.Entry pairs = (Map.Entry) iterThree.next(); - handleIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + Map.Entry pairs = iterThree.next(); + handleIcons3.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3")); } if (getPartAmount() > 2) { iterThree = accessoryStrings.entrySet().iterator(); while (iterThree.hasNext()) { - Map.Entry pairs = (Map.Entry) iterThree.next(); + Map.Entry pairs = iterThree.next(); accessoryIcons3.put( - (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3")); } } if (getPartAmount() > 3) { iterThree = extraStrings.entrySet().iterator(); while (iterThree.hasNext()) { - Map.Entry pairs = (Map.Entry) iterThree.next(); + Map.Entry pairs = iterThree.next(); extraIcons3.put( - (Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3")); } } iterThree = effectStrings.entrySet().iterator(); while (iterThree.hasNext()) { - Map.Entry pairs = (Map.Entry) iterThree.next(); - effectIcons3.put((Integer) pairs.getKey(), iconRegister.registerIcon((String) pairs.getValue() + "_3")); + Map.Entry pairs = iterThree.next(); + effectIcons3.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3")); } } registerArrows(iconRegister); diff --git a/src/main/java/tconstruct/library/TConstructRegistry.java b/src/main/java/tconstruct/library/TConstructRegistry.java index 5fcbe1e4..c398a8c5 100644 --- a/src/main/java/tconstruct/library/TConstructRegistry.java +++ b/src/main/java/tconstruct/library/TConstructRegistry.java @@ -616,7 +616,7 @@ public class TConstructRegistry { LiquidCasting tableCasting() { try { - Class clazz = Class.forName("tconstruct.TConstruct"); + Class clazz = Class.forName("tconstruct.TConstruct"); Method method = clazz.getMethod("getTableCasting"); return (LiquidCasting) method.invoke(this); } catch (Exception e) { @@ -631,7 +631,7 @@ public class TConstructRegistry { LiquidCasting basinCasting() { try { - Class clazz = Class.forName("tconstruct.TConstruct"); + Class clazz = Class.forName("tconstruct.TConstruct"); Method method = clazz.getMethod("getBasinCasting"); return (LiquidCasting) method.invoke(this); } catch (Exception e) { @@ -646,7 +646,7 @@ public class TConstructRegistry { Detailing chiselDetailing() { try { - Class clazz = Class.forName("tconstruct.TConstruct"); + Class clazz = Class.forName("tconstruct.TConstruct"); Method method = clazz.getMethod("getChiselDetailing"); return (Detailing) method.invoke(this); } catch (Exception e) { diff --git a/src/main/java/tconstruct/library/component/TankLayerScan.java b/src/main/java/tconstruct/library/component/TankLayerScan.java index 05573e68..78c31449 100644 --- a/src/main/java/tconstruct/library/component/TankLayerScan.java +++ b/src/main/java/tconstruct/library/component/TankLayerScan.java @@ -233,7 +233,7 @@ public class TankLayerScan extends LogicComponent { } public int recurseStructureDown(int y) { - Iterator i = layerAirCoords.iterator(); + Iterator i = layerAirCoords.iterator(); if (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); if (checkAir(coord.x, y, coord.z)) { @@ -283,7 +283,7 @@ public class TankLayerScan extends LogicComponent { } public int recurseStructureUp(int y) { - Iterator i = layerBlockCoords.iterator(); + Iterator i = layerBlockCoords.iterator(); if (i.hasNext()) { CoordTuple coord = (CoordTuple) i.next(); if (checkServant(coord.x, y, coord.z)) { diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java index 30e6ce14..0d973045 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java +++ b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java @@ -75,7 +75,7 @@ public class ModBlaze extends ItemModTypeFilter { } public boolean validType(ToolCore tool) { - List list = Arrays.asList(tool.getTraits()); + List list = Arrays.asList(tool.getTraits()); return list.contains("melee") || list.contains("ammo"); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java index 8f906b27..535191e2 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java +++ b/src/main/java/tconstruct/modifiers/tools/ModButtertouch.java @@ -88,7 +88,7 @@ public class ModButtertouch extends ModBoolean { } public boolean validType(ToolCore tool) { - List list = Arrays.asList(tool.getTraits()); + List list = Arrays.asList(tool.getTraits()); return list.contains("weapon") || list.contains("harvest"); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java index dd409158..9b5afa0b 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModLapis.java +++ b/src/main/java/tconstruct/modifiers/tools/ModLapis.java @@ -90,7 +90,7 @@ public class ModLapis extends ItemModTypeFilter { updateModTag(tool, keyPair); } - List list = Arrays.asList(toolItem.getTraits()); + List list = Arrays.asList(toolItem.getTraits()); if (list.contains("weapon")) { if (keyPair[0] >= 450) { addEnchantment(tool, Enchantment.looting, 3); @@ -160,7 +160,7 @@ public class ModLapis extends ItemModTypeFilter { } public boolean validType(ToolCore tool) { - List list = Arrays.asList(tool.getTraits()); + List list = Arrays.asList(tool.getTraits()); return !list.contains("ammo") && (list.contains("weapon") || list.contains("harvest")); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java index 08b62599..821e5e9f 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModPiston.java +++ b/src/main/java/tconstruct/modifiers/tools/ModPiston.java @@ -75,7 +75,7 @@ public class ModPiston extends ItemModTypeFilter { } public boolean validType(ToolCore tool) { - List list = Arrays.asList(tool.getTraits()); + List list = Arrays.asList(tool.getTraits()); return list.contains("weapon") || list.contains("ammo"); } } diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java index 5356467b..d15c5eb2 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java +++ b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java @@ -103,7 +103,7 @@ public class ModRedstone extends ItemModTypeFilter { } public boolean validType(ToolCore tool) { - List list = Arrays.asList(tool.getTraits()); + List list = Arrays.asList(tool.getTraits()); // handled by the windup modifier if (list.contains("windup")) return false; diff --git a/src/main/java/tconstruct/modifiers/tools/ModWindup.java b/src/main/java/tconstruct/modifiers/tools/ModWindup.java index ff3da870..76d98095 100644 --- a/src/main/java/tconstruct/modifiers/tools/ModWindup.java +++ b/src/main/java/tconstruct/modifiers/tools/ModWindup.java @@ -12,7 +12,7 @@ public class ModWindup extends ModRedstone { } public boolean validType(ToolCore tool) { - List list = Arrays.asList(tool.getTraits()); + List list = Arrays.asList(tool.getTraits()); return list.contains("windup"); } diff --git a/src/main/java/tconstruct/util/ItemHelper.java b/src/main/java/tconstruct/util/ItemHelper.java index 805769ba..6ee6ad4a 100644 --- a/src/main/java/tconstruct/util/ItemHelper.java +++ b/src/main/java/tconstruct/util/ItemHelper.java @@ -15,7 +15,7 @@ import tconstruct.TConstruct; public class ItemHelper { public static Object getStaticItem(String name, String classPackage) { try { - Class clazz = Class.forName(classPackage); + Class clazz = Class.forName(classPackage); Field field = clazz.getDeclaredField(name); Object ret = field.get(null); if (ret != null && (ret instanceof ItemStack || ret instanceof Item)) return ret; diff --git a/src/main/java/tconstruct/util/config/PHConstruct.java b/src/main/java/tconstruct/util/config/PHConstruct.java index 1d0a0613..51d9685e 100644 --- a/src/main/java/tconstruct/util/config/PHConstruct.java +++ b/src/main/java/tconstruct/util/config/PHConstruct.java @@ -139,13 +139,13 @@ public class PHConstruct { boolean ic2 = true; boolean xycraft = true; try { - Class c = Class.forName("ic2.core.IC2"); + Class c = Class.forName("ic2.core.IC2"); ic2 = false; } catch (Exception ignored) { } try { - Class c = Class.forName("soaryn.xycraft.core.XyCraft"); + Class c = Class.forName("soaryn.xycraft.core.XyCraft"); xycraft = false; } catch (Exception ignored) { }