diff --git a/common/mekanism/api/DynamicNetwork.java b/common/mekanism/api/DynamicNetwork.java index b9d3359dc..426b1769d 100644 --- a/common/mekanism/api/DynamicNetwork.java +++ b/common/mekanism/api/DynamicNetwork.java @@ -13,7 +13,7 @@ import mekanism.common.EnergyNetwork; import mekanism.common.IMechanicalPipe; import mekanism.common.IUniversalCable; -public abstract class DynamicNetwork implements ITransmitterNetwork +public abstract class DynamicNetwork implements ITransmitterNetwork { public HashSet transmitters = new HashSet(); @@ -30,6 +30,7 @@ public abstract class DynamicNetwork implements ITransmitterNetwork transmitters.addAll(newTransmitters); } + @Override public void removeTransmitter(T transmitter) { transmitters.remove(transmitter); @@ -40,6 +41,7 @@ public abstract class DynamicNetwork implements ITransmitterNetwork } } + @Override public void register() { try { @@ -52,6 +54,7 @@ public abstract class DynamicNetwork implements ITransmitterNetwork } catch(NoSuchElementException e) {} } + @Override public void deregister() { transmitters.clear(); @@ -63,4 +66,19 @@ public abstract class DynamicNetwork implements ITransmitterNetwork { return transmitters.size(); } + + @Override + public void tick() + { + if(!fixed) + { + ++ticksSinceCreate; + + if(ticksSinceCreate > 1200) + { + ticksSinceCreate = 0; + fixMessedUpNetwork(transmitters.iterator().next()); + } + } + } } diff --git a/common/mekanism/api/GasNetwork.java b/common/mekanism/api/GasNetwork.java index f9e056095..cf102b059 100644 --- a/common/mekanism/api/GasNetwork.java +++ b/common/mekanism/api/GasNetwork.java @@ -20,7 +20,7 @@ import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.ChunkEvent; import cpw.mods.fml.common.FMLCommonHandler; -public class GasNetwork extends DynamicNetwork +public class GasNetwork extends DynamicNetwork { public GasNetwork(IPressurizedTube... varPipes) { @@ -45,7 +45,7 @@ public class GasNetwork extends DynamicNetwork public int emit(int gasToSend, EnumGas transferType, TileEntity emitter) { - List availableAcceptors = Arrays.asList(getGasAcceptors(transferType).toArray()); + List availableAcceptors = Arrays.asList(getAcceptors(transferType).toArray()); Collections.shuffle(availableAcceptors); @@ -84,8 +84,10 @@ public class GasNetwork extends DynamicNetwork return gasToSend; } - public Set getGasAcceptors(EnumGas transferType) + @Override + public Set getAcceptors(Object... data) { + EnumGas transferType = (EnumGas)data[0]; Set toReturn = new HashSet(); for(IGasAcceptor acceptor : possibleAcceptors) @@ -102,6 +104,7 @@ public class GasNetwork extends DynamicNetwork return toReturn; } + @Override public void refresh() { Set iterTubes = (Set) transmitters.clone(); @@ -139,6 +142,7 @@ public class GasNetwork extends DynamicNetwork } } + @Override public void merge(GasNetwork network) { if(network != null && network != this) @@ -151,6 +155,7 @@ public class GasNetwork extends DynamicNetwork } } + @Override public void split(IPressurizedTube splitPoint) { if(splitPoint instanceof TileEntity) @@ -215,6 +220,7 @@ public class GasNetwork extends DynamicNetwork } } + @Override public void fixMessedUpNetwork(IPressurizedTube tube) { if(tube instanceof TileEntity) @@ -304,46 +310,9 @@ public class GasNetwork extends DynamicNetwork } } - public static class NetworkLoader - { - @ForgeSubscribe - public void onChunkLoad(ChunkEvent.Load event) - { - if(event.getChunk() != null) - { - for(Object obj : event.getChunk().chunkTileEntityMap.values()) - { - if(obj instanceof TileEntity) - { - TileEntity tileEntity = (TileEntity)obj; - - if(tileEntity instanceof IPressurizedTube) - { - ((IPressurizedTube)tileEntity).refreshNetwork(); - } - } - } - } - } - } - @Override public String toString() { return "[GasNetwork] " + transmitters.size() + " transmitters, " + possibleAcceptors.size() + " acceptors."; } - - public void tick() - { - //Fix weird behaviour periodically. - if(!fixed) - { - ++ticksSinceCreate; - if(ticksSinceCreate > 1200) - { - ticksSinceCreate = 0; - fixMessedUpNetwork(transmitters.iterator().next()); - } - } - } } diff --git a/common/mekanism/api/GasTransmission.java b/common/mekanism/api/GasTransmission.java index 3a53f9164..fb900ba37 100644 --- a/common/mekanism/api/GasTransmission.java +++ b/common/mekanism/api/GasTransmission.java @@ -5,7 +5,6 @@ import java.util.Set; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.MinecraftForge; /** * A handy class containing several utilities for efficient gas transfer. @@ -14,23 +13,6 @@ import net.minecraftforge.common.MinecraftForge; */ public final class GasTransmission { - /** Do not mess with this, used to only register NetworkLoader once. */ - private static boolean networkLoader_loaded = false; - - /** - * Call this method in your mod's init phase in order for the GasNetwork to function properly. - */ - public static void register() - { - if(!networkLoader_loaded) - { - MinecraftForge.EVENT_BUS.register(new GasNetwork.NetworkLoader()); - networkLoader_loaded = true; - - System.out.println("[Mekanism] Successfully loaded gas transmission NetworkLoader."); - } - } - /** * Gets all the tubes around a tile entity. * @param tileEntity - center tile entity diff --git a/common/mekanism/api/IPressurizedTube.java b/common/mekanism/api/IPressurizedTube.java index 550c8d157..f37fdaeec 100644 --- a/common/mekanism/api/IPressurizedTube.java +++ b/common/mekanism/api/IPressurizedTube.java @@ -2,7 +2,7 @@ package mekanism.api; import net.minecraft.tileentity.TileEntity; -public interface IPressurizedTube +public interface IPressurizedTube extends ITransmitter { /** * Whether or not this tube can transfer gas. @@ -22,41 +22,4 @@ public interface IPressurizedTube * @param type - the type of gas transferred */ public void onTransfer(EnumGas type); - - /** - * Gets the GasNetwork currently in use by this tube segment. - * @return GasNetwork this cable is using - */ - public GasNetwork getNetwork(); - - /** - * Gets the GasNetwork currently in use by this tube segment. - * @param createIfNull - If true, the tube will try and connect to an - * adjacent network, merging several if necessary, or creating a new one - * if none is available - * @return GasNetwork this cable is using - */ - public GasNetwork getNetwork(boolean createIfNull); - - /** - * Sets this cable segment's GasNetwork to a new value. - * @param network - GasNetwork to set to - */ - public void setNetwork(GasNetwork network); - - /** - * Refreshes the tube's GasNetwork. - */ - public void refreshNetwork(); - - /** - * Remove a tube from its network. - */ - public void removeFromNetwork(); - - /** - * Call this if you're worried a tube's network is messed up and you want - * it to try and fix itself. - */ - public void fixNetwork(); } diff --git a/common/mekanism/api/ITransmitter.java b/common/mekanism/api/ITransmitter.java new file mode 100644 index 000000000..861371efc --- /dev/null +++ b/common/mekanism/api/ITransmitter.java @@ -0,0 +1,41 @@ +package mekanism.api; + +public interface ITransmitter +{ + /** + * Gets the network currently in use by this transmitter segment. + * @return network this transmitter is using + */ + public N getNetwork(); + + /** + * Gets the network currently in use by this transmitter segment. + * @param createIfNull - If true, the transmitter will try and connect to an + * adjacent network, merging several if necessary, or creating a new one + * if none is available + * @return network this transmitter is using + */ + public N getNetwork(boolean createIfNull); + + /** + * Sets this transmitter segment's network to a new value. + * @param network - network to set to + */ + public void setNetwork(N network); + + /** + * Refreshes the transmitter's network. + */ + public void refreshNetwork(); + + /** + * Remove this transmitter from its network. + */ + public void removeFromNetwork(); + + /** + * Call this if you're worried a transmitter's network is messed up and you want + * it to try and fix itself. + */ + public void fixNetwork(); +} diff --git a/common/mekanism/api/ITransmitterNetwork.java b/common/mekanism/api/ITransmitterNetwork.java index 6ee159eaf..c324bc916 100644 --- a/common/mekanism/api/ITransmitterNetwork.java +++ b/common/mekanism/api/ITransmitterNetwork.java @@ -1,8 +1,28 @@ package mekanism.api; -public interface ITransmitterNetwork +import java.util.Set; + +import mekanism.common.IUniversalCable; + +public interface ITransmitterNetwork { public void tick(); public int getSize(); + + public Set getAcceptors(Object... data); + + public void removeTransmitter(T transmitter); + + public void refresh(); + + public void split(T splitPoint); + + public void merge(N network); + + public void fixMessedUpNetwork(T transmitter); + + public void register(); + + public void deregister(); } diff --git a/common/mekanism/api/TransmitterNetworkRegistry.java b/common/mekanism/api/TransmitterNetworkRegistry.java index f1a61b605..881fc74f5 100644 --- a/common/mekanism/api/TransmitterNetworkRegistry.java +++ b/common/mekanism/api/TransmitterNetworkRegistry.java @@ -4,6 +4,10 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.Set; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ForgeSubscribe; +import net.minecraftforge.event.world.ChunkEvent; import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.registry.TickRegistry; @@ -12,6 +16,8 @@ import cpw.mods.fml.relauncher.Side; public class TransmitterNetworkRegistry implements ITickHandler { private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry(); + private static boolean loaderRegistered = false; + private HashSet networks = new HashSet(); public TransmitterNetworkRegistry() @@ -19,6 +25,16 @@ public class TransmitterNetworkRegistry implements ITickHandler TickRegistry.registerTickHandler(this, Side.SERVER); } + public static void initiate() + { + if(!loaderRegistered) + { + loaderRegistered = true; + + MinecraftForge.EVENT_BUS.register(getInstance()); + } + } + public static TransmitterNetworkRegistry getInstance() { return INSTANCE; @@ -85,4 +101,27 @@ public class TransmitterNetworkRegistry implements ITickHandler { return "Network Registry:\n" + networks; } + + public static class NetworkLoader + { + @ForgeSubscribe + public void onChunkLoad(ChunkEvent.Load event) + { + if(event.getChunk() != null) + { + for(Object obj : event.getChunk().chunkTileEntityMap.values()) + { + if(obj instanceof TileEntity) + { + TileEntity tileEntity = (TileEntity)obj; + + if(tileEntity instanceof ITransmitter) + { + ((ITransmitter)tileEntity).refreshNetwork(); + } + } + } + } + } + } } diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index 2e5b83031..cc7d4ce74 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -32,7 +32,7 @@ import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.Type; import cpw.mods.fml.common.FMLCommonHandler; -public class EnergyNetwork extends DynamicNetwork +public class EnergyNetwork extends DynamicNetwork { private double lastPowerScale = 0; private double joulesTransmitted = 0; @@ -63,7 +63,7 @@ public class EnergyNetwork extends DynamicNetwork { double totalNeeded = 0; - for(TileEntity acceptor : getEnergyAcceptors()) + for(TileEntity acceptor : getAcceptors()) { if(!ignored.contains(acceptor)) { @@ -94,7 +94,7 @@ public class EnergyNetwork extends DynamicNetwork double energyAvailable = energyToSend; double sent; - List availableAcceptors = Arrays.asList(getEnergyAcceptors().toArray()); + List availableAcceptors = Arrays.asList(getAcceptors().toArray()); Collections.shuffle(availableAcceptors); @@ -146,7 +146,8 @@ public class EnergyNetwork extends DynamicNetwork return energyToSend; } - public Set getEnergyAcceptors() + @Override + public Set getAcceptors(Object... data) { Set toReturn = new HashSet(); @@ -197,6 +198,7 @@ public class EnergyNetwork extends DynamicNetwork return toReturn; } + @Override public void refresh() { Set iterCables = (Set) transmitters.clone(); @@ -242,6 +244,7 @@ public class EnergyNetwork extends DynamicNetwork } } + @Override public void merge(EnergyNetwork network) { if(network != null && network != this) @@ -254,6 +257,7 @@ public class EnergyNetwork extends DynamicNetwork } } + @Override public void split(IUniversalCable splitPoint) { if(splitPoint instanceof TileEntity) @@ -318,6 +322,7 @@ public class EnergyNetwork extends DynamicNetwork } } + @Override public void fixMessedUpNetwork(IUniversalCable cable) { if(cable instanceof TileEntity) @@ -406,29 +411,6 @@ public class EnergyNetwork extends DynamicNetwork power = currentPower; } } - - public static class NetworkLoader - { - @ForgeSubscribe - public void onChunkLoad(ChunkEvent.Load event) - { - if(event.getChunk() != null) - { - for(Object obj : event.getChunk().chunkTileEntityMap.values()) - { - if(obj instanceof TileEntity) - { - TileEntity tileEntity = (TileEntity)obj; - - if(tileEntity instanceof IUniversalCable) - { - ((IUniversalCable)tileEntity).refreshNetwork(); - } - } - } - } - } - } @Override public String toString() @@ -436,22 +418,15 @@ public class EnergyNetwork extends DynamicNetwork return "[EnergyNetwork] " + transmitters.size() + " transmitters, " + possibleAcceptors.size() + " acceptors."; } + @Override public void tick() { clearJoulesTransmitted(); - //Fix weird behaviour periodically. - if(!fixed) - { - ++ticksSinceCreate; - if(ticksSinceCreate > 1200) - { - ticksSinceCreate = 0; - fixMessedUpNetwork(transmitters.iterator().next()); - } - } + super.tick(); double currentPowerScale = getPowerScale(); + if(currentPowerScale != lastPowerScale && FMLCommonHandler.instance().getEffectiveSide().isServer()) { lastPowerScale = currentPowerScale; diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java index 8b11a6ba4..a61e203c1 100644 --- a/common/mekanism/common/FluidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -3,30 +3,23 @@ package mekanism.common; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; import java.util.Set; import mekanism.api.DynamicNetwork; -import mekanism.api.ITransmitterNetwork; import mekanism.api.Object3D; -import mekanism.api.TransmitterNetworkRegistry; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; -import net.minecraftforge.event.ForgeSubscribe; -import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.FMLCommonHandler; -public class FluidNetwork extends DynamicNetwork +public class FluidNetwork extends DynamicNetwork { public FluidNetwork(IMechanicalPipe... varPipes) { @@ -51,7 +44,7 @@ public class FluidNetwork extends DynamicNetwork public int emit(FluidStack fluidToSend, boolean doTransfer, TileEntity emitter) { - List availableAcceptors = Arrays.asList(getFluidAcceptors(fluidToSend).toArray()); + List availableAcceptors = Arrays.asList(getAcceptors(fluidToSend).toArray()); Collections.shuffle(availableAcceptors); @@ -91,8 +84,10 @@ public class FluidNetwork extends DynamicNetwork return fluidSent; } - public Set getFluidAcceptors(FluidStack fluidToSend) + @Override + public Set getAcceptors(Object... data) { + FluidStack fluidToSend = (FluidStack)data[0]; Set toReturn = new HashSet(); for(IFluidHandler acceptor : possibleAcceptors) @@ -105,7 +100,8 @@ public class FluidNetwork extends DynamicNetwork return toReturn; } - + + @Override public void refresh() { Set iterPipes = (Set) transmitters.clone(); @@ -143,6 +139,7 @@ public class FluidNetwork extends DynamicNetwork } } + @Override public void merge(FluidNetwork network) { if(network != null && network != this) @@ -155,6 +152,7 @@ public class FluidNetwork extends DynamicNetwork } } + @Override public void split(IMechanicalPipe splitPoint) { if(splitPoint instanceof TileEntity) @@ -219,6 +217,7 @@ public class FluidNetwork extends DynamicNetwork } } + @Override public void fixMessedUpNetwork(IMechanicalPipe pipe) { if(pipe instanceof TileEntity) @@ -307,43 +306,6 @@ public class FluidNetwork extends DynamicNetwork fluidSent = fluid; } } - - public static class NetworkLoader - { - @ForgeSubscribe - public void onChunkLoad(ChunkEvent.Load event) - { - if(event.getChunk() != null) - { - for(Object obj : event.getChunk().chunkTileEntityMap.values()) - { - if(obj instanceof TileEntity) - { - TileEntity tileEntity = (TileEntity)obj; - - if(tileEntity instanceof IMechanicalPipe) - { - ((IMechanicalPipe)tileEntity).refreshNetwork(); - } - } - } - } - } - } - - public void tick() - { - //Fix weird behaviour periodically. - if(!fixed) - { - ++ticksSinceCreate; - if(ticksSinceCreate > 1200) - { - ticksSinceCreate = 0; - fixMessedUpNetwork(transmitters.iterator().next()); - } - } - } @Override public String toString() diff --git a/common/mekanism/common/ILogisticalTransporter.java b/common/mekanism/common/ILogisticalTransporter.java index bb24339d4..b62dcca51 100644 --- a/common/mekanism/common/ILogisticalTransporter.java +++ b/common/mekanism/common/ILogisticalTransporter.java @@ -1,41 +1,8 @@ package mekanism.common; -public interface ILogisticalTransporter -{ - /** - * Gets the InventoryNetwork currently in use by this transporter segment. - * @return InventoryNetwork this transporter is using - */ - public InventoryNetwork getNetwork(); - - /** - * Gets the InventoryNetwork currently in use by this transporter segment. - * @param createIfNull - If true, the transporter will try and connect to an - * adjacent network, merging several if necessary, or creating a new one - * if none is available - * @return InventoryNetwork this transporter is using - */ - public InventoryNetwork getNetwork(boolean createIfNull); - - /** - * Sets this transporter segment's InventoryNetwork to a new value. - * @param network - InventoryNetwork to set to - */ - public void setNetwork(InventoryNetwork network); - - /** - * Refreshes the transporter's InventoryNetwork. - */ - public void refreshNetwork(); - - /** - * Remove a transporter from its network. - */ - public void removeFromNetwork(); +import mekanism.api.ITransmitter; - /** - * Call this if you're worried a transporter's network is messed up and you want - * it to try and fix itself. - */ - public void fixNetwork(); -} +public interface ILogisticalTransporter extends ITransmitter +{ + +} \ No newline at end of file diff --git a/common/mekanism/common/IMechanicalPipe.java b/common/mekanism/common/IMechanicalPipe.java index f586cda99..61ca8abff 100644 --- a/common/mekanism/common/IMechanicalPipe.java +++ b/common/mekanism/common/IMechanicalPipe.java @@ -1,5 +1,6 @@ package mekanism.common; +import mekanism.api.ITransmitter; import net.minecraftforge.fluids.FluidStack; /** @@ -7,48 +8,11 @@ import net.minecraftforge.fluids.FluidStack; * @author AidanBrady * */ -public interface IMechanicalPipe +public interface IMechanicalPipe extends ITransmitter { /** * Called when fluid is transferred through this pipe. * @param fluidStack - the fluid transferred */ public void onTransfer(FluidStack fluidStack); - - /** - * Gets the FluidNetwork currently in use by this pipe segment. - * @return FluidNetwork this pipe is using - */ - public FluidNetwork getNetwork(); - - /** - * Gets the FluidNetwork currently in use by this pipe segment. - * @param createIfNull - If true, the pipe will try and connect to an - * adjacent network, merging several if necessary, or creating a new one - * if none is available - * @return FluidNetwork this pipe is using - */ - public FluidNetwork getNetwork(boolean createIfNull); - - /** - * Sets this pipe segment's FluidNetwork to a new value. - * @param network - FluidNetwork to set to - */ - public void setNetwork(FluidNetwork network); - - /** - * Refreshes the pipe's FluidNetwork. - */ - public void refreshNetwork(); - - /** - * Remove a pipe from its network. - */ - public void removeFromNetwork(); - - /** - * Call this if you're worried a pipe's network is messed up and you want - * it to try and fix itself. - */ - public void fixNetwork(); } diff --git a/common/mekanism/common/IUniversalCable.java b/common/mekanism/common/IUniversalCable.java index d0b941da7..fd2ddfd9f 100644 --- a/common/mekanism/common/IUniversalCable.java +++ b/common/mekanism/common/IUniversalCable.java @@ -1,50 +1,14 @@ package mekanism.common; +import mekanism.api.ITransmitter; + /** * Implement this in your TileEntity class if the block can transfer energy as a Universal Cable. * @author AidanBrady * */ -public interface IUniversalCable +public interface IUniversalCable extends ITransmitter { - /** - * Gets the EnergyNetwork currently in use by this cable segment. - * Will try to connect to adjacent networks or create a new one - * @return EnergyNetwork this cable is using - */ - public EnergyNetwork getNetwork(); - - /** - * Gets the EnergyNetwork currently in use by this cable segment. - * @param createIfNull - If true, the cable will try and connect to an - * adjacent network, merging several if necessary, or creating a new one - * if none is available - * @return EnergyNetwork this cable is using - */ - public EnergyNetwork getNetwork(boolean createIfNull); - - /** - * Sets this cable segment's EnergyNetwork to a new value. - * @param network - EnergyNetwork to set to - */ - public void setNetwork(EnergyNetwork network); - - /** - * Refreshes the cable's EnergyNetwork. - */ - public void refreshNetwork(); - - /** - * Remove a cable from its network. - */ - public void removeFromNetwork(); - - /** - * Call this if you're worried a cable's network is messed up and you want - * it to try and fix itself. - */ - public void fixNetwork(); - /** * Sets a Universal Cable's energy scale to a new value. * @param energyScale - energy scale to set diff --git a/common/mekanism/common/InventoryNetwork.java b/common/mekanism/common/InventoryNetwork.java index 75eccdcf0..20c39d89f 100644 --- a/common/mekanism/common/InventoryNetwork.java +++ b/common/mekanism/common/InventoryNetwork.java @@ -21,7 +21,7 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.world.ChunkEvent; -public class InventoryNetwork extends DynamicNetwork +public class InventoryNetwork extends DynamicNetwork { public InventoryNetwork(ILogisticalTransporter... varTransporters) { @@ -43,7 +43,14 @@ public class InventoryNetwork extends DynamicNetwork getAcceptors(Object... data) + { + return null; + } + @Override public void refresh() { Set iterPipes = (Set)transmitters.clone(); @@ -81,6 +88,7 @@ public class InventoryNetwork extends DynamicNetwork 1200) - { - ticksSinceCreate = 0; - fixMessedUpNetwork(transmitters.iterator().next()); - } - } - } @Override public String toString() diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index b93a7235d..e27073832 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -16,6 +16,7 @@ import mekanism.api.InfuseRegistry; import mekanism.api.InfuseType; import mekanism.api.InfusionInput; import mekanism.api.Object3D; +import mekanism.api.TransmitterNetworkRegistry; import mekanism.client.SoundHandler; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; @@ -1168,11 +1169,9 @@ public class Mekanism //Register to receive subscribed events MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(new IC2EnergyHandler()); - MinecraftForge.EVENT_BUS.register(new EnergyNetwork.NetworkLoader()); - MinecraftForge.EVENT_BUS.register(new FluidNetwork.NetworkLoader()); - //Register with GasTransmission - GasTransmission.register(); + //Register with TransmitterNetworkRegistry + TransmitterNetworkRegistry.initiate(); //Load configuration proxy.loadConfiguration();