From f70b5ce37eadd83c18b1c869c813d6c67c5ac240 Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Sat, 11 Oct 2014 23:48:18 +0800 Subject: [PATCH] New Transceiver ready for testing. --- resources/assets/enderio/lang/en_US.lang | 12 ++- .../blocks/transcieverOverlayDisabled.png | Bin 0 -> 322 bytes .../blocks/transcieverOverlayPull.png | Bin 0 -> 390 bytes .../blocks/transcieverOverlayPush.png | Bin 0 -> 401 bytes .../blocks/transcieverOverlayPushPull.png | Bin 0 -> 344 bytes .../machine/AbstractMachineRenderer.java | 9 +- .../machine/AbstractPoweredTaskEntity.java | 4 + .../crazypants/enderio/machine/IoMode.java | 8 ++ .../enderio/machine/MachineRecipes.java | 7 +- .../machine/transceiver/BlockTransceiver.java | 13 +++ .../transceiver/ServerChannelRegister.java | 2 +- .../machine/transceiver/TileTransceiver.java | 17 ++-- .../transceiver/gui/ContainerTransceiver.java | 46 ++++++---- .../machine/transceiver/gui/GeneralTab.java | 19 ++-- .../render/TransceiverRenderer.java | 82 ++++++++++++++++-- .../crazypants/render/CustomCubeRenderer.java | 1 - 16 files changed, 166 insertions(+), 54 deletions(-) create mode 100644 resources/assets/enderio/textures/blocks/transcieverOverlayDisabled.png create mode 100644 resources/assets/enderio/textures/blocks/transcieverOverlayPull.png create mode 100644 resources/assets/enderio/textures/blocks/transcieverOverlayPush.png create mode 100644 resources/assets/enderio/textures/blocks/transcieverOverlayPushPull.png diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 73ed33aa..44f270bc 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -249,10 +249,14 @@ tile.blockSagMill.tooltip.detailed.line4=Upgrade with capacitors to increase tile.blockSagMill.tooltip.detailed.line5=speed and energy storage tile.blockSagMill.tooltipPrefix=Contains -tile.blockHyperCube.name=Dimensional Transceiver -tile.blockHyperCube.tooltip.detailed.line1=Transports items, fluids and power -tile.blockHyperCube.tooltip.detailed.line2=wirelessly across any distance and -tile.blockHyperCube.tooltip.detailed.line3=between dimensions +tile.blockHyperCube.name=Dimensional Transceiver (Deprecated) +tile.blockHyperCube.tooltip.detailed.line1=Convert to new model by placing +tile.blockHyperCube.tooltip.detailed.line2=in the crafting grid + +tile.blockTransceiver.name=Dimensional Transceiver +tile.blockTransceiver.tooltip.detailed.line1=Transports items, fluids and power +tile.blockTransceiver.tooltip.detailed.line2=wirelessly across any distance and +tile.blockTransceiver.tooltip.detailed.line3=between dimensions tile.blockPowerMonitor.name=Power Monitor tile.blockPowerMonitor.tooltip.detailed.line1=Displays details of power use and diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayDisabled.png b/resources/assets/enderio/textures/blocks/transcieverOverlayDisabled.png new file mode 100644 index 0000000000000000000000000000000000000000..f677495ca9215e47d0b7b7011b95281a7b36624f GIT binary patch literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=G`7Ak6rd{eTWokiEpy*OmP)D;KXeyXsTJJ3t|+64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLj!{^MGJwdR(rZQhFJKoot(|rY{1i8&HpQ5_XQ2>B>r1RGn*WitjYMT z!ks14Ex+KOkCiSw%_{cS3iH#6DvYl(x!lvI6;>1s;*b z3=G`7Ak6rd{eTWokiEpy*OmP)D;KXeyXsTJJ3t|+64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLj!{^MGJwd-g~+@hFJJdog66Ctia=9+vD>-DEGIn-+T3k6H3e#7CZ{E zzsFE0JW0U%y{y0k<7cS{=WK|ze_(UVZ_~0DpO>{cS+G4dW;Z^!aH+EIV=tbf5;1m` z$PRDDjEHTERzK;DUb5;V(~c{Nx%GP*oR8&fl8bm9_krJdgS{}5!qm-aa~*Z(ncCdD zKf}@gaIcOD!__PLnh>9u^puFU_~ zStd?#jpftt2oBFN^?j^m_V`Mj>>io$xR%}*y4hJ#LJ5<9sY|m49ZqVf<-F>6^ZQ~y g+ur<*zu&R9H@({TQSbJ1pw}5ZUHx3vIVCg!0NbdNGXMYp literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayPush.png b/resources/assets/enderio/textures/blocks/transcieverOverlayPush.png new file mode 100644 index 0000000000000000000000000000000000000000..680209806edff7767f812dde2f338020b0799e67 GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=G`7Ak6rd{eTWokiEpy*OmP)D;KXeyXsTJJ3t|+64!{5;QX|b^2DN4hJeJ(yb?V> z*ARs=V?9$nLj!{^MGJwdetEh$hFJKo4L&V;Sb-;bhRkl~_7@#nBaOGJ%r?1lT<*&c zmuakmhwmPn)4;Cwa9Z)jcwt!)3Mt(kN<&Bfo`7TojEI*%?$F6vV1$r zss8Z7nL{t5nKtCSzk5$@bdDQgSCm+9m|S~o!MDoV-h`F+fV*>#w?aYL z6TSzF*tV)3=zeuVw(Ea5V;)dMbAj>`w&3H1%H<5}KMAdL)({XnvQu9}VPRKok70X< zQ0sRAB@YSXiTg!ZOgB7TcPV1W-}`|ZTd%78cp}^qj>gTe~DWM4fNye6l literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/blocks/transcieverOverlayPushPull.png b/resources/assets/enderio/textures/blocks/transcieverOverlayPushPull.png new file mode 100644 index 0000000000000000000000000000000000000000..1d114790574084744a45275e2a485debd355713b GIT binary patch literal 344 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$psFjL zE{-7<{%eCB`3@QIoKD^)UH^d3S;k_cZT~W%x60jj(>Q!5N(fI}Q?l}HS+r6d&veci zypvmu=N&&;X6~ZbdgxZc+}8%@wl3Ia>7lmEQ~bSA#9>}v&!C`A{sn9IJBUWQCO`M) zaLha2oN>E=h3~}k#xwcM3#wB1p9DF-O*(LBJ=@pyY-?Xkw4LEt&#LXwH7y({_3^!- z_mS)U0@+=9KZOHl_O_e)-bv8bKl_=b=v>ez{ka@QM-NxrzkbR_^m6#&lWbhse$Sq1 ku!e67o__m>xj-eOm8-#2xu)hop#K;=UHx3vIVCg!0JR8!X8-^I literal 0 HcmV?d00001 diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java index 8bc2b2dc..836eaca3 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineRenderer.java @@ -56,15 +56,8 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, II for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { brightnessPerSide[dir.ordinal()] = Math.max(RenderUtil.getColorMultiplierForFace(dir) + 0.1f, 1f); } - CubeRenderer.render(bb, textures, null, brightnessPerSide); - -// GL11.glPushMatrix(); -// GL11.glTranslatef(0, 0, 0); - Tessellator.instance.draw(); -// GL11.glPopMatrix(); - - + Tessellator.instance.draw(); } @Override diff --git a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java index 6f79e55a..8afbc04f 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractPoweredTaskEntity.java @@ -75,6 +75,10 @@ public abstract class AbstractPoweredTaskEntity extends AbstractMachineEntity { } return lastCompletedRecipe.getExperianceForOutput(output); } + + public boolean getRedstoneChecksPassed() { + return redstoneCheckPassed; + } @Override protected boolean processTasks(boolean redstoneChecksPassed) { diff --git a/src/main/java/crazypants/enderio/machine/IoMode.java b/src/main/java/crazypants/enderio/machine/IoMode.java index d9a361e1..6e45b701 100644 --- a/src/main/java/crazypants/enderio/machine/IoMode.java +++ b/src/main/java/crazypants/enderio/machine/IoMode.java @@ -48,6 +48,14 @@ public enum IoMode { public boolean pushes() { return this == PUSH || this == PUSH_PULL; } + + public boolean canOutput() { + return pushes() || this == NONE; + } + + public boolean canRecieveInput() { + return pulls() || this == NONE; + } public String getLocalisedName() { return Lang.localize(unlocalisedName); diff --git a/src/main/java/crazypants/enderio/machine/MachineRecipes.java b/src/main/java/crazypants/enderio/machine/MachineRecipes.java index b8399146..44ae540f 100644 --- a/src/main/java/crazypants/enderio/machine/MachineRecipes.java +++ b/src/main/java/crazypants/enderio/machine/MachineRecipes.java @@ -155,12 +155,13 @@ public class MachineRecipes { GameRegistry.addShapedRecipe(farm, "ehe", "eme", "pzp", 'h', Items.diamond_hoe, 'm', machineChassi, 'e', electricSteel, 'z', zombieController, 'p', pulCry); //transceiver - ItemStack transceiver = new ItemStack(EnderIO.blockHyperCube, 1, 0); + //ItemStack transceiver = new ItemStack(EnderIO.blockHyperCube, 1, 0); + ItemStack transceiver = new ItemStack(EnderIO.blockTransceiver, 1, 0); ItemStack obsidian = new ItemStack(Blocks.obsidian); - GameRegistry .addShapedRecipe(transceiver, "oeo", "pdp", "oco", 'o', obsidian, 'e', Items.ender_eye, 'c', enderCapacitor, 'p', phasedGold, 'd', Items.diamond); - + GameRegistry.addShapelessRecipe(transceiver, new ItemStack(EnderIO.blockHyperCube, 1, 0)); + //solar panel if(Config.photovoltaicCellEnabled) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index 32dd0711..1b018012 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -2,12 +2,14 @@ package crazypants.enderio.machine.transceiver; import java.util.Random; +import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.GuiHandler; import crazypants.enderio.ModObject; import crazypants.enderio.machine.AbstractMachineBlock; @@ -58,6 +60,17 @@ public class BlockTransceiver extends AbstractMachineBlock { return GuiHandler.GUI_ID_TRANSCEIVER; } + + @Override + protected void registerOverlayIcons(IIconRegister iIconRegister) { + overlayIconPull = iIconRegister.registerIcon("enderio:transcieverOverlayPull"); + overlayIconPush = iIconRegister.registerIcon("enderio:transcieverOverlayPush"); + overlayIconPushPull = iIconRegister.registerIcon("enderio:transcieverOverlayPushPull"); + overlayIconDisabled = iIconRegister.registerIcon("enderio:transcieverOverlayDisabled"); + overlayIconNone = iIconRegister.registerIcon("enderio:machineOverlayNone"); + selectedFaceIcon= iIconRegister.registerIcon("enderio:machineOverlaySelectedFace"); + } + @Override protected String getMachineFrontIconKey(boolean active) { if(active) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index 2c64b295..84547be1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -197,7 +197,7 @@ public class ServerChannelRegister extends ChannelRegister { for (Channel channel : channels) { RoundRobinIterator iter = getIterator(channel); for (TileTransceiver trans : iter) { - if(trans != from && trans.getRecieveChannels(ChannelType.ITEM).contains(channel)) { + if(trans != from && trans.getRecieveChannels(ChannelType.ITEM).contains(channel) && trans.getRedstoneChecksPassed()) { contents = sendItem(from, slot, contents, trans); if(contents == null) { return; diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index 58a7132f..b3144a9b 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -24,6 +24,7 @@ import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.ContinuousTask; import crazypants.enderio.machine.IMachineRecipe; import crazypants.enderio.machine.IPoweredTask; +import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; @@ -52,7 +53,7 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid private PowerDistributor powerDistributor; public TileTransceiver() { - super(new SlotDefinition(4, 4, 0)); + super(new SlotDefinition(8, 8, 0)); for (ChannelType type : ChannelType.values()) { sendChannels.put(type, new ArrayList()); recieveChannels.put(type, new ArrayList()); @@ -357,21 +358,24 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid @Override public int fill(ForgeDirection from, FluidStack resource, boolean doFill) { - if(getSendChannels(ChannelType.FLUID).isEmpty()) { + if(getSendChannels(ChannelType.FLUID).isEmpty() || !redstoneCheckPassed || !getIoMode(from).canRecieveInput()) { return 0; } return ServerChannelRegister.instance.fill(this, getSendChannels(ChannelType.FLUID), resource, doFill); } public int recieveFluid(List channels, FluidStack resource, boolean doFill) { - if(!hasRecieveChannel(channels, ChannelType.FLUID)) { + if(!hasRecieveChannel(channels, ChannelType.FLUID) || !redstoneCheckPassed) { return 0; } Map handlers = getNeighbouringFluidHandlers(); for (Entry entry : handlers.entrySet()) { - int res = entry.getValue().fill(entry.getKey().getOpposite(), resource, doFill); - if(res > 0) { - return res; + IoMode mode = getIoMode(entry.getKey()); + if(mode.canOutput()) { + int res = entry.getValue().fill(entry.getKey().getOpposite(), resource, doFill); + if(res > 0) { + return res; + } } } return 0; @@ -431,7 +435,6 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } } } - } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java index df44e939..57bc6456 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java @@ -12,10 +12,10 @@ import net.minecraft.item.ItemStack; public class ContainerTransceiver extends AbstractMachineContainer { - static final Point PLAYER_INV_OFFSET = new Point(47, 84); - - static final Point ITEM_INV_OFFSET = new Point(92, 23); + static final Point PLAYER_INV_OFFSET = new Point(47, 86); + static final Point ITEM_INV_OFFSET = new Point(54, 30); + static final Point HIDDEN_OFFSET = new Point(-3000, -3000); public ContainerTransceiver(InventoryPlayer inventory, TileTransceiver te) { @@ -25,10 +25,10 @@ public class ContainerTransceiver extends AbstractMachineContainer { @Override protected void addMachineSlots(InventoryPlayer playerInv) { int i; - for (i = 0; i < 4; i++) { + for (i = 0; i < 8; i++) { addSlotToContainer(new Slot(tileEntity, i, 0, 0)); } - for (; i < 8; i++) { + for (; i < 16; i++) { addSlotToContainer(new Slot(tileEntity, i, 0, 0) { @Override public boolean isItemValid(ItemStack p_75214_1_) { @@ -36,7 +36,7 @@ public class ContainerTransceiver extends AbstractMachineContainer { } }); } - setItemSlotLocations(ITEM_INV_OFFSET); + setItemSlotLocations(getItemInventoryOffset()); } @@ -46,22 +46,38 @@ public class ContainerTransceiver extends AbstractMachineContainer { entry.getKey().xDisplayPosition = visible ? entry.getValue().x : -3000; entry.getKey().yDisplayPosition = visible ? entry.getValue().y : -3000; } - Point itemOffset = visible ? ITEM_INV_OFFSET : HIDDEN_OFFSET; + Point itemOffset = visible ? getItemInventoryOffset() : HIDDEN_OFFSET; setItemSlotLocations(itemOffset); } private void setItemSlotLocations(Point offset) { int i; int x = offset.x; - int y = offset.y; - for (i = 0; i < 4; i++) { + int y = offset.y; + for (i = 0; i < 4; i++) { ((Slot) inventorySlots.get(i)).xDisplayPosition = x; ((Slot) inventorySlots.get(i)).yDisplayPosition = y; x += 18; } x = offset.x; - y = offset.y + getItemRowSpacing(); - for (; i < 8; i++) { + y = offset.y + 18; + for (; i < 8; i++) { + ((Slot) inventorySlots.get(i)).xDisplayPosition = x; + ((Slot) inventorySlots.get(i)).yDisplayPosition = y; + x += 18; + } + + x = offset.x + (18 * 4) + getItemBufferSpacing(); + //y = offset.y + 18 + getItemRowSpacing(); + y = offset.y; + for (; i < 12; i++) { + ((Slot) inventorySlots.get(i)).xDisplayPosition = x; + ((Slot) inventorySlots.get(i)).yDisplayPosition = y; + x += 18; + } + x = offset.x + (18 * 4) + getItemBufferSpacing(); + y = offset.y + 18; + for (; i < 16; i++) { ((Slot) inventorySlots.get(i)).xDisplayPosition = x; ((Slot) inventorySlots.get(i)).yDisplayPosition = y; x += 18; @@ -70,15 +86,15 @@ public class ContainerTransceiver extends AbstractMachineContainer { @Override public Point getPlayerInventoryOffset() { - return PLAYER_INV_OFFSET; + return PLAYER_INV_OFFSET; } - public Point getItemInventoryOffset() { + public Point getItemInventoryOffset() { return ITEM_INV_OFFSET; } - public int getItemRowSpacing() { - return 20; + public int getItemBufferSpacing() { + return 5; } } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 41a06c01..57fd02ba 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -68,14 +68,17 @@ public class GeneralTab implements ITabPanel { parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 162, 76); invRoot = container.getItemInventoryOffset(); - parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 72, 18); - parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1 + container.getItemRowSpacing(), 24, 180, 72, 18); + parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 72, 36); + parent.drawTexturedModalRect(left + invRoot.x - 1 + (18 * 4) + container.getItemBufferSpacing(), top + invRoot.y - 1, 24, 180, 72, 36); FontRenderer fr = parent.getFontRenderer(); - String sendTxt = "Send"; - fr.drawString(sendTxt, left + invRoot.x - fr.getStringWidth(sendTxt) - 4, top + invRoot.y + 3, ColorUtil.getRGB(Color.BLACK)); - String recText = "Receive:"; - fr.drawString(recText, left + invRoot.x - fr.getStringWidth(recText) - 4, top + invRoot.y + 3 + container.getItemRowSpacing(), ColorUtil.getRGB(Color.BLACK)); + String sendTxt = "Send"; + int x = left + invRoot.x + 36 - fr.getStringWidth(sendTxt)/2; + int y = top + invRoot.y - fr.FONT_HEIGHT - 3; + fr.drawString(sendTxt, x, y, ColorUtil.getRGB(Color.BLACK)); + String recText = "Receive"; + x = left + invRoot.x + 72 + container.getItemBufferSpacing() + 36 - fr.getStringWidth(recText)/2; + fr.drawString(recText, x, y, ColorUtil.getRGB(Color.BLACK)); //Highlights parent.renderSlotHighlights(); @@ -84,8 +87,8 @@ public class GeneralTab implements ITabPanel { RenderUtil.bindTexture("enderio:textures/gui/transceiver.png"); GL11.glColor3f(1, 1, 1); - int x = left + parent.getPowerX() - 1; - int y = top + parent.getPowerY() - 1; + x = left + parent.getPowerX() - 1; + y = top + parent.getPowerY() - 1; int maxHeight = parent.getPowerHeight(); parent.drawTexturedModalRect(x, y, 233, 196, 12, maxHeight + 2); 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 e61ba407..b1193047 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverRenderer.java @@ -1,23 +1,36 @@ package crazypants.enderio.machine.transceiver.render; +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.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import crazypants.enderio.EnderIO; import crazypants.enderio.config.Config; +import crazypants.enderio.machine.AbstractMachineBlock; +import crazypants.enderio.machine.IoMode; import crazypants.enderio.machine.transceiver.TileTransceiver; 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 TransceiverRenderer extends TileEntitySpecialRenderer implements IItemRenderer { @@ -42,22 +55,58 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II @Override public void renderTileEntityAt(TileEntity te, double x, double y, double z, float tick) { - TileTransceiver cube = (TileTransceiver) te; + TileTransceiver trans = (TileTransceiver) te; GL11.glEnable(GL12.GL_RESCALE_NORMAL); - - float f = cube.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); - int l = cube.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); + + float f = trans.getWorldObj().getBlockLightValue(te.xCoord, te.yCoord, te.zCoord); + int l = trans.getWorldObj().getLightBrightnessForSkyBlocks(te.xCoord, te.yCoord, te.zCoord, 0); int l1 = l % 65536; int l2 = l / 65536; Tessellator.instance.setColorOpaque_F(f, f, f); OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) l1, (float) l2); - model.render(cube, x, y, z); - if(cube.isActive()) { + model.render(trans, x, y, z); + if(trans.isActive()) { renderPower(te.getWorldObj(), x, y, z, true); - } + } GL11.glDisable(GL12.GL_RESCALE_NORMAL); + + GL11.glPushMatrix(); + GL11.glTranslatef((float) x, (float) y, (float) z); + GL11.glColor3f(1, 1, 1); + GL11.glDisable(GL11.GL_LIGHTING); + Tessellator.instance.startDrawingQuads(); + Tessellator.instance.setColorOpaque_F(f, f, f); + + + RenderUtil.bindBlockTexture(); + CustomRenderBlocks rb = new CustomRenderBlocks(te.getWorldObj()); + double scale = 0.88; + BoundingBox pushPullBounds = BoundingBox.UNIT_CUBE.scale(scale, scale, scale); + BoundingBox disabledBounds = BoundingBox.UNIT_CUBE.scale(1.01, 1.01, 1.01); + + for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + IoMode mode = trans.getIoMode(dir); + if(mode != null) { + if(mode == IoMode.DISABLED) { + rb.setRenderBounds(disabledBounds.minX, disabledBounds.minY, disabledBounds.minZ, + disabledBounds.maxX, disabledBounds.maxY, disabledBounds.maxZ); + } else { + rb.setRenderBounds(pushPullBounds.minX, pushPullBounds.minY, pushPullBounds.minZ, + pushPullBounds.maxX, pushPullBounds.maxY, pushPullBounds.maxZ); + } + IIcon icon = EnderIO.blockTransceiver.getOverlayIconForMode(mode); + if(icon != null) { + rb.doDefaultRenderFace(dir, EnderIO.blockTransceiver, 0, 0, 0, icon); + } + } + } + + Tessellator.instance.draw(); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glPopMatrix(); + } @Override @@ -127,4 +176,23 @@ public class TransceiverRenderer extends TileEntitySpecialRenderer implements II GL11.glPopMatrix(); } + // 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) { + // ccr.getCustomRenderBlocks().doDefaultRenderFace(face,par1Block,x,y,z, tex); + // } + // } + // + // } + // + // } + } diff --git a/src/main/java/crazypants/render/CustomCubeRenderer.java b/src/main/java/crazypants/render/CustomCubeRenderer.java index 92292452..4580cb1a 100644 --- a/src/main/java/crazypants/render/CustomCubeRenderer.java +++ b/src/main/java/crazypants/render/CustomCubeRenderer.java @@ -59,5 +59,4 @@ public class CustomCubeRenderer { } - }