aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/render
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/render
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/render')
-rw-r--r--src/main/java/gregtech/common/render/GT_RenderUtil.java21
-rw-r--r--src/main/java/gregtech/common/render/GT_RenderedTexture.java96
-rw-r--r--src/main/java/gregtech/common/render/GT_Renderer_Block.java25
-rw-r--r--src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java3
-rw-r--r--src/main/java/gregtech/common/render/GT_TextureBuilder.java29
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java3
-rw-r--r--src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java6
-rw-r--r--src/main/java/gregtech/common/render/items/InfinityRenderer.java3
-rw-r--r--src/main/java/gregtech/common/render/items/UniversiumRenderer.java27
9 files changed, 75 insertions, 138 deletions
diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GT_RenderUtil.java
index ffa6e359d8..1919b7975c 100644
--- a/src/main/java/gregtech/common/render/GT_RenderUtil.java
+++ b/src/main/java/gregtech/common/render/GT_RenderUtil.java
@@ -13,8 +13,7 @@ import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
public class GT_RenderUtil {
public static void colorGTItem(ItemStack aStack) {
- if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer) {
- IGT_ItemWithMaterialRenderer aItem = (IGT_ItemWithMaterialRenderer) aStack.getItem();
+ if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem) {
short[] tModulation = aItem.getRGBa(aStack);
GL11.glColor4f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F, 255.0f);
@@ -26,24 +25,30 @@ public class GT_RenderUtil {
public static void renderBlockIcon(RenderBlocks aRenderer, Block aBlock, double aX, double aY, double aZ,
IIcon aIcon, byte aSide) {
switch (aSide) {
- case 0:
+ case 0 -> {
aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon);
return;
- case 1:
+ }
+ case 1 -> {
aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon);
return;
- case 2:
+ }
+ case 2 -> {
aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon);
return;
- case 3:
+ }
+ case 3 -> {
aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon);
return;
- case 4:
+ }
+ case 4 -> {
aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon);
return;
- case 5:
+ }
+ case 5 -> {
aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon);
return;
+ }
}
}
diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GT_RenderedTexture.java
index a4c19c79d3..bc36628324 100644
--- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java
+++ b/src/main/java/gregtech/common/render/GT_RenderedTexture.java
@@ -222,18 +222,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
ExtendedFacing extendedFacing) {
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
- case COUNTER_CLOCKWISE:
- aRenderer.uvRotateBottom = 2;
- break;
- case CLOCKWISE:
- aRenderer.uvRotateBottom = 1;
- break;
- case UPSIDE_DOWN:
- aRenderer.uvRotateBottom = 3;
- break;
- default:
- aRenderer.uvRotateBottom = 0;
- break;
+ case COUNTER_CLOCKWISE -> aRenderer.uvRotateBottom = 2;
+ case CLOCKWISE -> aRenderer.uvRotateBottom = 1;
+ case UPSIDE_DOWN -> aRenderer.uvRotateBottom = 3;
+ default -> aRenderer.uvRotateBottom = 0;
}
final Flip aFlip = extendedFacing.getFlip();
@@ -258,18 +250,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
ExtendedFacing extendedFacing) {
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
- case COUNTER_CLOCKWISE:
- aRenderer.uvRotateTop = 2;
- break;
- case CLOCKWISE:
- aRenderer.uvRotateTop = 1;
- break;
- case UPSIDE_DOWN:
- aRenderer.uvRotateTop = 3;
- break;
- default:
- aRenderer.uvRotateTop = 0;
- break;
+ case COUNTER_CLOCKWISE -> aRenderer.uvRotateTop = 2;
+ case CLOCKWISE -> aRenderer.uvRotateTop = 1;
+ case UPSIDE_DOWN -> aRenderer.uvRotateTop = 3;
+ default -> aRenderer.uvRotateTop = 0;
}
final Flip aFlip = extendedFacing.getFlip();
@@ -292,18 +276,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
aRenderer.field_152631_f = true;
// **NOT A BUG**: aRenderer.uvRotateEast REALLY CONTROLS THE ROTATION OF THE NORTH SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
- case COUNTER_CLOCKWISE:
- aRenderer.uvRotateEast = 2;
- break;
- case CLOCKWISE:
- aRenderer.uvRotateEast = 1;
- break;
- case UPSIDE_DOWN:
- aRenderer.uvRotateEast = 3;
- break;
- default:
- aRenderer.uvRotateEast = 0;
- break;
+ case COUNTER_CLOCKWISE -> aRenderer.uvRotateEast = 2;
+ case CLOCKWISE -> aRenderer.uvRotateEast = 1;
+ case UPSIDE_DOWN -> aRenderer.uvRotateEast = 3;
+ default -> aRenderer.uvRotateEast = 0;
}
final Flip aFlip = extendedFacing.getFlip();
@@ -326,18 +302,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
ExtendedFacing extendedFacing) {
// **NOT A BUG**: aRenderer.uvRotateWest REALLY CONTROLS THE ROTATION OF THE SOUTH SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
- case COUNTER_CLOCKWISE:
- aRenderer.uvRotateWest = 2;
- break;
- case CLOCKWISE:
- aRenderer.uvRotateWest = 1;
- break;
- case UPSIDE_DOWN:
- aRenderer.uvRotateWest = 3;
- break;
- default:
- aRenderer.uvRotateWest = 0;
- break;
+ case COUNTER_CLOCKWISE -> aRenderer.uvRotateWest = 2;
+ case CLOCKWISE -> aRenderer.uvRotateWest = 1;
+ case UPSIDE_DOWN -> aRenderer.uvRotateWest = 3;
+ default -> aRenderer.uvRotateWest = 0;
}
final Flip aFlip = extendedFacing.getFlip();
@@ -359,18 +327,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
ExtendedFacing extendedFacing) {
// **NOT A BUG**: aRenderer.uvRotateNorth REALLY CONTROLS THE ROTATION OF THE WEST SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
- case COUNTER_CLOCKWISE:
- aRenderer.uvRotateNorth = 2;
- break;
- case CLOCKWISE:
- aRenderer.uvRotateNorth = 1;
- break;
- case UPSIDE_DOWN:
- aRenderer.uvRotateNorth = 3;
- break;
- default:
- aRenderer.uvRotateNorth = 0;
- break;
+ case COUNTER_CLOCKWISE -> aRenderer.uvRotateNorth = 2;
+ case CLOCKWISE -> aRenderer.uvRotateNorth = 1;
+ case UPSIDE_DOWN -> aRenderer.uvRotateNorth = 3;
+ default -> aRenderer.uvRotateNorth = 0;
}
final Flip aFlip = extendedFacing.getFlip();
@@ -393,18 +353,10 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol
aRenderer.field_152631_f = true;
// **NOT A BUG**: aRenderer.uvRotateSouth REALLY CONTROLS THE ROTATION OF THE EAST SIDE
switch (useExtFacing ? extendedFacing.getRotation() : Rotation.NORMAL) {
- case COUNTER_CLOCKWISE:
- aRenderer.uvRotateSouth = 2;
- break;
- case CLOCKWISE:
- aRenderer.uvRotateSouth = 1;
- break;
- case UPSIDE_DOWN:
- aRenderer.uvRotateSouth = 3;
- break;
- default:
- aRenderer.uvRotateSouth = 0;
- break;
+ case COUNTER_CLOCKWISE -> aRenderer.uvRotateSouth = 2;
+ case CLOCKWISE -> aRenderer.uvRotateSouth = 1;
+ case UPSIDE_DOWN -> aRenderer.uvRotateSouth = 3;
+ default -> aRenderer.uvRotateSouth = 0;
}
final Flip aFlip = extendedFacing.getFlip();
diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GT_Renderer_Block.java
index f17618829b..ca9997f333 100644
--- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java
+++ b/src/main/java/gregtech/common/render/GT_Renderer_Block.java
@@ -142,7 +142,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
}
switch (aConnections) {
- case NO_CONNECTION:
+ case NO_CONNECTION -> {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[DOWN.ordinal()], false);
@@ -151,8 +151,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false);
renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[WEST.ordinal()], false);
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
- break;
- case CONNECTED_EAST | CONNECTED_WEST:
+ }
+ case CONNECTED_EAST | CONNECTED_WEST -> {
// EAST - WEST Pipe Sides
aBlock.setBlockBounds(blockMin, pipeMin, pipeMin, blockMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -164,8 +164,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
// EAST - WEST Pipe Ends
renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[WEST.ordinal()], false);
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
- break;
- case CONNECTED_DOWN | CONNECTED_UP:
+ }
+ case CONNECTED_DOWN | CONNECTED_UP -> {
// UP - DOWN Pipe Sides
aBlock.setBlockBounds(pipeMin, blockMin, pipeMin, pipeMax, blockMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -177,8 +177,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
// UP - DOWN Pipe Ends
renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[DOWN.ordinal()], false);
renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[UP.ordinal()], false);
- break;
- case CONNECTED_NORTH | CONNECTED_SOUTH:
+ }
+ case CONNECTED_NORTH | CONNECTED_SOUTH -> {
// NORTH - SOUTH Pipe Sides
aBlock.setBlockBounds(pipeMin, pipeMin, blockMin, pipeMax, pipeMax, blockMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -190,8 +190,8 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
// NORTH - SOUTH Pipe Ends
renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[NORTH.ordinal()], false);
renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false);
- break;
- default:
+ }
+ default -> {
if ((aConnections & CONNECTED_WEST) == 0) {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -204,7 +204,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false);
}
renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[WEST.ordinal()], false);
-
if ((aConnections & CONNECTED_EAST) == 0) {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -217,7 +216,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false);
}
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
-
if ((aConnections & CONNECTED_DOWN) == 0) {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -230,7 +228,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
}
renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[DOWN.ordinal()], false);
-
if ((aConnections & CONNECTED_UP) == 0) {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -243,7 +240,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
}
renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[UP.ordinal()], false);
-
if ((aConnections & CONNECTED_NORTH) == 0) {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -256,7 +252,6 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
}
renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[NORTH.ordinal()], false);
-
if ((aConnections & CONNECTED_SOUTH) == 0) {
aBlock.setBlockBounds(pipeMin, pipeMin, pipeMin, pipeMax, pipeMax, pipeMax);
aRenderer.setRenderBoundsFromBlock(aBlock);
@@ -269,7 +264,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler {
renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[EAST.ordinal()], false);
}
renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, tIcons[SOUTH.ordinal()], false);
- break;
+ }
}
// Render covers on pipes
diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java b/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java
index 028573fdaf..e72a79514e 100644
--- a/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java
+++ b/src/main/java/gregtech/common/render/GT_Renderer_Entity_Arrow.java
@@ -2,6 +2,7 @@ package gregtech.common.render;
import net.minecraft.client.renderer.entity.RenderArrow;
import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -10,7 +11,7 @@ public class GT_Renderer_Entity_Arrow extends RenderArrow {
private final ResourceLocation mTexture;
- public GT_Renderer_Entity_Arrow(Class aArrowClass, String aTextureName) {
+ public GT_Renderer_Entity_Arrow(Class<? extends EntityArrow> aArrowClass, String aTextureName) {
this.mTexture = new ResourceLocation("gregtech:textures/entity/" + aTextureName + ".png");
RenderingRegistry.registerEntityRenderingHandler(aArrowClass, this);
}
diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GT_TextureBuilder.java
index 1cb613b32e..56009c2971 100644
--- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java
+++ b/src/main/java/gregtech/common/render/GT_TextureBuilder.java
@@ -118,22 +118,19 @@ public class GT_TextureBuilder implements ITextureBuilder {
}
if (worldCoord != null) throw new IllegalStateException("worldCoord without from block");
if (!textureLayers.isEmpty()) return new GT_MultiTexture(textureLayers.toArray(new ITexture[0]));
- switch (iconContainerList.size()) {
- case 1:
- return new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing);
- case 6:
- return new GT_SidedTexture(
- iconContainerList.get(ForgeDirection.DOWN.ordinal()),
- iconContainerList.get(ForgeDirection.UP.ordinal()),
- iconContainerList.get(ForgeDirection.NORTH.ordinal()),
- iconContainerList.get(ForgeDirection.SOUTH.ordinal()),
- iconContainerList.get(ForgeDirection.WEST.ordinal()),
- iconContainerList.get(ForgeDirection.EAST.ordinal()),
- rgba,
- allowAlpha);
- default:
- throw new IllegalStateException("Invalid sideIconContainer count");
- }
+ return switch (iconContainerList.size()) {
+ case 1 -> new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing);
+ case 6 -> new GT_SidedTexture(
+ iconContainerList.get(ForgeDirection.DOWN.ordinal()),
+ iconContainerList.get(ForgeDirection.UP.ordinal()),
+ iconContainerList.get(ForgeDirection.NORTH.ordinal()),
+ iconContainerList.get(ForgeDirection.SOUTH.ordinal()),
+ iconContainerList.get(ForgeDirection.WEST.ordinal()),
+ iconContainerList.get(ForgeDirection.EAST.ordinal()),
+ rgba,
+ allowAlpha);
+ default -> throw new IllegalStateException("Invalid sideIconContainer count");
+ };
}
private boolean isCTMBlock(Block fromBlock, int fromMeta) {
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);
}
}