diff options
Diffstat (limited to 'src/main/java/goodgenerator/client')
3 files changed, 63 insertions, 18 deletions
diff --git a/src/main/java/goodgenerator/client/ClientProxy.java b/src/main/java/goodgenerator/client/ClientProxy.java index df6c962106..b8a885cab6 100644 --- a/src/main/java/goodgenerator/client/ClientProxy.java +++ b/src/main/java/goodgenerator/client/ClientProxy.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import goodgenerator.common.CommonProxy; public class ClientProxy extends CommonProxy { + @Override public void preInit(FMLPreInitializationEvent event) { super.preInit(event); diff --git a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java b/src/main/java/goodgenerator/client/GUI/GG_UITextures.java index 0dcc2f7743..bf51238575 100644 --- a/src/main/java/goodgenerator/client/GUI/GG_UITextures.java +++ b/src/main/java/goodgenerator/client/GUI/GG_UITextures.java @@ -7,12 +7,12 @@ 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 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"); } diff --git a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java index d9ddd62d97..ac5c41bf83 100644 --- a/src/main/java/goodgenerator/client/render/BlockRenderHandler.java +++ b/src/main/java/goodgenerator/client/render/BlockRenderHandler.java @@ -4,16 +4,18 @@ import static gregtech.common.render.GT_Renderer_Block.*; import static net.minecraftforge.common.util.ForgeDirection.*; import static net.minecraftforge.common.util.ForgeDirection.EAST; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import goodgenerator.blocks.regularBlock.ITextureBlock; -import gregtech.GT_Mod; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + 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; + public class BlockRenderHandler implements ISimpleBlockRenderingHandler { public static final float blockMin = 0.0F; @@ -40,17 +42,59 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { aBlock.setBlockBoundsForItemRender(); aRenderer.setRenderBoundsFromBlock(aBlock); renderNegativeYFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) DOWN.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) DOWN.ordinal()), + true); renderPositiveYFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) UP.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) UP.ordinal()), + true); renderNegativeZFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) NORTH.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) NORTH.ordinal()), + true); renderPositiveZFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) SOUTH.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) SOUTH.ordinal()), + true); renderNegativeXFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) WEST.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) WEST.ordinal()), + true); renderPositiveXFacing( - null, aRenderer, aBlock, 0, 0, 0, tc.getTexture(aBlock, metadata, (byte) EAST.ordinal()), true); + null, + aRenderer, + aBlock, + 0, + 0, + 0, + tc.getTexture(aBlock, metadata, (byte) EAST.ordinal()), + true); } aBlock.setBlockBounds(blockMin, blockMin, blockMin, blockMax, blockMax, blockMax); @@ -61,8 +105,8 @@ public class BlockRenderHandler implements ISimpleBlockRenderingHandler { } @Override - public boolean renderWorldBlock( - IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) { + 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.useInventoryTint = false; if (aBlock instanceof ITextureBlock) { |