From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../goodgenerator/client/GUI/GGUITextures.java | 22 ++++++++++++++++++++++ .../goodgenerator/client/GUI/GG_UITextures.java | 22 ---------------------- .../client/render/BlockRenderHandler.java | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 src/main/java/goodgenerator/client/GUI/GGUITextures.java delete mode 100644 src/main/java/goodgenerator/client/GUI/GG_UITextures.java (limited to 'src/main/java/goodgenerator/client') diff --git a/src/main/java/goodgenerator/client/GUI/GGUITextures.java b/src/main/java/goodgenerator/client/GUI/GGUITextures.java new file mode 100644 index 0000000000..068b70d46b --- /dev/null +++ b/src/main/java/goodgenerator/client/GUI/GGUITextures.java @@ -0,0 +1,22 @@ +package goodgenerator.client.GUI; + +import com.gtnewhorizons.modularui.api.drawable.UITexture; + +public class GGUITextures { + + private static final String MODID = "goodgenerator"; + + public static final UITexture PICTURE_NAQUADAH_REACTOR = UITexture.fullImage(MODID, "gui/picture/naquadah_reactor"); + public static final UITexture PICTURE_NEUTRON_ACTIVATOR = UITexture + .fullImage(MODID, "gui/picture/neutron_activator"); + public static final UITexture PICTURE_EXTREME_HEAT_EXCHANGER = UITexture + .fullImage(MODID, "gui/picture/extreme_heat_exchanger"); + public static final UITexture PICTURE_COMPONENT_ASSLINE = UITexture + .fullImage(MODID, "gui/picture/component_assline"); + public static final UITexture OVERLAY_BUTTON_LOCK_OFF = UITexture.fullImage(MODID, "gui/overlay_button/lock_off"); + public static final UITexture OVERLAY_BUTTON_LOCK_ON = UITexture.fullImage(MODID, "gui/overlay_button/lock_on"); + public static final UITexture OVERLAY_BUTTON_ASSEMBLER_MODE = UITexture + .fullImage(MODID, "gui/overlay_button/assembler_mode"); + public static final UITexture OVERLAY_BUTTON_PRECISE_MODE = UITexture + .fullImage(MODID, "gui/overlay_button/precise_mode"); +} diff --git a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java b/src/main/java/goodgenerator/client/GUI/GG_UITextures.java deleted file mode 100644 index 2b9bc8df84..0000000000 --- a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java +++ /dev/null @@ -1,22 +0,0 @@ -package goodgenerator.client.GUI; - -import com.gtnewhorizons.modularui.api.drawable.UITexture; - -public class GG_UITextures { - - private static final String MODID = "goodgenerator"; - - public static final UITexture PICTURE_NAQUADAH_REACTOR = UITexture.fullImage(MODID, "gui/picture/naquadah_reactor"); - public static final UITexture PICTURE_NEUTRON_ACTIVATOR = UITexture - .fullImage(MODID, "gui/picture/neutron_activator"); - public static final UITexture PICTURE_EXTREME_HEAT_EXCHANGER = UITexture - .fullImage(MODID, "gui/picture/extreme_heat_exchanger"); - public static final UITexture PICTURE_COMPONENT_ASSLINE = UITexture - .fullImage(MODID, "gui/picture/component_assline"); - public static final UITexture OVERLAY_BUTTON_LOCK_OFF = UITexture.fullImage(MODID, "gui/overlay_button/lock_off"); - public static final UITexture OVERLAY_BUTTON_LOCK_ON = UITexture.fullImage(MODID, "gui/overlay_button/lock_on"); - public static final UITexture OVERLAY_BUTTON_ASSEMBLER_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/assembler_mode"); - public static final UITexture OVERLAY_BUTTON_PRECISE_MODE = UITexture - .fullImage(MODID, "gui/overlay_button/precise_mode"); -} diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java index 01893339f5..c8e8bfacb8 100644 --- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java +++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java @@ -1,6 +1,6 @@ package goodgenerator.client.render; -import static gregtech.common.render.GT_Renderer_Block.*; +import static gregtech.common.render.GTRendererBlock.*; import static net.minecraftforge.common.util.ForgeDirection.*; import static net.minecraftforge.common.util.ForgeDirection.EAST; @@ -14,7 +14,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import goodgenerator.blocks.regularBlock.ITextureBlock; -import gregtech.GT_Mod; +import gregtech.GTMod; public class BlockRenderHandler implements ISimpleBlockRenderingHandler { @@ -59,7 +59,7 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) { - aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion; + aRenderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GTMod.gregtechproxy.mRenderTileAmbientOcclusion; aRenderer.useInventoryTint = false; if (aBlock instanceof ITextureBlock) { aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); -- cgit