tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed crates connecting to wires

Browse source
This commit is contained in:
Henry Mao 2013-01-05 12:09:04 +08:00
parent 9e528c8461
commit 351478ade7
7 changed files with 58 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ public class ClientProxy extends CommonProxy
return new GuiImprinter(player.inventory, world, new Vector3(x, y, z));
case GUI_ENCODER:
if (tileEntity != null && tileEntity instanceof TileEntityEncoder)
return new GuiEncoder(player.inventory, world, (TileEntityEncoder) tileEntity);
return new GuiEncoder(player.inventory, (TileEntityEncoder) tileEntity);
}
return null;

9
src/minecraft/assemblyline/client/gui/GuiEncoder.java
View file

@ -16,14 +16,10 @@ import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.network.PacketDispatcher;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.AssemblyLine;
@ -32,6 +28,7 @@ import assemblyline.common.machine.encoder.ContainerEncoder;
import assemblyline.common.machine.encoder.IInventoryWatcher;
import assemblyline.common.machine.encoder.ItemDisk;
import assemblyline.common.machine.encoder.TileEntityEncoder;
import cpw.mods.fml.common.network.PacketDispatcher;
public class GuiEncoder extends GuiContainer implements IInventoryWatcher
{
@ -49,9 +46,9 @@ public class GuiEncoder extends GuiContainer implements IInventoryWatcher
private GuiButton pDnButton;
private GuiTextField commandField;
public GuiEncoder(InventoryPlayer par1InventoryPlayer, World worldObj, TileEntityEncoder tileEntity)
public GuiEncoder(InventoryPlayer par1InventoryPlayer, TileEntityEncoder tileEntity)
{
super(new ContainerEncoder(par1InventoryPlayer, worldObj, tileEntity));
super(new ContainerEncoder(par1InventoryPlayer, tileEntity));
this.ySize = 256;
this.tileEntity = tileEntity;
}

21
src/minecraft/assemblyline/client/render/RenderCrate.java
View file

@ -7,6 +7,7 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
@ -19,9 +20,8 @@ import org.lwjgl.opengl.GL11;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.machine.imprinter.ItemImprinter;
public class RenderCrate extends RenderImprintable
public class RenderCrate extends TileEntitySpecialRenderer
{
private final RenderBlocks renderBlocks = new RenderBlocks();
@Override
@ -37,23 +37,6 @@ public class RenderCrate extends RenderImprintable
String amount = "";
ItemStack itemStack = tileEntity.getStackInSlot(0);
if (itemStack == null)
{
if (tileEntity.getFilter() != null)
{
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{
itemStack = ItemImprinter.getFilters(tileEntity.getFilter()).get(0).splitStack(0); // see
// if
// it
// has
// a
// filter
// instead
}
}
}
if (itemStack != null)
{
itemName = itemStack.getDisplayName();

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

@ -41,8 +41,6 @@ public class CommonProxy implements IGuiHandler
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
// System.out.println("Server GUI request for ID " + ID);
switch (ID)
{
case GUI_STAMPER:
@ -50,7 +48,7 @@ public class CommonProxy implements IGuiHandler
case GUI_ENCODER:
{
if (tileEntity != null && tileEntity instanceof TileEntityEncoder)
return new ContainerEncoder(player.inventory, world, (TileEntityEncoder) tileEntity);
return new ContainerEncoder(player.inventory, (TileEntityEncoder) tileEntity);
}
}

25
src/minecraft/assemblyline/common/block/BlockCrate.java
View file

@ -203,15 +203,7 @@ public class BlockCrate extends BlockMachine
if (containingStack != null)
{
boolean filterValid = true;
if (tileEntity.getFilter() != null)
{
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
}
}
if (containingStack.isStackable() && containingStack.isItemEqual(itemStack) && filterValid)
if (containingStack.isStackable() && containingStack.isItemEqual(itemStack))
{
int newStackSize = containingStack.stackSize + itemStack.stackSize;
int overFlowAmount = newStackSize - tileEntity.getInventoryStackLimit();
@ -231,19 +223,8 @@ public class BlockCrate extends BlockMachine
}
else
{
boolean filterValid = true;
if (tileEntity.getFilter() != null)
{
if (ItemImprinter.getFilters(tileEntity.getFilter()).size() > 0)
{
filterValid = itemStack.isItemEqual(ItemImprinter.getFilters(tileEntity.getFilter()).get(0));
}
}
if (filterValid)
{
tileEntity.setInventorySlotContents(0, itemStack.copy());
itemStack.stackSize = 0;
}
tileEntity.setInventorySlotContents(0, itemStack.copy());
itemStack.stackSize = 0;
}
if (itemStack.stackSize <= 0) { return null; }

73
src/minecraft/assemblyline/common/block/TileEntityCrate.java
View file

@ -4,16 +4,23 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.ISidedInventory;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.imprinter.ItemImprinter;
import assemblyline.common.machine.imprinter.TileEntityImprintable;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
public class TileEntityCrate extends TileEntityImprintable implements ISidedInventory, IPacketReceiver
public class TileEntityCrate extends TileEntityAdvanced implements ISidedInventory, IPacketReceiver
{
public static final int MAX_LIMIT = 2048;
private ItemStack[] containingItems = new ItemStack[1];
@ -24,24 +31,44 @@ public class TileEntityCrate extends TileEntityImprintable implements ISidedInve
return false;
}
/*
* @Override public void handlePacketData(INetworkManager network, int packetType,
* Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput dataStream) { if
* (this.worldObj.isRemote) { try { if (dataStream.readBoolean()) { if (this.containingItems[0]
* == null) { this.containingItems[0] = new ItemStack(dataStream.readInt(),
* dataStream.readInt(), dataStream.readInt()); } else { this.containingItems[0].itemID =
* dataStream.readInt(); this.containingItems[0].stackSize = dataStream.readInt();
* this.containingItems[0].setItemDamage(dataStream.readInt()); } } else {
* this.containingItems[0] = null; } } catch (Exception e) { e.printStackTrace(); } } }
*/
@Override
public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput dataStream)
{
if (this.worldObj.isRemote)
{
try
{
if (dataStream.readBoolean())
{
if (this.containingItems[0] == null)
{
this.containingItems[0] = new ItemStack(dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
}
else
{
this.containingItems[0].itemID = dataStream.readInt();
this.containingItems[0].stackSize = dataStream.readInt();
this.containingItems[0].setItemDamage(dataStream.readInt());
}
}
else
{
this.containingItems[0] = null;
}
}
catch (Exception e)
{
e.printStackTrace();
}
}
}
/*
* @Override public Packet getDescriptionPacket() { if (this.containingItems[0] != null) {
* return PacketManager.getPacket(AssemblyLine.CHANNEL, this, true,
* this.containingItems[0].itemID, this.containingItems[0].stackSize,
* this.containingItems[0].getItemDamage()); } return
* PacketManager.getPacket(AssemblyLine.CHANNEL, this, false); }
*/
@Override
public Packet getDescriptionPacket()
{
if (this.containingItems[0] != null) { return PacketManager.getPacket(AssemblyLine.CHANNEL, this, true, this.containingItems[0].itemID, this.containingItems[0].stackSize, this.containingItems[0].getItemDamage()); }
return PacketManager.getPacket(AssemblyLine.CHANNEL, this, false);
}
/**
* Inventory functions.
@ -105,14 +132,6 @@ public class TileEntityCrate extends TileEntityImprintable implements ISidedInve
{
if (stack != null)
{
boolean filterValid = true;
if (getFilter() != null)
{
if (ItemImprinter.getFilters(getFilter()).size() > 0)
{
filterValid = stack.isItemEqual(ItemImprinter.getFilters(getFilter()).get(0));
}
}
if (stack.isStackable())
{
this.containingItems[slot] = stack;

4
src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java
View file

@ -11,13 +11,11 @@ import universalelectricity.core.vector.Vector3;
public class ContainerEncoder extends Container
{
private ItemStack[] containingItems = new ItemStack[1];
private World worldObj;
private InventoryPlayer inventoryPlayer;
private TileEntityEncoder encoder;
public ContainerEncoder(InventoryPlayer inventoryPlayer, World worldObj, TileEntityEncoder encoder)
public ContainerEncoder(InventoryPlayer inventoryPlayer, TileEntityEncoder encoder)
{
this.worldObj = worldObj;
this.inventoryPlayer = inventoryPlayer;
this.encoder = encoder;