From b088958c9f6935d356b6c087c8e8106b400aa24f Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Sat, 1 Apr 2023 20:06:12 +0100 Subject: 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 --- .../render/items/GT_GeneratedItem_Renderer.java | 3 +-- .../items/GT_GeneratedMaterial_Renderer.java | 6 ++--- .../common/render/items/InfinityRenderer.java | 3 +-- .../common/render/items/UniversiumRenderer.java | 27 ++++++++-------------- 4 files changed, 13 insertions(+), 26 deletions(-) (limited to 'src/main/java/gregtech/common/render/items') diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java index 398465d586..fbd3798b76 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java @@ -43,8 +43,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof GT_MetaGenerated_Item)) return; - GT_MetaGenerated_Item aItem = (GT_MetaGenerated_Item) aStack.getItem(); + if (!(aStack.getItem() instanceof GT_MetaGenerated_Item aItem)) return; GL11.glEnable(GL11.GL_BLEND); GL11.glColor3f(1.0F, 1.0F, 1.0F); diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java index 4e8a85cace..ebfb06bcbe 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java @@ -49,8 +49,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; int passes = 1; if (aItem.requiresMultipleRenderPasses()) { @@ -98,8 +97,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { } protected void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon, boolean shouldModulateColor) { - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; if (shouldModulateColor) { short[] tModulation = aItem.getRGBa(aStack); diff --git a/src/main/java/gregtech/common/render/items/InfinityRenderer.java b/src/main/java/gregtech/common/render/items/InfinityRenderer.java index 0441ab2272..3187ab8bcb 100644 --- a/src/main/java/gregtech/common/render/items/InfinityRenderer.java +++ b/src/main/java/gregtech/common/render/items/InfinityRenderer.java @@ -21,8 +21,7 @@ public class InfinityRenderer extends GT_GeneratedMaterial_Renderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; int passes = 1; if (aItem.requiresMultipleRenderPasses()) { diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java index a2369128b0..8f75bfb03e 100644 --- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java +++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java @@ -45,8 +45,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { short aMetaData = (short) aStack.getItemDamage(); - if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer)) return; - IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem(); + if (!(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem)) return; int passes = 1; if (aItem.requiresMultipleRenderPasses()) { @@ -90,20 +89,17 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { processLightLevel(type, data); switch (type) { - case ENTITY: { + case ENTITY -> { GL11.glPushMatrix(); if (aStack.isOnItemFrame()) GL11.glTranslatef(0F, -0.3F, 0.01F); render(tIcon); GL11.glPopMatrix(); - break; } - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: { + case EQUIPPED, EQUIPPED_FIRST_PERSON -> { render(tIcon); - break; } - case INVENTORY: { + case INVENTORY -> { GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -163,10 +159,8 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); - break; } - default: - break; + default -> {} } } @@ -229,7 +223,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { private void processLightLevel(ItemRenderType type, Object... data) { switch (type) { - case ENTITY: { + case ENTITY -> { EntityItem ent = (EntityItem) (data[1]); if (ent != null) { CosmicRenderStuffs.setLightFromLocation( @@ -238,10 +232,8 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { MathHelper.floor_double(ent.posY), MathHelper.floor_double(ent.posZ)); } - break; } - case EQUIPPED: - case EQUIPPED_FIRST_PERSON: { + case EQUIPPED, EQUIPPED_FIRST_PERSON -> { EntityLivingBase ent = (EntityLivingBase) (data[1]); if (ent != null) { CosmicRenderStuffs.setLightFromLocation( @@ -250,13 +242,12 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { MathHelper.floor_double(ent.posY), MathHelper.floor_double(ent.posZ)); } - break; } - case INVENTORY: { + case INVENTORY -> { CosmicRenderStuffs.setLightLevel(10.2f); return; } - default: { + default -> { CosmicRenderStuffs.setLightLevel(1.0f); } } -- cgit