upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-14 01:14:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

quick fix : Raw use of parameterized class

Browse Source
This commit is contained in:
Alexdoru authored and Jason Mitchell committed 2023-01-28 18:02:41 -08:00
1 parent f384a4fe28
commit 9cfd723ea3
11 files changed
+48 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/tconstruct/items/tools/BowBase.java
+33 -34
View File
@@ -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<Map.Entry<Integer, String>> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Map.Entry<Integer, String>> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Map.Entry<Integer, String>> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Integer, String> 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<Integer, String> pairs = iterThree.next();
effectIcons3.put(pairs.getKey(), iconRegister.registerIcon(pairs.getValue() + "_3"));
}
}
registerArrows(iconRegister);
src/main/java/tconstruct/library/TConstructRegistry.java
+3 -3
View File
@@ -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) {
src/main/java/tconstruct/library/component/TankLayerScan.java
+2 -2
View File
@@ -233,7 +233,7 @@ public class TankLayerScan extends LogicComponent {
}
public int recurseStructureDown(int y) {
Iterator i = layerAirCoords.iterator();
Iterator<CoordTuple> 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<CoordTuple> i = layerBlockCoords.iterator();
if (i.hasNext()) {
CoordTuple coord = (CoordTuple) i.next();
if (checkServant(coord.x, y, coord.z)) {
src/main/java/tconstruct/modifiers/tools/ModBlaze.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class ModBlaze extends ItemModTypeFilter {
}
public boolean validType(ToolCore tool) {
List list = Arrays.asList(tool.getTraits());
List<String> list = Arrays.asList(tool.getTraits());
return list.contains("melee") || list.contains("ammo");
}
}
src/main/java/tconstruct/modifiers/tools/ModButtertouch.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class ModButtertouch extends ModBoolean {
}
public boolean validType(ToolCore tool) {
List list = Arrays.asList(tool.getTraits());
List<String> list = Arrays.asList(tool.getTraits());
return list.contains("weapon") || list.contains("harvest");
}
}
src/main/java/tconstruct/modifiers/tools/ModLapis.java
+2 -2
View File
@@ -90,7 +90,7 @@ public class ModLapis extends ItemModTypeFilter {
updateModTag(tool, keyPair);
}
List list = Arrays.asList(toolItem.getTraits());
List<String> 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<String> list = Arrays.asList(tool.getTraits());
return !list.contains("ammo") && (list.contains("weapon") || list.contains("harvest"));
}
}
src/main/java/tconstruct/modifiers/tools/ModPiston.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class ModPiston extends ItemModTypeFilter {
}
public boolean validType(ToolCore tool) {
List list = Arrays.asList(tool.getTraits());
List<String> list = Arrays.asList(tool.getTraits());
return list.contains("weapon") || list.contains("ammo");
}
}
src/main/java/tconstruct/modifiers/tools/ModRedstone.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class ModRedstone extends ItemModTypeFilter {
}
public boolean validType(ToolCore tool) {
List list = Arrays.asList(tool.getTraits());
List<String> list = Arrays.asList(tool.getTraits());
// handled by the windup modifier
if (list.contains("windup")) return false;
src/main/java/tconstruct/modifiers/tools/ModWindup.java
+1 -1
View File
@@ -12,7 +12,7 @@ public class ModWindup extends ModRedstone {
}
public boolean validType(ToolCore tool) {
List list = Arrays.asList(tool.getTraits());
List<String> list = Arrays.asList(tool.getTraits());
return list.contains("windup");
}
src/main/java/tconstruct/util/ItemHelper.java
+1 -1
View File
@@ -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;
src/main/java/tconstruct/util/config/PHConstruct.java
+2 -2
View File
@@ -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) {
}