diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-12-21 23:19:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 23:19:04 +0100 |
| commit | ef8ac539395ce5067edfcf1b8a98ae746c476fc1 (patch) | |
| tree | af4167cbb06d109743d76a506c005910ce6d42d6 /src/main/java/gtPlusPlus/core/util | |
| parent | 62676f57093ed476b9c378615560749c6e0136e3 (diff) | |
| parent | 06c8eb6bf1e2c634033d21e1d50ff7a8d8474550 (diff) | |
| download | GT5-Unofficial-ef8ac539395ce5067edfcf1b8a98ae746c476fc1.tar.gz GT5-Unofficial-ef8ac539395ce5067edfcf1b8a98ae746c476fc1.tar.bz2 GT5-Unofficial-ef8ac539395ce5067edfcf1b8a98ae746c476fc1.zip | |
Merge pull request #74 from GTNewHorizons/New-Multis
New multis
Diffstat (limited to 'src/main/java/gtPlusPlus/core/util')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java index b322036ef7..0e2fff3f35 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/HazmatUtils.java @@ -254,7 +254,7 @@ public class HazmatUtils { aItemFields.add(ReflectionUtils.getField(aItemsGravisuite, "graviChestPlate")); AutoMap<ItemStack> aGravisuite = new AutoMap<ItemStack>(); for (Field aItemField : aItemFields) { - Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField); + Item aItemObject = ReflectionUtils.getFieldValue(aItemField); if (aItemObject != null) { aGravisuite.add(ItemUtils.getSimpleStack(aItemObject)); } @@ -274,7 +274,7 @@ public class HazmatUtils { aItemFields.add(ReflectionUtils.getField(aItemsEMT, "ultimateSolarHelmet")); AutoMap<ItemStack> aASP = new AutoMap<ItemStack>(); for (Field aItemField : aItemFields) { - Item aItemObject = (Item) ReflectionUtils.getFieldValue(aItemField); + Item aItemObject = ReflectionUtils.getFieldValue(aItemField); if (aItemObject != null) { aASP.add(ItemUtils.getSimpleStack(aItemObject)); } diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 1ef925f793..92804d72ec 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -1060,13 +1060,13 @@ public class ReflectionUtils { return false; } - public static Object getFieldValue(Field field) { + public static <T> T getFieldValue(Field field) { return getFieldValue(field, null); } - public static Object getFieldValue(Field field, Object instance) { + public static <T> T getFieldValue(Field field, Object instance) { try { - return field.get(instance); + return (T) field.get(instance); } catch (IllegalArgumentException | IllegalAccessException e) { } return null; |