diff options
Diffstat (limited to 'src/main/java/gregtech/common/render')
-rw-r--r-- | src/main/java/gregtech/common/render/DroneRender.java (renamed from src/main/java/gregtech/common/render/GT_RenderDrone.java) | 12 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/FlaskRenderer.java (renamed from src/main/java/gregtech/common/render/GT_FlaskRenderer.java) | 16 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java (renamed from src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java) | 8 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTCapeRenderer.java (renamed from src/main/java/gregtech/common/render/GT_CapeRenderer.java) | 18 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java (renamed from src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java) | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java (renamed from src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java) | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTIconFlipped.java (renamed from src/main/java/gregtech/common/render/GT_IconFlipped.java) | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTMultiTextureRender.java (renamed from src/main/java/gregtech/common/render/GT_MultiTexture.java) | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTRenderUtil.java (renamed from src/main/java/gregtech/common/render/GT_RenderUtil.java) | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTRenderedTexture.java (renamed from src/main/java/gregtech/common/render/GT_RenderedTexture.java) | 46 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTRendererBlock.java (renamed from src/main/java/gregtech/common/render/GT_Renderer_Block.java) | 54 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTSidedTextureRender.java (renamed from src/main/java/gregtech/common/render/GT_SidedTexture.java) | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTTextureBase.java (renamed from src/main/java/gregtech/common/render/GT_TextureBase.java) | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/GTTextureBuilder.java (renamed from src/main/java/gregtech/common/render/GT_TextureBuilder.java) | 25 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/IRenderedBlock.java | 12 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/LaserRenderer.java (renamed from src/main/java/gregtech/common/render/GT_LaserRenderer.java) | 13 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/MetaGeneratedToolRenderer.java (renamed from src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java) | 32 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/MultiTileRenderer.java (renamed from src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java) | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/PollutionRenderer.java (renamed from src/main/java/gregtech/common/render/GT_PollutionRenderer.java) | 22 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/WormholeRenderer.java (renamed from src/main/java/gregtech/common/render/GT_WormholeRenderer.java) | 12 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/DataStickRenderer.java (renamed from src/main/java/gregtech/common/render/items/GT_DataStick_Renderer.java) | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java | 12 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/GeneratedItemRenderer.java (renamed from src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java) | 20 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/GeneratedMaterialRenderer.java (renamed from src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java) | 14 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/InfinityRenderer.java | 6 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java (renamed from src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java) | 24 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/render/items/UniversiumRenderer.java | 12 |
30 files changed, 220 insertions, 220 deletions
diff --git a/src/main/java/gregtech/common/render/GT_RenderDrone.java b/src/main/java/gregtech/common/render/DroneRender.java index af1336a219..02445b6dc6 100644 --- a/src/main/java/gregtech/common/render/GT_RenderDrone.java +++ b/src/main/java/gregtech/common/render/DroneRender.java @@ -14,22 +14,22 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.common.tileentities.render.TileDrone; +import gregtech.common.tileentities.render.TileEntityDrone; @SideOnly(Side.CLIENT) -public class GT_RenderDrone extends TileEntitySpecialRenderer { +public class DroneRender extends TileEntitySpecialRenderer { private static final ResourceLocation DroneTexture = new ResourceLocation(GregTech.ID, "textures/model/drone.png"); private static final IModelCustom Drone = AdvancedModelLoader .loadModel(new ResourceLocation(GregTech.ID, "textures/model/drone.obj")); - public GT_RenderDrone() { - ClientRegistry.bindTileEntitySpecialRenderer(TileDrone.class, this); + public DroneRender() { + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDrone.class, this); } @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) { - if (!(tile instanceof TileDrone drone)) return; + if (!(tile instanceof TileEntityDrone drone)) return; final float size = 1.0f; GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); @@ -53,7 +53,7 @@ public class GT_RenderDrone extends TileEntitySpecialRenderer { GL11.glEnable(GL11.GL_LIGHTING); } - private void renderBlade(TileDrone drone, double size) { + private void renderBlade(TileEntityDrone drone, double size) { GL11.glDisable(GL11.GL_LIGHTING); GL11.glDisable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java b/src/main/java/gregtech/common/render/FlaskRenderer.java index addcb1cf70..f7d2e96ca1 100644 --- a/src/main/java/gregtech/common/render/GT_FlaskRenderer.java +++ b/src/main/java/gregtech/common/render/FlaskRenderer.java @@ -14,12 +14,12 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.ItemList; -import gregtech.common.items.GT_VolumetricFlask; +import gregtech.common.items.ItemVolumetricFlask; @SideOnly(Side.CLIENT) -public final class GT_FlaskRenderer implements IItemRenderer { +public final class FlaskRenderer implements IItemRenderer { - public GT_FlaskRenderer() { + public FlaskRenderer() { MinecraftForgeClient.registerItemRenderer(ItemList.VOLUMETRIC_FLASK.getItem(), this); } @@ -36,11 +36,11 @@ public final class GT_FlaskRenderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - GT_VolumetricFlask cell = (GT_VolumetricFlask) item.getItem(); + ItemVolumetricFlask cell = (ItemVolumetricFlask) item.getItem(); IIcon icon = item.getIconIndex(); GL11.glEnable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_ALPHA_TEST); - GT_RenderUtil.applyStandardItemTransform(type); + GTRenderUtil.applyStandardItemTransform(type); FluidStack fs = cell != null ? cell.getFluid(item) : null; if (fs != null) { @@ -51,20 +51,20 @@ public final class GT_FlaskRenderer implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glBlendFunc(GL11.GL_ZERO, GL11.GL_ONE); - GT_RenderUtil.renderItem(type, iconWindow); + GTRenderUtil.renderItem(type, iconWindow); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glColor3ub((byte) (fluidColor >> 16), (byte) (fluidColor >> 8), (byte) fluidColor); - GT_RenderUtil.renderItem(type, fluidIcon); + GTRenderUtil.renderItem(type, fluidIcon); GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1); GL11.glDepthFunc(GL11.GL_LEQUAL); } Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GT_RenderUtil.renderItem(type, icon); + GTRenderUtil.renderItem(type, icon); GL11.glDisable(GL11.GL_ALPHA_TEST); GL11.glDisable(GL11.GL_BLEND); } diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java index 9a35f6bc57..80e2cbe6a6 100644 --- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java +++ b/src/main/java/gregtech/common/render/FluidDisplayStackRenderer.java @@ -16,12 +16,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; -import gregtech.common.items.GT_FluidDisplayItem; +import gregtech.common.items.ItemFluidDisplay; @SideOnly(Side.CLIENT) -public class GT_FluidDisplayStackRenderer implements IItemRenderer { +public class FluidDisplayStackRenderer implements IItemRenderer { - public GT_FluidDisplayStackRenderer() { + public FluidDisplayStackRenderer() { MinecraftForgeClient.registerItemRenderer(ItemList.Display_Fluid.getItem(), this); } @@ -39,7 +39,7 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - if (item == null || item.getItem() == null || !(item.getItem() instanceof GT_FluidDisplayItem)) return; + if (item == null || item.getItem() == null || !(item.getItem() instanceof ItemFluidDisplay)) return; OpenGlHelper.glBlendFunc(770, 771, 1, 0); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/gregtech/common/render/GT_CapeRenderer.java b/src/main/java/gregtech/common/render/GTCapeRenderer.java index ec9ef2880c..ea8e0a37cd 100644 --- a/src/main/java/gregtech/common/render/GT_CapeRenderer.java +++ b/src/main/java/gregtech/common/render/GTCapeRenderer.java @@ -13,11 +13,11 @@ import net.minecraftforge.client.event.RenderPlayerEvent; import org.lwjgl.opengl.GL11; -import gregtech.api.enums.GT_Values; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_Utility; +import gregtech.api.enums.GTValues; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTUtility; -public class GT_CapeRenderer extends RenderPlayer { +public class GTCapeRenderer extends RenderPlayer { private final ResourceLocation[] mCapes = { new ResourceLocation("gregtech:textures/BrainTechCape.png"), new ResourceLocation("gregtech:textures/GregTechCape.png"), @@ -29,14 +29,14 @@ public class GT_CapeRenderer extends RenderPlayer { new ResourceLocation("gregtech:textures/Stargate.png") }; private final Collection<String> mCapeList; - public GT_CapeRenderer(Collection<String> aCapeList) { + public GTCapeRenderer(Collection<String> aCapeList) { this.mCapeList = aCapeList; setRenderManager(RenderManager.instance); } public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) { AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer; - if (GT_Utility.getFullInvisibility(aPlayer)) { + if (GTUtility.getFullInvisibility(aPlayer)) { aEvent.setCanceled(true); return; } @@ -44,7 +44,7 @@ public class GT_CapeRenderer extends RenderPlayer { if (aPlayer.isInvisible()) { return; } - if (GT_Utility.getPotion(aPlayer, Potion.invisibility.id)) { + if (GTUtility.getPotion(aPlayer, Potion.invisibility.id)) { return; } try { @@ -140,8 +140,8 @@ public class GT_CapeRenderer extends RenderPlayer { GL11.glPopMatrix(); } } catch (Throwable e) { - if (GT_Values.D1) { - e.printStackTrace(GT_Log.err); + if (GTValues.D1) { + e.printStackTrace(GTLog.err); } } } diff --git a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java index 937c1a994f..ab4282c7ba 100644 --- a/src/main/java/gregtech/common/render/GT_CopiedBlockTexture.java +++ b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java @@ -9,12 +9,12 @@ import gregtech.api.interfaces.IBlockContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.util.LightingHelper; -public class GT_CopiedBlockTexture extends GT_TextureBase implements ITexture, IBlockContainer { +public class GTCopiedBlockTextureRender extends GTTextureBase implements ITexture, IBlockContainer { private final Block mBlock; private final byte mSide, mMeta; - protected GT_CopiedBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { + protected GTCopiedBlockTextureRender(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedBlockTexture"); mBlock = aBlock; mSide = (byte) ordinalSide; diff --git a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java index 17fa9ac8ff..d3f6292435 100644 --- a/src/main/java/gregtech/common/render/GT_CopiedCTMBlockTexture.java +++ b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java @@ -7,15 +7,15 @@ import net.minecraftforge.common.util.ForgeDirection; import gregtech.api.interfaces.IBlockContainer; import gregtech.api.interfaces.ITexture; -import gregtech.api.util.GT_RenderingWorld; +import gregtech.api.util.GTRenderingWorld; import gregtech.api.util.LightingHelper; -class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBlockContainer { +class GTCopiedCTMBlockTexture extends GTTextureBase implements ITexture, IBlockContainer { private final Block mBlock; private final byte mSide, mMeta; - GT_CopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { + GTCopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) { if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedCTMBlockTexture"); mBlock = aBlock; @@ -33,8 +33,8 @@ class GT_CopiedCTMBlockTexture extends GT_TextureBase implements ITexture, IBloc return mBlock.getIcon(getBlockAccess(aRenderer), aX, aY, aZ, tSide); } - private GT_RenderingWorld getBlockAccess(RenderBlocks aRenderer) { - return GT_RenderingWorld.getInstance(aRenderer.blockAccess); + private GTRenderingWorld getBlockAccess(RenderBlocks aRenderer) { + return GTRenderingWorld.getInstance(aRenderer.blockAccess); } @Override diff --git a/src/main/java/gregtech/common/render/GT_IconFlipped.java b/src/main/java/gregtech/common/render/GTIconFlipped.java index 8258e74ffa..261e5e63b2 100644 --- a/src/main/java/gregtech/common/render/GT_IconFlipped.java +++ b/src/main/java/gregtech/common/render/GTIconFlipped.java @@ -6,13 +6,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class GT_IconFlipped implements IIcon { +public class GTIconFlipped implements IIcon { private final IIcon baseIcon; private final boolean flipU; private final boolean flipV; - public GT_IconFlipped(IIcon baseIcon, boolean flipU, boolean flipV) { + public GTIconFlipped(IIcon baseIcon, boolean flipU, boolean flipV) { this.baseIcon = baseIcon; this.flipU = flipU; this.flipV = flipV; diff --git a/src/main/java/gregtech/common/render/GT_MultiTexture.java b/src/main/java/gregtech/common/render/GTMultiTextureRender.java index d3cff271cb..1eaf4c69e3 100644 --- a/src/main/java/gregtech/common/render/GT_MultiTexture.java +++ b/src/main/java/gregtech/common/render/GTMultiTextureRender.java @@ -3,7 +3,7 @@ package gregtech.common.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.interfaces.ITexture; /** @@ -14,15 +14,15 @@ import gregtech.api.interfaces.ITexture; * I should have done this much earlier... * </p> */ -public class GT_MultiTexture extends GT_TextureBase implements ITexture { +public class GTMultiTextureRender extends GTTextureBase implements ITexture { protected final ITexture[] mTextures; - public static GT_MultiTexture get(ITexture... aTextures) { - return GT_Mod.instance.isClientSide() ? new GT_MultiTexture(aTextures) : null; + public static GTMultiTextureRender get(ITexture... aTextures) { + return GTMod.instance.isClientSide() ? new GTMultiTextureRender(aTextures) : null; } - protected GT_MultiTexture(ITexture... aTextures) { + protected GTMultiTextureRender(ITexture... aTextures) { mTextures = aTextures; } diff --git a/src/main/java/gregtech/common/render/GT_RenderUtil.java b/src/main/java/gregtech/common/render/GTRenderUtil.java index 68195513fe..650d827cff 100644 --- a/src/main/java/gregtech/common/render/GT_RenderUtil.java +++ b/src/main/java/gregtech/common/render/GTRenderUtil.java @@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; -public class GT_RenderUtil { +public class GTRenderUtil { public static void colorGTItem(ItemStack aStack) { if (aStack.getItem() instanceof IGT_ItemWithMaterialRenderer aItem) { diff --git a/src/main/java/gregtech/common/render/GT_RenderedTexture.java b/src/main/java/gregtech/common/render/GTRenderedTexture.java index afaf3b290c..3bd4e6d864 100644 --- a/src/main/java/gregtech/common/render/GT_RenderedTexture.java +++ b/src/main/java/gregtech/common/render/GTRenderedTexture.java @@ -18,7 +18,7 @@ import com.gtnewhorizon.structurelib.alignment.enumerable.ExtendedFacing; import com.gtnewhorizon.structurelib.alignment.enumerable.Flip; import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.interfaces.IColorModulationContainer; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; @@ -26,7 +26,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.LightingHelper; -public class GT_RenderedTexture extends GT_TextureBase implements ITexture, IColorModulationContainer { +public class GTRenderedTexture extends GTTextureBase implements ITexture, IColorModulationContainer { protected final IIconContainer mIconContainer; private final short[] mRGBa; @@ -34,7 +34,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol private final boolean stdOrient; private final boolean useExtFacing; - protected GT_RenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow, + protected GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow, boolean stdOrient, boolean extFacing) { if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); mIconContainer = aIcon; @@ -55,7 +55,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final boolean enableAO = aRenderer.enableAO; final LightingHelper lighting = new LightingHelper(aRenderer); if (glow) { - if (!GT_Mod.gregtechproxy.mRenderGlowTextures) { + if (!GTMod.gregtechproxy.mRenderGlowTextures) { draw(aRenderer); return; } @@ -81,7 +81,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final boolean enableAO = aRenderer.enableAO; final LightingHelper lighting = new LightingHelper(aRenderer); if (glow) { - if (!GT_Mod.gregtechproxy.mRenderGlowTextures) { + if (!GTMod.gregtechproxy.mRenderGlowTextures) { draw(aRenderer); return; } @@ -107,7 +107,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final boolean enableAO = aRenderer.enableAO; final LightingHelper lighting = new LightingHelper(aRenderer); if (glow) { - if (!GT_Mod.gregtechproxy.mRenderGlowTextures) { + if (!GTMod.gregtechproxy.mRenderGlowTextures) { draw(aRenderer); return; } @@ -133,7 +133,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final boolean enableAO = aRenderer.enableAO; final LightingHelper lighting = new LightingHelper(aRenderer); if (glow) { - if (!GT_Mod.gregtechproxy.mRenderGlowTextures) { + if (!GTMod.gregtechproxy.mRenderGlowTextures) { draw(aRenderer); return; } @@ -159,7 +159,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final boolean enableAO = aRenderer.enableAO; final LightingHelper lighting = new LightingHelper(aRenderer); if (glow) { - if (!GT_Mod.gregtechproxy.mRenderGlowTextures) { + if (!GTMod.gregtechproxy.mRenderGlowTextures) { draw(aRenderer); return; } @@ -185,7 +185,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol final boolean enableAO = aRenderer.enableAO; final LightingHelper lighting = new LightingHelper(aRenderer); if (glow) { - if (!GT_Mod.gregtechproxy.mRenderGlowTextures) { + if (!GTMod.gregtechproxy.mRenderGlowTextures) { draw(aRenderer); return; } @@ -234,9 +234,9 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol x, y, z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped()) - : new GT_IconFlipped(icon, !stdOrient, false)); + useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped() ^ !stdOrient, aFlip.isVerticallyFliped()) + : new GTIconFlipped(icon, !stdOrient, false)); aRenderer.uvRotateBottom = 0; } @@ -259,8 +259,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol x, y, z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) : icon); aRenderer.uvRotateTop = 0; } @@ -285,8 +285,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol x, y, z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) : icon); aRenderer.uvRotateEast = 0; aRenderer.field_152631_f = false; @@ -311,8 +311,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol x, y, z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) : icon); aRenderer.uvRotateWest = 0; } @@ -336,8 +336,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol x, y, z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) : icon); aRenderer.uvRotateNorth = 0; } @@ -362,8 +362,8 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol x, y, z, - useExtFacing && GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped - ? new GT_IconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) + useExtFacing && GTMod.gregtechproxy.mRenderFlippedMachinesFlipped + ? new GTIconFlipped(icon, aFlip.isHorizontallyFlipped(), aFlip.isVerticallyFliped()) : icon); aRenderer.uvRotateSouth = 0; aRenderer.field_152631_f = false; @@ -371,7 +371,7 @@ public class GT_RenderedTexture extends GT_TextureBase implements ITexture, ICol private ExtendedFacing getExtendedFacing(int x, int y, int z) { if (stdOrient) return ExtendedFacing.DEFAULT; - final EntityPlayer player = GT_Mod.gregtechproxy.getThePlayer(); + final EntityPlayer player = GTMod.gregtechproxy.getThePlayer(); if (player == null) return ExtendedFacing.DEFAULT; final World w = player.getEntityWorld(); if (w == null) return ExtendedFacing.DEFAULT; diff --git a/src/main/java/gregtech/common/render/GT_Renderer_Block.java b/src/main/java/gregtech/common/render/GTRendererBlock.java index aa61cc125e..1c8e2da29d 100644 --- a/src/main/java/gregtech/common/render/GT_Renderer_Block.java +++ b/src/main/java/gregtech/common/render/GTRendererBlock.java @@ -1,11 +1,11 @@ package gregtech.common.render; -import static gregtech.api.enums.GT_Values.SIDE_DOWN; -import static gregtech.api.enums.GT_Values.SIDE_EAST; -import static gregtech.api.enums.GT_Values.SIDE_NORTH; -import static gregtech.api.enums.GT_Values.SIDE_SOUTH; -import static gregtech.api.enums.GT_Values.SIDE_UP; -import static gregtech.api.enums.GT_Values.SIDE_WEST; +import static gregtech.api.enums.GTValues.SIDE_DOWN; +import static gregtech.api.enums.GTValues.SIDE_EAST; +import static gregtech.api.enums.GTValues.SIDE_NORTH; +import static gregtech.api.enums.GTValues.SIDE_SOUTH; +import static gregtech.api.enums.GTValues.SIDE_UP; +import static gregtech.api.enums.GTValues.SIDE_WEST; import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_DOWN; import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_EAST; import static gregtech.api.interfaces.metatileentity.IConnectable.CONNECTED_NORTH; @@ -42,8 +42,8 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.GTMod; +import gregtech.api.GregTechAPI; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IAllSidedTexturedTileEntity; @@ -52,13 +52,13 @@ import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity; import gregtech.api.interfaces.tileentity.ITexturedTileEntity; import gregtech.api.metatileentity.MetaPipeEntity; import gregtech.api.objects.XSTR; -import gregtech.common.blocks.GT_Block_FrameBox; -import gregtech.common.blocks.GT_Block_Machines; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.common.blocks.BlockFrameBox; +import gregtech.common.blocks.BlockMachines; +import gregtech.common.blocks.BlockOresAbstract; +import gregtech.common.blocks.TileEntityOres; @ThreadSafeISBRH(perThread = true) -public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { +public class GTRendererBlock implements ISimpleBlockRenderingHandler { public static final float blockMin = 0.0F; public static final float blockMax = 1.0F; @@ -67,12 +67,12 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { private static final float coverInnerMax = blockMax - coverThickness; @Deprecated - public static GT_Renderer_Block INSTANCE; + public static GTRendererBlock INSTANCE; public static int mRenderID; public static void register() { mRenderID = RenderingRegistry.getNextAvailableRenderId(); - INSTANCE = new GT_Renderer_Block(); + INSTANCE = new GTRendererBlock(); RenderingRegistry.registerBlockHandler(INSTANCE); } @@ -543,7 +543,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } } - final GT_TileEntity_Ores tTileEntity = new GT_TileEntity_Ores(); + final TileEntityOres tTileEntity = new TileEntityOres(); @Override public void renderInventoryBlock(Block aBlock, int aMeta, int aModelID, RenderBlocks aRenderer) { @@ -552,7 +552,7 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - if (aBlock instanceof GT_Block_Ores_Abstract) { + if (aBlock instanceof BlockOresAbstract) { tTileEntity.mMetaData = ((short) aMeta); aBlock.setBlockBoundsForItemRender(); @@ -566,13 +566,13 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { renderNegativeXFacing(null, aRenderer, aBlock, 0, 0, 0, texture, true); renderPositiveXFacing(null, aRenderer, aBlock, 0, 0, 0, texture, true); // spotless:on - } else if (aMeta > 0 && (aMeta < GregTech_API.METATILEENTITIES.length) - && aBlock instanceof GT_Block_Machines - && (GregTech_API.METATILEENTITIES[aMeta] != null) - && (!GregTech_API.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer))) { + } else if (aMeta > 0 && (aMeta < GregTechAPI.METATILEENTITIES.length) + && aBlock instanceof BlockMachines + && (GregTechAPI.METATILEENTITIES[aMeta] != null) + && (!GregTechAPI.METATILEENTITIES[aMeta].renderInInventory(aBlock, aMeta, aRenderer))) { renderNormalInventoryMetaTileEntity(aBlock, aMeta, aRenderer); - } else if (aBlock instanceof GT_Block_FrameBox) { - ITexture[] texture = ((GT_Block_FrameBox) aBlock).getTexture(aMeta); + } else if (aBlock instanceof BlockFrameBox) { + ITexture[] texture = ((BlockFrameBox) aBlock).getTexture(aMeta); aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); // spotless:off @@ -593,10 +593,10 @@ public class GT_Renderer_Block implements ISimpleBlockRenderingHandler { } private static void renderNormalInventoryMetaTileEntity(Block aBlock, int aMeta, RenderBlocks aRenderer) { - if ((aMeta <= 0) || (aMeta >= GregTech_API.METATILEENTITIES.length)) { + if ((aMeta <= 0) || (aMeta >= GregTechAPI.METATILEENTITIES.length)) { return; } - final IMetaTileEntity tMetaTileEntity = GregTech_API.METATILEENTITIES[aMeta]; + final IMetaTileEntity tMetaTileEntity = GregTechAPI.METATILEENTITIES[aMeta]; if (tMetaTileEntity == null) { return; } @@ -724,14 +724,14 @@ public class GT_Renderer_Block 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; final TileEntity tileEntity = aWorld.getTileEntity(aX, aY, aZ); // If this block does not have a TE, render it as a normal block. // Otherwise, render the TE instead. - if (tileEntity == null && aBlock instanceof GT_Block_FrameBox frameBlock) { + if (tileEntity == null && aBlock instanceof BlockFrameBox frameBlock) { int meta = aWorld.getBlockMetadata(aX, aY, aZ); ITexture[] texture = frameBlock.getTexture(meta); if (texture == null) return false; diff --git a/src/main/java/gregtech/common/render/GT_SidedTexture.java b/src/main/java/gregtech/common/render/GTSidedTextureRender.java index 7a851fd1e7..15885f10ce 100644 --- a/src/main/java/gregtech/common/render/GT_SidedTexture.java +++ b/src/main/java/gregtech/common/render/GTSidedTextureRender.java @@ -8,7 +8,7 @@ import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.render.TextureFactory; -public class GT_SidedTexture extends GT_TextureBase implements ITexture, IColorModulationContainer { +public class GTSidedTextureRender extends GTTextureBase implements ITexture, IColorModulationContainer { protected final ITexture[] mTextures; /** @@ -18,7 +18,7 @@ public class GT_SidedTexture extends GT_TextureBase implements ITexture, IColorM */ private final short[] mRGBa; - protected GT_SidedTexture(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, + protected GTSidedTextureRender(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2, IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) { if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture"); mTextures = new ITexture[] { TextureFactory.of(aIcon0, aRGBa, aAllowAlpha), diff --git a/src/main/java/gregtech/common/render/GT_TextureBase.java b/src/main/java/gregtech/common/render/GTTextureBase.java index 20188e2e01..08dedf1d6a 100644 --- a/src/main/java/gregtech/common/render/GT_TextureBase.java +++ b/src/main/java/gregtech/common/render/GTTextureBase.java @@ -4,15 +4,15 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import gregtech.api.interfaces.ITexture; -import gregtech.api.util.GT_UtilityClient; +import gregtech.api.util.GTUtilityClient; -public abstract class GT_TextureBase implements ITexture { +public abstract class GTTextureBase implements ITexture { protected boolean isDrawing = false; @Override public void startDrawingQuads(RenderBlocks aRenderer, float aNormalX, float aNormalY, float aNormalZ) { - if (aRenderer.useInventoryTint && (!isOldTexture() || !GT_UtilityClient.isDrawing(Tessellator.instance))) { + if (aRenderer.useInventoryTint && (!isOldTexture() || !GTUtilityClient.isDrawing(Tessellator.instance))) { // Draw if we're not an old texture OR we are an old texture AND we're not already drawing isDrawing = true; Tessellator.instance.startDrawingQuads(); diff --git a/src/main/java/gregtech/common/render/GT_TextureBuilder.java b/src/main/java/gregtech/common/render/GTTextureBuilder.java index af8a590fc1..aad734b828 100644 --- a/src/main/java/gregtech/common/render/GT_TextureBuilder.java +++ b/src/main/java/gregtech/common/render/GTTextureBuilder.java @@ -7,15 +7,15 @@ import java.util.List; import net.minecraft.block.Block; import net.minecraftforge.common.util.ForgeDirection; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.ITextureBuilder; @SuppressWarnings({ "unused", "ClassWithTooManyFields" }) -public class GT_TextureBuilder implements ITextureBuilder { +public class GTTextureBuilder implements ITextureBuilder { private final List<IIconContainer> iconContainerList; private final List<ITexture> textureLayers; @@ -29,7 +29,7 @@ public class GT_TextureBuilder implements ITextureBuilder { private boolean glow; private Boolean worldCoord = null; - public GT_TextureBuilder() { + public GTTextureBuilder() { textureLayers = new ArrayList<>(); iconContainerList = new ArrayList<>(); rgba = Dyes._NULL.mRGBa; @@ -113,14 +113,14 @@ public class GT_TextureBuilder implements ITextureBuilder { public ITexture build() { if (fromBlock != null) { if (worldCoord == Boolean.TRUE || worldCoord == null && isCTMBlock(fromBlock, fromMeta)) - return new GT_CopiedCTMBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha); - else return new GT_CopiedBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha); + return new GTCopiedCTMBlockTexture(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha); + else return new GTCopiedBlockTextureRender(fromBlock, fromSide.ordinal(), fromMeta, rgba, allowAlpha); } if (worldCoord != null) throw new IllegalStateException("worldCoord without from block"); - if (!textureLayers.isEmpty()) return new GT_MultiTexture(textureLayers.toArray(new ITexture[0])); + if (!textureLayers.isEmpty()) return new GTMultiTextureRender(textureLayers.toArray(new ITexture[0])); return switch (iconContainerList.size()) { - case 1 -> new GT_RenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing); - case 6 -> new GT_SidedTexture( + case 1 -> new GTRenderedTexture(iconContainerList.get(0), rgba, allowAlpha, glow, stdOrient, extFacing); + case 6 -> new GTSidedTextureRender( iconContainerList.get(ForgeDirection.DOWN.ordinal()), iconContainerList.get(ForgeDirection.UP.ordinal()), iconContainerList.get(ForgeDirection.NORTH.ordinal()), @@ -134,16 +134,15 @@ public class GT_TextureBuilder implements ITextureBuilder { } private boolean isCTMBlock(Block fromBlock, int fromMeta) { - return GT_Mod.gregtechproxy.mCTMBlockCache - .computeIfAbsent(fromBlock, (byte) fromMeta, GT_TextureBuilder::apply); + return GTMod.gregtechproxy.mCTMBlockCache.computeIfAbsent(fromBlock, (byte) fromMeta, GTTextureBuilder::apply); } private static Boolean apply(Block b, Byte m) { Class<?> clazz = b.getClass(); while (clazz != Block.class) { final String className = clazz.getName(); - if (GT_Values.mCTMDisabledBlock.contains(className)) return false; - if (GT_Values.mCTMEnabledBlock.contains(className)) return true; + if (GTValues.mCTMDisabledBlock.contains(className)) return false; + if (GTValues.mCTMEnabledBlock.contains(className)) return true; clazz = clazz.getSuperclass(); } return false; diff --git a/src/main/java/gregtech/common/render/IRenderedBlock.java b/src/main/java/gregtech/common/render/IRenderedBlock.java index 16268de750..9b55388770 100644 --- a/src/main/java/gregtech/common/render/IRenderedBlock.java +++ b/src/main/java/gregtech/common/render/IRenderedBlock.java @@ -102,12 +102,12 @@ public interface IRenderedBlock { @Override public boolean renderBlock(Block aBlock, RenderBlocks aRenderer, IBlockAccess aWorld, int aX, int aY, int aZ) { aBlock.setBlockBounds(-0.25F, -0.25F, -0.25F, 1.25F, 1.25F, 1.25F); - GT_Renderer_Block.renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); - GT_Renderer_Block.renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); - GT_Renderer_Block.renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); - GT_Renderer_Block.renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); - GT_Renderer_Block.renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); - GT_Renderer_Block.renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); + GTRendererBlock.renderNegativeYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); + GTRendererBlock.renderPositiveYFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); + GTRendererBlock.renderNegativeZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); + GTRendererBlock.renderPositiveZFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); + GTRendererBlock.renderNegativeXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); + GTRendererBlock.renderPositiveXFacing(aWorld, aRenderer, aBlock, aX, aY, aZ, mErrorTexture, false); return true; } } diff --git a/src/main/java/gregtech/common/render/GT_LaserRenderer.java b/src/main/java/gregtech/common/render/LaserRenderer.java index 1c54a5d58b..4afdbcf5ca 100644 --- a/src/main/java/gregtech/common/render/GT_LaserRenderer.java +++ b/src/main/java/gregtech/common/render/LaserRenderer.java @@ -8,9 +8,9 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ClientRegistry; -import gregtech.common.tileentities.render.TileLaser; +import gregtech.common.tileentities.render.TileEntityLaser; -public class GT_LaserRenderer extends TileEntitySpecialRenderer { +public class LaserRenderer extends TileEntitySpecialRenderer { private double zOffset = 0.0; private double xOffset = 0.0; @@ -22,8 +22,8 @@ public class GT_LaserRenderer extends TileEntitySpecialRenderer { final private float laserSpeed = 0.8F; - public GT_LaserRenderer() { - ClientRegistry.bindTileEntitySpecialRenderer(TileLaser.class, this); + public LaserRenderer() { + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityLaser.class, this); } private void maths(float counter) { @@ -32,7 +32,8 @@ public class GT_LaserRenderer extends TileEntitySpecialRenderer { xOffset = 0.5 + 0.45 * Math.sin(0.5 * Math.PI * tc); } - private void renderFakeLine(TileLaser laser, double x1, double y1, double z1, double x2, double y2, double z2) { + private void renderFakeLine(TileEntityLaser laser, double x1, double y1, double z1, double x2, double y2, + double z2) { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.setColorRGBA_F(laser.getRed(), laser.getGreen(), laser.getBlue(), lineOpacity); @@ -50,7 +51,7 @@ public class GT_LaserRenderer extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) { - final TileLaser ltile = (TileLaser) tile; + final TileEntityLaser ltile = (TileEntityLaser) tile; if (ltile.getShouldRender()) { // Push GL state diff --git a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java b/src/main/java/gregtech/common/render/MetaGeneratedToolRenderer.java index 96285a3fc1..0e9650401b 100644 --- a/src/main/java/gregtech/common/render/GT_MetaGenerated_Tool_Renderer.java +++ b/src/main/java/gregtech/common/render/MetaGeneratedToolRenderer.java @@ -8,17 +8,17 @@ import net.minecraftforge.client.MinecraftForgeClient; import org.lwjgl.opengl.GL11; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.items.MetaGeneratedTool; -public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { +public class MetaGeneratedToolRenderer implements IItemRenderer { - public GT_MetaGenerated_Tool_Renderer() { - for (GT_MetaGenerated_Tool tItem : GT_MetaGenerated_Tool.sInstances.values()) { + public MetaGeneratedToolRenderer() { + for (MetaGeneratedTool tItem : MetaGeneratedTool.sInstances.values()) { if (tItem != null) { MinecraftForgeClient.registerItemRenderer(tItem, this); } @@ -40,9 +40,9 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack stack, Object... data) { - GT_MetaGenerated_Tool item = (GT_MetaGenerated_Tool) stack.getItem(); + MetaGeneratedTool item = (MetaGeneratedTool) stack.getItem(); GL11.glEnable(GL11.GL_BLEND); - GT_RenderUtil.applyStandardItemTransform(type); + GTRenderUtil.applyStandardItemTransform(type); GL11.glColor3f(1.0F, 1.0F, 1.0F); IToolStats toolStats = item != null ? item.getToolStats(stack) : null; @@ -51,11 +51,11 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { renderToolPart(type, stack, toolStats, true); if ((type == ItemRenderType.INVENTORY) - && (GT_MetaGenerated_Tool.getPrimaryMaterial(stack) != Materials._NULL)) { - if (GT_Mod.gregtechproxy.mRenderItemDurabilityBar) { + && (MetaGeneratedTool.getPrimaryMaterial(stack) != Materials._NULL)) { + if (GTMod.gregtechproxy.mRenderItemDurabilityBar) { IIconContainer iconContainer; - long damage = GT_MetaGenerated_Tool.getToolDamage(stack); - long maxDamage = GT_MetaGenerated_Tool.getToolMaxDamage(stack); + long damage = MetaGeneratedTool.getToolDamage(stack); + long maxDamage = MetaGeneratedTool.getToolMaxDamage(stack); if (damage <= 0L) { iconContainer = Textures.ItemIcons.DURABILITY_BAR[8]; } else if (damage >= maxDamage) { @@ -67,7 +67,7 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { renderIcon(iconContainer); } - if (GT_Mod.gregtechproxy.mRenderItemChargeBar) { + if (GTMod.gregtechproxy.mRenderItemChargeBar) { IIconContainer iconContainer; Long[] stats = item.getElectricStats(stack); if ((stats != null) && (stats[3] < 0L)) { @@ -97,12 +97,12 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { if (icon != null) { Minecraft.getMinecraft().renderEngine.bindTexture(iconContainer.getTextureFile()); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); + GTRenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } if (overlay != null) { Minecraft.getMinecraft().renderEngine.bindTexture(iconContainer.getTextureFile()); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GT_RenderUtil.renderItemIcon(overlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); + GTRenderUtil.renderItemIcon(overlay, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } } } @@ -117,13 +117,13 @@ public class GT_MetaGenerated_Tool_Renderer implements IItemRenderer { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); short[] modulation = toolStats.getRGBa(isToolHead, stack); GL11.glColor3f(modulation[0] / 255.0F, modulation[1] / 255.0F, modulation[2] / 255.0F); - GT_RenderUtil.renderItem(type, icon); + GTRenderUtil.renderItem(type, icon); GL11.glColor3f(1.0F, 1.0F, 1.0F); } if (overlay != null) { Minecraft.getMinecraft().renderEngine.bindTexture(iconContainer.getTextureFile()); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GT_RenderUtil.renderItem(type, overlay); + GTRenderUtil.renderItem(type, overlay); } } } diff --git a/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java b/src/main/java/gregtech/common/render/MultiTileRenderer.java index c8c1d832b0..8dca8c3c33 100644 --- a/src/main/java/gregtech/common/render/GT_MultiTile_Renderer.java +++ b/src/main/java/gregtech/common/render/MultiTileRenderer.java @@ -12,7 +12,7 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.interfaces.ITexture; import gregtech.api.logic.ModelRenderLogic; import gregtech.api.logic.interfaces.ModelRenderLogicHost; @@ -22,12 +22,12 @@ import gregtech.api.multitileentity.MultiTileEntityRegistry; import gregtech.api.multitileentity.interfaces.IMultiBlockController; import gregtech.api.multitileentity.multiblock.base.MultiBlockPart; -public class GT_MultiTile_Renderer implements ISimpleBlockRenderingHandler { +public class MultiTileRenderer implements ISimpleBlockRenderingHandler { private final int renderID; - public static GT_MultiTile_Renderer INSTANCE; + public static MultiTileRenderer INSTANCE; - public GT_MultiTile_Renderer() { + public MultiTileRenderer() { this.renderID = RenderingRegistry.getNextAvailableRenderId(); INSTANCE = this; RenderingRegistry.registerBlockHandler(this); @@ -76,7 +76,7 @@ public class GT_MultiTile_Renderer implements ISimpleBlockRenderingHandler { return false; } - renderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion; + renderer.enableAO = Minecraft.isAmbientOcclusionEnabled() && GTMod.gregtechproxy.mRenderTileAmbientOcclusion; renderer.useInventoryTint = false; if (entity instanceof ModelRenderLogicHost modelEntity && modelEntity.shouldRenderModel()) { diff --git a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java b/src/main/java/gregtech/common/render/PollutionRenderer.java index 476305f1b3..3b97fc820f 100644 --- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java +++ b/src/main/java/gregtech/common/render/PollutionRenderer.java @@ -21,14 +21,14 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.GT_Mod; -import gregtech.common.entities.GT_EntityFXPollution; -import gregtech.common.misc.GT_ClientPollutionMap; +import gregtech.GTMod; +import gregtech.common.entities.EntityFXPollution; +import gregtech.common.misc.GTClientPollutionMap; @SideOnly(Side.CLIENT) -public class GT_PollutionRenderer { +public class PollutionRenderer { - private static GT_ClientPollutionMap pollutionMap; + private static GTClientPollutionMap pollutionMap; private static int playerPollution = 0; private static final boolean DEBUG = false; @@ -51,8 +51,8 @@ public class GT_PollutionRenderer { // TODO need to soft update some blocks, grass and leaves does more often than liquid it looks like. - public GT_PollutionRenderer() { - pollutionMap = new GT_ClientPollutionMap(); + public PollutionRenderer() { + pollutionMap = new GTClientPollutionMap(); } public void preLoad() { @@ -130,7 +130,7 @@ public class GT_PollutionRenderer { @SubscribeEvent(priority = EventPriority.LOWEST) public void renderGTPollutionFog(EntityViewRenderEvent.RenderFogEvent event) { - if (!GT_Mod.gregtechproxy.mRenderPollutionFog) return; + if (!GTMod.gregtechproxy.mRenderPollutionFog) return; if ((!DEBUG && Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) || (fogIntensityLastTick < FOG_START_EXP_RATIO)) return; @@ -147,7 +147,7 @@ public class GT_PollutionRenderer { @SubscribeEvent(priority = EventPriority.LOWEST) public void renderGTPollutionFog(EntityViewRenderEvent.FogDensity event) { - if (!GT_Mod.gregtechproxy.mRenderPollutionFog) return; + if (!GTMod.gregtechproxy.mRenderPollutionFog) return; if (!DEBUG && Minecraft.getMinecraft().thePlayer.capabilities.isCreativeMode) return; @@ -203,7 +203,7 @@ public class GT_PollutionRenderer { // Adding dirt particles in the air @SubscribeEvent(priority = EventPriority.HIGHEST) public void onClientTick(TickEvent.ClientTickEvent event) { - if (!GT_Mod.gregtechproxy.mRenderDirtParticles) return; + if (!GTMod.gregtechproxy.mRenderDirtParticles) return; Minecraft mc = Minecraft.getMinecraft(); if (mc == null) return; EntityClientPlayerMP player = mc.thePlayer; @@ -230,7 +230,7 @@ public class GT_PollutionRenderer { Block block = w.getBlock(i1, j1, k1); if (block.getMaterial() == Material.air) { - EntityFX fx = new GT_EntityFXPollution( + EntityFX fx = new EntityFXPollution( w, (float) i1 + w.rand.nextFloat(), (float) j1 + w.rand.nextFloat(), diff --git a/src/main/java/gregtech/common/render/GT_WormholeRenderer.java b/src/main/java/gregtech/common/render/WormholeRenderer.java index 43385eb861..c9e2b61fe5 100644 --- a/src/main/java/gregtech/common/render/GT_WormholeRenderer.java +++ b/src/main/java/gregtech/common/render/WormholeRenderer.java @@ -1,6 +1,6 @@ package gregtech.common.render; -import static com.github.technus.tectech.rendering.EOH.EOH_RenderingUtils.addRenderedBlockInWorld; +import static tectech.rendering.EOH.EOHRenderingUtils.addRenderedBlockInWorld; import net.minecraft.block.Block; import net.minecraft.client.renderer.Tessellator; @@ -12,12 +12,12 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ClientRegistry; -import gregtech.common.tileentities.render.TileWormhole; +import gregtech.common.tileentities.render.TileEntityWormhole; -public class GT_WormholeRenderer extends TileEntitySpecialRenderer { +public class WormholeRenderer extends TileEntitySpecialRenderer { - public GT_WormholeRenderer() { - ClientRegistry.bindTileEntitySpecialRenderer(TileWormhole.class, this); + public WormholeRenderer() { + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWormhole.class, this); } private static final double trimPercentage = .95; @@ -58,7 +58,7 @@ public class GT_WormholeRenderer extends TileEntitySpecialRenderer { @Override public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) { - if (tile instanceof TileWormhole wTile) { + if (tile instanceof TileEntityWormhole wTile) { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); GL11.glScaled(wTile.targetRadius, wTile.targetRadius, wTile.targetRadius); diff --git a/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java b/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java index acb830de58..eac929d047 100644 --- a/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java +++ b/src/main/java/gregtech/common/render/items/CosmicNeutroniumRenderer.java @@ -1,6 +1,6 @@ package gregtech.common.render.items; -import static gregtech.common.render.GT_RenderUtil.colorGTItem; +import static gregtech.common.render.GTRenderUtil.colorGTItem; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderItem; @@ -14,9 +14,9 @@ import org.lwjgl.opengl.GL12; import com.gtnewhorizons.modularui.api.math.Pos2d; import gregtech.api.enums.Textures; -import gregtech.common.render.GT_RenderUtil; +import gregtech.common.render.GTRenderUtil; -public class CosmicNeutroniumRenderer extends GT_GeneratedMaterial_Renderer { +public class CosmicNeutroniumRenderer extends GeneratedMaterialRenderer { // spotless:off private static final Pos2d point0 = new Pos2d(0 - 10, 0 - 10); @@ -90,10 +90,10 @@ public class CosmicNeutroniumRenderer extends GT_GeneratedMaterial_Renderer { colorGTItem(item); if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) { - GT_RenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); + GTRenderUtil.renderItemIcon(icon, 16.0D, 0.001D, 0.0F, 0.0F, -1.0F); } else { GL11.glEnable(GL11.GL_DEPTH_TEST); - GT_RenderUtil.renderItem(type, icon); + GTRenderUtil.renderItem(type, icon); } GL11.glPopMatrix(); } diff --git a/src/main/java/gregtech/common/render/items/GT_DataStick_Renderer.java b/src/main/java/gregtech/common/render/items/DataStickRenderer.java index 668b1daa6c..3411c24c83 100644 --- a/src/main/java/gregtech/common/render/items/GT_DataStick_Renderer.java +++ b/src/main/java/gregtech/common/render/items/DataStickRenderer.java @@ -9,11 +9,11 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; -import gregtech.api.util.GT_AssemblyLineUtils; +import gregtech.api.util.AssemblyLineUtils; // borrow form ae2 -public class GT_DataStick_Renderer implements IItemRenderer { +public class DataStickRenderer implements IItemRenderer { private final RenderItem ri = new RenderItem(); @@ -30,7 +30,7 @@ public class GT_DataStick_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - final ItemStack is = GT_AssemblyLineUtils.getDataStickOutput(item); + final ItemStack is = AssemblyLineUtils.getDataStickOutput(item); final Minecraft mc = Minecraft.getMinecraft(); GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT); diff --git a/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java b/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java index 08663adf4d..9de4afbef0 100644 --- a/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java +++ b/src/main/java/gregtech/common/render/items/GaiaSpiritRenderer.java @@ -7,21 +7,21 @@ import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; -import gregtech.GT_Mod; -import gregtech.common.render.GT_RenderUtil; +import gregtech.GTMod; +import gregtech.common.render.GTRenderUtil; -public class GaiaSpiritRenderer extends GT_GeneratedMaterial_Renderer { +public class GaiaSpiritRenderer extends GeneratedMaterialRenderer { @Override protected void renderRegularItem(ItemRenderType type, ItemStack aStack, IIcon icon, boolean shouldModulateColor) { - long animationTicks = GT_Mod.gregtechproxy.getAnimationTicks(); - float partialTicks = GT_Mod.gregtechproxy.getPartialRenderTicks(); + long animationTicks = GTMod.gregtechproxy.getAnimationTicks(); + float partialTicks = GTMod.gregtechproxy.getPartialRenderTicks(); if (shouldModulateColor) { Color color = Color.getHSBColor((animationTicks % 360 + partialTicks) % 180 / 180f, 0.4f, 0.9f); GL11.glColor3f(color.getRed() / 255.0F, color.getGreen() / 255.0F, color.getBlue() / 255.0F); } - GT_RenderUtil.renderItem(type, icon); + GTRenderUtil.renderItem(type, icon); } } diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java b/src/main/java/gregtech/common/render/items/GeneratedItemRenderer.java index 84045446c2..880e4b11c9 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedItem_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GeneratedItemRenderer.java @@ -26,12 +26,12 @@ import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite; import gregtech.api.enums.ItemList; import gregtech.api.enums.Textures; -import gregtech.api.items.GT_MetaGenerated_Item; -import gregtech.api.util.GT_Utility; -import gregtech.common.render.GT_RenderUtil; +import gregtech.api.items.MetaGeneratedItem; +import gregtech.api.util.GTUtility; +import gregtech.common.render.GTRenderUtil; import gregtech.loaders.ExtraIcons; -public class GT_GeneratedItem_Renderer implements IItemRenderer { +public class GeneratedItemRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -49,7 +49,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 aItem)) return; + if (!(aStack.getItem() instanceof MetaGeneratedItem aItem)) return; GL11.glEnable(GL11.GL_BLEND); GL11.glColor3f(1.0F, 1.0F, 1.0F); @@ -89,7 +89,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - GT_RenderUtil.renderItem(type, tIcon); + GTRenderUtil.renderItem(type, tIcon); GL11.glDisable(GL11.GL_BLEND); } @@ -126,9 +126,9 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { // Empty inner side Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); markNeedsAnimationUpdate(inner); - GT_RenderUtil.renderItem(type, inner); + GTRenderUtil.renderItem(type, inner); - FluidStack fluidStack = GT_Utility.getFluidForFilledItem(stack, true); + FluidStack fluidStack = GTUtility.getFluidForFilledItem(stack, true); if (fluidStack != null && fluidStack.getFluid() != null) { IIcon fluidIcon = fluidStack.getFluid() @@ -144,7 +144,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glDepthFunc(GL11.GL_EQUAL); GL11.glColor3ub((byte) (fluidColor >> 16), (byte) (fluidColor >> 8), (byte) fluidColor); - GT_RenderUtil.renderItem(type, fluidIcon); + GTRenderUtil.renderItem(type, fluidIcon); GL11.glColor3ub((byte) -1, (byte) -1, (byte) -1); GL11.glDepthFunc(GL11.GL_LEQUAL); @@ -153,7 +153,7 @@ public class GT_GeneratedItem_Renderer implements IItemRenderer { private static boolean isSame(ItemList item, ItemStack stack) { ItemStack internal = item.getInternalStack_unsafe(); - if (GT_Utility.isStackInvalid(internal)) return false; + if (GTUtility.isStackInvalid(internal)) return false; return internal.getItem() == stack.getItem() && internal.getItemDamage() == stack.getItemDamage(); } diff --git a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java b/src/main/java/gregtech/common/render/items/GeneratedMaterialRenderer.java index a67d5512ed..8d7b05981f 100644 --- a/src/main/java/gregtech/common/render/items/GT_GeneratedMaterial_Renderer.java +++ b/src/main/java/gregtech/common/render/items/GeneratedMaterialRenderer.java @@ -15,10 +15,10 @@ import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite; import codechicken.lib.render.TextureUtils; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; -import gregtech.api.util.GT_Utility; -import gregtech.common.render.GT_RenderUtil; +import gregtech.api.util.GTUtility; +import gregtech.common.render.GTRenderUtil; -public class GT_GeneratedMaterial_Renderer implements IItemRenderer { +public class GeneratedMaterialRenderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -59,7 +59,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { for (int pass = 0; pass < passes; pass++) { IIcon tIcon = aItem.getIcon(aMetaData, pass); IIcon tOverlay = aItem.getOverlayIcon(aMetaData, pass); - FluidStack aFluid = GT_Utility.getFluidForFilledItem(aStack, true); + FluidStack aFluid = GTUtility.getFluidForFilledItem(aStack, true); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -104,7 +104,7 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { GL11.glColor3f(tModulation[0] / 255.0F, tModulation[1] / 255.0F, tModulation[2] / 255.0F); } - GT_RenderUtil.renderItem(type, icon); + GTRenderUtil.renderItem(type, icon); } protected void renderContainedFluid(ItemRenderType type, FluidStack aFluidStack, IIcon fluidIcon) { @@ -114,12 +114,12 @@ public class GT_GeneratedMaterial_Renderer implements IItemRenderer { TextureUtils.bindAtlas(aFluid.getSpriteNumber()); GL11.glDepthFunc(GL11.GL_EQUAL); - GT_RenderUtil.renderItem(type, fluidIcon); + GTRenderUtil.renderItem(type, fluidIcon); GL11.glDepthFunc(GL11.GL_LEQUAL); } protected void renderItemOverlay(ItemRenderType type, IIcon overlay) { - GT_RenderUtil.renderItem(type, overlay); + GTRenderUtil.renderItem(type, overlay); } protected void markNeedsAnimationUpdate(IIcon icon) { diff --git a/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java b/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java index f7e4413c97..b73a75f354 100644 --- a/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java +++ b/src/main/java/gregtech/common/render/items/GlitchEffectRenderer.java @@ -12,9 +12,9 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.render.TextureUtils; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; -public class GlitchEffectRenderer extends GT_GeneratedMaterial_Renderer { +public class GlitchEffectRenderer extends GeneratedMaterialRenderer { public Random rand = new Random(); int[] red = new int[] { 255, 50, 50, 192 }; @@ -73,7 +73,7 @@ public class GlitchEffectRenderer extends GT_GeneratedMaterial_Renderer { IIcon itemIcon = itemRenderer.getIcon(metaData, pass); IIcon overlay = itemRenderer.getOverlayIcon(metaData, pass); - FluidStack aFluid = GT_Utility.getFluidForFilledItem(item, true); + FluidStack aFluid = GTUtility.getFluidForFilledItem(item, true); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/gregtech/common/render/items/InfinityRenderer.java b/src/main/java/gregtech/common/render/items/InfinityRenderer.java index 3a98898b8a..c083024dd3 100644 --- a/src/main/java/gregtech/common/render/items/InfinityRenderer.java +++ b/src/main/java/gregtech/common/render/items/InfinityRenderer.java @@ -12,11 +12,11 @@ import org.lwjgl.opengl.GL11; import codechicken.lib.render.TextureUtils; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; // TODO: Render effects outside inventory. -public class InfinityRenderer extends GT_GeneratedMaterial_Renderer { +public class InfinityRenderer extends GeneratedMaterialRenderer { public Random rand = new Random(); @@ -33,7 +33,7 @@ public class InfinityRenderer extends GT_GeneratedMaterial_Renderer { for (int pass = 0; pass < passes; pass++) { IIcon tIcon = aItem.getIcon(aMetaData, pass); IIcon tOverlay = aItem.getOverlayIcon(aMetaData, pass); - FluidStack aFluid = GT_Utility.getFluidForFilledItem(aStack, true); + FluidStack aFluid = GTUtility.getFluidForFilledItem(aStack, true); GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java b/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java index d7425c2fcb..14d9b65e7f 100644 --- a/src/main/java/gregtech/common/render/items/GT_MetaGenerated_Item_Renderer.java +++ b/src/main/java/gregtech/common/render/items/MetaGeneratedItemRenderer.java @@ -9,18 +9,18 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; import gregtech.api.objects.ItemData; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.render.GT_RenderUtil; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.render.GTRenderUtil; -public class GT_MetaGenerated_Item_Renderer implements IItemRenderer { +public class MetaGeneratedItemRenderer implements IItemRenderer { - private final IItemRenderer mItemRenderer = new GT_GeneratedItem_Renderer(); - private final IItemRenderer mMaterialRenderer = new GT_GeneratedMaterial_Renderer(); + private final IItemRenderer mItemRenderer = new GeneratedItemRenderer(); + private final IItemRenderer mMaterialRenderer = new GeneratedMaterialRenderer(); - private final IItemRenderer mDataStickRenderer = new GT_DataStick_Renderer(); + private final IItemRenderer mDataStickRenderer = new DataStickRenderer(); - public GT_MetaGenerated_Item_Renderer() {} + public MetaGeneratedItemRenderer() {} public <T extends Item & IGT_ItemWithMaterialRenderer> void registerItem(T item) { MinecraftForgeClient.registerItemRenderer(item, this); @@ -28,7 +28,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer { @Override public boolean handleRenderType(ItemStack aStack, ItemRenderType aType) { - if ((GT_Utility.isStackInvalid(aStack)) || (aStack.getItemDamage() < 0) + if ((GTUtility.isStackInvalid(aStack)) || (aStack.getItemDamage() < 0) || !(aStack.getItem() instanceof IGT_ItemWithMaterialRenderer) || !((IGT_ItemWithMaterialRenderer) aStack.getItem()).shouldUseCustomRenderer(aStack.getItemDamage())) { return false; @@ -38,7 +38,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer { @Override public boolean shouldUseRenderHelper(ItemRenderType aType, ItemStack aStack, ItemRendererHelper aHelper) { - if (GT_Utility.isStackInvalid(aStack)) { + if (GTUtility.isStackInvalid(aStack)) { return false; } return getRendererForItemStack(aStack).shouldUseRenderHelper(aType, aStack, aHelper); @@ -46,7 +46,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { - GT_RenderUtil.applyStandardItemTransform(type); + GTRenderUtil.applyStandardItemTransform(type); IItemRenderer itemRenderer = getRendererForItemStack(aStack); itemRenderer.renderItem(type, aStack, data); @@ -61,7 +61,7 @@ public class GT_MetaGenerated_Item_Renderer implements IItemRenderer { // Handle fluid rendering. if (aMaterialRenderer == null) { - ItemData itemData = GT_OreDictUnificator.getAssociation(aStack); + ItemData itemData = GTOreDictUnificator.getAssociation(aStack); if (itemData != null) { Materials material = itemData.mMaterial.mMaterial; if (material.renderer != null) { diff --git a/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java b/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java index 8583033e0f..7f619f2df5 100644 --- a/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java +++ b/src/main/java/gregtech/common/render/items/TranscendentMetalRenderer.java @@ -13,11 +13,11 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; import codechicken.lib.render.TextureUtils; -import gregtech.GT_Mod; +import gregtech.GTMod; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; -import gregtech.api.util.GT_Util; +import gregtech.api.util.GTUtil; -public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer { +public class TranscendentMetalRenderer extends GeneratedMaterialRenderer { @Override public void renderItem(ItemRenderType type, ItemStack aStack, Object... data) { @@ -69,7 +69,7 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer { GL11.glPushMatrix(); Fluid fluid = fluidStack.getFluid(); - applyEffect(type, GT_Util.getRGBaArray(fluid.getColor()), true); + applyEffect(type, GTUtil.getRGBaArray(fluid.getColor()), true); TextureUtils.bindAtlas(fluid.getSpriteNumber()); GL11.glDepthFunc(GL11.GL_EQUAL); @@ -124,7 +124,7 @@ public class TranscendentMetalRenderer extends GT_GeneratedMaterial_Renderer { GL11.glTranslatef(0.5f, 0.5f, 0.0f); } - GL11.glRotatef((GT_Mod.gregtechproxy.getAnimationTicks() * 3.5f) % 360, 0.3f, 0.5f, 0.2f); + GL11.glRotatef((GTMod.gregtechproxy.getAnimationTicks() * 3.5f) % 360, 0.3f, 0.5f, 0.2f); GL11.glRotatef(180, 0.5f, 0.0f, 0.0f); if (type.equals(IItemRenderer.ItemRenderType.INVENTORY)) { diff --git a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java index 92b86071cf..ecea6956de 100644 --- a/src/main/java/gregtech/common/render/items/UniversiumRenderer.java +++ b/src/main/java/gregtech/common/render/items/UniversiumRenderer.java @@ -22,10 +22,10 @@ import codechicken.lib.render.TextureUtils; import fox.spiteful.avaritia.render.CosmicRenderShenanigans; import gregtech.api.enums.ItemList; import gregtech.api.interfaces.IGT_ItemWithMaterialRenderer; -import gregtech.common.render.GT_RenderUtil; +import gregtech.common.render.GTRenderUtil; @SuppressWarnings("RedundantLabeledSwitchRuleCodeBlock") -public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { +public class UniversiumRenderer extends GeneratedMaterialRenderer { private static final float cosmicOpacity = 2.5f; @@ -112,7 +112,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { mc.getTextureManager() .bindTexture(resourcelocation); } else { - GT_RenderUtil.renderItem(type, tIcon); + GTRenderUtil.renderItem(type, tIcon); } GL11.glEnable(GL11.GL_BLEND); @@ -133,7 +133,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { GL11.glColor4d(1, 1, 1, 1); // Draw cosmic overlay - GT_RenderUtil.renderItem(type, tIcon); + GTRenderUtil.renderItem(type, tIcon); CosmicRenderShenanigans.releaseShader(); CosmicRenderShenanigans.inventoryRender = false; @@ -141,7 +141,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { GL11.glEnable(GL12.GL_RESCALE_NORMAL); } else { // RENDER ITEM - GT_RenderUtil.renderItem(type, tIcon); + GTRenderUtil.renderItem(type, tIcon); int program = GL11.glGetInteger(GL20.GL_CURRENT_PROGRAM); @@ -151,7 +151,7 @@ public class UniversiumRenderer extends GT_GeneratedMaterial_Renderer { CosmicRenderShenanigans.useShader(); // RENDER COSMIC OVERLAY - GT_RenderUtil.renderItem(type, tIcon); + GTRenderUtil.renderItem(type, tIcon); CosmicRenderShenanigans.releaseShader(); GL11.glDepthFunc(GL11.GL_LEQUAL); |