Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

worked on crane a bit

Browse source
This commit is contained in:
Robert Seifert 2013-05-09 03:39:48 -04:00
parent 41f59b1299
commit 752b5fb934
12 changed files with 116 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
models/Crane/Arm.tcn
View file

Binary file not shown.

0
models/Crane/old/ArmMountPoint.tcn → models/Crane/ArmMountPoint.tcn
View file

BIN
models/Crane/Head.tcn
View file

Binary file not shown.

BIN
models/Crane/MountPoint.tcn
View file

Binary file not shown.

0
models/Crane/old/craneArm.tcn → models/Crane/craneArm.tcn
View file

0
models/Crane/old/craneArmHoist.tcn → models/Crane/craneArmHoist.tcn
View file

25
src/minecraft/assemblyline/client/ClientProxy.java
View file

@ -1,10 +1,13 @@
package assemblyline.client;
import java.awt.Color;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import universalelectricity.core.vector.Vector3;
import assemblyline.client.gui.GuiEncoder;
import assemblyline.client.gui.GuiImprinter;
import assemblyline.client.render.BlockRenderingHandler;
@ -27,8 +30,13 @@ import assemblyline.common.machine.crane.TileEntityCraneController;
import assemblyline.common.machine.crane.TileEntityCraneRail;
import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.TileEntityEncoder;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import dark.library.DarkMain;
import dark.library.effects.FXBeam;
public class ClientProxy extends CommonProxy
{
@ -79,4 +87,21 @@ public class ClientProxy extends CommonProxy
{
return GuiScreen.isCtrlKeyDown();
}
/**
* Renders a laser beam from one power to another by a set color for a set time
*
* @param world - world this laser is to be rendered in
* @param position - start vector3
* @param target - end vector3
* @param color - color of the beam
* @param age - life of the beam in 1/20 secs
*/
public void renderBeam(World world, Vector3 position, Vector3 target, Color color, int age)
{
if (world.isRemote || FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
{
FMLClientHandler.instance().getClient().effectRenderer.addEffect(new FXBeam(world, position, target, color, DarkMain.TEXTURE_DIRECTORY + "", age));
}
}
}

15
src/minecraft/assemblyline/common/CommonProxy.java
View file

@ -1,5 +1,6 @@
package assemblyline.common;
import java.awt.Color;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@ -9,6 +10,7 @@ import java.util.zip.ZipInputStream;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.multiblock.TileEntityMulti;
import assemblyline.common.armbot.TileEntityArmbot;
import assemblyline.common.block.TileEntityCrate;
@ -144,4 +146,17 @@ public class CommonProxy implements IGuiHandler
{
return false;
}
/**
* Renders a laser beam from one power to another by a set color for a set time
*
* @param world - world this laser is to be rendered in
* @param position - start vector3
* @param target - end vector3
* @param color - color of the beam
* @param age - life of the beam in 1/20 secs
*/
public void renderBeam(World world, Vector3 position, Vector3 target, Color color, int age)
{
}
}

3
src/minecraft/assemblyline/common/machine/TileEntityAssemblyNetwork.java
View file

