From dec86fad1818a1008e808a9c25ef79bbdbea76f8 Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Mon, 16 Feb 2015 23:02:25 +1100 Subject: [PATCH] 16/02/2015 #2 --- .../client/render/block/RenderCrystal.java | 2 ++ .../client/render/tile/RenderTileCrystal.java | 22 +++++++++++++ .../itemblocks/EnergyCrystalItemBlock.java | 11 +++++++ .../common/blocks/machine/EnergyCrystal.java | 33 +++++++++++++++++-- .../energynet/TileEnergyTransceiver.java | 8 +++++ .../energynet/TileRemoteEnergyBase.java | 5 +++ 6 files changed, 79 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java index 7bd939f6..1d6ae2b6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderCrystal.java @@ -23,6 +23,8 @@ public class RenderCrystal implements IItemRenderer { relay2 = new TileEnergyRelay(1); transceiver1 = new TileEnergyTransceiver(0); transceiver2 = new TileEnergyTransceiver(1); + transceiver1.facing = 1; + transceiver2.facing = 1; } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java index 8968d978..607cdb2a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java @@ -94,6 +94,28 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); GL11.glScalef(0.5f, 0.5f, 0.5f); + + switch (tileEntity.facing) + { + case 0: + GL11.glRotatef(180, 0, 0, 1); + break; + case 3: + GL11.glRotatef(90, 1, 0, 0); + break; + case 2: + GL11.glRotatef(90, -1, 0, 0); + break; + case 4: + GL11.glRotatef(90, 0, 0, 1); + break; + case 5: + GL11.glRotatef(90, 0, 0, -1); + break; + } + + GL11.glTranslated(0, -1, 0); + //GL11.glDisable(GL11.GL_LIGHTING); //todo disable? RenderHelper.disableStandardItemLighting(); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/EnergyCrystalItemBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/EnergyCrystalItemBlock.java index 0d0958b8..1a43ed5c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/EnergyCrystalItemBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/EnergyCrystalItemBlock.java @@ -1,8 +1,11 @@ package com.brandon3055.draconicevolution.common.blocks.itemblocks; +import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.world.World; /** * Created by Brandon on 10/02/2015. @@ -23,4 +26,12 @@ public class EnergyCrystalItemBlock extends ItemBlock { public String getUnlocalizedName(ItemStack stack) { return super.getUnlocalizedName(stack) + stack.getItemDamage(); } + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { + boolean b = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + TileEnergyTransceiver transceiver = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null; + if (transceiver != null) transceiver.facing = side; + return b; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java index a68b80fe..a311d23c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java @@ -56,9 +56,37 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock } @Override - public void setBlockBoundsBasedOnState(IBlockAccess iBlockAccess, int x, int y, int z) { - int meta = iBlockAccess.getBlockMetadata(x, y, z); + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); if (meta == 1 || meta == 0) setBlockBounds(0.37F, 0.135F, 0.37F, 0.63F, 0.865F, 0.63F); + else if (meta == 2 || meta == 3) + { + TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null; + if (tile != null) + { + switch (tile.facing) + { + case 0: + setBlockBounds(0.37F, 0.59F, 0.37F, 0.63F, 1.0F, 0.63F); + break; + case 1: + setBlockBounds(0.37F, 0.0F, 0.37F, 0.63F, 0.41F, 0.63F); + break; + case 2: + setBlockBounds(0.37F, 0.37F, 0.59F, 0.63F, 0.63F, 1.0F); + break; + case 3: + setBlockBounds(0.37F, 0.37F, 0.0F, 0.63F, 0.63F, 0.41F); + break; + case 4: + setBlockBounds(0.59F, 0.37F, 0.37F, 1.0F, 0.63F, 0.63F); + break; + case 5: + setBlockBounds(0.0F, 0.37F, 0.37F, 0.41F, 0.63F, 0.63F); + break; + } + } + } } @Override @@ -126,4 +154,5 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock } return list; } + } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java index 00dd442a..2c4d2429 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java @@ -7,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound; */ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ + public int facing = 0;//0=up, 1=down, 3=north, 2=south, 4=east, 5=west + public TileEnergyTransceiver() {} public TileEnergyTransceiver(int powerTier) @@ -15,6 +17,10 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ this.updateStorage(); } + @Override + public void updateEntity() { + super.updateEntity(); + } @Override public double getBeamX() { @@ -49,10 +55,12 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ @Override public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound); + compound.setInteger("Facing", facing); } @Override public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); + facing = compound.getInteger("Facing"); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java index db12712a..e9d4329f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.util.ForgeDirection; @@ -286,4 +287,8 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe readFromNBT(pkt.func_148857_g()); } + @Override + public AxisAlignedBB getRenderBoundingBox() { + return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord + 1, yCoord + 1, zCoord + 1); + } }