diff options
Diffstat (limited to 'src/main/java/gregtech/common/GT_ThaumcraftCompat.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_ThaumcraftCompat.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java index a7a2f0d4ee..9c7eeb8f09 100644 --- a/src/main/java/gregtech/common/GT_ThaumcraftCompat.java +++ b/src/main/java/gregtech/common/GT_ThaumcraftCompat.java @@ -123,10 +123,10 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { private static final AspectList getAspectList(List<TC_Aspects.TC_AspectStack> aAspects) { AspectList rAspects = new AspectList(); TC_Aspects.TC_AspectStack tAspect; - for (Iterator i$ = aAspects.iterator(); i$.hasNext(); rAspects.add( + for (Iterator<TC_Aspects.TC_AspectStack> i$ = aAspects.iterator(); i$.hasNext(); rAspects.add( (Aspect) tAspect.mAspect.mAspect, (int) tAspect.mAmount)) { - tAspect = (TC_Aspects.TC_AspectStack) i$.next(); + tAspect = i$.next(); } return rAspects; } @@ -142,9 +142,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { if (tCategory == null) { return null; } - for (Iterator i$ = tCategory.research.values() - .iterator(); i$.hasNext();) { - ResearchItem tResearch = (ResearchItem) i$.next(); + for (ResearchItem tResearch : tCategory.research.values()) { if ((tResearch.displayColumn == aX) && (tResearch.displayRow == aY)) { aX += (aX > 0 ? 5 : -5); aY += (aY > 0 ? 5 : -5); @@ -158,7 +156,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { aY, aComplexity, aIcon); - ArrayList<ResearchPage> tPages = new ArrayList(aPages.length); + ArrayList<ResearchPage> tPages = new ArrayList<>(aPages.length); GT_LanguageManager.addStringLocalization("tc.research_name." + aResearch, aName); GT_LanguageManager.addStringLocalization("tc.research_text." + aResearch, "[GT] " + aText); for (Object tPage : aPages) { @@ -198,14 +196,14 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { rResearch.setStub(); } if (aParentResearches != null) { - ArrayList<String> tParentResearches = new ArrayList(); + ArrayList<String> tParentResearches = new ArrayList<>(); for (String tParent : aParentResearches) { if (GregTech_API.sRecipeFile.get(ConfigCategories.Recipes.researches, aResearch, true)) { tParentResearches.add(tParent); } } if (tParentResearches.size() > 0) { - rResearch.setParents((String[]) tParentResearches.toArray(new String[tParentResearches.size()])); + rResearch.setParents(tParentResearches.toArray(new String[0])); rResearch.setConcealed(); } } @@ -213,7 +211,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { rResearch.setItemTriggers(aResearchTriggers); rResearch.setHidden(); } - rResearch.setPages((ResearchPage[]) tPages.toArray(new ResearchPage[tPages.size()])); + rResearch.setPages(tPages.toArray(new ResearchPage[0])); return rResearch.registerResearchItem(); } @@ -273,7 +271,7 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { public boolean registerThaumcraftAspectsToItem(ItemStack aExampleStack, List<TC_Aspects.TC_AspectStack> aAspects, String aOreDict) { if (aAspects.isEmpty()) return false; - ThaumcraftApi.registerObjectTag(aOreDict, (AspectList) getAspectList(aAspects)); + ThaumcraftApi.registerObjectTag(aOreDict, getAspectList(aAspects)); return true; } @@ -282,12 +280,12 @@ public class GT_ThaumcraftCompat implements IThaumcraftCompat { boolean aAdditive) { if (aAspects.isEmpty()) return false; if (aAdditive) { - ThaumcraftApi.registerComplexObjectTag(aStack, (AspectList) getAspectList(aAspects)); + ThaumcraftApi.registerComplexObjectTag(aStack, getAspectList(aAspects)); return true; } AspectList tAlreadyRegisteredAspects = ThaumcraftApiHelper.getObjectAspects(aStack); if (tAlreadyRegisteredAspects == null || tAlreadyRegisteredAspects.size() <= 0) { - ThaumcraftApi.registerObjectTag(aStack, (AspectList) getAspectList(aAspects)); + ThaumcraftApi.registerObjectTag(aStack, getAspectList(aAspects)); } return true; } |