Fixed differing gas networks being able to merge, fix API issue
This commit is contained in:
parent
c8d765bde0
commit
9acc744794
12 changed files with 13 additions and 15 deletions
|
@ -1,4 +1,4 @@
|
||||||
package mekanism.common.util;
|
package mekanism.api;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
|
@ -8,18 +8,15 @@ import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.transmitters.DynamicNetwork;
|
import mekanism.api.transmitters.DynamicNetwork;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.api.transmitters.ITransmitterNetwork;
|
import mekanism.api.transmitters.ITransmitterNetwork;
|
||||||
import mekanism.api.transmitters.TransmissionType;
|
import mekanism.api.transmitters.TransmissionType;
|
||||||
import mekanism.common.FluidNetwork;
|
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
||||||
import net.minecraftforge.event.Event;
|
import net.minecraftforge.event.Event;
|
||||||
import net.minecraftforge.fluids.Fluid;
|
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -379,7 +376,7 @@ public class GasNetwork extends DynamicNetwork<IGasHandler, GasNetwork>
|
||||||
|
|
||||||
for(ITransmitterNetwork<?, ?> network : networks)
|
for(ITransmitterNetwork<?, ?> network : networks)
|
||||||
{
|
{
|
||||||
if(network instanceof FluidNetwork)
|
if(network instanceof GasNetwork)
|
||||||
{
|
{
|
||||||
GasNetwork net = (GasNetwork)network;
|
GasNetwork net = (GasNetwork)network;
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ package mekanism.client.gui;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import mekanism.api.Coord4D;
|
import mekanism.api.Coord4D;
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.gas.GasStack;
|
import mekanism.api.gas.GasStack;
|
||||||
import mekanism.client.render.MekanismRenderer;
|
import mekanism.client.render.MekanismRenderer;
|
||||||
import mekanism.common.PacketHandler;
|
import mekanism.common.PacketHandler;
|
||||||
|
@ -10,7 +11,6 @@ import mekanism.common.PacketHandler.Transmission;
|
||||||
import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
|
import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
|
||||||
import mekanism.common.network.PacketTileEntity;
|
import mekanism.common.network.PacketTileEntity;
|
||||||
import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
|
import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import mekanism.common.util.MekanismUtils;
|
import mekanism.common.util.MekanismUtils;
|
||||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
|
|
|
@ -3,11 +3,11 @@ package mekanism.client.nei;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.gas.GasRegistry;
|
import mekanism.api.gas.GasRegistry;
|
||||||
import mekanism.client.gui.GuiChemicalInjectionChamber;
|
import mekanism.client.gui.GuiChemicalInjectionChamber;
|
||||||
import mekanism.common.Mekanism;
|
import mekanism.common.Mekanism;
|
||||||
import mekanism.common.RecipeHandler.Recipe;
|
import mekanism.common.RecipeHandler.Recipe;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import mekanism.common.util.MekanismUtils;
|
import mekanism.common.util.MekanismUtils;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,9 @@ package mekanism.client.nei;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.client.gui.GuiCombiner;
|
import mekanism.client.gui.GuiCombiner;
|
||||||
import mekanism.common.RecipeHandler.Recipe;
|
import mekanism.common.RecipeHandler.Recipe;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@ package mekanism.client.nei;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.client.gui.GuiOsmiumCompressor;
|
import mekanism.client.gui.GuiOsmiumCompressor;
|
||||||
import mekanism.common.Mekanism;
|
import mekanism.common.Mekanism;
|
||||||
import mekanism.common.RecipeHandler.Recipe;
|
import mekanism.common.RecipeHandler.Recipe;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
||||||
public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler
|
public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler
|
||||||
|
|
|
@ -3,10 +3,10 @@ package mekanism.client.nei;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.gas.GasRegistry;
|
import mekanism.api.gas.GasRegistry;
|
||||||
import mekanism.client.gui.GuiPurificationChamber;
|
import mekanism.client.gui.GuiPurificationChamber;
|
||||||
import mekanism.common.RecipeHandler.Recipe;
|
import mekanism.common.RecipeHandler.Recipe;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import mekanism.common.util.MekanismUtils;
|
import mekanism.common.util.MekanismUtils;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -266,7 +266,7 @@ public class RenderPartTransmitter implements IIconRegister
|
||||||
|
|
||||||
MekanismRenderer.glowOn(fluid.getLuminosity());
|
MekanismRenderer.glowOn(fluid.getLuminosity());
|
||||||
|
|
||||||
CCRenderState.changeTexture((MekanismRenderer.getBlocksTexture()));
|
CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture());
|
||||||
GL11.glTranslated(pos.x, pos.y, pos.z);
|
GL11.glTranslated(pos.x, pos.y, pos.z);
|
||||||
|
|
||||||
boolean gas = fluid.isGaseous();
|
boolean gas = fluid.isGaseous();
|
||||||
|
|
|
@ -10,13 +10,13 @@ import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.energy.IStrictEnergyAcceptor;
|
import mekanism.api.energy.IStrictEnergyAcceptor;
|
||||||
import mekanism.api.transmitters.DynamicNetwork;
|
import mekanism.api.transmitters.DynamicNetwork;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.api.transmitters.TransmissionType;
|
import mekanism.api.transmitters.TransmissionType;
|
||||||
import mekanism.api.transmitters.TransmitterNetworkRegistry;
|
import mekanism.api.transmitters.TransmitterNetworkRegistry;
|
||||||
import mekanism.common.util.CableUtils;
|
import mekanism.common.util.CableUtils;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import mekanism.common.util.MekanismUtils;
|
import mekanism.common.util.MekanismUtils;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
|
|
@ -8,12 +8,12 @@ import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.transmitters.DynamicNetwork;
|
import mekanism.api.transmitters.DynamicNetwork;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.api.transmitters.ITransmitterNetwork;
|
import mekanism.api.transmitters.ITransmitterNetwork;
|
||||||
import mekanism.api.transmitters.TransmissionType;
|
import mekanism.api.transmitters.TransmissionType;
|
||||||
import mekanism.common.tileentity.TileEntityMechanicalPipe;
|
import mekanism.common.tileentity.TileEntityMechanicalPipe;
|
||||||
import mekanism.common.util.ListUtils;
|
|
||||||
import mekanism.common.util.PipeUtils;
|
import mekanism.common.util.PipeUtils;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
|
|
@ -3,7 +3,7 @@ package mekanism.common.miner;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import mekanism.common.util.ListUtils;
|
import mekanism.api.ListUtils;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
|
@ -5,6 +5,7 @@ import java.util.List;
|
||||||
|
|
||||||
import mekanism.api.Coord4D;
|
import mekanism.api.Coord4D;
|
||||||
import mekanism.api.EnumColor;
|
import mekanism.api.EnumColor;
|
||||||
|
import mekanism.api.ListUtils;
|
||||||
import mekanism.api.transmitters.IGridTransmitter;
|
import mekanism.api.transmitters.IGridTransmitter;
|
||||||
import mekanism.common.ILogisticalTransporter;
|
import mekanism.common.ILogisticalTransporter;
|
||||||
import mekanism.common.tileentity.TileEntityDiversionTransporter;
|
import mekanism.common.tileentity.TileEntityDiversionTransporter;
|
||||||
|
|
Loading…
Reference in a new issue