mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +00:00
Merge remote-tracking branch 'upstream/1.11' into 1.12_firstpass
This commit is contained in:
commit
df68b1e36a
299 files changed
+514
-9448
No files matched your search
@@ -1,8 +1,6 @@
|
||||
package mekanism.common.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
|
||||
import cofh.redstoneflux.api.IEnergyConnection;
|
||||
import cofh.redstoneflux.api.IEnergyProvider;
|
||||
@@ -186,7 +184,7 @@ public final class CableUtils
|
||||
|
||||
if(energyToSend > 0)
|
||||
{
|
||||
List<EnumFacing> outputtingSides = new ArrayList<EnumFacing>();
|
||||
List<EnumFacing> outputtingSides = new LinkedList<>();
|
||||
boolean[] connectable = getConnections((TileEntity)emitter, emitter.getOutputtingSides());
|
||||
|
||||
for(EnumFacing side : emitter.getOutputtingSides())
|
||||
@@ -197,7 +195,7 @@ public final class CableUtils
|
||||
}
|
||||
}
|
||||
|
||||
if(outputtingSides.size() > 0)
|
||||
if(!outputtingSides.isEmpty())
|
||||
{
|
||||
double sent = 0;
|
||||
boolean tryAgain = false;
|
||||
@@ -224,10 +222,10 @@ public final class CableUtils
|
||||
double splitSend = (totalToSend-remains)/outputtingSides.size();
|
||||
double sent = 0;
|
||||
|
||||
List<EnumFacing> toRemove = new ArrayList<EnumFacing>();
|
||||
|
||||
for(EnumFacing side : outputtingSides)
|
||||
for(Iterator<EnumFacing> it = outputtingSides.iterator(); it.hasNext();)
|
||||
{
|
||||
EnumFacing side = it.next();
|
||||
|
||||
TileEntity tileEntity = Coord4D.get((TileEntity)emitter).offset(side).getTileEntity(((TileEntity)emitter).getWorld());
|
||||
double toSend = splitSend+remains;
|
||||
remains = 0;
|
||||
@@ -237,15 +235,10 @@ public final class CableUtils
|
||||
|
||||
if(sent-prev == 0)
|
||||
{
|
||||
toRemove.add(side);
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
|
||||
for(EnumFacing side : toRemove)
|
||||
{
|
||||
outputtingSides.remove(side);
|
||||
}
|
||||
|
||||
return sent;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user