From e0d5a220e764f9a921d5cd98a3e1e2e64ad6c591 Mon Sep 17 00:00:00 2001
From: boubou19 <miisterunknown@gmail.com>
Date: Wed, 4 Oct 2023 23:22:52 +0200
Subject: Code cleanup (#2309)

* guard clause technique on GT_ItemIterator

* removing oredict for ars magica 2 items

* removing oredict for mystcraft items

* convert big if ladder into a swtich statement

* enhanced switch

* clean non GTNH compat and identify other compats

* spotlessApply (#2310)

Co-authored-by: GitHub GTNH Actions <>

* more guard clauses

* reordering condition

* removing dead code

* removing optional block

* deprecating mIC2Classic

* spotless apply

* deprecate modloaded variables

* spotlessApply

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../gregtech/common/render/items/GT_GeneratedItem_Renderer.java    | 4 ++--
 .../common/render/items/GT_GeneratedMaterial_Renderer.java         | 5 +++--
 src/main/java/gregtech/common/render/items/UniversiumRenderer.java | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/main/java/gregtech/common/render')

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 e6a0ed750b..2788fd15c2 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
@@ -9,6 +9,7 @@ import static gregtech.api.enums.ItemList.Large_Fluid_Cell_StainlessSteel;
 import static gregtech.api.enums.ItemList.Large_Fluid_Cell_Steel;
 import static gregtech.api.enums.ItemList.Large_Fluid_Cell_Titanium;
 import static gregtech.api.enums.ItemList.Large_Fluid_Cell_TungstenSteel;
+import static gregtech.api.enums.Mods.HodgePodge;
 
 import javax.annotation.Nullable;
 
@@ -25,7 +26,6 @@ import org.lwjgl.opengl.GL11;
 
 import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Textures;
 import gregtech.api.items.GT_MetaGenerated_Item;
@@ -194,7 +194,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer {
     }
 
     protected void markNeedsAnimationUpdate(IIcon icon) {
-        if (GregTech_API.mHodgepodge && icon instanceof IPatchedTextureAtlasSprite) {
+        if (HodgePodge.isModLoaded() && icon instanceof IPatchedTextureAtlasSprite) {
             ((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate();
         }
     }
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 727064d3ea..ef06731fbe 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
@@ -1,5 +1,7 @@
 package gregtech.common.render.items;
 
+import static gregtech.api.enums.Mods.HodgePodge;
+
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
@@ -13,7 +15,6 @@ import org.lwjgl.opengl.GL11;
 import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite;
 
 import codechicken.lib.render.TextureUtils;
-import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.render.GT_RenderUtil;
@@ -158,7 +159,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer {
     }
 
     protected void markNeedsAnimationUpdate(IIcon icon) {
-        if (GregTech_API.mHodgepodge && icon instanceof IPatchedTextureAtlasSprite) {
+        if (HodgePodge.isModLoaded() && icon instanceof IPatchedTextureAtlasSprite) {
             ((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate();
         }
     }
diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
index 14e2ca2d8e..b0e2c39cb7 100644
--- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
+++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java
@@ -1,5 +1,7 @@
 package gregtech.common.render.items;
 
+import static gregtech.api.enums.Mods.Avaritia;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.RenderHelper;
@@ -17,7 +19,6 @@ import org.lwjgl.opengl.GL12;
 
 import codechicken.lib.render.TextureUtils;
 import fox.spiteful.avaritia.render.CosmicRenderShenanigans;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.ItemList;
 import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer;
 
@@ -81,7 +82,9 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer {
 
     private void magicRenderMethod(ItemRenderType type, ItemStack aStack, IIcon tIcon, boolean fluidDisplay,
         Object... data) {
-        if (!GregTech_API.mAvaritia) return;
+        if (!Avaritia.isModLoaded()) {
+            return;
+        }
 
         RenderItem r = RenderItem.getInstance();
         Minecraft mc = Minecraft.getMinecraft();
-- 
cgit