aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/GT_ThaumcraftCompat.java
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-01 20:06:12 +0100
committerGitHub <noreply@github.com>2023-04-01 19:06:12 +0000
commitb088958c9f6935d356b6c087c8e8106b400aa24f (patch)
treebe608fac08ba158f1226a4fb9f5b1ed459bac2a9 /src/main/java/gregtech/common/GT_ThaumcraftCompat.java
parente52cd9c3458584e58073df5cd9cde1302994f266 (diff)
downloadGT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.gz
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.tar.bz2
GT5-Unofficial-b088958c9f6935d356b6c087c8e8106b400aa24f.zip
Jabel, Generic injection and mostly automatic code cleanup (#1829)
* Enable Jabel&Generic injection, fix type error caused by this * add missing <> * Infer generic types automatically * Parametrize cast types * Use enhanced for loops * Unnecessary boxing * Unnecessary unboxing * Use Objects.equals * Explicit type can be replaced with `<>` * Collapse identical catch blocks * Add SafeVarargs where applicable * Anonymous type can be replaced with lambda * Use List.sort directly * Lambda can be a method reference * Statement lambda can be an expression lambda * Use string switches * Instanceof pattern matching * Text block can be used * Migrate to enhanced switch * Java style array declarations * Unnecessary toString() * More unnecessary String conversions * Unnecessary modifiers * Unnecessary semicolons * Fix duplicate conditions * Extract common code from if branches * Replace switches with ifs for 1-2 cases * Inner class may be static * Minor performance issues * Replace string appending in loops with string builders * Fix IntelliJ using the wrong empty list method * Use Long.compare * Generic arguments: getSubItems * Generic arguments: getSubBlocks * Raw types warnings * Fix remaining missing generics * Too weak variable type leads to unnecessary cast * Redundant type casts * Redundant array length check * Redundant vararg arrays * Manual min/max implementations * A couple missed inspections * Goodbye explosion power ternary ladder * Apply spotless * Get rid of the other two big ternary ladders * Binary search explosion power * Don't overcomplicate things
Diffstat (limited to 'src/main/java/gregtech/common/GT_ThaumcraftCompat.java')
-rw-r--r--src/main/java/gregtech/common/GT_ThaumcraftCompat.java22
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;
}