diff --git a/resources/assets/enderio/textures/blocks/blankMachinePanel.png b/resources/assets/enderio/textures/blocks/blankMachinePanel.png new file mode 100644 index 00000000..2c1981fd Binary files /dev/null and b/resources/assets/enderio/textures/blocks/blankMachinePanel.png differ diff --git a/resources/assets/enderio/textures/blocks/combustionGenFront.png b/resources/assets/enderio/textures/blocks/combustionGenFront.png index 41e10fa6..dd9f7216 100644 Binary files a/resources/assets/enderio/textures/blocks/combustionGenFront.png and b/resources/assets/enderio/textures/blocks/combustionGenFront.png differ diff --git a/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png b/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png index f89510b7..798f297a 100644 Binary files a/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png and b/resources/assets/enderio/textures/blocks/combustionGenFrontOn.png differ diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 173a9004..705679cd 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -39,6 +39,8 @@ import crazypants.enderio.enderface.TileEnderIO; import crazypants.enderio.item.PoweredItemRenderer; import crazypants.enderio.item.YetaWrenchOverlayRenderer; import crazypants.enderio.item.YetaWrenchTickHandler; +import crazypants.enderio.machine.generator.BlockCombustionGenerator; +import crazypants.enderio.machine.generator.CombustionGeneratorRenderer; import crazypants.enderio.machine.hypercube.HyperCubeRenderer; import crazypants.enderio.machine.hypercube.TileHyperCube; import crazypants.enderio.machine.light.BlockElectricLight; @@ -114,6 +116,9 @@ public class ClientProxy extends CommonProxy { BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId(); RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer()); + + BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); + RenderingRegistry.registerBlockHandler(new CombustionGeneratorRenderer()); FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer(); MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr); @@ -210,3 +215,4 @@ public class ClientProxy extends CommonProxy { } } + diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java index 1c538a5d..e2ba1738 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchRenderer.java @@ -62,7 +62,7 @@ public class RedstoneSwitchRenderer extends DefaultConduitRenderer { BoundingBox bb = switchBounds.translate(trans); for (VertexTransform tf : xForms) { - CubeRenderer.render(bb, icons, tf); + CubeRenderer.render(bb, icons, tf,null); } bb = connectorBounds.translate(trans); for (VertexTransform tf : xForms) { diff --git a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java index bdd0c854..7c8b3886 100644 --- a/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/BlockCombustionGenerator.java @@ -1,6 +1,8 @@ package crazypants.enderio.machine.generator; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.IIcon; import net.minecraft.world.World; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; @@ -8,12 +10,28 @@ import crazypants.enderio.machine.AbstractMachineBlock; public class BlockCombustionGenerator extends AbstractMachineBlock { + public static int renderId; + + protected IIcon frontOn; + protected IIcon frontOff; + public static BlockCombustionGenerator create() { BlockCombustionGenerator gen = new BlockCombustionGenerator(); gen.init(); return gen; } + + + @Override + public void registerBlockIcons(IIconRegister iIconRegister) { + super.registerBlockIcons(iIconRegister); + frontOn = iIconRegister.registerIcon("enderio:combustionGenFrontOn"); + frontOff = iIconRegister.registerIcon("enderio:combustionGenFront"); + } + + + protected BlockCombustionGenerator() { super(ModObject.blockCombustionGenerator, TileCombustionGenerator.class); } @@ -34,11 +52,48 @@ public class BlockCombustionGenerator extends AbstractMachineBlock 0.9 || vec.y < 0.1) { + if(transX) { + vec.x -= 0.5; + vec.x *= 0.6; + vec.x += 0.5; + } else { + vec.z -= 0.5; + vec.z *= 0.6; + vec.z += 0.5; + } + } + + vec.y -= 0.5; + vec.y *= 0.8; + vec.y += 0.5; + + vec.add(x, y, z); + } + + @Override + public void applyToNormal(Vector3f vec) { + } + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index dd90c0cc..ae423e57 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -28,7 +28,7 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { textures[3] = block.getBlockTextureFromSide(ForgeDirection.UP.ordinal()); textures[4] = block.getBlockTextureFromSide(ForgeDirection.WEST.ordinal()); textures[5] = block.getBlockTextureFromSide(ForgeDirection.EAST.ordinal()); - CubeRenderer.render(bb, textures, null); + CubeRenderer.render(bb, textures, null, null); Tessellator.instance.draw(); } @@ -50,7 +50,7 @@ public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { textures[4] = block.getIcon(world, x, y, z, ForgeDirection.WEST.ordinal()); textures[5] = block.getIcon(world, x, y, z, ForgeDirection.EAST.ordinal()); - CubeRenderer.render(bb, textures, null); + CubeRenderer.render(bb, textures, null, null); return true; } diff --git a/src/main/java/crazypants/render/CubeRenderer.java b/src/main/java/crazypants/render/CubeRenderer.java index 06fdbafb..13055377 100644 --- a/src/main/java/crazypants/render/CubeRenderer.java +++ b/src/main/java/crazypants/render/CubeRenderer.java @@ -166,7 +166,7 @@ public final class CubeRenderer { addVecWithUV(verts[3], minU, maxV); } - public static void render(BoundingBox bb, IIcon[] faceTextures, VertexTransform xForm) { + public static void render(BoundingBox bb, IIcon[] faceTextures, VertexTransform xForm, float[] brightnessPerSide) { setupVertices(bb, xForm); float minU; float maxU; @@ -177,6 +177,11 @@ public final class CubeRenderer { Tessellator tessellator = Tessellator.instance; tessellator.setNormal(0, 0, -1); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.NORTH.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } + tex = faceTextures[0]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -188,6 +193,10 @@ public final class CubeRenderer { addVecWithUV(verts[2], minU, maxV); tessellator.setNormal(0, 0, 1); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.SOUTH.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[1]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -199,6 +208,10 @@ public final class CubeRenderer { addVecWithUV(verts[7], minU, maxV); tessellator.setNormal(0, 1, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.UP.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[2]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -210,6 +223,10 @@ public final class CubeRenderer { addVecWithUV(verts[7], maxU, minV); tessellator.setNormal(0, -1, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.UP.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[3]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -221,6 +238,10 @@ public final class CubeRenderer { addVecWithUV(verts[4], maxU, minV); tessellator.setNormal(1, 0, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.EAST.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[4]; minU = tex.getMinU(); maxU = tex.getMaxU(); @@ -232,6 +253,10 @@ public final class CubeRenderer { addVecWithUV(verts[1], minU, minV); tessellator.setNormal(-1, 0, 0); + if(brightnessPerSide != null) { + float cm = brightnessPerSide[ForgeDirection.WEST.ordinal()]; + tessellator.setColorOpaque_F(cm, cm, cm); + } tex = faceTextures[5]; minU = tex.getMinU(); maxU = tex.getMaxU(); diff --git a/src/main/java/crazypants/vecmath/Vector3f.java b/src/main/java/crazypants/vecmath/Vector3f.java index 348cc101..de77c27e 100644 --- a/src/main/java/crazypants/vecmath/Vector3f.java +++ b/src/main/java/crazypants/vecmath/Vector3f.java @@ -55,6 +55,12 @@ public class Vector3f { y += vec.y; z += vec.z; } + + public void add(int x2, int y2, int z2) { + x += x2; + y += y2; + z += z2; + } public void sub(Vector3f vec) { x -= vec.x; @@ -108,4 +114,6 @@ public class Vector3f { return new Vector3d(x, y, z); } + + }