tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
aidancbrady 2015-07-06 08:47:07 -07:00
commit cdd76c5edd
5 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/api/gas/GasNetwork.java
View file

@ -8,10 +8,11 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import com.google.common.collect.Lists;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
@ -137,7 +138,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
public int tickEmit(GasStack stack)
{
List<IGasHandler> availableAcceptors = new ArrayList<>();
List<IGasHandler> availableAcceptors = Lists.newArrayList();
availableAcceptors.addAll(getAcceptors(stack.getGas()));

15
src/main/java/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -9,10 +9,13 @@ import java.util.LinkedHashSet;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import mekanism.api.Coord4D;
import mekanism.api.IClientTicker;
import mekanism.api.Range4D;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
@ -23,13 +26,13 @@ import cpw.mods.fml.common.eventhandler.Event;
public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implements IClientTicker, INetworkDataHandler
{
public LinkedHashSet<IGridTransmitter<A, N>> transmitters = new LinkedHashSet<>();
public LinkedHashSet<IGridTransmitter<A, N>> transmittersToAdd = new LinkedHashSet<>();
public LinkedHashSet<IGridTransmitter<A, N>> transmittersAdded = new LinkedHashSet<>();
public LinkedHashSet<IGridTransmitter<A, N>> transmitters = Sets.newLinkedHashSet();
public LinkedHashSet<IGridTransmitter<A, N>> transmittersToAdd = Sets.newLinkedHashSet();
public LinkedHashSet<IGridTransmitter<A, N>> transmittersAdded = Sets.newLinkedHashSet();
public HashMap<Coord4D, A> possibleAcceptors = new HashMap<Coord4D, A>();
public HashMap<Coord4D, EnumSet<ForgeDirection>> acceptorDirections = new HashMap<Coord4D, EnumSet<ForgeDirection>>();
public HashMap<IGridTransmitter<A, N>, EnumSet<ForgeDirection>> changedAcceptors = new HashMap<>();
public HashMap<IGridTransmitter<A, N>, EnumSet<ForgeDirection>> changedAcceptors = Maps.newHashMap();
private Set<DelayQueue> updateQueue = new LinkedHashSet<DelayQueue>();
@ -75,7 +78,7 @@ public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implemen
updateCapacity();
clampBuffer();
queueClientUpdate(new ArrayList<>(transmittersToAdd));
queueClientUpdate(Lists.newArrayList(transmittersToAdd));
transmittersToAdd.clear();
}

19
src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java
View file

@ -10,6 +10,9 @@ import net.minecraftforge.common.util.ForgeDirection;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.TickEvent.Phase;
@ -21,11 +24,11 @@ public class TransmitterNetworkRegistry
private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry();
private static boolean loaderRegistered = false;
private HashSet<DynamicNetwork> networks = new HashSet<>();
private HashSet<DynamicNetwork> networksToChange = new HashSet<>();
private HashSet<DynamicNetwork> networks = Sets.newHashSet();
private HashSet<DynamicNetwork> networksToChange = Sets.newHashSet();
private HashSet<IGridTransmitter> invalidTransmitters = new HashSet<>();
private HashMap<Coord4D, IGridTransmitter> orphanTransmitters = new HashMap<>();
private HashSet<IGridTransmitter> invalidTransmitters = Sets.newHashSet();
private HashMap<Coord4D, IGridTransmitter> orphanTransmitters = Maps.newHashMap();
private Logger logger = LogManager.getLogger("MekanismTransmitters");
@ -151,7 +154,7 @@ public class TransmitterNetworkRegistry
{
if(startOrphan.isValid() && startOrphan.isOrphan())
{
OrphanPathFinder<A, N> finder = new OrphanPathFinder<>(startOrphan);
OrphanPathFinder<A, N> finder = new OrphanPathFinder<A, N>(startOrphan);
finder.start();
N network;
@ -225,10 +228,10 @@ public class TransmitterNetworkRegistry
{
public IGridTransmitter<A, N> startPoint;
public HashSet<Coord4D> iterated = new HashSet<>();
public HashSet<Coord4D> iterated = Sets.newHashSet();
public HashSet<IGridTransmitter<A, N>> connectedTransmitters = new HashSet<>();
public HashSet<N> networksFound = new HashSet<>();
public HashSet<IGridTransmitter<A, N>> connectedTransmitters = Sets.newHashSet();
public HashSet<N> networksFound = Sets.newHashSet();
public OrphanPathFinder(IGridTransmitter<A, N> start)
{

2
src/main/java/mekanism/client/gui/GuiPasswordEnter.java
View file

@ -161,6 +161,8 @@ public class GuiPasswordEnter extends GuiScreen
@Override
public void drawScreen(int mouseX, int mouseY, float partialTick)
{
drawDefaultBackground();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordEnter.png"));

2
src/main/java/mekanism/client/gui/GuiPasswordModify.java
View file

@ -187,6 +187,8 @@ public class GuiPasswordModify extends GuiScreen
@Override
public void drawScreen(int mouseX, int mouseY, float partialTick)
{
drawDefaultBackground();
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiPasswordModify.png"));