diff options
author | draknyte1 <draknyte1@hotmail.com> | 2017-03-29 17:36:18 +1000 |
---|---|---|
committer | draknyte1 <draknyte1@hotmail.com> | 2017-03-29 17:36:18 +1000 |
commit | 72708e125960fbbf80ce38c0cec573aebf038cc5 (patch) | |
tree | fa24ffd761d67080f0177aa794458fc250478487 /src/Java/gtPlusPlus | |
parent | 56699a5b6c5e469e2e5b34bdbb5441dce8a34a63 (diff) | |
download | GT5-Unofficial-72708e125960fbbf80ce38c0cec573aebf038cc5.tar.gz GT5-Unofficial-72708e125960fbbf80ce38c0cec573aebf038cc5.tar.bz2 GT5-Unofficial-72708e125960fbbf80ce38c0cec573aebf038cc5.zip |
% Changed some ArrayList functions for J7 compliance.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r-- | src/Java/gtPlusPlus/core/util/Utils.java | 4 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index f969d3e075..45dc2ce701 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -340,8 +340,8 @@ public class Utils { return targetList; } - public static List<Object> convertArrayListToList(@SuppressWarnings("rawtypes") final ArrayList sourceArray) { - final List<Object> targetList = new ArrayList<>(Arrays.asList(sourceArray)); + public static List<Object> convertArrayListToList(final ArrayList<Object> sourceArray) { + final List<Object> targetList = new ArrayList<Object>(Arrays.asList(sourceArray)); return targetList; } diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index da68bfaaae..1150fe6602 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -35,8 +35,8 @@ public class MaterialUtils { public static List<?> oreDictValuesForEntry(final String oredictName){ List<?> oredictItemNames; if(OreDictionary.doesOreNameExist(oredictName)){ - final ArrayList<ItemStack> oredictItems = OreDictionary.getOres(oredictName); - oredictItemNames = Utils.convertArrayListToList(oredictItems); + final List<ItemStack> oredictItems = OreDictionary.getOres(oredictName); + oredictItemNames = oredictItems; return oredictItemNames; } return null; |