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/helpers/DualityInterface.java
+7 -7
View File
@@ -169,7 +169,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
if ( details != null )
{
if ( craftingList == null )
craftingList = new LinkedList();
craftingList = new LinkedList<ICraftingPatternDetails>();
craftingList.add( details );
}
@@ -182,7 +182,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
return;
if ( waitingToSend == null )
waitingToSend = new LinkedList();
waitingToSend = new LinkedList<ItemStack>();
waitingToSend.add( is );
@@ -513,8 +513,8 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
return patterns;
}
MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<IAEItemStack>( new NullInventory(), StorageChannel.ITEMS );
MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<IAEFluidStack>( new NullInventory(), StorageChannel.FLUIDS );
MEMonitorPassThrough<IAEItemStack> items = new MEMonitorPassThrough<IAEItemStack>( new NullInventory<IAEItemStack>(), StorageChannel.ITEMS );
MEMonitorPassThrough<IAEFluidStack> fluids = new MEMonitorPassThrough<IAEFluidStack>( new NullInventory<IAEFluidStack>(), StorageChannel.FLUIDS );
public void gridChanged()
{
@@ -525,8 +525,8 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
}
catch (GridAccessException gae)
{
items.setInternal( new NullInventory() );
fluids.setInternal( new NullInventory() );
items.setInternal( new NullInventory<IAEItemStack>() );
fluids.setInternal( new NullInventory<IAEFluidStack>() );
}
notifyNeighbors();
@@ -997,7 +997,7 @@ public class DualityInterface implements IGridTickable, ISegmentedInventory, ISt
craftingTracker.jobStateChange( link );
}
static final Set<Block> badBlocks = new HashSet();
static final Set<Block> badBlocks = new HashSet<Block>();
public String getTermName()
{
src/main/java/appeng/helpers/MeteoritePlacer.java
+3 -3
View File
@@ -378,8 +378,8 @@ public class MeteoritePlacer
}
int minBLocks = 200;
HashSet<Block> validSpawn = new HashSet();
HashSet<Block> invalidSpawn = new HashSet();
HashSet<Block> validSpawn = new HashSet<Block>();
HashSet<Block> invalidSpawn = new HashSet<Block>();
Fallout type = new Fallout();
@@ -700,7 +700,7 @@ public class MeteoritePlacer
ap.addItems( AEApi.instance().blocks().blockSkyStone.stack( (int) (Math.random() * 12) + 1 ) );
break;
case 1:
List<ItemStack> possibles = new LinkedList();
List<ItemStack> possibles = new LinkedList<ItemStack>();
possibles.addAll( OreDictionary.getOres( "nuggetIron" ) );
possibles.addAll( OreDictionary.getOres( "nuggetCopper" ) );
possibles.addAll( OreDictionary.getOres( "nuggetTin" ) );
src/main/java/appeng/helpers/PatternHelper.java
+4 -4
View File
@@ -79,8 +79,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
ACCEPT, DECLINE, TEST
}
HashSet<TestLookup> failCache = new HashSet();
HashSet<TestLookup> passCache = new HashSet();
HashSet<TestLookup> failCache = new HashSet<TestLookup>();
HashSet<TestLookup> passCache = new HashSet<TestLookup>();
private void markItemAs(int slotIndex, ItemStack i, TestStatus b)
{
@@ -122,8 +122,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
patternItem = is;
pattern = AEItemStack.create( is );
List<IAEItemStack> in = new ArrayList();
List<IAEItemStack> out = new ArrayList();
List<IAEItemStack> in = new ArrayList<IAEItemStack>();
List<IAEItemStack> out = new ArrayList<IAEItemStack>();
for (int x = 0; x < inTag.tagCount(); x++)
{