From b83a7a22ec0a37acb786754ffa44593d4f14b952 Mon Sep 17 00:00:00 2001 From: Henry Mao Date: Sun, 10 Feb 2013 22:33:12 +0800 Subject: [PATCH] Added name to crane frame --- .../assemblyline/language/en_US.properties | 7 +- .../common/machine/crane/BlockCraneRail.java | 161 ------------------ 2 files changed, 5 insertions(+), 163 deletions(-) delete mode 100644 src/minecraft/assemblyline/common/machine/crane/BlockCraneRail.java diff --git a/resources/assemblyline/language/en_US.properties b/resources/assemblyline/language/en_US.properties index d264b41d..e104d0a6 100644 --- a/resources/assemblyline/language/en_US.properties +++ b/resources/assemblyline/language/en_US.properties @@ -7,13 +7,16 @@ assemblyline.gui.crafting=Crafting # Blocks tile.crate.name=Crate +tile.crate.0.name=Basic Crate +tile.crate.1.name=Advanced Crate +tile.crate.2.name=Elite Crate tile.conveyorBelt.name=Conveyor Belt tile.imprinter.name=Imprinter tile.encoder.name=Encoder -tile.engineerTable.name=Engineer's Table tile.detector.name=Detector tile.armbot.name=Armbot -tile.cranecontroller.name=Crane Controller +tile.craneController.name=Crane Controller +tile.craneFrame.name=Crane Frame tile.manipulator.name=Manipulator tile.rejector.name=Rejector tile.turntable.name=Turntable diff --git a/src/minecraft/assemblyline/common/machine/crane/BlockCraneRail.java b/src/minecraft/assemblyline/common/machine/crane/BlockCraneRail.java deleted file mode 100644 index 5fe7250f..00000000 --- a/src/minecraft/assemblyline/common/machine/crane/BlockCraneRail.java +++ /dev/null @@ -1,161 +0,0 @@ -package assemblyline.common.machine.crane; - -import net.minecraft.block.material.Material; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeDirection; -import universalelectricity.prefab.BlockMachine; -import assemblyline.client.render.BlockRenderingHandler; -import assemblyline.common.TabAssemblyLine; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class BlockCraneRail extends BlockMachine -{ - public BlockCraneRail(int id) - { - super("CraneRail", id, Material.iron); - this.setCreativeTab(TabAssemblyLine.INSTANCE); - this.setBlockBounds(0.25f, 0.25f, 0.25f, 0.75f, 0.75f, 0.75f); - } - - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) - { - return super.getSelectedBoundingBoxFromPool(world, x, y, z); - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) - { - TileEntity tE = world.getBlockTileEntity(x, y, z); - if (tE != null && tE instanceof TileEntityCraneRail) - { - AxisAlignedBB middle = AxisAlignedBB.getBoundingBox(0.25f, 0.25f, 0.25f, 0.75f, 0.75f, 0.75f); - AxisAlignedBB up = AxisAlignedBB.getBoundingBox(0.25f, 0.75f, 0.25f, 0.75f, 1.0f, 0.75f); - AxisAlignedBB down = AxisAlignedBB.getBoundingBox(0.25f, 0.0f, 0.25f, 0.75f, 0.25f, 0.75f); - AxisAlignedBB left = AxisAlignedBB.getBoundingBox(0.0f, 0.25f, 0.25f, 0.25f, 0.75f, 0.75f); - AxisAlignedBB right = AxisAlignedBB.getBoundingBox(0.75f, 0.25f, 0.25f, 1.0f, 0.75f, 0.75f); - AxisAlignedBB front = AxisAlignedBB.getBoundingBox(0.25f, 0.25f, 0.0f, 0.75f, 0.75f, 0.25f); - AxisAlignedBB back = AxisAlignedBB.getBoundingBox(0.25f, 0.25f, 0.75f, 0.75f, 0.75f, 1.0f); - boolean connectUp = CraneHelper.canFrameConnectTo(tE, x, y + 1, z, ForgeDirection.DOWN); - boolean connectDown = CraneHelper.canFrameConnectTo(tE, x, y - 1, z, ForgeDirection.UP); - // EAST, X- - boolean connectLeft = CraneHelper.canFrameConnectTo(tE, x - 1, y, z, ForgeDirection.EAST); - // WAST, X+ - boolean connectRight = CraneHelper.canFrameConnectTo(tE, x + 1, y, z, ForgeDirection.WEST); - // SOUTH, Z- - boolean connectFront = CraneHelper.canFrameConnectTo(tE, x, y, z - 1, ForgeDirection.SOUTH); - // NORTH, Z+ - boolean connectBack = CraneHelper.canFrameConnectTo(tE, x, y, z + 1, ForgeDirection.NORTH); - if (connectUp) - { - middle.maxY = up.maxY; - } - if (connectDown) - { - middle.minY = down.minY; - } - if (connectLeft) - { - middle.minX = left.minX; - } - if (connectRight) - { - middle.maxX = right.maxX; - } - if (connectFront) - { - middle.minZ = front.minZ; - } - if (connectBack) - { - middle.maxZ = back.maxZ; - } - setBlockBounds((float) middle.minX, (float) middle.minY, (float) middle.minZ, (float) middle.maxX, (float) middle.maxY, (float) middle.maxZ); - middle.offset(x, y, z); - return middle; - } - return super.getCollisionBoundingBoxFromPool(world, x, y, z); - } - - @Override - public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) - { - TileEntity tE = world.getBlockTileEntity(x, y, z); - if (tE != null && tE instanceof TileEntityCraneRail) - { - AxisAlignedBB middle = AxisAlignedBB.getBoundingBox(0.25f, 0.25f, 0.25f, 0.75f, 0.75f, 0.75f); - AxisAlignedBB up = AxisAlignedBB.getBoundingBox(0.25f, 0.75f, 0.25f, 0.75f, 1.0f, 0.75f); - AxisAlignedBB down = AxisAlignedBB.getBoundingBox(0.25f, 0.0f, 0.25f, 0.75f, 0.25f, 0.75f); - AxisAlignedBB left = AxisAlignedBB.getBoundingBox(0.0f, 0.25f, 0.25f, 0.25f, 0.75f, 0.75f); - AxisAlignedBB right = AxisAlignedBB.getBoundingBox(0.75f, 0.25f, 0.25f, 1.0f, 0.75f, 0.75f); - AxisAlignedBB front = AxisAlignedBB.getBoundingBox(0.25f, 0.25f, 0.0f, 0.75f, 0.75f, 0.25f); - AxisAlignedBB back = AxisAlignedBB.getBoundingBox(0.25f, 0.25f, 0.75f, 0.75f, 0.75f, 1.0f); - boolean connectUp = CraneHelper.canFrameConnectTo(tE, x, y + 1, z, ForgeDirection.DOWN); - boolean connectDown = CraneHelper.canFrameConnectTo(tE, x, y - 1, z, ForgeDirection.UP); - // EAST, X- - boolean connectLeft = CraneHelper.canFrameConnectTo(tE, x - 1, y, z, ForgeDirection.EAST); - // WAST, X+ - boolean connectRight = CraneHelper.canFrameConnectTo(tE, x + 1, y, z, ForgeDirection.WEST); - // SOUTH, Z- - boolean connectFront = CraneHelper.canFrameConnectTo(tE, x, y, z - 1, ForgeDirection.SOUTH); - // NORTH, Z+ - boolean connectBack = CraneHelper.canFrameConnectTo(tE, x, y, z + 1, ForgeDirection.NORTH); - if (connectUp) - { - middle.maxY = up.maxY; - } - if (connectDown) - { - middle.minY = down.minY; - } - if (connectLeft) - { - middle.minX = left.minX; - } - if (connectRight) - { - middle.maxX = right.maxX; - } - if (connectFront) - { - middle.minZ = front.minZ; - } - if (connectBack) - { - middle.maxZ = back.maxZ; - } - setBlockBounds((float) middle.minX, (float) middle.minY, (float) middle.minZ, (float) middle.maxX, (float) middle.maxY, (float) middle.maxZ); - return; - } - setBlockBounds(0.25f, 0.25f, 0.25f, 0.75f, 0.75f, 0.75f); - } - - @Override - public TileEntity createNewTileEntity(World world, int metadata) - { - return new TileEntityCraneRail(); - } - - @Override - public boolean renderAsNormalBlock() - { - return false; - } - - @Override - public boolean isOpaqueCube() - { - return false; - } - - @Override - public int getRenderType() - { - return BlockRenderingHandler.BLOCK_RENDER_ID; - } -}