BrassGoggledCoders
/
SteamCraft2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wires can now extract from multiple sides and have GUI.

dev
Serban Rares 2015-10-25 19:38:53 +02:00
parent b8a0aaf407
commit e8e44b5f88
5 changed files with 200 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/steamcraft/client/renderers/tile/TileCopperWireRenderer.java
View File

@ -52,12 +52,20 @@ public class TileCopperWireRenderer extends TileEntitySpecialRenderer
this.bindTexture(this.texture1);
this.drawCore(wire);
for (ForgeDirection dir : wire.connections)
for (int i = 0;i < 6;i++)
{
ForgeDirection dir = wire.connections[i];
if (dir != null)
if (wire.extract == dir)
{
if (wire.extractions[i] != null)
{
this.drawAlternateConnection(dir, wire);
}
else
this.drawConnection(dir, wire);
}
}
GL11.glEnable(GL11.GL_LIGHTING);

2
src/main/java/steamcraft/common/init/InitPackets.java
View File

@ -48,12 +48,12 @@ public class InitPackets
network.registerMessage(TimeBombPacketHandler.class, TimeBombPacket.class, packetId++, Side.SERVER);
network.registerMessage(OpenContainerFromClientPacketHandler.class, OpenContainerFromClientPacket.class, packetId++, Side.SERVER);
network.registerMessage(UpdateExtractionPacketHandler.class, UpdateExtractionPacket.class, packetId++, Side.SERVER);
network.registerMessage(CopperPipePacketHandler.class, CopperPipePacket.class, packetId++, Side.CLIENT);
network.registerMessage(FluidNetworkPacketHandler.class, CopperPipeFluidPacket.class, packetId++, Side.CLIENT);
network.registerMessage(CopperTankPacketHandler.class, CopperTankPacket.class, packetId++, Side.CLIENT);
network.registerMessage(WirePacketHandler.class, WirePacket.class, packetId++, Side.CLIENT);
network.registerMessage(UpdateExtractionPacketHandler.class, UpdateExtractionPacket.class, packetId++, Side.SERVER);
network.registerMessage(UpdateClientsideInventoryPacketHandler.class, UpdateClientsideInventoryPacket.class, packetId++, Side.CLIENT);
}

25
src/main/java/steamcraft/common/packets/WirePacket.java
View File

@ -34,19 +34,19 @@ public class WirePacket implements IMessage
{
private int x, y, z;
ForgeDirection[] connections;
ForgeDirection extract;
ForgeDirection[] extractions;
public WirePacket()
{
} // REQUIRED
public WirePacket(int x, int y, int z, ForgeDirection[] connections, ForgeDirection extract)
public WirePacket(int x, int y, int z, ForgeDirection[] connections, ForgeDirection[] extractions)
{
this.x = x;
this.y = y;
this.z = z;
this.connections = connections;
this.extract = extract;
this.extractions = extractions;
}
@Override
@ -65,9 +65,16 @@ public class WirePacket implements IMessage
if (this.connections[i] == ForgeDirection.UNKNOWN)
this.connections[i] = null;
}
this.extract = ForgeDirection.getOrientation(buf.readByte());
if (this.extract == ForgeDirection.UNKNOWN)
this.extract = null;
this.extractions = new ForgeDirection[6];
for (int i = 0; i < 6; i++)
{
this.extractions[i] = ForgeDirection.getOrientation(buf.readByte());
if (this.extractions[i] == ForgeDirection.UNKNOWN)
this.extractions[i] = null;
}
}
@Override
@ -79,7 +86,9 @@ public class WirePacket implements IMessage
for (int i = 0; i < 6; i++)
buf.writeByte(CopperPipePacket.directionToByte(this.connections[i]));
buf.writeByte(CopperPipePacket.directionToByte(this.extract));
for (int i = 0; i < 6; i++)
buf.writeByte(CopperPipePacket.directionToByte(this.extractions[i]));
}
@ -96,7 +105,7 @@ public class WirePacket implements IMessage
TileCopperWire wire = (TileCopperWire) world.getTileEntity(message.x, message.y, message.z);
wire.connections = message.connections;
wire.extract = message.extract;
wire.extractions = message.extractions;
}
return null;

28
src/main/java/steamcraft/common/tiles/TileCopperPipe.java
View File

