diff --git a/resources/assets/enderio/models/combustionGenerator.tcn b/resources/assets/enderio/models/combustionGen.tcn similarity index 100% rename from resources/assets/enderio/models/combustionGenerator.tcn rename to resources/assets/enderio/models/combustionGen.tcn diff --git a/resources/assets/enderio/models/combustionGenerator.png b/resources/assets/enderio/textures/blocks/combustionGenModel.png similarity index 100% rename from resources/assets/enderio/models/combustionGenerator.png rename to resources/assets/enderio/textures/blocks/combustionGenModel.png diff --git a/resources/assets/enderio/textures/blocks/machineOverlayDisabledNoCenter.png b/resources/assets/enderio/textures/blocks/machineOverlayDisabledNoCenter.png new file mode 100644 index 00000000..20eb55db Binary files /dev/null and b/resources/assets/enderio/textures/blocks/machineOverlayDisabledNoCenter.png differ diff --git a/resources/assets/enderio/textures/blocks/machineOverlayPullNoCenter.png b/resources/assets/enderio/textures/blocks/machineOverlayPullNoCenter.png new file mode 100644 index 00000000..04a6d9a5 Binary files /dev/null and b/resources/assets/enderio/textures/blocks/machineOverlayPullNoCenter.png differ diff --git a/resources/assets/enderio/models/spawner.png b/resources/assets/enderio/textures/blocks/poweredSpawnerModel.png similarity index 100% rename from resources/assets/enderio/models/spawner.png rename to resources/assets/enderio/textures/blocks/poweredSpawnerModel.png diff --git a/resources/assets/enderio/models/soulBinder.png b/resources/assets/enderio/textures/blocks/soulBinderModel.png similarity index 100% rename from resources/assets/enderio/models/soulBinder.png rename to resources/assets/enderio/textures/blocks/soulBinderModel.png diff --git a/resources/assets/enderio/models/transceiver.png b/resources/assets/enderio/textures/blocks/transceiver.png similarity index 100% rename from resources/assets/enderio/models/transceiver.png rename to resources/assets/enderio/textures/blocks/transceiver.png diff --git a/resources/assets/enderio/models/vat.png b/resources/assets/enderio/textures/blocks/vatModel.png similarity index 100% rename from resources/assets/enderio/models/vat.png rename to resources/assets/enderio/textures/blocks/vatModel.png diff --git a/src/main/java/crazypants/enderio/ClientProxy.java b/src/main/java/crazypants/enderio/ClientProxy.java index 8e3d0624..229ab749 100644 --- a/src/main/java/crazypants/enderio/ClientProxy.java +++ b/src/main/java/crazypants/enderio/ClientProxy.java @@ -13,17 +13,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.obj.GroupObject; -import net.minecraftforge.client.model.techne.TechneModel; import net.minecraftforge.common.MinecraftForge; - -import org.lwjgl.util.vector.Matrix4f; -import org.lwjgl.util.vector.Vector3f; - import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -85,7 +77,6 @@ import crazypants.enderio.machine.farm.FarmingStationRenderer; import crazypants.enderio.machine.farm.FarmingStationSpecialRenderer; import crazypants.enderio.machine.farm.TileFarmStation; import crazypants.enderio.machine.generator.combustion.BlockCombustionGenerator; -import crazypants.enderio.machine.generator.combustion.CombustionGeneratorModelRenderer; import crazypants.enderio.machine.generator.combustion.CombustionGeneratorRenderer; import crazypants.enderio.machine.generator.combustion.TileCombustionGenerator; import crazypants.enderio.machine.generator.zombie.TileZombieGenerator; @@ -140,15 +131,19 @@ import crazypants.enderio.teleport.anchor.TileTravelAnchor; import crazypants.enderio.teleport.anchor.TravelEntitySpecialRenderer; import crazypants.enderio.teleport.telepad.TeleportEntityRenderHandler; import crazypants.render.IconUtil; -import crazypants.render.TechneUtil; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy { // @formatter:off public static int[][] sideAndFacingToSpriteOffset = new int[][] { - - { 3, 2, 0, 0, 0, 0 }, { 2, 3, 1, 1, 1, 1 }, { 1, 1, 3, 2, 5, 4 }, { 0, 0, 2, 3, 4, 5 }, { 4, 5, 4, 5, 3, 2 }, { 5, 4, 5, 4, 2, 3 } }; + { 3, 2, 0, 0, 0, 0 }, + { 2, 3, 1, 1, 1, 1 }, + { 1, 1, 3, 2, 5, 4 }, + { 0, 0, 2, 3, 4, 5 }, + { 4, 5, 4, 5, 3, 2 }, + { 5, 4, 5, 4, 2, 3 } + }; // @formatter:on static { @@ -268,18 +263,9 @@ public class ClientProxy extends CommonProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileWeatherObelisk.class, twr); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockWeatherObelisk), twr); - if(Config.useCombustionGenModel) { - CombustionGeneratorModelRenderer cgmr = new CombustionGeneratorModelRenderer(); - ClientRegistry.bindTileEntitySpecialRenderer(TileCombustionGenerator.class, cgmr); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCombustionGenerator), cgmr); - } else { - BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); - CombustionGeneratorRenderer cr = new CombustionGeneratorRenderer(); - RenderingRegistry.registerBlockHandler(cr); - if(!Config.combustionGeneratorUseOpaqueModel) { - ClientRegistry.bindTileEntitySpecialRenderer(TileCombustionGenerator.class, cr); - } - } + BlockCombustionGenerator.renderId = RenderingRegistry.getNextAvailableRenderId(); + CombustionGeneratorRenderer cr = new CombustionGeneratorRenderer(); + RenderingRegistry.registerBlockHandler(cr); ZombieGeneratorRenderer zgr = new ZombieGeneratorRenderer(); ClientRegistry.bindTileEntitySpecialRenderer(TileZombieGenerator.class, zgr); diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java index 4ac5a5d2..02568d28 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineBlock.java @@ -15,6 +15,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -131,9 +132,9 @@ public abstract class AbstractMachineBlock exte overlayIconNone = iIconRegister.registerIcon("enderio:machineOverlayNone"); selectedFaceIcon = iIconRegister.registerIcon("enderio:machineOverlaySelectedFace"); } - + @SideOnly(Side.CLIENT) - public IIcon getOverlayIconForMode(IoMode mode) { + public IIcon getOverlayIconForMode(ForgeDirection face, IoMode mode) { if(mode == null) { return null; } diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 8cdd4be1..7ad73536 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -24,7 +24,6 @@ import crazypants.enderio.TileEntityEio; import crazypants.enderio.api.redstone.IRedstoneConnectable; import crazypants.enderio.config.Config; import crazypants.util.BlockCoord; -import crazypants.util.IProgressTile; import crazypants.util.InventoryWrapper; import crazypants.util.ItemUtil; import crazypants.util.Lang; @@ -192,6 +191,10 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi public short getFacing() { return facing; } + + public ForgeDirection getFacingDir() { + return ForgeDirection.getOrientation(facing); + } public void setFacing(short facing) { this.facing = facing; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index ac4ddb53..dbead0f2 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -1,10 +1,7 @@ package crazypants.enderio.machine; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -19,24 +16,19 @@ import crazypants.enderio.machine.painter.PainterUtil; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; import crazypants.render.CustomCubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.IRenderFace; import crazypants.render.IconUtil; import crazypants.render.RenderUtil; -import crazypants.vecmath.Vertex; public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { private OverlayRenderer overlayRenderer = new OverlayRenderer(); - private AbstractMachineEntity curEnt; - private CustomCubeRenderer ccr = new CustomCubeRenderer(); - + private PaintedBlockRenderer paintedRenderer = new PaintedBlockRenderer(this.getRenderId(), null); // passthrough renderer for paintable machines @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { + public boolean handleRenderType(ItemStack item, ItemRenderType type) { return true; } @@ -48,10 +40,10 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { Block block; - if ((block = PainterUtil.getSourceBlock(item)) != null) { - paintedRenderer.renderInventoryBlock(block, PainterUtil.getSourceBlockMetadata(item), 0, (RenderBlocks)data[0]); + if((block = PainterUtil.getSourceBlock(item)) != null) { + paintedRenderer.renderInventoryBlock(block, PainterUtil.getSourceBlockMetadata(item), 0, (RenderBlocks) data[0]); } else { - renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks)data[0]); + renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); } } @@ -76,13 +68,13 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { TileEntity te = world.getTileEntity(x, y, z); + AbstractMachineEntity machine = null; if(te instanceof AbstractMachineEntity) { - curEnt = (AbstractMachineEntity)te; - } else { - curEnt = null; + machine = (AbstractMachineEntity) te; } - - if (te instanceof IPaintableTileEntity && ((IPaintableTileEntity) te).getSourceBlock() != null) { + + overlayRenderer.setTile(machine); + if(te instanceof IPaintableTileEntity && ((IPaintableTileEntity) te).getSourceBlock() != null) { ccr.setOverrideTexture(IconUtil.blankTexture); ccr.renderBlock(world, block, x, y, z, overlayRenderer); ccr.setOverrideTexture(renderer.overrideBlockTexture); @@ -105,25 +97,4 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II public int getRenderId() { return AbstractMachineBlock.renderId; } - - private class OverlayRenderer implements IRenderFace { - - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { - - ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z,texture); - if(curEnt != null && par1Block instanceof AbstractMachineBlock) { - IoMode mode = curEnt.getIoMode(face); - IIcon tex = ((AbstractMachineBlock)par1Block).getOverlayIconForMode(mode); - if(tex != null) { - // dirty z-fighting hax, avert your eyes! - ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x + (face.offsetX * 0.0001), y + (face.offsetY * 0.0001), z + (face.offsetZ * 0.0001), tex); - } - } - - } - - } - } diff --git a/src/main/java/crazypants/enderio/machine/OverlayRenderer.java b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java new file mode 100644 index 00000000..f84dd2b2 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/OverlayRenderer.java @@ -0,0 +1,42 @@ +package crazypants.enderio.machine; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.util.IIcon; +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.render.CustomCubeRenderer; +import crazypants.render.CustomRenderBlocks; +import crazypants.render.IRenderFace; +import crazypants.util.ForgeDirectionOffsets; +import crazypants.vecmath.Vector3d; +import crazypants.vecmath.Vertex; + +public class OverlayRenderer implements IRenderFace { + + private static final CustomCubeRenderer ccr = CustomCubeRenderer.instance; + private AbstractMachineEntity te; + + public void setTile(AbstractMachineEntity te) { + this.te = te; + } + + @Override + public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, + boolean translateToXyz) { + + if(te != null && par1Block instanceof AbstractMachineBlock) { + Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, 0.001); + Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); + + IoMode mode = te.getIoMode(face); + IIcon tex = ((AbstractMachineBlock) par1Block).getOverlayIconForMode(face, mode); + if(tex != null) { + ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, tex); + } + + Tessellator.instance.addTranslation(-(float) offset.x, -(float) offset.y, -(float) offset.z); + } + } +} diff --git a/src/main/java/crazypants/enderio/machine/TechneModelRenderer.java b/src/main/java/crazypants/enderio/machine/TechneModelRenderer.java new file mode 100644 index 00000000..c10b867e --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/TechneModelRenderer.java @@ -0,0 +1,58 @@ +package crazypants.enderio.machine; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.model.obj.GroupObject; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.render.TechneUtil; +import crazypants.render.VertexTransform; + +public class TechneModelRenderer implements ISimpleBlockRenderingHandler { + + private List model; + private int renderId; + + protected VertexTransform vt; + + public TechneModelRenderer(String modelPath, int renderId) { + this(modelPath, renderId, null); + } + + public TechneModelRenderer(String modelPath, int renderId, VertexTransform vt) { + model = TechneUtil.getModel(modelPath); + this.renderId = renderId; + this.vt = vt; + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { + TechneUtil.vt = this.vt; + TechneUtil.renderInventoryBlock(model, block, metadata); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { + IIcon override = renderer.overrideBlockTexture; + + TechneUtil.vt = this.vt; + + if(override != null) { + return TechneUtil.renderWorldBlock(model, override, world, x, y, z, block); + } + return TechneUtil.renderWorldBlock(model, world, x, y, z, block); + } + + @Override + public boolean shouldRender3DInInventory(int modelId) { + return true; + } + + @Override + public int getRenderId() { + return renderId; + } +} diff --git a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java index a6f9c429..33927b8f 100644 --- a/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java +++ b/src/main/java/crazypants/enderio/machine/farm/FarmingStationRenderer.java @@ -1,7 +1,5 @@ package crazypants.enderio.machine.farm; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -9,19 +7,14 @@ import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.obj.GroupObject; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import crazypants.enderio.machine.TechneModelRenderer; import crazypants.render.BoundingBox; import crazypants.render.CubeRenderer; -import crazypants.render.TechneUtil; -public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { +public class FarmingStationRenderer extends TechneModelRenderer { - private List model = TechneUtil.getModel("models/farm"); - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - TechneUtil.renderInventoryBlock(model, block, metadata); + public FarmingStationRenderer() { + super("models/farm", BlockFarmStation.renderId); } @Override @@ -40,19 +33,6 @@ public class FarmingStationRenderer implements ISimpleBlockRenderingHandler { } } - if(override != null) { - return TechneUtil.renderWorldBlock(model, override, world, x, y, z, block); - } - return TechneUtil.renderWorldBlock(model, world, x, y, z, block); - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockFarmStation.renderId; + return super.renderWorldBlock(world, x, y, z, block, modelId, renderer); } } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java index 1e165eb0..b779aaa2 100644 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java +++ b/src/main/java/crazypants/enderio/machine/generator/combustion/BlockCombustionGenerator.java @@ -2,6 +2,7 @@ package crazypants.enderio.machine.generator.combustion; import java.util.Random; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -15,6 +16,7 @@ import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.enderio.machine.AbstractMachineEntity; +import crazypants.enderio.machine.IoMode; import crazypants.enderio.network.PacketHandler; import crazypants.util.FluidUtil; import crazypants.util.Util; @@ -22,6 +24,8 @@ import crazypants.util.Util; public class BlockCombustionGenerator extends AbstractMachineBlock { public static int renderId = -1; + + private IIcon overlayPullNoCenter, overlayDisabledNoCenter; public static BlockCombustionGenerator create() { PacketHandler.INSTANCE.registerMessage(PacketCombustionTank.class, PacketCombustionTank.class, PacketHandler.nextID(), Side.CLIENT); @@ -108,6 +112,23 @@ public class BlockCombustionGenerator extends AbstractMachineBlock 0) { - IIcon icon = tank.getFluid().getFluid().getStillIcon(); - if(icon != null) { - float fullness = (float) (tank.getFluidAmount() - 1000) / (tank.getCapacity() - 1000); - float scx = scaleX ? size : 1f; - float scz = scaleX ? 1f : size; - bb = bb.scale(scx, 0.97 * fullness, scz); - - float tx = scaleX ? 0.25f * 1.25f : 0; - float tz = scaleX ? 0 : 0.25f * 1.25f; - float ty = -(0.98f - (bb.maxY - bb.minY)) / 2; - if(!isLeft) { - tx = -tx; - tz = -tz; - } - bb = bb.translate(tx, ty, tz); - CubeRenderer.render(bb, icon); - } - } - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { return true; } @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - Tessellator tes = Tessellator.instance; - GL11.glDisable(GL11.GL_LIGHTING); - tes.startDrawingQuads(); - renderWorldBlock(null, 0, 0, 0, block, 0, renderer); - tes.draw(); - GL11.glEnable(GL11.GL_LIGHTING); + ((VertexRotationFacing) vt).setRotation(ForgeDirection.SOUTH); + super.renderInventoryBlock(block, metadata, modelId, renderer); } - - @Override - public int getRenderId() { - return BlockCombustionGenerator.renderId; - } - - private class OverlayRenderer implements IRenderFace { - - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { - - if(gen != null && par1Block instanceof AbstractMachineBlock) { - Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, 0.01); - Tessellator.instance.addTranslation((float) offset.x, (float) offset.y, (float) offset.z); - - IoMode mode = gen.getIoMode(face); - IIcon tex = ((AbstractMachineBlock) par1Block).getOverlayIconForMode(mode); - if(tex != null) { - ccr.getCustomRenderBlocks().doDefaultRenderFace(face, par1Block, x, y, z, tex); - } - - Tessellator.instance.addTranslation(-(float) offset.x, -(float) offset.y, -(float) offset.z); - } - - } - - } - } diff --git a/src/main/java/crazypants/enderio/machine/generator/combustion/FacingVertexTransform.java b/src/main/java/crazypants/enderio/machine/generator/combustion/FacingVertexTransform.java deleted file mode 100644 index 80d364cc..00000000 --- a/src/main/java/crazypants/enderio/machine/generator/combustion/FacingVertexTransform.java +++ /dev/null @@ -1,44 +0,0 @@ -package crazypants.enderio.machine.generator.combustion; - -import crazypants.render.VertexTransform; -import crazypants.vecmath.Vector3d; -import crazypants.vecmath.Vector3f; -import crazypants.vecmath.Vertex; - -class FacingVertexTransform implements VertexTransform { - - - boolean transX; - - public FacingVertexTransform() { - } - - public void setFacing(int facing) { - transX = facing != 4 && facing != 5; - } - - @Override - public void apply(Vertex vertex) { - apply(vertex.xyz); - } - - @Override - public void apply(Vector3d vec) { - if(vec.y > 0.8 || vec.y < 0.2) { - 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; - } - } - } - - @Override - public void applyToNormal(Vector3f vec) { - } - -} \ No newline at end of file diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java index 65fe6f95..6ed24098 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -89,7 +89,7 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II rb.setRenderBounds(pushPullBounds.minX, pushPullBounds.minY, pushPullBounds.minZ, pushPullBounds.maxX, pushPullBounds.maxY, pushPullBounds.maxZ); } - IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(mode); + IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(dir, mode); if(icon != null) { rb.doDefaultRenderFace(dir, EnderIO.blockTransceiver, 0, 0, 0, icon); } diff --git a/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java b/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java index f88b1885..7660feef 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRenderer.java @@ -1,9 +1,6 @@ package crazypants.enderio.machine.vat; -import java.util.List; - import net.minecraft.block.Block; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; @@ -11,20 +8,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import crazypants.enderio.machine.AbstractMachineBlock; -import crazypants.enderio.machine.IoMode; +import crazypants.enderio.machine.OverlayRenderer; import crazypants.enderio.machine.generator.combustion.TranslatedCubeRenderer; import crazypants.render.BoundingBox; import crazypants.render.CustomCubeRenderer; -import crazypants.render.CustomRenderBlocks; -import crazypants.render.IRenderFace; import crazypants.render.VertexTransform; -import crazypants.util.ForgeDirectionOffsets; import crazypants.vecmath.Vector3d; import crazypants.vecmath.Vector3f; import crazypants.vecmath.Vertex; @@ -38,9 +30,9 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer private OverlayRenderer overlayRenderer = new OverlayRenderer(); private TileVat vat; - + @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { + public boolean handleRenderType(ItemStack item, ItemRenderType type) { return true; } @@ -51,42 +43,39 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks)data[0]); + renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks) data[0]); } @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - short facing = 3; - boolean active = false; if(world != null) { TileEntity te = world.getTileEntity(x, y, z); if(te instanceof TileVat) { vat = (TileVat) te; - facing = vat.facing; - active = vat.isActive(); } else { vat = null; } } float fudge = 1f; - + IIcon override = renderer.overrideBlockTexture; //-x side - BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); - bb = bb.translate(0.5f - (0.334f/2),0,0); + BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge, fudge); + bb = bb.translate(0.5f - (0.334f / 2), 0, 0); TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, override, world != null); - bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); + bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge, fudge); TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, override, world != null); - bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge); - bb = bb.translate(-0.5f + (0.334f/2),0,0); + bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge, fudge); + bb = bb.translate(-0.5f + (0.334f / 2), 0, 0); TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, override, world != null); if(vat != null) { + overlayRenderer.setTile(vat); ccr.renderBlock(world, block, x, y, z, overlayRenderer); } vat = null; @@ -94,7 +83,6 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer return true; } - @Override public boolean shouldRender3DInInventory(int modelId) { return true; @@ -102,14 +90,14 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - - GL11.glDisable(GL11.GL_LIGHTING); + + GL11.glDisable(GL11.GL_LIGHTING); Tessellator tes = Tessellator.instance; tes.startDrawingQuads(); tes.addTranslation(0, -0.1f, 0); renderWorldBlock(null, 0, 0, 0, block, 0, renderer); tes.addTranslation(0, 0.1f, 0); - tes.draw(); + tes.draw(); GL11.glEnable(GL11.GL_LIGHTING); } @@ -125,7 +113,7 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer @Override public void apply(Vertex vertex) { - apply(vertex.xyz); + apply(vertex.xyz); } @Override @@ -142,26 +130,4 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer } } - - private class OverlayRenderer implements IRenderFace { - - @Override - public void renderFace(CustomRenderBlocks rb, ForgeDirection face, Block par1Block, double x, double y, double z, IIcon texture, List refVertices, - boolean translateToXyz) { - - if(vat != null && par1Block instanceof AbstractMachineBlock) { - Vector3d offset = ForgeDirectionOffsets.offsetScaled(face, 0.01); - Tessellator.instance.addTranslation((float)offset.x, (float)offset.y, (float)offset.z); - - IoMode mode = vat.getIoMode(face); - IIcon tex = ((AbstractMachineBlock)par1Block).getOverlayIconForMode(mode); - if(tex != null) { - ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z, tex); - } - Tessellator.instance.addTranslation(-(float)offset.x, -(float)offset.y, -(float)offset.z); - } - - } - - } } diff --git a/src/main/java/crazypants/render/CustomCubeRenderer.java b/src/main/java/crazypants/render/CustomCubeRenderer.java index 9a6c50dd..c6c2dcfb 100644 --- a/src/main/java/crazypants/render/CustomCubeRenderer.java +++ b/src/main/java/crazypants/render/CustomCubeRenderer.java @@ -33,9 +33,7 @@ public class CustomCubeRenderer { } public void renderBlock(IBlockAccess ba, Block par1Block, int par2, int par3, int par4, Collection renderers) { - if(rb == null) { - rb = new CustomRenderBlocks(ba); - } + rb.blockAccess = ba; rb.setOverrideTexture(getOverrideTexture()); rb.setFaceRenderers(renderers); @@ -52,8 +50,9 @@ public class CustomCubeRenderer { } public CustomRenderBlocks getCustomRenderBlocks() { + if (rb == null) { + rb = new CustomRenderBlocks(); + } return rb; } - - } diff --git a/src/main/java/crazypants/render/CustomRenderBlocks.java b/src/main/java/crazypants/render/CustomRenderBlocks.java index 799c8353..86b85cfc 100644 --- a/src/main/java/crazypants/render/CustomRenderBlocks.java +++ b/src/main/java/crazypants/render/CustomRenderBlocks.java @@ -21,6 +21,10 @@ public class CustomRenderBlocks extends RenderBlocks { private final List renderFaceCallbacks = new ArrayList(); private IIcon overrideTexture; + public CustomRenderBlocks() { + super(); + } + public CustomRenderBlocks(IBlockAccess par1iBlockAccess) { super(par1iBlockAccess); } diff --git a/src/main/java/crazypants/render/TechneUtil.java b/src/main/java/crazypants/render/TechneUtil.java index 3fe29a36..6576427b 100644 --- a/src/main/java/crazypants/render/TechneUtil.java +++ b/src/main/java/crazypants/render/TechneUtil.java @@ -43,7 +43,6 @@ import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.PositionTextureVertex; import net.minecraft.client.model.TexturedQuad; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -65,6 +64,7 @@ import com.google.common.collect.Lists; import cpw.mods.fml.common.ObfuscationReflectionHelper; import crazypants.enderio.EnderIO; import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.vecmath.Vector3d; /** * Slightly modified to fit the EnderIO source. @@ -73,6 +73,25 @@ import crazypants.enderio.machine.AbstractMachineBlock; */ public class TechneUtil { + private static class DefaultVertexTransform implements VertexTransform { + + private static DefaultVertexTransform INSTANCE = new DefaultVertexTransform(); + + @Override + public void apply(crazypants.vecmath.Vertex vertex) { + } + + @Override + public void apply(Vector3d vec) { + } + + @Override + public void applyToNormal(crazypants.vecmath.Vector3f vec) { + } + } + + public static VertexTransform vt = DefaultVertexTransform.INSTANCE; + private static final Tessellator tes = Tessellator.instance; public static List bakeModel(ModelRenderer model) { @@ -181,12 +200,20 @@ public class TechneUtil { } public static void renderWithIcon(List model, IIcon icon, Tessellator tes) { + renderWithIcon(model, icon, tes, null); + } + + public static void renderWithIcon(List model, IIcon icon, Tessellator tes, VertexTransform vt) { for (GroupObject go : model) { for (Face f : go.faces) { Vertex n = f.faceNormal; tes.setNormal(n.x, n.y, n.z); for (int i = 0; i < f.vertices.length; i++) { - Vertex v = f.vertices[i]; + Vertex vert = f.vertices[i]; + Vector3d v = new Vector3d(vert); + if(vt != null) { + vt.apply(v); + } TextureCoordinate t = f.textureCoordinates[i]; tes.addVertexWithUV(v.x, v.y, v.z, icon.getInterpolatedU(t.u * 16), icon.getInterpolatedV(t.v * 8)); } @@ -202,9 +229,10 @@ public class TechneUtil { tes.startDrawingQuads(); tes.setColorOpaque_F(1, 1, 1); tes.addTranslation(0, -0.5f, 0); - renderWithIcon(model, icon, tes); + renderWithIcon(model, icon, tes, vt); tes.addTranslation(0, 0.5f, 0); tes.draw(); + resetVT(); } public static boolean renderWorldBlock(List model, IBlockAccess world, int x, int y, int z, Block block) { @@ -216,11 +244,16 @@ public class TechneUtil { tes.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tes.setColorOpaque_F(1, 1, 1); tes.addTranslation(x + .5F, y + 0.0375f, z + .5F); - renderWithIcon(model, icon, tes); + renderWithIcon(model, icon, tes, vt); tes.addTranslation(-x - .5F, -y - 0.0375f, -z - .5F); + resetVT(); return true; } + private static void resetVT() { + vt = DefaultVertexTransform.INSTANCE; + } + private static IIcon getIconFor(Block block, IBlockAccess world, int x, int y, int z) { if(block instanceof AbstractMachineBlock) { return ((AbstractMachineBlock) block).getModelIcon(world, x, y, z); diff --git a/src/main/java/crazypants/render/VertexRotation.java b/src/main/java/crazypants/render/VertexRotation.java index 26ae0be4..6cf4241e 100644 --- a/src/main/java/crazypants/render/VertexRotation.java +++ b/src/main/java/crazypants/render/VertexRotation.java @@ -35,6 +35,10 @@ public class VertexRotation implements VertexTransform { this.angle = angle; quat = Quat4d.makeRotate(angle, axis); } + + public double getAngle() { + return angle; + } public void setAxis(Vector3d axis) { this.axis.set(axis); diff --git a/src/main/java/crazypants/render/VertexRotationFacing.java b/src/main/java/crazypants/render/VertexRotationFacing.java new file mode 100644 index 00000000..6ece5acd --- /dev/null +++ b/src/main/java/crazypants/render/VertexRotationFacing.java @@ -0,0 +1,29 @@ +package crazypants.render; + +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.vecmath.Vector3d; + +public class VertexRotationFacing extends VertexRotation { + + private ForgeDirection defaultDir; + + public VertexRotationFacing(ForgeDirection defaultDir) { + super(0, new Vector3d(0, 0.5, 0), new Vector3d(0, 0, 0)); + this.defaultDir = defaultDir; + } + + // No I have no idea why this value works. + private double rotationAmount = 1.571; + + public void setRotation(ForgeDirection dir) { + if(dir == defaultDir) { + setAngle(0); + } else if(dir == defaultDir.getOpposite()) { + setAngle(rotationAmount * 2); + } else if(dir == defaultDir.getRotation(ForgeDirection.DOWN)) { + setAngle(rotationAmount); + } else { + setAngle(rotationAmount * 3); + } + } +} diff --git a/src/main/java/crazypants/vecmath/Vector3d.java b/src/main/java/crazypants/vecmath/Vector3d.java index bafa7828..2bb55999 100644 --- a/src/main/java/crazypants/vecmath/Vector3d.java +++ b/src/main/java/crazypants/vecmath/Vector3d.java @@ -1,6 +1,7 @@ package crazypants.vecmath; import net.minecraft.util.Vec3; +import net.minecraftforge.client.model.obj.Vertex; public class Vector3d { @@ -28,6 +29,10 @@ public class Vector3d { this(corner.x, corner.y, corner.z); } + public Vector3d(Vertex vert) { + this(vert.x, vert.y, vert.z); + } + public void set(double x, double y, double z) { this.x = x; this.y = y;