From 0fd99fa04ee84c8c6c1c727e03f7e7383b04d8e1 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sun, 19 Jan 2014 19:46:07 +0800 Subject: [PATCH] Gears now work all 6 sides --- .../fluid/network/FluidNetwork.java | 9 +- .../mechanical/gear/PartGear.java | 403 +--------------- .../mechanical/network/PartMechanical.java | 456 ++++++++++++++++++ 3 files changed, 465 insertions(+), 403 deletions(-) create mode 100644 src/main/java/resonantinduction/mechanical/network/PartMechanical.java diff --git a/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java b/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java index 0a0ffbf43..ecf884774 100644 --- a/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java +++ b/src/main/java/resonantinduction/mechanical/fluid/network/FluidNetwork.java @@ -26,6 +26,9 @@ public abstract class FluidNetwork extends Network 0) - { - if (isClockwise) - angle += getNetwork().getAngularVelocity() / 20f; - else - angle -= getNetwork().getAngularVelocity() / 20f; - } - } - } @Override @@ -116,186 +61,6 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart return 0.1f; } - /** - * Updates rotations of all nearby gears. - */ - public void updateRotations() - { - /** Look for gears that are back-to-back with this gear. Equate torque. */ - universalelectricity.api.vector.Vector3 vec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(placementSide); - - TileEntity tile = vec.getTileEntity(world()); - - if (tile instanceof TileMultipart) - { - TMultiPart neighbor = ((TileMultipart) tile).partMap(this.placementSide.getOpposite().ordinal()); - - if (neighbor instanceof PartGear) - { - equateRotation((PartGear) neighbor, false); - } - } - - /** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */ - for (int i = 0; i < 4; i++) - { - ForgeDirection checkDir = ForgeDirection.getOrientation(Rotation.rotateSide(this.placementSide.ordinal(), i)); - universalelectricity.api.vector.Vector3 checkVec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(checkDir); - - TileEntity checkTile = checkVec.getTileEntity(world()); - - if (checkTile instanceof TileMultipart) - { - TMultiPart neighbor = ((TileMultipart) checkTile).partMap(this.placementSide.ordinal()); - - if (neighbor != this && neighbor instanceof PartGear) - { - equateRotation((PartGear) neighbor, false); - } - } - } - - /** Look for gears that are internal and adjacent to this gear. (The 2 sides) */ - for (int i = 0; i < 4; i++) - { - ForgeDirection checkDir = ForgeDirection.getOrientation(i); - TMultiPart neighbor = tile().partMap(this.placementSide.getRotation(checkDir).ordinal()); - - if (neighbor != this && neighbor instanceof PartGear) - { - equateRotation((PartGear) neighbor, false); - } - } - - markRotationUpdate = false; - } - - @Override - public void onAdded() - { - super.onAdded(); - refresh(); - } - - @Override - public void onMoved() - { - this.refresh(); - } - - @Override - public void onChunkLoad() - { - super.onChunkLoad(); - refresh(); - } - - @Override - public void onNeighborChanged() - { - super.onNeighborChanged(); - refresh(); - } - - @Override - public void onPartChanged(TMultiPart part) - { - refresh(); - } - - /** - * Refresh should be called sparingly. - */ - public void refresh() - { - /** Look for gears that are back-to-back with this gear. Equate torque. */ - universalelectricity.api.vector.Vector3 vec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(placementSide); - - TileEntity tile = vec.getTileEntity(world()); - - if (tile instanceof TileMultipart) - { - TMultiPart neighbor = ((TileMultipart) tile).partMap(this.placementSide.getOpposite().ordinal()); - - if (neighbor instanceof PartGear) - { - connections[this.placementSide.getOpposite().ordinal()] = neighbor; - getNetwork().merge(((PartGear) neighbor).getNetwork()); - } - } - else if (tile instanceof IMechanical) - { - connections[this.placementSide.getOpposite().ordinal()] = tile; - if (tile instanceof IMechanicalConnector) - { - getNetwork().merge(((IMechanicalConnector) tile).getNetwork()); - } - } - - /** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */ - for (int i = 0; i < 4; i++) - { - ForgeDirection checkDir = ForgeDirection.getOrientation(Rotation.rotateSide(this.placementSide.ordinal(), i)); - universalelectricity.api.vector.Vector3 checkVec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(checkDir); - - TileEntity checkTile = checkVec.getTileEntity(world()); - - if (checkTile instanceof TileMultipart) - { - TMultiPart neighbor = ((TileMultipart) checkTile).partMap(this.placementSide.ordinal()); - - if (neighbor != this && neighbor instanceof PartGear) - { - connections[checkDir.ordinal()] = neighbor; - getNetwork().merge(((PartGear) neighbor).getNetwork()); - } - } - } - - /** Look for gears that are internal and adjacent to this gear. (The 2 sides) */ - for (int i = 0; i < 4; i++) - { - ForgeDirection checkDir = ForgeDirection.getOrientation(i); - TMultiPart neighbor = tile().partMap(this.placementSide.getRotation(checkDir).ordinal()); - - if (neighbor != this && neighbor instanceof PartGear) - { - connections[checkDir.ordinal()] = neighbor; - getNetwork().merge(((PartGear) neighbor).getNetwork()); - } - } - - getNetwork().reconstruct(); - - if (!world().isRemote) - { - sendRefreshPacket(); - } - } - - @Override - public Object[] getConnections() - { - return connections; - } - - public void equateRotation(PartGear neighbor, boolean isPositive) - { - if (!neighbor.markRotationUpdate) - { - if (isPositive) - { - ((PartGear) neighbor).isClockwise = isClockwise; - } - else - { - ((PartGear) neighbor).isClockwise = !isClockwise; - } - - neighbor.markRotationUpdate = true; - } - } - @Override public boolean activate(EntityPlayer player, MovingObjectPosition hit, ItemStack item) { @@ -308,124 +73,12 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart return false; } - public long onReceiveEnergy(ForgeDirection from, long torque, float angularVelocity, boolean doReceive) - { - if (!world().isRemote && doReceive) - { - getNetwork().onReceiveEnergy(torque, angularVelocity); - markRotationUpdate = true; - } - - return (long) (torque * angularVelocity); - } - @Override - public void preRemove() - { - this.getNetwork().split(this); - } - - /** Packet Code. */ - @Override - public void readDesc(MCDataInput packet) - { - this.placementSide = ForgeDirection.getOrientation(packet.readByte()); - } - - @Override - public void writeDesc(MCDataOutput packet) - { - packet.writeByte(this.placementSide.ordinal()); - } - - @Override - public void read(MCDataInput packet) - { - read(packet, packet.readUByte()); - } - - @Override - public boolean sendNetworkPacket(long torque, float angularVelocity) - { - if (tile() != null) - { - tile().getWriteStream(this).writeByte(0).writeLong(torque).writeFloat(angularVelocity).writeBoolean(isClockwise); - } - - return true; - } - - public void sendRefreshPacket() - { - if (tile() != null) - { - tile().getWriteStream(this).writeByte(1); - } - } - - public void read(MCDataInput packet, int packetID) - { - if (packetID == 0) - { - getNetwork().setPower(packet.readLong(), packet.readFloat()); - isClockwise = packet.readBoolean(); - markRotationUpdate = true; - } - else if (packetID == 1) - { - this.refresh(); - } - } - - @Override - public int getSlotMask() - { - return 1 << this.placementSide.ordinal(); - } - - @Override - public Cuboid6 getBounds() - { - return FaceMicroClass.aBounds()[0x10 | this.placementSide.ordinal()]; - } - - @Override - public int redstoneConductionMap() - { - return 0; - } - - @Override - public boolean solid(int arg0) - { - return true; - } - - @Override - public Iterable getOcclusionBoxes() - { - return Arrays.asList(oBoxes[this.placementSide.ordinal()]); - } - protected ItemStack getItem() { return new ItemStack(Mechanical.itemGear); } - @Override - public Iterable getDrops() - { - List drops = new ArrayList(); - drops.add(getItem()); - return drops; - } - - @Override - public ItemStack pickItem(MovingObjectPosition hit) - { - return getItem(); - } - @Override @SideOnly(Side.CLIENT) public void renderDynamic(Vector3 pos, float frame, int pass) @@ -436,59 +89,9 @@ public class PartGear extends JCuboidPart implements JNormalOcclusion, TFacePart } } - @Override - public void load(NBTTagCompound nbt) - { - super.load(nbt); - this.placementSide = ForgeDirection.getOrientation(nbt.getByte("side")); - } - - @Override - public void save(NBTTagCompound nbt) - { - super.save(nbt); - nbt.setByte("side", (byte) this.placementSide.ordinal()); - } - @Override public String getType() { return "resonant_induction_gear"; } - - @Override - public IMechanicalNetwork getNetwork() - { - if (this.network == null) - { - this.network = new MechanicalNetwork(); - this.network.addConnector(this); - } - return this.network; - } - - @Override - public void setNetwork(IMechanicalNetwork network) - { - this.network = network; - } - - @Override - public boolean canConnect(ForgeDirection direction) - { - return new universalelectricity.api.vector.Vector3(this.x() + direction.offsetX, this.y() + direction.offsetY, this.z() + direction.offsetZ).getTileEntity(this.world()) instanceof IMechanicalConnector; - } - - @Override - public boolean isClockwise() - { - return isClockwise; - } - - @Override - public void setRotation(boolean isClockwise) - { - this.isClockwise = isClockwise; - } - } \ No newline at end of file diff --git a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java new file mode 100644 index 000000000..1a7b8ee9d --- /dev/null +++ b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java @@ -0,0 +1,456 @@ +package resonantinduction.mechanical.network; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraftforge.common.ForgeDirection; +import resonantinduction.mechanical.Mechanical; +import resonantinduction.mechanical.network.IMechanical; +import resonantinduction.mechanical.network.IMechanicalConnector; +import resonantinduction.mechanical.network.IMechanicalNetwork; +import resonantinduction.mechanical.network.MechanicalNetwork; +import codechicken.lib.data.MCDataInput; +import codechicken.lib.data.MCDataOutput; +import codechicken.lib.vec.Cuboid6; +import codechicken.lib.vec.Rotation; +import codechicken.lib.vec.Transformation; +import codechicken.lib.vec.Vector3; +import codechicken.microblock.FaceMicroClass; +import codechicken.multipart.JCuboidPart; +import codechicken.multipart.JNormalOcclusion; +import codechicken.multipart.TFacePart; +import codechicken.multipart.TMultiPart; +import codechicken.multipart.TileMultipart; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +/** + * We assume all the force acting on the gear is 90 degrees. + * + * @author Calclavia + * + */ +public abstract class PartMechanical extends JCuboidPart implements JNormalOcclusion, TFacePart, IMechanicalConnector +{ + public static Cuboid6[][] oBoxes = new Cuboid6[6][2]; + + static + { + oBoxes[0][0] = new Cuboid6(1 / 8D, 0, 0, 7 / 8D, 1 / 8D, 1); + oBoxes[0][1] = new Cuboid6(0, 0, 1 / 8D, 1, 1 / 8D, 7 / 8D); + for (int s = 1; s < 6; s++) + { + Transformation t = Rotation.sideRotations[s].at(Vector3.center); + oBoxes[s][0] = oBoxes[0][0].copy().apply(t); + oBoxes[s][1] = oBoxes[0][1].copy().apply(t); + } + } + + private IMechanicalNetwork network; + + /** The mechanical connections this connector has made */ + protected Object[] connections = new Object[6]; + + /** Side of the block this is placed on */ + public ForgeDirection placementSide; + + /** The size of the gear */ + private float radius = 0.5f; + + public boolean isClockwise = true; + + /** The current angle the gear is on. In radians per second. */ + public float angle = 0; + + /** When true, it will start marking nearby gears for update */ + public boolean markRotationUpdate = true; + + public void preparePlacement(int side, int itemDamage) + { + this.placementSide = ForgeDirection.getOrientation((byte) (side ^ 1)); + } + + @Override + public void update() + { + if (markRotationUpdate) + { + updateRotations(); + } + + if (this.world().isRemote) + { + /** + * Update angle rotation. + */ + if (getNetwork().getPower() > 0) + { + if (isClockwise) + angle += getNetwork().getAngularVelocity() / 20f; + else + angle -= getNetwork().getAngularVelocity() / 20f; + } + } + + } + + /** + * Updates rotations of all nearby gears. + */ + public void updateRotations() + { + /** Look for gears that are back-to-back with this gear. Equate torque. */ + universalelectricity.api.vector.Vector3 vec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(placementSide); + + TileEntity tile = vec.getTileEntity(world()); + + if (tile instanceof TileMultipart) + { + TMultiPart neighbor = ((TileMultipart) tile).partMap(this.placementSide.getOpposite().ordinal()); + + if (neighbor instanceof PartMechanical) + { + equateRotation((PartMechanical) neighbor, false); + } + } + + /** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */ + for (int i = 0; i < 4; i++) + { + ForgeDirection checkDir = ForgeDirection.getOrientation(Rotation.rotateSide(this.placementSide.ordinal(), i)); + universalelectricity.api.vector.Vector3 checkVec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(checkDir); + + TileEntity checkTile = checkVec.getTileEntity(world()); + + if (checkTile instanceof TileMultipart) + { + TMultiPart neighbor = ((TileMultipart) checkTile).partMap(this.placementSide.ordinal()); + + if (neighbor != this && neighbor instanceof PartMechanical) + { + equateRotation((PartMechanical) neighbor, false); + } + } + } + + /** Look for gears that are internal and adjacent to this gear. (The 2 sides) */ + for (int i = 0; i < 6; i++) + { + ForgeDirection checkDir = ForgeDirection.getOrientation(i); + TMultiPart neighbor = tile().partMap(this.placementSide.getRotation(checkDir).ordinal()); + + if (neighbor != this && neighbor instanceof PartMechanical) + { + equateRotation((PartMechanical) neighbor, false); + } + } + + markRotationUpdate = false; + } + + @Override + public void onAdded() + { + super.onAdded(); + refresh(); + } + + @Override + public void onMoved() + { + this.refresh(); + } + + @Override + public void onChunkLoad() + { + super.onChunkLoad(); + refresh(); + } + + @Override + public void onNeighborChanged() + { + super.onNeighborChanged(); + refresh(); + } + + @Override + public void onPartChanged(TMultiPart part) + { + refresh(); + } + + /** + * Refresh should be called sparingly. + */ + public void refresh() + { + /** Look for gears that are back-to-back with this gear. Equate torque. */ + universalelectricity.api.vector.Vector3 vec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(placementSide); + + TileEntity tile = vec.getTileEntity(world()); + + if (tile instanceof TileMultipart) + { + TMultiPart neighbor = ((TileMultipart) tile).partMap(this.placementSide.getOpposite().ordinal()); + + if (neighbor instanceof IMechanicalConnector) + { + connections[this.placementSide.getOpposite().ordinal()] = neighbor; + getNetwork().merge(((IMechanicalConnector) neighbor).getNetwork()); + } + } + else if (tile instanceof IMechanical) + { + connections[this.placementSide.getOpposite().ordinal()] = tile; + if (tile instanceof IMechanicalConnector) + { + getNetwork().merge(((IMechanicalConnector) tile).getNetwork()); + } + } + + /** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */ + for (int i = 0; i < 4; i++) + { + ForgeDirection checkDir = ForgeDirection.getOrientation(Rotation.rotateSide(this.placementSide.ordinal(), i)); + universalelectricity.api.vector.Vector3 checkVec = new universalelectricity.api.vector.Vector3(tile()).modifyPositionFromSide(checkDir); + + TileEntity checkTile = checkVec.getTileEntity(world()); + + if (checkTile instanceof TileMultipart) + { + TMultiPart neighbor = ((TileMultipart) checkTile).partMap(this.placementSide.ordinal()); + + if (neighbor != this && neighbor instanceof PartMechanical) + { + connections[checkDir.ordinal()] = neighbor; + getNetwork().merge(((PartMechanical) neighbor).getNetwork()); + } + } + } + + /** Look for gears that are internal and adjacent to this gear. (The 2 sides) */ + for (int i = 0; i < 6; i++) + { + ForgeDirection checkDir = ForgeDirection.getOrientation(i); + TMultiPart neighbor = tile().partMap(this.placementSide.getRotation(checkDir).ordinal()); + + if (neighbor != this && neighbor instanceof PartMechanical) + { + connections[checkDir.ordinal()] = neighbor; + getNetwork().merge(((PartMechanical) neighbor).getNetwork()); + } + } + + getNetwork().reconstruct(); + + if (!world().isRemote) + { + sendRefreshPacket(); + } + } + + @Override + public Object[] getConnections() + { + return connections; + } + + public void equateRotation(PartMechanical neighbor, boolean isPositive) + { + if (!neighbor.markRotationUpdate) + { + if (isPositive) + { + ((PartMechanical) neighbor).isClockwise = isClockwise; + } + else + { + ((PartMechanical) neighbor).isClockwise = !isClockwise; + } + + neighbor.markRotationUpdate = true; + } + } + + public long onReceiveEnergy(ForgeDirection from, long torque, float angularVelocity, boolean doReceive) + { + if (!world().isRemote && doReceive) + { + getNetwork().onReceiveEnergy(torque, angularVelocity); + markRotationUpdate = true; + } + + return (long) (torque * angularVelocity); + } + + @Override + public void preRemove() + { + this.getNetwork().split(this); + } + + /** Packet Code. */ + + @Override + public boolean sendNetworkPacket(long torque, float angularVelocity) + { + if (tile() != null) + { + tile().getWriteStream(this).writeByte(0).writeLong(torque).writeFloat(angularVelocity).writeBoolean(isClockwise); + } + + return true; + } + + public void sendRefreshPacket() + { + if (tile() != null) + { + tile().getWriteStream(this).writeByte(1); + } + } + + public void read(MCDataInput packet, int packetID) + { + if (packetID == 0) + { + getNetwork().setPower(packet.readLong(), packet.readFloat()); + isClockwise = packet.readBoolean(); + markRotationUpdate = true; + } + else if (packetID == 1) + { + this.refresh(); + } + } + + /** + * Network Methods + */ + @Override + public IMechanicalNetwork getNetwork() + { + if (this.network == null) + { + this.network = new MechanicalNetwork(); + this.network.addConnector(this); + } + return this.network; + } + + @Override + public void setNetwork(IMechanicalNetwork network) + { + this.network = network; + } + + @Override + public boolean canConnect(ForgeDirection direction) + { + return new universalelectricity.api.vector.Vector3(this.x() + direction.offsetX, this.y() + direction.offsetY, this.z() + direction.offsetZ).getTileEntity(this.world()) instanceof IMechanicalConnector; + } + + @Override + public boolean isClockwise() + { + return isClockwise; + } + + @Override + public void setRotation(boolean isClockwise) + { + this.isClockwise = isClockwise; + } + + /** Packet Code. */ + @Override + public void readDesc(MCDataInput packet) + { + this.placementSide = ForgeDirection.getOrientation(packet.readByte()); + } + + @Override + public void writeDesc(MCDataOutput packet) + { + packet.writeByte(this.placementSide.ordinal()); + } + + @Override + public void read(MCDataInput packet) + { + read(packet, packet.readUByte()); + } + + @Override + public int getSlotMask() + { + return 1 << this.placementSide.ordinal(); + } + + @Override + public Cuboid6 getBounds() + { + return FaceMicroClass.aBounds()[0x10 | this.placementSide.ordinal()]; + } + + @Override + public int redstoneConductionMap() + { + return 0; + } + + @Override + public boolean solid(int arg0) + { + return true; + } + + /** + * Multipart Methods + */ + + @Override + public Iterable getOcclusionBoxes() + { + return Arrays.asList(oBoxes[this.placementSide.ordinal()]); + } + + @Override + public void load(NBTTagCompound nbt) + { + super.load(nbt); + this.placementSide = ForgeDirection.getOrientation(nbt.getByte("side")); + } + + @Override + public void save(NBTTagCompound nbt) + { + super.save(nbt); + nbt.setByte("side", (byte) this.placementSide.ordinal()); + } + + protected abstract ItemStack getItem(); + + @Override + public Iterable getDrops() + { + List drops = new ArrayList(); + drops.add(getItem()); + return drops; + } + + @Override + public ItemStack pickItem(MovingObjectPosition hit) + { + return getItem(); + } + +} \ No newline at end of file