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:
Aidan C. Brady 2015-04-07 10:42:50 -04:00
commit 068e4b58a7
12 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/api/Coord4D.java
View file

@ -1,7 +1,5 @@
package mekanism.api;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import net.minecraft.block.Block;
@ -18,6 +16,8 @@ import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import io.netty.buffer.ByteBuf;
/**
* Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes
* in account the dimension the coordinate is in.

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

@ -1,19 +1,16 @@
package mekanism.api.gas;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.common.Mekanism;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
@ -114,7 +111,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
return;
}
if(!gas.isGasEqual(buffer)) Mekanism.logger.warn("Gas type " + gas.getGas().getName() + " of buffer doesn't match type " + buffer.getGas().getName() + " of absorbing network");
// if(!gas.isGasEqual(buffer)) Mekanism.logger.warn("Gas type " + gas.getGas().getName() + " of buffer doesn't match type " + buffer.getGas().getName() + " of absorbing network");
buffer.amount += gas.amount;
gas.amount = 0;

1
src/main/java/mekanism/api/gas/GasTransmission.java
View file

@ -8,6 +8,7 @@ import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;

1
src/main/java/mekanism/api/reactor/IFusionReactor.java
View file

@ -2,6 +2,7 @@ package mekanism.api.reactor;
import mekanism.api.IHeatTransfer;
import mekanism.api.gas.GasTank;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidTank;

1
src/main/java/mekanism/api/recipe/RecipeHelper.java
View file

@ -4,6 +4,7 @@ import java.lang.reflect.Method;
import mekanism.api.gas.GasStack;
import mekanism.api.infuse.InfuseType;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;

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

@ -6,7 +6,6 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
@ -22,8 +21,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.Event;
import scala.collection.parallel.ParIterableLike.Collect;
public abstract class DynamicNetwork<A, N extends DynamicNetwork<A, N>> implements IClientTicker, INetworkDataHandler
{
public LinkedHashSet<IGridTransmitter<A, N>> transmitters = new LinkedHashSet<>();

11
src/main/java/mekanism/api/transmitters/TransmissionType.java
View file

@ -1,6 +1,7 @@
package mekanism.api.transmitters;
import mekanism.api.gas.IGasTransmitter;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
@ -41,6 +42,16 @@ public enum TransmissionType
return type.checkTransmissionType(sideTile);
}
public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type)
{
return checkTransmissionType(tile1, type, null);
}
public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type, TileEntity tile2)
{
return type.checkTransmissionType(tile1, tile2);
}
public boolean checkTransmissionType(ITransmitter transmitter)
{
return transmitter.getTransmissionType() == this;

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

@ -4,7 +4,6 @@ import java.util.HashMap;
import java.util.HashSet;
import mekanism.api.Coord4D;
import mekanism.common.Mekanism;
import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.FMLCommonHandler;
@ -13,6 +12,9 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;
import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent;
import cpw.mods.fml.relauncher.Side;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public class TransmitterNetworkRegistry
{
private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry();
@ -24,6 +26,8 @@ public class TransmitterNetworkRegistry
private HashSet<IGridTransmitter> invalidTransmitters = new HashSet<>();
private HashMap<Coord4D, IGridTransmitter> orphanTransmitters = new HashMap<>();
private Logger logger = LogManager.getLogger("MekanismTransmitters");
public static void initiate()
{
if(!loaderRegistered)
@ -102,7 +106,7 @@ public class TransmitterNetworkRegistry
{
if(!invalidTransmitters.isEmpty())
{
Mekanism.logger.debug("Dealing with " + invalidTransmitters.size() + " invalid Transmitters");
logger.debug("Dealing with " + invalidTransmitters.size() + " invalid Transmitters");
}
for(IGridTransmitter invalid : invalidTransmitters)
{
@ -122,7 +126,7 @@ public class TransmitterNetworkRegistry
{
if(!orphanTransmitters.isEmpty())
{
Mekanism.logger.debug("Dealing with " + orphanTransmitters.size() + " orphan Transmitters");
logger.debug("Dealing with " + orphanTransmitters.size() + " orphan Transmitters");
}
for(IGridTransmitter orphanTransmitter : orphanTransmitters.values())
{
@ -149,15 +153,15 @@ public class TransmitterNetworkRegistry
switch(finder.networksFound.size())
{
case 0:
Mekanism.logger.debug("No networks found. Creating new network");
logger.debug("No networks found. Creating new network");
network = startOrphan.createEmptyNetwork();
break;
case 1:
Mekanism.logger.debug("Using single found network");
logger.debug("Using single found network");
network = finder.networksFound.iterator().next();
break;
default:
Mekanism.logger.debug("Merging " + finder.networksFound.size() + " networks");
logger.debug("Merging " + finder.networksFound.size() + " networks");
network = startOrphan.mergeNetworks(finder.networksFound);
}

11
src/main/java/mekanism/common/EnergyNetwork.java
View file

@ -1,34 +1,25 @@
package mekanism.common;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.EnergyAcceptorWrapper;
import mekanism.common.base.EnergyAcceptorWrapper;
import mekanism.api.energy.EnergyStack;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.common.util.MekanismUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.ForgeDirection;
import cofh.api.energy.IEnergyReceiver;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.Event;
import cofh.api.energy.IEnergyReceiver;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergySink;
public class EnergyNetwork extends DynamicNetwork<EnergyAcceptorWrapper, EnergyNetwork>
{
private double lastPowerScale = 0;

3
src/main/java/mekanism/api/energy/EnergyAcceptorWrapper.java → src/main/java/mekanism/common/base/EnergyAcceptorWrapper.java
View file

@ -1,7 +1,8 @@
package mekanism.api.energy;
package mekanism.common.base;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.util.MekanismUtils;
import net.minecraft.tileentity.TileEntity;

2
src/main/java/mekanism/common/multipart/PartUniversalCable.java
View file

@ -5,7 +5,7 @@ import java.util.List;
import mekanism.api.MekanismConfig.client;
import mekanism.api.MekanismConfig.general;
import mekanism.api.energy.EnergyAcceptorWrapper;
import mekanism.common.base.EnergyAcceptorWrapper;
import mekanism.api.energy.EnergyStack;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;

3
src/main/java/mekanism/common/network/PacketTransmitterUpdate.java
View file

@ -4,7 +4,7 @@ import java.util.Collection;
import java.util.HashSet;
import mekanism.api.Coord4D;
import mekanism.api.energy.EnergyAcceptorWrapper;
import mekanism.common.base.EnergyAcceptorWrapper;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasNetwork;
import mekanism.api.gas.GasRegistry;
@ -12,7 +12,6 @@ import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasHandler;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.IGridTransmitter;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.ITransmitterTile;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.EnergyNetwork;