@ -1,12 +1,11 @@
package assemblyline.common.machine;
import dark.library.machine.TileEntityRunnableMachine;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.AssemblyLine;
import dark.library.machine.TileEntityRunnableMachine;
/**
* A class to be inherited by all machines on the assembly line. This will allow all machines to be

3
src/minecraft/assemblyline/common/machine/crane/BlockCraneController.java
View file

@ -7,6 +7,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -17,7 +18,7 @@ public class BlockCraneController extends BlockALMachine
{
super(id, UniversalElectricity.machine);
this.setUnlocalizedName("craneController");
// this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setCreativeTab(TabAssemblyLine.INSTANCE);
}
@Override

3
src/minecraft/assemblyline/common/machine/crane/BlockCraneFrame.java
View file

@ -7,6 +7,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.block.BlockALMachine;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -17,7 +18,7 @@ public class BlockCraneFrame extends BlockALMachine
{
super(id, UniversalElectricity.machine);
this.setUnlocalizedName("craneFrame");
// this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setCreativeTab(TabAssemblyLine.INSTANCE);
this.setBlockBounds(0.25f, 0.25f, 0.25f, 0.75f, 0.75f, 0.75f);
}

134
src/minecraft/assemblyline/common/machine/crane/TileEntityCraneController.java
View file

@ -1,31 +1,58 @@
package assemblyline.common.machine.crane;
import java.awt.Color;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import assemblyline.api.ICraneConnectable;
import universalelectricity.core.vector.Vector3;
import assemblyline.api.ICraneStructure;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.TileEntityAssemblyNetwork;
public class TileEntityCraneController extends TileEntityAssemblyNetwork implements ICraneConnectable
public class TileEntityCraneController extends TileEntityAssemblyNetwork implements ICraneStructure
{
int width, height, depth;
int width, depth;
boolean isCraneValid;
long ticks;
Vector3 armPos;
@Override
public void initiate()
{
this.validateCrane();
if(armPos == null || armPos.equals(new Vector3()))
{
int deltaX = 0;
int deltaZ = 0;
switch(this.getFacing())
{
case SOUTH: case EAST: deltaX = (this.width/2);deltaZ = (this.depth/2);break;
case NORTH: case WEST: deltaX = -(this.width/2);deltaZ = -(this.depth/2);break;
}
armPos = new Vector3(this.xCoord + deltaX, this.yCoord, this.zCoord+ deltaZ);
}
}
public ForgeDirection getFacing()
{
return ForgeDirection.getOrientation(this.worldObj.getBlockMetadata(this.xCoord, this.yCoord, this.zCoord));
}
public TileEntityCraneController()
{
super();
width = height = depth = 0;
width = depth = 0;
isCraneValid = false;
ticks = 0;
}
@Override
public void updateEntity()
{
ticks++;
if (ticks % 20 == 0)
if(this.worldObj.isRemote && armPos != null)
{
validateCrane();
AssemblyLine.proxy.renderBeam(this.worldObj, new Vector3(this), armPos, Color.BLUE, 1);
}
super.updateEntity();
if (ticks % 60 == 0)
{
this.validateCrane();
}
}
@ -37,44 +64,46 @@ public class TileEntityCraneController extends TileEntityAssemblyNetwork impleme
private void validateCrane()
{
isCraneValid = false;
width = height = depth = 0;
findCraneHeight();
width = depth = 0;
findCraneWidth();
System.out.println("CraneValidator: Width = "+ this.width);
findCraneDepth();
if (Math.abs(height) > 1 && Math.abs(width) > 1 && Math.abs(depth) > 1)
System.out.println("CraneValidator: Depth = "+ this.depth);
if (Math.abs(width) > 1 && Math.abs(depth) > 1)
{
isCraneValid = isFrameValid();
}
System.out.println("CraneValidator: is valid? "+ this.isCraneValid);
}
private boolean isFrameValid()
{
for (int x = Math.min(0, width); x <= Math.max(0, width); x++)
{
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord + x, yCoord + height, zCoord))
return false;
}
for (int x = Math.min(0, width); x <= Math.max(0, width); x++)
{
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord + x, yCoord + height, zCoord + depth))
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord + x, yCoord, zCoord))
{
System.out.println("CraneValidator: Failed width check ");
return false;
}
}
for (int z = Math.min(0, depth); z <= Math.max(0, depth); z++)
{
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord, yCoord + height, zCoord + z))
return false;
}
for (int z = Math.min(0, depth); z <= Math.max(0, depth); z++)
{
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord + width, yCoord + height, zCoord + z))
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord, yCoord, zCoord + z))
{
System.out.println("CraneValidator: Failed Depth Check? ");
return false;
}
}
for (int x = Math.min(width + 1, 1); x <= Math.max(-1, width - 1); x++)
{
for (int z = Math.min(depth + 1, 1); z <= Math.max(-1, depth - 1); z++)
{
if (!worldObj.isAirBlock(xCoord + x, yCoord + height, zCoord + z))
if (!worldObj.isAirBlock(xCoord + x, yCoord, zCoord + z))
{
System.out.println("CraneValidator: Failed Area check");
return false;
}
}
}
return true;
@ -85,19 +114,20 @@ public class TileEntityCraneController extends TileEntityAssemblyNetwork impleme
*/
private void findCraneWidth()
{
if (height == 0)
{
width = 0;
return;
}
int x = 0;
ForgeDirection facing = ForgeDirection.getOrientation(worldObj.getBlockMetadata(xCoord, yCoord, zCoord));
ForgeDirection facing = this.getFacing();
System.out.println("CraneValidator: Width direction = "+ facing.ordinal());
while (true)
{
if (Math.abs(x) > CraneHelper.MAX_SIZE)
if (Math.abs(x) >= CraneHelper.MAX_SIZE)
{
break;
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord + x, yCoord + height, zCoord))
}
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord + x, yCoord, zCoord))
{
System.out.println("CraneValidator: Hit non block at x = "+ x);
break;
}
if (facing == ForgeDirection.NORTH || facing == ForgeDirection.EAST)
{
x++;
@ -109,28 +139,13 @@ public class TileEntityCraneController extends TileEntityAssemblyNetwork impleme
}
width = x; // can be negative
if (width < 0)
width++;
if (width > 0)
width--;
}
/**
* Find y size and store in this.height
*/
private void findCraneHeight()
{
int y = 1;
while (true)
{
if (yCoord + y >= 256)
break;
if (y > CraneHelper.MAX_SIZE)
break;
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord, yCoord + y, zCoord))
break;
y++;
width++;
}
if (width > 0)
{
width--;
}
height = y - 1;
}
/**
@ -138,18 +153,13 @@ public class TileEntityCraneController extends TileEntityAssemblyNetwork impleme
*/
private void findCraneDepth()
{
if (height == 0)
{
width = 0;
return;
}
int z = 0;
ForgeDirection facing = ForgeDirection.getOrientation(worldObj.getBlockMetadata(xCoord, yCoord, zCoord));
ForgeDirection facing = this.getFacing();
while (true)
{
if (Math.abs(z) > CraneHelper.MAX_SIZE)
break;
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord, yCoord + height, zCoord + z))
if (!CraneHelper.isCraneStructureBlock(worldObj, xCoord, yCoord, zCoord + z))
break;
if (facing == ForgeDirection.SOUTH || facing == ForgeDirection.EAST)
{
@ -185,7 +195,6 @@ public class TileEntityCraneController extends TileEntityAssemblyNetwork impleme
{
super.writeToNBT(nbt);
nbt.setInteger("width", width);
nbt.setInteger("height", height);
nbt.setInteger("depth", depth);
nbt.setBoolean("isValid", isCraneValid);
}
@ -195,7 +204,6 @@ public class TileEntityCraneController extends TileEntityAssemblyNetwork impleme
{
super.readFromNBT(nbt);
width = nbt.getInteger("width");
height = nbt.getInteger("height");
depth = nbt.getInteger("depth");
isCraneValid = nbt.getBoolean("isValid");
}