@ -181,6 +181,8 @@ public class TileCopperPipe extends TileEntity implements IFluidHandler, ISpanne
{
super.readFromNBT(tag);
this.extractions = new ForgeDirection[6];
NBTTagList extractions = tag.getTagList("extractions", Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < extractions.tagCount(); i++)
@ -379,10 +381,10 @@ public class TileCopperPipe extends TileEntity implements IFluidHandler, ISpanne
this.network.outputs.remove(temp);
this.network.inputs.remove(temp);
}
this.extractions[i] = null;
this.connections[i] = null;
this.extractions[i] = null;
this.connections[i] = null;
}
}
public void updateConnections()
@ -465,7 +467,7 @@ public class TileCopperPipe extends TileEntity implements IFluidHandler, ISpanne
for (int i = 0;i < 6;i++)
{
ForgeDirection dir = this.connections[i];
if ((dir != null) && this.isFluidHandler(dir))
if (dir != null && this.isFluidHandler(dir))
{
Coords temp = new Coords(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY, this.zCoord + dir.offsetZ, dir.getOpposite());
@ -730,15 +732,11 @@ public class TileCopperPipe extends TileEntity implements IFluidHandler, ISpanne
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{
boolean canFill = false;
for (ForgeDirection dir : this.extractions)
if (dir == from)
{
canFill = true;
break;
}
return false;
return canFill && (this.network != null)
return (this.network != null)
&& ((this.network.tank.getFluid() == null) || (this.network.tank.getFluid().getFluid() == fluid));
}
@ -781,15 +779,11 @@ public class TileCopperPipe extends TileEntity implements IFluidHandler, ISpanne
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
boolean canFill = false;
for (ForgeDirection dir : this.extractions)
if (dir == from)
{
canFill = true;
break;
}
return 0;
if (canFill && (this.network != null))
if ((this.network != null))
{
int amount = Math.min(resource.amount, this.pipeExtract);
@ -811,7 +805,7 @@ public class TileCopperPipe extends TileEntity implements IFluidHandler, ISpanne
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return new GuiChangeExtractions((TileCopperPipe) world.getTileEntity(x, y, z), player.dimension);
return new GuiChangeExtractions(world.getTileEntity(x, y, z), player.dimension);
}
@Override

265
src/main/java/steamcraft/common/tiles/energy/TileCopperWire.java
View File

@ -14,12 +14,14 @@ package steamcraft.common.tiles.energy;
import java.util.ArrayList;
import boilerplate.api.IOpenableGUI;
import cofh.api.energy.EnergyStorage;
import cofh.api.energy.IEnergyConnection;
import cofh.api.energy.IEnergyHandler;
import cofh.api.energy.IEnergyProvider;
import cofh.api.energy.IEnergyReceiver;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.NetworkManager;
@ -27,18 +29,21 @@ import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.common.util.ForgeDirection;
import steamcraft.api.tile.ISpannerTile;
import steamcraft.client.gui.GuiChangeExtractions;
import steamcraft.common.init.InitBlocks;
import steamcraft.common.init.InitPackets;
import steamcraft.common.packets.WirePacket;
import steamcraft.common.tiles.TileCopperPipe.Coords;
import steamcraft.common.tiles.container.ContainerChangeExtractions;
/**
* @author decebaldecebal
*
*/
public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpannerTile
public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpannerTile, IOpenableGUI
{
private static int copperWireCapacity = 5000;
private static int copperWireTransfer = 1000;
@ -49,8 +54,8 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
public EnergyNetwork network;
private boolean isMaster = false;
public ForgeDirection extract = null;
public ForgeDirection[] connections = new ForgeDirection[6];
public ForgeDirection[] extractions = new ForgeDirection[6];
private Coords masterCoords = null;
@Override
@ -60,8 +65,7 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
if (this.isMaster)
{
if (this.network.updateNetworkForWires) // Update network on
// world load
if (this.network.updateNetworkForWires)
{
this.network.updateNetworkForWires = false;
this.updateConnections();
@ -77,8 +81,19 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
super.writeToNBT(tag);
writeDirectionToNBT(tag, this.extract);
NBTTagList extractions = new NBTTagList();
for (int i = 0; i < 6; i++)
if (this.extractions[i] != null)
{
NBTTagCompound conn = new NBTTagCompound();
conn.setByte("index", (byte) i);
writeDirectionToNBT(conn, this.extractions[i]);
extractions.appendTag(conn);
}
tag.setTag("extractions", extractions);
tag.setBoolean("master", this.isMaster);
if (this.isMaster)
@ -123,7 +138,16 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
super.readFromNBT(tag);
this.extract = readDirectionFromNBT(tag);
this.extractions = new ForgeDirection[6];
NBTTagList extractions = tag.getTagList("extractions", Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < extractions.tagCount(); i++)
{
NBTTagCompound dirTag = extractions.getCompoundTagAt(i);
this.extractions[dirTag.getByte("index")] = readDirectionFromNBT(dirTag);
}
this.isMaster = tag.getBoolean("master");
@ -151,7 +175,17 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
NBTTagCompound tag = new NBTTagCompound();
writeDirectionToNBT(tag, this.extract);
NBTTagList extractions = new NBTTagList();
for (int i = 0; i < 6; i++)
if (this.extractions[i] != null)
{
NBTTagCompound conn = new NBTTagCompound();
conn.setByte("index", (byte) i);
writeDirectionToNBT(conn, this.extractions[i]);
extractions.appendTag(conn);
}
NBTTagList connections = new NBTTagList();
@ -165,6 +199,7 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
connections.appendTag(conn);
}
tag.setTag("extractions", extractions);
tag.setTag("connections", connections);
return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, tag);
@ -173,7 +208,16 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
@Override
public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity packet)
{
this.extract = readDirectionFromNBT(packet.func_148857_g());
this.extractions = new ForgeDirection[6];
NBTTagList extractions = packet.func_148857_g().getTagList("extractions", Constants.NBT.TAG_COMPOUND);
for (int i = 0; i < extractions.tagCount(); i++)
{
NBTTagCompound tag = extractions.getCompoundTagAt(i);
this.extractions[tag.getByte("index")] = readDirectionFromNBT(tag);
}
this.connections = new ForgeDirection[6];
@ -192,57 +236,109 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
if (!this.worldObj.isRemote)
{
if (this.extract != null)
for (int i = 0; i < 6; i++)
{
Coords temp = new Coords(this.xCoord + this.extract.offsetX, this.yCoord + this.extract.offsetY, this.zCoord + this.extract.offsetZ,
this.extract.getOpposite());
ForgeDirection dir = this.connections[i];
this.network.inputs.remove(temp);
if (!this.network.outputs.contains(temp))
this.network.outputs.add(temp);
if ((dir != null) && this.isEnergyHandler(dir))
{
Coords temp = new Coords(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY,
this.zCoord + dir.offsetZ, dir.getOpposite());
this.extract = null;
}
else
for (ForgeDirection dir : this.connections)
if ((dir != null) && this.isEnergyHandler(dir))
if (this.extractions[i] == null)
{
this.extract = dir;
Coords temp = new Coords(this.xCoord + this.extract.offsetX, this.yCoord + this.extract.offsetY,
this.zCoord + this.extract.offsetZ, this.extract.getOpposite());
this.extractions[i] = dir;
this.network.outputs.remove(temp);
if (!this.network.inputs.contains(temp))
this.network.inputs.add(temp);
break;
}
else
{
this.extractions[i] = null;
this.network.inputs.remove(temp);
if (!this.network.outputs.contains(temp))
this.network.outputs.add(temp);
}
}
}
this.updateClientConnections();
}
}
@Override
public void changeExtraction(int dirIndex)
{
if (!this.worldObj.isRemote)
{
ForgeDirection dir = this.connections[dirIndex];
if (dir != null)
{
Coords temp = new Coords(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY,
this.zCoord + dir.offsetZ, dir.getOpposite());
if (this.extractions[dirIndex] == null)
{
this.extractions[dirIndex] = this.connections[dirIndex];
this.network.outputs.remove(temp);
if (!this.network.inputs.contains(temp))
this.network.inputs.add(temp);
}
else
{
this.extractions[dirIndex] = null;
this.network.inputs.remove(temp);
if (!this.network.outputs.contains(temp))
this.network.outputs.add(temp);
}
this.updateClientConnections();
}
}
}
@Override
public ForgeDirection[] getExtractableConnections()
{
ForgeDirection[] extractableConnections = new ForgeDirection[6];
for(int i = 0;i < 6;i++)
{
ForgeDirection dir = this.connections[i];
if (dir != null && this.isEnergyHandler(dir))
extractableConnections[i] = dir;
}
return extractableConnections;
}
@Override
public ForgeDirection[] getExtractions()
{
return this.extractions;
}
private void removeConnections(int i)
{
if (this.connections[i] != null)
if (this.connections[i] != null && !this.worldObj.isRemote)
{
System.out.println("Removing connections 1...");
ForgeDirection dir = this.connections[i];
Coords temp = new Coords(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY, this.zCoord + dir.offsetZ, dir.getOpposite());
this.network.outputs.remove(temp);
this.network.inputs.remove(temp);
if (this.connections[i] == this.extract)
{
this.network.inputs.remove(temp);
System.out.println("Removing extract...");
this.extract = null;
}
System.out.println("Removing connections 2...");
this.extractions[i] = null;
this.connections[i] = null;
}
}
@ -251,9 +347,6 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
if (!this.worldObj.isRemote)
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Updating connections...");
if (this.canConnect(ForgeDirection.DOWN))
{
if (!this.updateNetwork(ForgeDirection.DOWN))
@ -308,24 +401,20 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
else
this.removeConnections(5);
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Connections updated");
if (this.network == null)
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("This network null, creating a new one.");
this.network = new EnergyNetwork(1, this.wireCapacity, this.wireTransfer);
this.setMaster(this);
}
for (ForgeDirection dir : this.connections)
if ((dir != null) && this.isEnergyHandler(dir))
for (int i = 0;i < 6;i++)
{
ForgeDirection dir = this.connections[i];
if (dir != null && this.isEnergyHandler(dir))
{
Coords temp = new Coords(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY, this.zCoord + dir.offsetZ, dir.getOpposite());
if ((this.extract != dir) && (this.worldObj.getTileEntity(temp.x, temp.y, temp.z) instanceof IEnergyReceiver))
if (this.extractions[i] == null && (this.worldObj.getTileEntity(temp.x, temp.y, temp.z) instanceof IEnergyReceiver))
{
if (!this.network.outputs.contains(temp))
this.network.outputs.add(temp);
@ -333,9 +422,7 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
else if (!this.network.inputs.contains(temp) && (this.worldObj.getTileEntity(temp.x, temp.y, temp.z) instanceof IEnergyProvider))
this.network.inputs.add(temp);
}
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("This network" + this.network.toString());
}
this.updateClientConnections();
}
@ -343,9 +430,9 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
private void updateClientConnections()
{
if ((this.network != null) && !this.worldObj.isRemote)
if (this.network != null && !this.worldObj.isRemote)
{
InitPackets.network.sendToAllAround(new WirePacket(this.xCoord, this.yCoord, this.zCoord, this.connections, this.extract),
InitPackets.network.sendToAllAround(new WirePacket(this.xCoord, this.yCoord, this.zCoord, this.connections, this.extractions),
new TargetPoint(this.worldObj.provider.dimensionId, this.xCoord, this.yCoord, this.zCoord, 100));
}
}
@ -360,16 +447,10 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
if (wire.network != null) // Is null only on world load
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Wire network not null.");
if (!wire.network.equals(this.network))
{
if (this.network == null)
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Network null.");
this.setMaster(wire.getMaster());
this.network.changeSize(1);
@ -379,13 +460,8 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
int energy = this.network.buffer.getEnergyStored() + wire.network.buffer.getEnergyStored();
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Network not null.");
if (this.network.size > wire.network.size)
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("This network bigger.");
wire.setMaster(this.getMaster());
this.network.buffer.setEnergyStored(energy);
@ -395,8 +471,6 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
}
else
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("This network smaller.Updating connections again.");
this.setMaster(wire.getMaster());
this.network.buffer.setEnergyStored(energy);
@ -410,17 +484,11 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
}
else
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Same network.");
wire.updateOneConnection(dir.getOpposite());
}
}
else if (this.network != null)
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Wire network null, this network not null.");
wire.setMaster(this.getMaster());
this.network.changeSize(1);
wire.updateConnections();
@ -467,9 +535,6 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
{
if (this.network != null)
{
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Removing network.");
this.network.changeSize(-1);
if (this.network.size != 0)
@ -483,9 +548,6 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
TileCopperWire wire = (TileCopperWire) this.worldObj.getTileEntity(this.xCoord + dir.offsetX, this.yCoord + dir.offsetY,
this.zCoord + dir.offsetZ);
System.out.print(this.xCoord + " " + this.yCoord + " " + this.zCoord);
System.out.println("Updating neighbors.");
wire.network.setSize(0);
wire.network = new EnergyNetwork(1, this.wireCapacity, this.wireTransfer);
@ -561,12 +623,11 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
@Override
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate)
{
if ((from != this.extract) && (this.network != null)) // should actively
// receive
// energy from
// where it is
// not actively
// pulling
for (ForgeDirection dir : this.extractions)
if (dir == from)
return 0;
if ((this.network != null)) // should actively receive energy from where it is not actively pulling
{
int amount = Math.min(maxReceive, this.wireTransfer);
@ -579,7 +640,11 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
@Override
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
{
if ((from != this.extract) && (this.network != null))
for (ForgeDirection dir : this.extractions)
if (dir == from)
return 0;
if ((this.network != null))
{
int amount = Math.min(maxExtract, this.wireTransfer);
@ -607,6 +672,18 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
return 0;
}
@Override
public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return new GuiChangeExtractions(world.getTileEntity(x, y, z), player.dimension);
}
@Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z)
{
return new ContainerChangeExtractions();
}
private static class EnergyNetwork
{
private int capacityPerWire;
@ -639,9 +716,7 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
}
this.updateInputs(wire.worldObj);
// System.out.println("Buffer before: " + buffer.getEnergyStored());
this.updateOutputs(wire);
// System.out.println("Buffer after: " + buffer.getEnergyStored());
}
private void updateInputs(World world)
@ -743,22 +818,4 @@ public class TileCopperWire extends TileEntity implements IEnergyHandler, ISpann
return network;
}
}
@Override
public void changeExtraction(int dirIndex)
{
}
@Override
public ForgeDirection[] getExtractableConnections()
{
return null;
}
@Override
public ForgeDirection[] getExtractions()
{
return null;
}
}