From 26caa265b7eae49767947e1ff4e6cfc8166b07f5 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sun, 9 Apr 2023 01:08:26 +0200 Subject: clean up GT++ code (#589) * yeet big reactor support * yeet IC2 classic support * yeet pneumaticraft support * yeet More Planets support * yeet Immersive Engineering support * yeet Psychedilicraft support * yeet Beyond Reality Core support * sort mods to see what must be purged * yeet simply jetpacks * yeet RFTools * yeet xReliquary * yeet RedTech * yeet Mekanism * yeet GrowthCraft * yeet ihl * leftover cleaning * yeet thermal fondation support * yeet compact windmills support * spotless * remove constants from LoadedMods (part 1 / 2) * spotless * remove constants from LoadedMods (part 2 / 2) * use mod id enum instead of strings + optimize imports * Loaded.isModLoaded -> enum * restore RA init * missing ! * start organizing recipes stuff * fix crash on world load in dev * remove unused class * remove HazmatUtils.java * move all the removals * remove enableHarderRecipesForHighTierCasings and usages(disabled in the pack) * move some pyrolyse oven recipes to its own file * sa * bump GT version * bump GT5U version * spotless apply * use Everglades entry from the mod enum --------- Co-authored-by: miozune Co-authored-by: Martin Robertz --- src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java | 5 +++-- src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java | 4 +++- src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java | 5 +++-- .../gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java | 5 +++-- .../gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java | 5 +++-- 5 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/main/java/gtPlusPlus/core/client') diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java index e3fccaf2df..1e6435038a 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -13,13 +15,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelBatKing; import gtPlusPlus.core.entity.monster.EntityBatKing; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderBatKing extends RenderLiving { private static final ResourceLocation batTextures = new ResourceLocation( - CORE.MODID + ":" + "textures/entity/batKing.png"); + GTPlusPlus.ID + ":" + "textures/entity/batKing.png"); /** * not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java index 47564edd84..fc99536fee 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -19,7 +21,7 @@ import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; public class RenderDecayChest extends TileEntitySpecialRenderer { private static final ResourceLocation mChestTexture = new ResourceLocation( - CORE.MODID, + GTPlusPlus.ID, "textures/blocks/TileEntities/DecayablesChest_full.png"); private ModelDecayChest mChestModel = new ModelDecayChest(); diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java index 10d155f1cd..28e4dd4bc2 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; @@ -10,13 +12,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelSickBlaze; import gtPlusPlus.core.entity.monster.EntitySickBlaze; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderSickBlaze extends RenderLiving { private static final ResourceLocation blazeTextures = new ResourceLocation( - CORE.MODID + ":" + "textures/entity/sickBlaze.png"); + GTPlusPlus.ID + ":" + "textures/entity/sickBlaze.png"); private int field_77068_a; public RenderSickBlaze() { diff --git a/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java index f97be33e4f..3ed25954d1 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.texture.TextureMap; @@ -16,13 +18,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.ModelStaballoyConstruct; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderStaballoyConstruct extends RenderLiving { private static final ResourceLocation staballoyGolemTextures = new ResourceLocation( - CORE.MODID + ":" + "textures/entity/golemStaballoy.png"); + GTPlusPlus.ID + ":" + "textures/entity/golemStaballoy.png"); /** Staballoy Golem's Model. */ private final ModelStaballoyConstruct staballoyGolemModel; diff --git a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java index 9a110adccd..f47d7ecd20 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.client.renderer.tabula; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -8,7 +10,6 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.client.model.tabula.ModelTabulaBase; -import gtPlusPlus.core.lib.CORE; @SideOnly(Side.CLIENT) public class RenderTabulaBase extends TileEntitySpecialRenderer { @@ -22,7 +23,7 @@ public class RenderTabulaBase extends TileEntitySpecialRenderer { public RenderTabulaBase(ModelTabulaBase aModel, String aTexturePath, Class aTileClass) { mModel = aModel; - mTexture = new ResourceLocation(CORE.MODID, aTexturePath); + mTexture = new ResourceLocation(GTPlusPlus.ID, aTexturePath); mTileClass = aTileClass; this.mRenderID = RenderingRegistry.getNextAvailableRenderId(); mInstance = this; -- cgit