diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index c8b28f3f7..0c1554826 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -15,6 +15,11 @@ import org.apache.logging.log4j.LogManager; public class MekanismAPI { + /** + * The version of the api classes - may not always match the mod's version + */ + public static final String API_VERSION = "9.7.2"; + /** * Mekanism debug mode */ diff --git a/src/main/java/mekanism/api/energy/package-info.java b/src/main/java/mekanism/api/energy/package-info.java index f59f1b64a..acd53e5b5 100644 --- a/src/main/java/mekanism/api/energy/package-info.java +++ b/src/main/java/mekanism/api/energy/package-info.java @@ -1,5 +1,6 @@ -@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|energy") +@API(apiVersion = MekanismAPI.API_VERSION, owner = "mekanism", provides = "MekanismAPI|energy") package mekanism.api.energy; +import mekanism.api.MekanismAPI; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/gas/package-info.java b/src/main/java/mekanism/api/gas/package-info.java index fdb11cf87..2a162b794 100644 --- a/src/main/java/mekanism/api/gas/package-info.java +++ b/src/main/java/mekanism/api/gas/package-info.java @@ -1,5 +1,6 @@ -@API(apiVersion = "9.1.0", owner = "mekanism", provides = "MekanismAPI|gas") +@API(apiVersion = MekanismAPI.API_VERSION, owner = "mekanism", provides = "MekanismAPI|gas") package mekanism.api.gas; +import mekanism.api.MekanismAPI; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/infuse/package-info.java b/src/main/java/mekanism/api/infuse/package-info.java index 41734f41c..04e996cec 100644 --- a/src/main/java/mekanism/api/infuse/package-info.java +++ b/src/main/java/mekanism/api/infuse/package-info.java @@ -1,5 +1,6 @@ -@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|infuse") +@API(apiVersion = MekanismAPI.API_VERSION, owner = "mekanism", provides = "MekanismAPI|infuse") package mekanism.api.infuse; +import mekanism.api.MekanismAPI; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/lasers/package-info.java b/src/main/java/mekanism/api/lasers/package-info.java index 8377e3061..70ce4489f 100644 --- a/src/main/java/mekanism/api/lasers/package-info.java +++ b/src/main/java/mekanism/api/lasers/package-info.java @@ -1,5 +1,6 @@ -@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|laser") +@API(apiVersion = MekanismAPI.API_VERSION, owner = "mekanism", provides = "MekanismAPI|laser") package mekanism.api.lasers; +import mekanism.api.MekanismAPI; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/package-info.java b/src/main/java/mekanism/api/package-info.java index be9037791..e3616d2c8 100644 --- a/src/main/java/mekanism/api/package-info.java +++ b/src/main/java/mekanism/api/package-info.java @@ -1,4 +1,4 @@ -@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|core") +@API(apiVersion = MekanismAPI.API_VERSION, owner = "mekanism", provides = "MekanismAPI|core") package mekanism.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java index f54fd3b7a..52f9dbb58 100644 --- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java +++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java @@ -10,6 +10,7 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map.Entry; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.IClientTicker; import mekanism.api.Range4D; @@ -22,15 +23,17 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; import org.apache.commons.lang3.tuple.Pair; -public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler { +public abstract class DynamicNetwork, BUFFER> implements + IClientTicker, INetworkDataHandler { - public LinkedHashSet> transmitters = Sets.newLinkedHashSet(); - public LinkedHashSet> transmittersToAdd = Sets.newLinkedHashSet(); - public LinkedHashSet> transmittersAdded = Sets.newLinkedHashSet(); + public LinkedHashSet> transmitters = Sets.newLinkedHashSet(); + public LinkedHashSet> transmittersToAdd = Sets.newLinkedHashSet(); + public LinkedHashSet> transmittersAdded = Sets.newLinkedHashSet(); - public HashMap possibleAcceptors = new HashMap<>(); + public HashMap possibleAcceptors = new HashMap<>(); public HashMap> acceptorDirections = new HashMap<>(); - public HashMap, EnumSet> changedAcceptors = Maps.newHashMap(); + public HashMap, EnumSet> changedAcceptors = Maps + .newHashMap(); protected Range4D packetRange = null; protected int capacity = 0; protected double meanCapacity = 0; @@ -40,13 +43,13 @@ public abstract class DynamicNetwork> implemen protected World world = null; private Set updateQueue = new LinkedHashSet<>(); - public void addNewTransmitters(Collection> newTransmitters) { + public void addNewTransmitters(Collection> newTransmitters) { transmittersToAdd.addAll(newTransmitters); } public void commit() { if (!transmittersToAdd.isEmpty()) { - for (IGridTransmitter transmitter : transmittersToAdd) { + for (IGridTransmitter transmitter : transmittersToAdd) { if (transmitter.isValid()) { if (world == null) { world = transmitter.world(); @@ -56,7 +59,7 @@ public abstract class DynamicNetwork> implemen updateTransmitterOnSide(transmitter, side); } - transmitter.setTransmitterNetwork((N) this); + transmitter.setTransmitterNetwork((NETWORK) this); absorbBuffer(transmitter); transmitters.add(transmitter); } @@ -69,8 +72,9 @@ public abstract class DynamicNetwork> implemen } if (!changedAcceptors.isEmpty()) { - for (Entry, EnumSet> entry : changedAcceptors.entrySet()) { - IGridTransmitter transmitter = entry.getKey(); + for (Entry, EnumSet> entry : changedAcceptors + .entrySet()) { + IGridTransmitter transmitter = entry.getKey(); if (transmitter.isValid()) { EnumSet directionsChanged = entry.getValue(); @@ -85,8 +89,8 @@ public abstract class DynamicNetwork> implemen } } - public void updateTransmitterOnSide(IGridTransmitter transmitter, EnumFacing side) { - A acceptor = transmitter.getAcceptor(side); + public void updateTransmitterOnSide(IGridTransmitter transmitter, EnumFacing side) { + ACCEPTOR acceptor = transmitter.getAcceptor(side); Coord4D acceptorCoord = transmitter.coord().offset(side); EnumSet directions = acceptorDirections.get(acceptorCoord); @@ -114,7 +118,12 @@ public abstract class DynamicNetwork> implemen } - public abstract void absorbBuffer(IGridTransmitter transmitter); + @Nullable + public BUFFER getBuffer() { + return null; + } + + public abstract void absorbBuffer(IGridTransmitter transmitter); public abstract void clampBuffer(); @@ -126,12 +135,12 @@ public abstract class DynamicNetwork> implemen clampBuffer(); //Update all shares - for (IGridTransmitter transmitter : transmitters) { + for (IGridTransmitter transmitter : transmitters) { transmitter.updateShare(); } //Now invalidate the transmitters - for (IGridTransmitter transmitter : transmitters) { + for (IGridTransmitter transmitter : transmitters) { invalidateTransmitter(transmitter); } @@ -139,7 +148,7 @@ public abstract class DynamicNetwork> implemen deregister(); } - public void invalidateTransmitter(IGridTransmitter transmitter) { + public void invalidateTransmitter(IGridTransmitter transmitter) { if (!world.isRemote && transmitter.isValid()) { transmitter.takeShare(); transmitter.setTransmitterNetwork(null); @@ -147,7 +156,7 @@ public abstract class DynamicNetwork> implemen } } - public void acceptorChanged(IGridTransmitter transmitter, EnumFacing side) { + public void acceptorChanged(IGridTransmitter transmitter, EnumFacing side) { EnumSet directions = changedAcceptors.get(transmitter); if (directions != null) { @@ -159,9 +168,9 @@ public abstract class DynamicNetwork> implemen TransmitterNetworkRegistry.registerChangedNetwork(this); } - public void adoptTransmittersAndAcceptorsFrom(N net) { - for (IGridTransmitter transmitter : net.transmitters) { - transmitter.setTransmitterNetwork((N) this); + public void adoptTransmittersAndAcceptorsFrom(NETWORK net) { + for (IGridTransmitter transmitter : net.transmitters) { + transmitter.setTransmitterNetwork((NETWORK) this); transmitters.add(transmitter); transmittersAdded.add(transmitter); } @@ -196,7 +205,7 @@ public abstract class DynamicNetwork> implemen return null; } - IGridTransmitter initTransmitter = transmitters.iterator().next(); + IGridTransmitter initTransmitter = transmitters.iterator().next(); Coord4D initCoord = initTransmitter.coord(); int minX = initCoord.x; @@ -285,7 +294,7 @@ public abstract class DynamicNetwork> implemen return world; } - public abstract Set> getAcceptors(Object data); + public abstract Set> getAcceptors(Object data); public void tick() { onUpdate(); @@ -333,7 +342,7 @@ public abstract class DynamicNetwork> implemen public void clientTick() { } - public void queueClientUpdate(Collection> newTransmitters) { + public void queueClientUpdate(Collection> newTransmitters) { transmittersAdded.addAll(newTransmitters); updateDelay = 5; } @@ -342,9 +351,17 @@ public abstract class DynamicNetwork> implemen updateQueue.add(new DelayQueue(player)); } + public boolean isCompatibleWith(NETWORK other) { + return true; + } + + public boolean compatibleWithBuffer(BUFFER buffer) { + return true; + } + public static class TransmittersAddedEvent extends Event { - public DynamicNetwork network; + public DynamicNetwork network; public boolean newNetwork; public Collection newTransmitters; diff --git a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java index 7a153adbf..2d37d55bb 100644 --- a/src/main/java/mekanism/api/transmitters/IGridTransmitter.java +++ b/src/main/java/mekanism/api/transmitters/IGridTransmitter.java @@ -1,11 +1,12 @@ package mekanism.api.transmitters; import java.util.Collection; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -public interface IGridTransmitter> extends ITransmitter { +public interface IGridTransmitter, BUFFER> extends ITransmitter { boolean hasTransmitterNetwork(); @@ -14,14 +15,14 @@ public interface IGridTransmitter> extends ITr * * @return network this transmitter is using */ - N getTransmitterNetwork(); + NETWORK getTransmitterNetwork(); /** * Sets this transmitter segment's network to a new value. * * @param network - network to set to */ - void setTransmitterNetwork(N network); + void setTransmitterNetwork(NETWORK network); void setRequestsUpdate(); @@ -45,7 +46,7 @@ public interface IGridTransmitter> extends ITr Coord4D getAdjacentConnectableTransmitterCoord(EnumFacing side); - A getAcceptor(EnumFacing side); + ACCEPTOR getAcceptor(EnumFacing side); boolean isValid(); @@ -53,15 +54,50 @@ public interface IGridTransmitter> extends ITr void setOrphan(boolean orphaned); - N createEmptyNetwork(); + NETWORK createEmptyNetwork(); - N mergeNetworks(Collection toMerge); + NETWORK mergeNetworks(Collection toMerge); - N getExternalNetwork(Coord4D from); + NETWORK getExternalNetwork(Coord4D from); void takeShare(); void updateShare(); - Object getBuffer(); + /** + * @return The transmitter's buffer. + */ + @Nullable + BUFFER getBuffer(); + + /** + * If the transmitter does not have a buffer this will try to fallback on the network's buffer. + * @return The transmitter's buffer, or if null the network's buffer. + */ + @Nullable + default BUFFER getBufferWithFallback() { + BUFFER buffer = getBuffer(); + //If we don't have a buffer try falling back to the network's buffer + if (buffer == null && hasTransmitterNetwork()) { + return getTransmitterNetwork().getBuffer(); + } + return buffer; + } + + default boolean isCompatibleWith(IGridTransmitter other){ + return true; + } + + /** + * Gets called on an orphan if at least one attempted network fails to connect + * due to having connected to another network that is incompatible with the + * next attempted ones. + * + * This is primarily used for if extra handling needs to be done, such as + * refreshing the connections visually on a minor delay so that it has + * time to have the buffer no longer be null and properly compare the + * connection. + */ + default void connectionFailed() { + } } diff --git a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java index 8bb75d8b1..77e7927eb 100644 --- a/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ b/src/main/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java @@ -130,10 +130,10 @@ public class TransmitterNetworkRegistry { orphanTransmitters.clear(); } - public > DynamicNetwork getNetworkFromOrphan( - IGridTransmitter startOrphan) { + public , BUFFER> DynamicNetwork getNetworkFromOrphan( + IGridTransmitter startOrphan) { if (startOrphan.isValid() && startOrphan.isOrphan()) { - OrphanPathFinder finder = new OrphanPathFinder<>(startOrphan); + OrphanPathFinder finder = new OrphanPathFinder<>(startOrphan); finder.start(); N network; @@ -167,6 +167,13 @@ public class TransmitterNetworkRegistry { network.addNewTransmitters(finder.connectedTransmitters); + if (finder.someNetworksFailed) { + //At least one network that connection was attempted with is not compatible + // So inform this transmitter that there was a failed connection attempt + // so that it can refresh the connections + startOrphan.connectionFailed(); + } + return network; } @@ -197,18 +204,20 @@ public class TransmitterNetworkRegistry { return strings; } - public class OrphanPathFinder> { + public class OrphanPathFinder, BUFFER> { - public IGridTransmitter startPoint; + public IGridTransmitter startPoint; public HashSet iterated = Sets.newHashSet(); - public HashSet> connectedTransmitters = Sets.newHashSet(); + public HashSet> connectedTransmitters = Sets.newHashSet(); public HashSet networksFound = Sets.newHashSet(); private Deque queue = new LinkedList<>(); - public OrphanPathFinder(IGridTransmitter start) { + public boolean someNetworksFailed; + + public OrphanPathFinder(IGridTransmitter start) { startPoint = start; } @@ -231,9 +240,10 @@ public class TransmitterNetworkRegistry { iterated.add(from); if (orphanTransmitters.containsKey(from)) { - IGridTransmitter transmitter = orphanTransmitters.get(from); + IGridTransmitter transmitter = orphanTransmitters.get(from); - if (transmitter.isValid() && transmitter.isOrphan()) { + if (transmitter.isValid() && transmitter.isOrphan() && (connectedTransmitters.isEmpty() + || connectedTransmitters.stream().anyMatch(existing -> existing.isCompatibleWith(transmitter)))) { connectedTransmitters.add(transmitter); transmitter.setOrphan(false); @@ -256,8 +266,15 @@ public class TransmitterNetworkRegistry { public void addNetworkToIterated(Coord4D from) { N net = startPoint.getExternalNetwork(from); - if (net != null) { - networksFound.add(net); + //Make sure that there is an external network and that it is compatible with this buffer + if (net != null && net.compatibleWithBuffer(startPoint.getBuffer())) { + if (networksFound.isEmpty() || networksFound.iterator().next().isCompatibleWith(net)) { + networksFound.add(net); + } else { + //If it a network was found but it is incompatible, then mark we have a failed + // network so we can inform the transmitter it should do a tick delayed refresh + someNetworksFailed = true; + } } } } diff --git a/src/main/java/mekanism/api/transmitters/package-info.java b/src/main/java/mekanism/api/transmitters/package-info.java index 5af98bb0a..76788ca45 100644 --- a/src/main/java/mekanism/api/transmitters/package-info.java +++ b/src/main/java/mekanism/api/transmitters/package-info.java @@ -1,5 +1,6 @@ -@API(apiVersion = "9.0.0", owner = "mekanism", provides = "MekanismAPI|transmitter") +@API(apiVersion = MekanismAPI.API_VERSION, owner = "mekanism", provides = "MekanismAPI|transmitter") package mekanism.api.transmitters; +import mekanism.api.MekanismAPI; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 9b20f0dda..e1715c609 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -111,8 +111,6 @@ import mekanism.common.CommonProxy; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; -import mekanism.common.tier.BaseTier; -import mekanism.common.tier.GasTankTier; import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; @@ -144,6 +142,8 @@ import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; +import mekanism.common.tier.BaseTier; +import mekanism.common.tier.GasTankTier; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBin; @@ -175,7 +175,6 @@ import mekanism.common.tile.TileEntityGasTank; import mekanism.common.tile.TileEntityInductionCasing; import mekanism.common.tile.TileEntityLaserAmplifier; import mekanism.common.tile.TileEntityLaserTractorBeam; -import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.tile.TileEntityMetallurgicInfuser; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.tile.TileEntityOsmiumCompressor; @@ -670,8 +669,10 @@ public class ClientProxy extends CommonProxy { if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - RecipeType recipe = RecipeType.values()[((ItemBlockMachine) stack.getItem()).getRecipeType(stack)]; - resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + RecipeType recipe = ((ItemBlockMachine) stack.getItem()).getRecipeTypeOrNull(stack); + if (recipe != null) { + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } } return machineResources.get(resource); diff --git a/src/main/java/mekanism/client/jei/MekanismJEI.java b/src/main/java/mekanism/client/jei/MekanismJEI.java index 1d2043d8b..162018547 100644 --- a/src/main/java/mekanism/client/jei/MekanismJEI.java +++ b/src/main/java/mekanism/client/jei/MekanismJEI.java @@ -61,7 +61,10 @@ public class MekanismJEI implements IModPlugin { } if (itemStack.getItem() instanceof IFactory) { - ret += ":" + RecipeType.values()[((IFactory) itemStack.getItem()).getRecipeType(itemStack)].getName(); + RecipeType recipeType = ((IFactory) itemStack.getItem()).getRecipeTypeOrNull(itemStack); + if (recipeType != null) { + ret += ":" + recipeType.getName(); + } } if (itemStack.getItem() instanceof ItemBlockGasTank) { diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 75062439e..d2b48331b 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -3,6 +3,7 @@ package mekanism.common.base; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; +import javax.annotation.Nullable; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.common.InfuseStorage; @@ -44,6 +45,15 @@ public interface IFactory { */ int getRecipeType(ItemStack itemStack); + /** + * Gets the recipe type this Factory currently has. + * + * @param itemStack - stack to check + * @return RecipeType or null if it has invalid NBT + */ + @Nullable + RecipeType getRecipeTypeOrNull(ItemStack itemStack); + /** * Sets the recipe type of this Smelting Factory to a new value. * diff --git a/src/main/java/mekanism/common/base/ILogisticalTransporter.java b/src/main/java/mekanism/common/base/ILogisticalTransporter.java index a8a69585a..d5c13b470 100644 --- a/src/main/java/mekanism/common/base/ILogisticalTransporter.java +++ b/src/main/java/mekanism/common/base/ILogisticalTransporter.java @@ -12,7 +12,7 @@ import mekanism.common.transmitters.grid.InventoryNetwork; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; -public interface ILogisticalTransporter extends IGridTransmitter, IBlockableConnection { +public interface ILogisticalTransporter extends IGridTransmitter, IBlockableConnection { TransitResponse insert(Coord4D original, TransitRequest request, EnumColor color, boolean doEmit, int min); diff --git a/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java b/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java index 1edb2d086..4185f213f 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java +++ b/src/main/java/mekanism/common/capabilities/DefaultGridTransmitter.java @@ -13,7 +13,7 @@ import net.minecraftforge.common.capabilities.CapabilityManager; /** * Created by ben on 03/05/16. */ -public class DefaultGridTransmitter> implements IGridTransmitter { +public class DefaultGridTransmitter, BUFFER> implements IGridTransmitter { public static void register() { CapabilityManager.INSTANCE.register(IGridTransmitter.class, new NullStorage<>(), DefaultGridTransmitter::new); @@ -130,7 +130,7 @@ public class DefaultGridTransmitter> implement } @Override - public Object getBuffer() { + public BUFFER getBuffer() { return null; } @@ -142,4 +142,9 @@ public class DefaultGridTransmitter> implement public TransmissionType getTransmissionType() { return null; } + + @Override + public boolean isCompatibleWith(IGridTransmitter other) { + return false; + } } diff --git a/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java b/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java index 55a8ee7eb..159b51959 100644 --- a/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java +++ b/src/main/java/mekanism/common/capabilities/DefaultLogisticalTransporter.java @@ -3,6 +3,7 @@ package mekanism.common.capabilities; import java.util.Collection; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.base.ILogisticalTransporter; import mekanism.common.capabilities.DefaultStorageHelper.NullStorage; @@ -188,7 +189,7 @@ public class DefaultLogisticalTransporter implements ILogisticalTransporter { } @Override - public Object getBuffer() { + public Void getBuffer() { return null; } @@ -200,4 +201,9 @@ public class DefaultLogisticalTransporter implements ILogisticalTransporter { public TransmissionType getTransmissionType() { return null; } + + @Override + public boolean isCompatibleWith(IGridTransmitter other) { + return false; + } } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index d8ba765f0..7f6ee9166 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; @@ -17,8 +18,6 @@ import mekanism.client.MekKeyHandler; import mekanism.client.MekanismClient; import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; -import mekanism.common.tier.BaseTier; -import mekanism.common.tier.FluidTankTier; import mekanism.common.Upgrade; import mekanism.common.base.FluidItemWrapper; import mekanism.common.base.IFactory; @@ -45,6 +44,8 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; import mekanism.common.security.ISecurityTile.SecurityMode; +import mekanism.common.tier.BaseTier; +import mekanism.common.tier.FluidTankTier; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityQuantumEntangloporter; @@ -144,19 +145,19 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - BaseTier tier = type == MachineType.BASIC_FACTORY ? BaseTier.BASIC - : (type == MachineType.ADVANCED_FACTORY ? BaseTier.ADVANCED : BaseTier.ELITE); + BaseTier tier = type.factoryTier.getBaseTier(); - if (I18n.canTranslate( - "tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getTranslationKey() - + "Factory")) { - return LangUtils.localize( - "tile." + tier.getSimpleName() + RecipeType.values()[getRecipeType(itemstack)].getTranslationKey() - + "Factory"); + RecipeType recipeType = getRecipeTypeOrNull(itemstack); + if (recipeType != null) { + + String langKey = "tile." + tier.getSimpleName() + recipeType.getTranslationKey() + "Factory"; + if (I18n.canTranslate(langKey)) { + return LangUtils.localize(langKey); + } + + return tier.getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super + .getItemStackDisplayName(itemstack); } - - return tier.getLocalizedName() + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() - + " " + super.getItemStackDisplayName(itemstack); } else if (type == MachineType.FLUID_TANK) { return LangUtils.localize("tile.FluidTank" + getBaseTier(itemstack).getSimpleName() + ".name"); } @@ -222,9 +223,12 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if (type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - list.add( - EnumColor.INDIGO + LangUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType - .values()[getRecipeType(itemstack)].getLocalizedName()); + + RecipeType recipeType = getRecipeTypeOrNull(itemstack); + if (recipeType != null) { + list.add(EnumColor.INDIGO + LangUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + + recipeType.getLocalizedName()); + } } if (type == MachineType.FLUID_TANK) { @@ -361,8 +365,10 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if (tileEntity instanceof TileEntityFactory) { TileEntityFactory factory = (TileEntityFactory) tileEntity; - RecipeType recipeType = RecipeType.values()[getRecipeType(stack)]; - factory.setRecipeType(recipeType); + RecipeType recipeType = getRecipeTypeOrNull(stack); + if (recipeType != null) { + factory.setRecipeType(recipeType); + } world.notifyNeighborsOfStateChange(pos, tileEntity.getBlockType(), true); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tileEntity), @@ -529,6 +535,16 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec return itemStack.getTagCompound().getInteger("recipeType"); } + @Nullable + @Override + public RecipeType getRecipeTypeOrNull(ItemStack itemStack) { + int recipeType = getRecipeType(itemStack); + if (recipeType < RecipeType.values().length) { + return RecipeType.values()[recipeType]; + } + return null; + } + @Override public void setRecipeType(int type, ItemStack itemStack) { if (itemStack.getTagCompound() == null) { @@ -627,9 +643,9 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if (machineType.isFactory()) { // 200*tier.processes*recipeType.getEnergyUsage(); // From TileEntityFactory - RecipeType recipeType = RecipeType.values()[getRecipeType(itemStack)]; + RecipeType recipeType = getRecipeTypeOrNull(itemStack); int tierProcess = machineType.factoryTier.processes; - double baseMaxEnergy = 200 * tierProcess * recipeType.getEnergyUsage(); + double baseMaxEnergy = 200 * tierProcess * (recipeType == null ? 1 : recipeType.getEnergyUsage()); return MekanismUtils.getMaxEnergy(itemStack, baseMaxEnergy); } diff --git a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java index 99d549e33..5c7c60915 100644 --- a/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java +++ b/src/main/java/mekanism/common/network/PacketTransmitterUpdate.java @@ -7,12 +7,10 @@ import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.common.PacketHandler; -import mekanism.common.base.EnergyAcceptorWrapper; import mekanism.common.capabilities.Capabilities; import mekanism.common.config.MekanismConfig; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; @@ -25,7 +23,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.capability.IFluidHandler; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; @@ -40,14 +37,21 @@ public class PacketTransmitterUpdate implements IMessageHandler - { - if (message.packetType == PacketType.UPDATE) { - TileEntity tileEntity = message.coord4D.getTileEntity(player.world); + PacketHandler.handlePacket(() -> { + if (message.coord4D == null) { + return; + } + TileEntity tileEntity = message.coord4D.getTileEntity(player.world); - if (CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - IGridTransmitter transmitter = CapabilityUtils - .getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + if (CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { + IGridTransmitter transmitter = CapabilityUtils + .getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); + if (transmitter == null) { + //Should never be the case, but removes the warning + return; + } + + if (message.packetType == PacketType.UPDATE) { DynamicNetwork network = transmitter.hasTransmitterNetwork() && !message.newNetwork ? transmitter .getTransmitterNetwork() : transmitter.createEmptyNetwork(); network.register(); @@ -63,37 +67,21 @@ public class PacketTransmitterUpdate implements IMessageHandler) transmitter) - .getTransmitterNetwork().clientEnergyScale = message.power; + TransmissionType transmissionType = transmitter.getTransmissionType(); + if (message.packetType == PacketType.ENERGY) { + if (transmissionType == TransmissionType.ENERGY) { + ((EnergyNetwork) transmitter.getTransmitterNetwork()).clientEnergyScale = message.power; } - } - } else if (message.packetType == PacketType.GAS) { - TileEntity tileEntity = message.coord4D.getTileEntity(player.world); - - if (CapabilityUtils.hasCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { - IGridTransmitter transmitter = CapabilityUtils - .getCapability(tileEntity, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); - - if (transmitter.hasTransmitterNetwork() - && transmitter.getTransmissionType() == TransmissionType.GAS) { - GasNetwork net = ((IGridTransmitter) transmitter) - .getTransmitterNetwork(); + } else if (message.packetType == PacketType.GAS) { + if (transmissionType == TransmissionType.GAS) { + GasNetwork net = (GasNetwork) transmitter.getTransmitterNetwork(); if (message.gasType != null) { net.refGas = message.gasType; @@ -102,18 +90,9 @@ public class PacketTransmitterUpdate implements IMessageHandler) transmitter) - .getTransmitterNetwork(); + } else if (message.packetType == PacketType.FLUID) { + if (transmissionType == TransmissionType.FLUID) { + FluidNetwork net = (FluidNetwork) transmitter.getTransmitterNetwork(); if (message.fluidType != null) { net.refFluid = message.fluidType; diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java index bc6b61791..34239c24a 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityLogisticalTransporter.java @@ -42,7 +42,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.common.FMLCommonHandler; -public class TileEntityLogisticalTransporter extends TileEntityTransmitter { +public class TileEntityLogisticalTransporter extends TileEntityTransmitter { private final int SYNC_PACKET = 1; private final int BATCH_PACKET = 2; @@ -385,7 +385,7 @@ public class TileEntityLogisticalTransporter extends TileEntityTransmitter implements +public class TileEntityMechanicalPipe extends TileEntityTransmitter implements IFluidHandlerWrapper { public PipeTier tier = PipeTier.BASIC; @@ -167,6 +167,19 @@ public class TileEntityMechanicalPipe extends TileEntityTransmitter implements IGasHandler { +public class TileEntityPressurizedTube extends TileEntityTransmitter implements + IGasHandler { public TubeTier tier = TubeTier.BASIC; @@ -169,6 +171,19 @@ public class TileEntityPressurizedTube extends TileEntityTransmitter implements +public class TileEntityThermodynamicConductor extends TileEntityTransmitter implements IHeatTransfer { public ConductorTier tier = ConductorTier.BASIC; @@ -58,7 +58,7 @@ public class TileEntityThermodynamicConductor extends TileEntityTransmitter> extends TileEntitySidedPipe implements - IAlloyInteraction { +public abstract class TileEntityTransmitter, BUFFER> extends + TileEntitySidedPipe implements IAlloyInteraction { - public TransmitterImpl transmitterDelegate; + public TransmitterImpl transmitterDelegate; public boolean unloaded = true; - public boolean dataRequest = false; + public boolean delayedRefresh = false; private N lastClientNetwork = null; @@ -35,7 +38,7 @@ public abstract class TileEntityTransmitter> e transmitterDelegate = new TransmitterImpl<>(this); } - public TransmitterImpl getTransmitter() { + public TransmitterImpl getTransmitter() { return transmitterDelegate; } @@ -58,6 +61,13 @@ public abstract class TileEntityTransmitter> e public void update() { super.update(); + if (delayedRefresh) { + //Gets run the tick after the variable has been set. This is enough + // time to ensure that the transmitter has been registered. + delayedRefresh = false; + refreshConnections(); + } + if (getWorld().isRemote) { if (!dataRequest) { dataRequest = true; @@ -105,6 +115,103 @@ public abstract class TileEntityTransmitter> e } } + protected boolean canHaveIncompatibleNetworks() { + return false; + } + + @Override + protected void recheckConnections(byte newlyEnabledTransmitters) { + if (canHaveIncompatibleNetworks() && getTransmitter().hasTransmitterNetwork()) { + //We only need to check if we can have incompatible networks and if we actually have a network + boolean networkUpdated = false; + for (EnumFacing side : EnumFacing.values()) { + if (connectionMapContainsSide(newlyEnabledTransmitters, side)) { + //Recheck the side that is now enabled, as we manually merge this + // cannot be simplified to a first match is good enough + networkUpdated |= recheckConnectionPrechecked(side); + } + } + if (networkUpdated) { + refreshNetwork(); + } + } + } + + @Override + protected void recheckConnection(EnumFacing side) { + if (canHaveIncompatibleNetworks() && getTransmitter().hasTransmitterNetwork()) { + //We only need to check if we can have incompatible networks and if we actually have a network + if (recheckConnectionPrechecked(side)) { + refreshNetwork(); + } + } + } + + private void refreshNetwork() { + //Queue an update for all the transmitters in the network just in case something went wrong + // and to update the rendering of them + N network = getTransmitter().getTransmitterNetwork(); + network.queueClientUpdate(network.transmitters); + //Copy values into a set so that we don't risk a CME + Set> transmitters = new HashSet<>(network.transmitters); + //TODO: Make some better way of refreshing the connections, given we only need to refresh + // connections to ourself anyways + // The best way to do this is probably by making a method that updates the values for + // the valid transmitters manually if the network is the same object. + for (IGridTransmitter transmitter : transmitters) { + if (transmitter instanceof TransmitterImpl) { + //Refresh the connections because otherwise sometimes they need to wait for a block update + ((TransmitterImpl) transmitter).containingTile.refreshConnections(); + } + } + } + + private boolean recheckConnectionPrechecked(EnumFacing side) { + N network = getTransmitter().getTransmitterNetwork(); + TileEntity tileEntity = getWorld().getTileEntity(getPos().offset(side)); + if (tileEntity instanceof TileEntityTransmitter) { + TileEntityTransmitter other = (TileEntityTransmitter) tileEntity; + //The other one should always have the same incompatible networks state as us + // But just in case it doesn't just check the boolean + if (other.canHaveIncompatibleNetworks() && other.getTransmitter().hasTransmitterNetwork()) { + N otherNetwork = (N) other.getTransmitter().getTransmitterNetwork(); + if (network != otherNetwork && network.isCompatibleWith(otherNetwork)) { + //We have two networks that are now compatible and they are not the same source network + // The most common cause they would be same source network is that they would merge + // from the first pipe checking when it attempts to reconnect, and then the second + // pipe still is going to be checking the connection. + + if (getBufferWithFallback() == null) { + //If we don't have any use them as primary network + N tempNetwork = network; + network = otherNetwork; + otherNetwork = tempNetwork; + } + + // Manually merge the networks. + // This code is not in network registry as there is special handling needed to ensure + // it visually updates properly. There also were above checks that get us to a certain + // point where we can make some assumptions about the networks and if it is actually + // valid to merge them when otherwise people may try to merge things when they shouldn't + // be merged causing unexpected bugs. + network.adoptTransmittersAndAcceptorsFrom(otherNetwork); + //Unregister the other network + otherNetwork.deregister(); + //Commit the changes of the new network + network.commit(); + + //We did not have these as part of the update because they got directly added + // This means that we have to update the capacity/buffer and queue client updates + // ourselves + network.updateCapacity(); + network.clampBuffer(); + return true; + } + } + } + return false; + } + public abstract A getCachedAcceptor(EnumFacing side); protected TileEntity getCachedTile(EnumFacing side) { @@ -169,7 +276,18 @@ public abstract class TileEntityTransmitter> e public abstract int getCapacity(); - public abstract Object getBuffer(); + @Nullable + public abstract BUFFER getBuffer(); + + @Nullable + public BUFFER getBufferWithFallback() { + BUFFER buffer = getBuffer(); + //If we don't have a buffer try falling back to the network's buffer + if (buffer == null && getTransmitter().hasTransmitterNetwork()) { + return getTransmitter().getTransmitterNetwork().getBuffer(); + } + return buffer; + } public abstract void takeShare(); diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java index 1a6446878..77876aeee 100644 --- a/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java +++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityUniversalCable.java @@ -40,7 +40,7 @@ import net.minecraftforge.fml.common.Optional; @Optional.InterfaceList( @Optional.Interface(iface = "cofh.redstoneflux.api.IEnergyReceiver", modid = MekanismHooks.REDSTONEFLUX_MOD_ID) ) -public class TileEntityUniversalCable extends TileEntityTransmitter implements +public class TileEntityUniversalCable extends TileEntityTransmitter implements IStrictEnergyAcceptor, IStrictEnergyStorage, IEnergyReceiver { public CableTier tier = CableTier.BASIC; @@ -240,7 +240,7 @@ public class TileEntityUniversalCable extends TileEntityTransmitter> implements IGridTransmitter { +public abstract class Transmitter, BUFFER> implements IGridTransmitter { - public N theNetwork = null; + public NETWORK theNetwork = null; public boolean orphaned = true; @Override - public N getTransmitterNetwork() { + public NETWORK getTransmitterNetwork() { return theNetwork; } @Override - public void setTransmitterNetwork(N network) { + public void setTransmitterNetwork(NETWORK network) { if (theNetwork == network) { return; } diff --git a/src/main/java/mekanism/common/transmitters/TransmitterImpl.java b/src/main/java/mekanism/common/transmitters/TransmitterImpl.java index d375e709d..00ad822f0 100644 --- a/src/main/java/mekanism/common/transmitters/TransmitterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransmitterImpl.java @@ -1,6 +1,7 @@ package mekanism.common.transmitters; import java.util.Collection; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -12,11 +13,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -public class TransmitterImpl> extends Transmitter { +public class TransmitterImpl, BUFFER> extends Transmitter { - public TileEntityTransmitter containingTile; + public TileEntityTransmitter containingTile; - public TransmitterImpl(TileEntityTransmitter multiPart) { + public TransmitterImpl(TileEntityTransmitter multiPart) { setTileEntity(multiPart); } @@ -61,7 +62,20 @@ public class TransmitterImpl> extends Transmit } @Override - public A getAcceptor(EnumFacing side) { + public boolean isCompatibleWith(IGridTransmitter other) { + if (other instanceof TransmitterImpl) { + return containingTile.isValidTransmitter(((TransmitterImpl) other).containingTile); + } + return true;//allow non-Transmitter impls to connect? + } + + @Override + public void connectionFailed() { + containingTile.delayedRefresh = true; + } + + @Override + public ACCEPTOR getAcceptor(EnumFacing side) { return getTileEntity().getCachedAcceptor(side); } @@ -78,12 +92,12 @@ public class TransmitterImpl> extends Transmit } @Override - public N createEmptyNetwork() { + public NETWORK createEmptyNetwork() { return getTileEntity().createNewNetwork(); } @Override - public N getExternalNetwork(Coord4D from) { + public NETWORK getExternalNetwork(Coord4D from) { TileEntity tile = from.getTileEntity(world()); if (CapabilityUtils.hasCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null)) { @@ -91,7 +105,7 @@ public class TransmitterImpl> extends Transmit .getCapability(tile, Capabilities.GRID_TRANSMITTER_CAPABILITY, null); if (TransmissionType.checkTransmissionType(transmitter, getTransmissionType())) { - return ((IGridTransmitter) transmitter).getTransmitterNetwork(); + return ((IGridTransmitter) transmitter).getTransmitterNetwork(); } } @@ -108,13 +122,20 @@ public class TransmitterImpl> extends Transmit containingTile.updateShare(); } + @Nullable @Override - public Object getBuffer() { + public BUFFER getBuffer() { return getTileEntity().getBuffer(); } + @Nullable @Override - public N mergeNetworks(Collection toMerge) { + public BUFFER getBufferWithFallback() { + return getTileEntity().getBufferWithFallback(); + } + + @Override + public NETWORK mergeNetworks(Collection toMerge) { return getTileEntity().createNetworkByMerging(toMerge); } @@ -128,11 +149,11 @@ public class TransmitterImpl> extends Transmit containingTile.sendDesc = true; } - public TileEntityTransmitter getTileEntity() { + public TileEntityTransmitter getTileEntity() { return containingTile; } - public void setTileEntity(TileEntityTransmitter containingPart) { + public void setTileEntity(TileEntityTransmitter containingPart) { this.containingTile = containingPart; } } diff --git a/src/main/java/mekanism/common/transmitters/TransporterImpl.java b/src/main/java/mekanism/common/transmitters/TransporterImpl.java index 0f89943c1..44e6e4f57 100644 --- a/src/main/java/mekanism/common/transmitters/TransporterImpl.java +++ b/src/main/java/mekanism/common/transmitters/TransporterImpl.java @@ -36,7 +36,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.Constants.NBT; -public class TransporterImpl extends TransmitterImpl implements ILogisticalTransporter { +public class TransporterImpl extends TransmitterImpl implements ILogisticalTransporter { private Map transit = new HashMap<>(); diff --git a/src/main/java/mekanism/common/transmitters/grid/EnergyNetwork.java b/src/main/java/mekanism/common/transmitters/grid/EnergyNetwork.java index 080703336..d5fcd18ca 100644 --- a/src/main/java/mekanism/common/transmitters/grid/EnergyNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/EnergyNetwork.java @@ -7,6 +7,7 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.energy.EnergyStack; import mekanism.api.transmitters.DynamicNetwork; @@ -20,7 +21,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; import org.apache.commons.lang3.tuple.Pair; -public class EnergyNetwork extends DynamicNetwork { +public class EnergyNetwork extends DynamicNetwork { public double clientEnergyScale = 0; public EnergyStack buffer = new EnergyStack(0); @@ -34,15 +35,6 @@ public class EnergyNetwork extends DynamicNetwork networks) { for (EnergyNetwork net : networks) { if (net != null) { - if (net.jouleBufferLastTick > jouleBufferLastTick || net.clientEnergyScale > clientEnergyScale) { - clientEnergyScale = net.clientEnergyScale; - jouleBufferLastTick = net.jouleBufferLastTick; - joulesTransmitted = net.joulesTransmitted; - lastPowerScale = net.lastPowerScale; - } - - buffer.amount += net.buffer.amount; - adoptTransmittersAndAcceptorsFrom(net); net.deregister(); } @@ -51,13 +43,31 @@ public class EnergyNetwork extends DynamicNetwork jouleBufferLastTick || net.clientEnergyScale > clientEnergyScale) { + clientEnergyScale = net.clientEnergyScale; + jouleBufferLastTick = net.jouleBufferLastTick; + joulesTransmitted = net.joulesTransmitted; + lastPowerScale = net.lastPowerScale; + } + + buffer.amount += net.buffer.amount; + super.adoptTransmittersAndAcceptorsFrom(net); + } + public static double round(double d) { return Math.round(d * 10000) / 10000; } + @Nullable + public EnergyStack getBuffer() { + return buffer; + } + @Override - public void absorbBuffer(IGridTransmitter transmitter) { - EnergyStack energy = (EnergyStack) transmitter.getBuffer(); + public void absorbBuffer(IGridTransmitter transmitter) { + EnergyStack energy = transmitter.getBuffer(); buffer.amount += energy.amount; energy.amount = 0; } @@ -78,7 +88,7 @@ public class EnergyNetwork extends DynamicNetwork cable : transmitters) { + for (IGridTransmitter cable : transmitters) { reciprocalSum += 1.0 / (double) cable.getCapacity(); } diff --git a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java index d1b523a44..664770a17 100644 --- a/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/FluidNetwork.java @@ -7,6 +7,7 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -25,7 +26,7 @@ import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.eventhandler.Event; import org.apache.commons.lang3.tuple.Pair; -public class FluidNetwork extends DynamicNetwork { +public class FluidNetwork extends DynamicNetwork { public int transferDelay = 0; @@ -47,21 +48,6 @@ public class FluidNetwork extends DynamicNetwork { public FluidNetwork(Collection networks) { for (FluidNetwork net : networks) { if (net != null) { - if (net.buffer != null) { - if (buffer == null) { - buffer = net.buffer.copy(); - } else { - if (buffer.getFluid() == net.buffer.getFluid()) { - buffer.amount += net.buffer.amount; - } else if (net.buffer.amount > buffer.amount) { - buffer = net.buffer.copy(); - } - - } - - net.buffer = null; - } - adoptTransmittersAndAcceptorsFrom(net); net.deregister(); } @@ -73,15 +59,37 @@ public class FluidNetwork extends DynamicNetwork { } @Override - public void absorbBuffer(IGridTransmitter transmitter) { - Object b = transmitter.getBuffer(); + public void adoptTransmittersAndAcceptorsFrom(FluidNetwork net) { + if (net.buffer != null) { + if (buffer == null) { + buffer = net.buffer.copy(); + } else { + if (buffer.getFluid() == net.buffer.getFluid()) { + buffer.amount += net.buffer.amount; + } else if (net.buffer.amount > buffer.amount) { + buffer = net.buffer.copy(); + } - if (!(b instanceof FluidStack) || ((FluidStack) b).getFluid() == null || ((FluidStack) b).amount == 0) { + } + + net.buffer = null; + } + super.adoptTransmittersAndAcceptorsFrom(net); + } + + @Nullable + public FluidStack getBuffer() { + return buffer; + } + + @Override + public void absorbBuffer(IGridTransmitter transmitter) { + FluidStack fluid = transmitter.getBuffer(); + + if (fluid == null || fluid.getFluid() == null || fluid.amount == 0) { return; } - FluidStack fluid = (FluidStack) b; - if (buffer == null || buffer.getFluid() == null || buffer.amount == 0) { buffer = fluid.copy(); fluid.amount = 0; @@ -108,7 +116,7 @@ public class FluidNetwork extends DynamicNetwork { int numCables = transmitters.size(); double sum = 0; - for (IGridTransmitter pipe : transmitters) { + for (IGridTransmitter pipe : transmitters) { sum += pipe.getCapacity(); } @@ -309,6 +317,17 @@ public class FluidNetwork extends DynamicNetwork { return prevTransferAmount + " mB/t"; } + @Override + public boolean isCompatibleWith(FluidNetwork other) { + return super.isCompatibleWith(other) && (this.buffer == null || other.buffer == null || this.buffer + .isFluidEqual(other.buffer)); + } + + @Override + public boolean compatibleWithBuffer(FluidStack buffer) { + return super.compatibleWithBuffer(buffer) && (this.buffer == null || buffer == null || this.buffer.isFluidEqual(buffer)); + } + public static class FluidTransferEvent extends Event { public final FluidNetwork fluidNetwork; diff --git a/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java b/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java index 5b5e012cc..b0a7b3c70 100644 --- a/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/GasNetwork.java @@ -7,6 +7,7 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; import java.util.Set; +import javax.annotation.Nullable; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -29,7 +30,7 @@ import org.apache.commons.lang3.tuple.Pair; * * @author aidancbrady */ -public class GasNetwork extends DynamicNetwork { +public class GasNetwork extends DynamicNetwork { public int transferDelay = 0; @@ -51,33 +52,6 @@ public class GasNetwork extends DynamicNetwork { public GasNetwork(Collection networks) { for (GasNetwork net : networks) { if (net != null) { - if (FMLCommonHandler.instance().getEffectiveSide().isClient()) { - if (net.refGas != null && net.gasScale > gasScale) { - gasScale = net.gasScale; - refGas = net.refGas; - buffer = net.buffer; - - net.gasScale = 0; - net.refGas = null; - net.buffer = null; - } - } else { - if (net.buffer != null) { - if (buffer == null) { - buffer = net.buffer.copy(); - } else { - if (buffer.isGasEqual(net.buffer)) { - buffer.amount += net.buffer.amount; - } else if (net.buffer.amount > buffer.amount) { - buffer = net.buffer.copy(); - } - - } - - net.buffer = null; - } - } - adoptTransmittersAndAcceptorsFrom(net); net.deregister(); } @@ -89,15 +63,48 @@ public class GasNetwork extends DynamicNetwork { } @Override - public void absorbBuffer(IGridTransmitter transmitter) { - Object b = transmitter.getBuffer(); + public void adoptTransmittersAndAcceptorsFrom(GasNetwork net) { + if (FMLCommonHandler.instance().getEffectiveSide().isClient()) { + if (net.refGas != null && net.gasScale > gasScale) { + gasScale = net.gasScale; + refGas = net.refGas; + buffer = net.buffer; - if (!(b instanceof GasStack) || ((GasStack) b).getGas() == null || ((GasStack) b).amount == 0) { + net.gasScale = 0; + net.refGas = null; + net.buffer = null; + } + } else { + if (net.buffer != null) { + if (buffer == null) { + buffer = net.buffer.copy(); + } else { + if (buffer.isGasEqual(net.buffer)) { + buffer.amount += net.buffer.amount; + } else if (net.buffer.amount > buffer.amount) { + buffer = net.buffer.copy(); + } + + } + net.buffer = null; + } + } + super.adoptTransmittersAndAcceptorsFrom(net); + } + + @Nullable + public GasStack getBuffer() { + return buffer; + } + + @Override + public void absorbBuffer(IGridTransmitter transmitter) { + GasStack gas = transmitter.getBuffer(); + + if (gas == null || gas.getGas() == null || gas.amount == 0) { return; } - GasStack gas = (GasStack) b; - if (buffer == null || buffer.getGas() == null || buffer.amount == 0) { buffer = gas.copy(); gas.amount = 0; @@ -303,6 +310,18 @@ public class GasNetwork extends DynamicNetwork { return prevTransferAmount + "/t"; } + @Override + public boolean isCompatibleWith(GasNetwork other) { + return super.isCompatibleWith(other) && (this.buffer == null || other.buffer == null || this.buffer + .isGasEqual(other.buffer)); + } + + @Override + public boolean compatibleWithBuffer(GasStack buffer) { + return super.compatibleWithBuffer(buffer) && (this.buffer == null || buffer == null || this.buffer + .isGasEqual(buffer)); + } + public static class GasTransferEvent extends Event { public final GasNetwork gasNetwork; diff --git a/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java b/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java index 33ce47f30..ff2981b00 100644 --- a/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/HeatNetwork.java @@ -15,7 +15,7 @@ import org.apache.commons.lang3.tuple.Pair; //import mekanism.common.multipart.MultipartTransmitter; -public class HeatNetwork extends DynamicNetwork { +public class HeatNetwork extends DynamicNetwork { public double meanTemp = 0; @@ -55,7 +55,7 @@ public class HeatNetwork extends DynamicNetwork { } @Override - public void absorbBuffer(IGridTransmitter transmitter) { + public void absorbBuffer(IGridTransmitter transmitter) { } @Override @@ -76,7 +76,7 @@ public class HeatNetwork extends DynamicNetwork { double newHeatTransferred = 0; if (FMLCommonHandler.instance().getEffectiveSide().isServer()) { - for (IGridTransmitter transmitter : transmitters) { + for (IGridTransmitter transmitter : transmitters) { if (transmitter instanceof TransmitterImpl && ((TransmitterImpl) transmitter).getTileEntity() .hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null)) { IHeatTransfer heatTransmitter = (IHeatTransfer) ((TransmitterImpl) transmitter).getTileEntity() @@ -87,7 +87,7 @@ public class HeatNetwork extends DynamicNetwork { } } - for (IGridTransmitter transmitter : transmitters) { + for (IGridTransmitter transmitter : transmitters) { if (transmitter instanceof TransmitterImpl && ((TransmitterImpl) transmitter).getTileEntity() .hasCapability(Capabilities.HEAT_TRANSFER_CAPABILITY, null)) { IHeatTransfer heatTransmitter = (IHeatTransfer) ((TransmitterImpl) transmitter).getTileEntity() diff --git a/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java b/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java index ce58e1483..ea0a9e89f 100644 --- a/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java +++ b/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java @@ -18,7 +18,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.common.FMLCommonHandler; -public class InventoryNetwork extends DynamicNetwork { +public class InventoryNetwork extends DynamicNetwork { public InventoryNetwork() { } @@ -82,7 +82,7 @@ public class InventoryNetwork extends DynamicNetwork transmitter) { + public void absorbBuffer(IGridTransmitter transmitter) { } @Override diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java index f69d9149c..db5df4230 100644 --- a/src/main/java/mekanism/common/util/RecipeUtils.java +++ b/src/main/java/mekanism/common/util/RecipeUtils.java @@ -7,6 +7,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; import mekanism.common.Upgrade; import mekanism.common.base.IFactory; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ITierItem; import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; @@ -47,8 +48,10 @@ public class RecipeUtils { if (target.getItem() instanceof IFactory && input.getItem() instanceof IFactory) { if (isFactory(target) && isFactory(input)) { - return ((IFactory) target.getItem()).getRecipeType(target) == ((IFactory) input.getItem()) - .getRecipeType(input); + RecipeType recipeTypeInput = ((IFactory) input.getItem()).getRecipeTypeOrNull(input); + //If either factory has invalid NBT don't crash it + return recipeTypeInput != null + && ((IFactory) target.getItem()).getRecipeTypeOrNull(target) == recipeTypeInput; } }