From 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 Mon Sep 17 00:00:00 2001
From: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Date: Wed, 2 Oct 2024 07:31:08 +0200
Subject: Cleanup the codebase (#3311)

Co-authored-by: boubou19 <miisterunknown@gmail.com>
---
 .../java/gtPlusPlus/core/client/CustomTextureSet.java  |  4 ++--
 .../gtPlusPlus/core/client/model/ModelSickBlaze.java   |  4 ++--
 .../core/client/renderer/CustomOreBlockRenderer.java   | 18 ++++++++----------
 .../core/client/renderer/RenderDecayChest.java         |  2 +-
 .../core/client/renderer/RenderToxinball.java          |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core/client')

diff --git a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
index ce4d9a0320..ca9328dba0 100644
--- a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
+++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
@@ -4,7 +4,7 @@ import gregtech.api.enums.TextureSet;
 
 public class CustomTextureSet extends TextureSet {
 
-    public static enum TextureSets {
+    public enum TextureSets {
 
         REFINED(),
         GEM_A(),
@@ -13,7 +13,7 @@ public class CustomTextureSet extends TextureSet {
 
         private final CustomTextureSet A;
 
-        private TextureSets() {
+        TextureSets() {
             A = new CustomTextureSet(
                 this.name()
                     .toUpperCase());
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
index 3b5922444d..877fe3886c 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
@@ -12,9 +12,9 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class ModelSickBlaze extends ModelBlaze {
 
     /** The sticks that fly around the Blaze. */
-    private ModelRenderer[] blazeSticks = new ModelRenderer[24];
+    private final ModelRenderer[] blazeSticks = new ModelRenderer[24];
 
-    private ModelRenderer blazeHead;
+    private final ModelRenderer blazeHead;
 
     public ModelSickBlaze() {
         for (int i = 0; i < this.blazeSticks.length; ++i) {
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
index 689f075703..a32dd2da8f 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java
@@ -31,8 +31,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
 
     public boolean renderStandardBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock,
         RenderBlocks aRenderer) {
-        Block tTileEntity = aBlock;
-        if ((tTileEntity instanceof ITexturedBlock)) {
+        if ((aBlock instanceof ITexturedBlock)) {
             return renderStandardBlock(
                 aWorld,
                 aX,
@@ -40,12 +39,12 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
                 aZ,
                 aBlock,
                 aRenderer,
-                new ITexture[][] { ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.DOWN),
-                    ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.UP),
-                    ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.NORTH),
-                    ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.SOUTH),
-                    ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.WEST),
-                    ((ITexturedBlock) tTileEntity).getTexture(ForgeDirection.EAST) });
+                new ITexture[][] { ((ITexturedBlock) aBlock).getTexture(ForgeDirection.DOWN),
+                    ((ITexturedBlock) aBlock).getTexture(ForgeDirection.UP),
+                    ((ITexturedBlock) aBlock).getTexture(ForgeDirection.NORTH),
+                    ((ITexturedBlock) aBlock).getTexture(ForgeDirection.SOUTH),
+                    ((ITexturedBlock) aBlock).getTexture(ForgeDirection.WEST),
+                    ((ITexturedBlock) aBlock).getTexture(ForgeDirection.EAST) });
         }
         return false;
     }
@@ -556,8 +555,7 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler {
                 .getTextureManager()
                 .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno");
         }
-
-        return (IIcon) iicon;
+        return iicon;
     }
 
     IBlockAccess blockAccess = RenderBlocks.getInstance().blockAccess;
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
index 78d4f367eb..a5ab58ef59 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java
@@ -23,7 +23,7 @@ public class RenderDecayChest extends TileEntitySpecialRenderer {
     private static final ResourceLocation mChestTexture = new ResourceLocation(
         GTPlusPlus.ID,
         "textures/blocks/TileEntities/DecayablesChest_full.png");
-    private ModelDecayChest mChestModel = new ModelDecayChest();
+    private final ModelDecayChest mChestModel = new ModelDecayChest();
 
     public static RenderDecayChest INSTANCE;
     public final int mRenderID;
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java
index 2c0ed7f562..bc8c3b7bbc 100644
--- a/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java
+++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java
@@ -18,7 +18,7 @@ import gtPlusPlus.core.entity.projectile.EntityToxinball;
 @SideOnly(Side.CLIENT)
 public class RenderToxinball extends Render {
 
-    private float mSize;
+    private final float mSize;
 
     public RenderToxinball(float scale) {
         this.mSize = scale;
-- 
cgit