fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/rv2' into rv2

Browse Source 
Conflicts:
	src/main/java/appeng/items/tools/powered/ToolMassCannon.java
This commit is contained in:
Andrew
2014-09-29 00:26:15 -07:00
parent fd18393a8b 72106c877d
commit 5c5aaa21ee
113 changed files with 410 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/container/AEBaseContainer.java
+4 -4
View File
@@ -72,7 +72,7 @@ public abstract class AEBaseContainer extends Container
int ticksSinceCheck = 900;
IAEItemStack clientRequestedTargetItem = null;
List<PacketPartialItem> dataChunks = new LinkedList();
List<PacketPartialItem> dataChunks = new LinkedList<PacketPartialItem>();
public void postPartial(PacketPartialItem packetPartialItem)
{
@@ -129,7 +129,7 @@ public abstract class AEBaseContainer extends Container
CompressedStreamTools.writeCompressed( item, stream );
int maxChunkSize = 30000;
List<byte[]> miniPackets = new LinkedList();
List<byte[]> miniPackets = new LinkedList<byte[]>();
byte[] data = stream.toByteArray();
@@ -216,7 +216,7 @@ public abstract class AEBaseContainer extends Container
public ContainerOpenContext openContext;
protected IMEInventoryHandler<IAEItemStack> cellInv;
protected HashSet<Integer> locked = new HashSet();
protected HashSet<Integer> locked = new HashSet<Integer>();
protected IEnergySource powerSrc;
public void lockPlayerInventorySlot(int idx)
@@ -774,7 +774,7 @@ public abstract class AEBaseContainer extends Container
if ( action == InventoryAction.MOVE_REGION )
{
List<Slot> from = new LinkedList();
List<Slot> from = new LinkedList<Slot>();
for (Object j : inventorySlots)
{