From 7305ba719930ea3fbf8aa987aeec48b33cdbd82e Mon Sep 17 00:00:00 2001 From: Foghrye4 Date: Tue, 21 Mar 2017 17:34:07 +0300 Subject: Oregen --- ihl/model/FlexibleCableItemRender.java | 13 ++---- ihl/model/MultiMetaBlockRender.java | 76 ---------------------------------- ihl/model/RenderBlocksExt.java | 67 ++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 86 deletions(-) delete mode 100644 ihl/model/MultiMetaBlockRender.java create mode 100644 ihl/model/RenderBlocksExt.java (limited to 'ihl/model') diff --git a/ihl/model/FlexibleCableItemRender.java b/ihl/model/FlexibleCableItemRender.java index 02fc5f7..71a8337 100644 --- a/ihl/model/FlexibleCableItemRender.java +++ b/ihl/model/FlexibleCableItemRender.java @@ -109,11 +109,7 @@ public class FlexibleCableItemRender implements IItemRenderer { GL11.glRotatef(360f / this.segmentsAmount, 1f, 0f, 0f); GL11.glTranslatef(0.004f, 0f, 0f); GL11.glRotatef(spiralStepAngle, 0f, 0f, 1f); - if (((FlexibleCableItem) stack.getItem()).isDataCable) { - GL11.glColor3f(1f, 0.2f, 0f); - } else { - GL11.glColor3f(1f, 1f, 1f); - } + GL11.glColor3f(1f, 1f, 1f); if (i == 0) { if (isNoInsulation(stack)) { if (FlexibleCableItem.instance.yellowColoredWires @@ -163,9 +159,7 @@ public class FlexibleCableItemRender implements IItemRenderer { } private int getCableType(ItemStack stack) { - if (((FlexibleCableItem) stack.getItem()).isDataCable) { - return 3; - } else if (isNoInsulation(stack)) { + if (isNoInsulation(stack)) { if (FlexibleCableItem.instance.yellowColoredWires.contains(FlexibleCableItem.instance.getMaterial(stack))) { return 1; } else { @@ -176,7 +170,6 @@ public class FlexibleCableItemRender implements IItemRenderer { } private boolean isNoInsulation(ItemStack stack) { - return stack.stackTagCompound != null && FlexibleCableItem.instance.getInsulationMaterial(stack).equals("null") - && !((FlexibleCableItem) stack.getItem()).isDataCable; + return stack.stackTagCompound != null && FlexibleCableItem.instance.getInsulationMaterial(stack).equals("null"); } } \ No newline at end of file diff --git a/ihl/model/MultiMetaBlockRender.java b/ihl/model/MultiMetaBlockRender.java deleted file mode 100644 index c995989..0000000 --- a/ihl/model/MultiMetaBlockRender.java +++ /dev/null @@ -1,76 +0,0 @@ -package ihl.model; - -import org.lwjgl.opengl.GL11; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.IBlockAccess; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class MultiMetaBlockRender implements ISimpleBlockRenderingHandler -{ - public final static int renderId = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderId() - { - return renderId; - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderblocks) - { - Tessellator tessellator = Tessellator.instance; - block.setBlockBoundsForItemRender(); - renderblocks.setRenderBoundsFromBlock(block); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, -1.0F, 0.0F); - renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 0, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 1.0F, 0.0F); - renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 1, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, -1.0F); - renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 2, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(0.0F, 0.0F, 1.0F); - renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 3, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(-1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 4, metadata)); - tessellator.draw(); - tessellator.startDrawingQuads(); - tessellator.setNormal(1.0F, 0.0F, 0.0F); - renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, renderblocks.getBlockIconFromSideAndMetadata(block, 5, metadata)); - tessellator.draw(); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - } - - @Override - public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int meta, RenderBlocks blockRenderer) - { - blockRenderer.renderStandardBlock(block, x, y, z); - Tessellator var5 = Tessellator.instance; - var5.setBrightness(block.getMixedBrightnessForBlock(blockAccess, x, y, z)); - int var6 = block.colorMultiplier(blockAccess, x, y, z); - float var7 = (var6 >> 16 & 255) / 255.0F; - float var8 = (var6 >> 8 & 255) / 255.0F; - float var9 = (var6 & 255) / 255.0F; - var5.setColorOpaque_F(var7, var8, var9); - return true; - } - - @Override - public boolean shouldRender3DInInventory(int arg0) - { - return true; - } -} diff --git a/ihl/model/RenderBlocksExt.java b/ihl/model/RenderBlocksExt.java new file mode 100644 index 0000000..6415059 --- /dev/null +++ b/ihl/model/RenderBlocksExt.java @@ -0,0 +1,67 @@ +package ihl.model; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; + +public class RenderBlocksExt extends RenderBlocks { + + public RenderBlocksExt(IBlockAccess blockAccess) { + super(blockAccess); + } + + @Override + public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) + { + this.brightnessTopLeft=16711935; + this.brightnessTopRight=16711935; + super.renderFaceYNeg(block,x,y,z,icon); + } + + public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) + { + if (this.enableAO) + { + System.out.println("AO is on"); + } + else + { + System.out.println("AO is off"); + } + + this.brightnessTopLeft=16711935; + this.brightnessTopRight=16711935; + super.renderFaceYPos(block, x, y, z, icon); + } + + public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) + { + this.brightnessTopLeft=16711935; + this.brightnessTopRight=16711935; + super.renderFaceZNeg(block, x, y, z, icon); + } + + public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) + { + this.brightnessTopLeft=16711935; + this.brightnessTopRight=16711935; + super.renderFaceZPos(block, x, y, z, icon); + } + + public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) + { + this.brightnessTopLeft=16711935; + this.brightnessTopRight=16711935; + super.renderFaceXNeg(block, x, y, z, icon); + } + + public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) + { + this.brightnessTopLeft=16711935; + this.brightnessTopRight=16711935; + super.renderFaceXPos(block, x, y, z, icon); + } + + +} -- cgit v1.2.3