From 9acc7447947edc3662ba94ef186e81fc804cefb6 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Thu, 2 Jan 2014 21:58:14 -0500 Subject: [PATCH] Fixed differing gas networks being able to merge, fix API issue --- common/mekanism/{common/util => api}/ListUtils.java | 2 +- common/mekanism/api/gas/GasNetwork.java | 7 ++----- common/mekanism/client/gui/GuiRotaryCondensentrator.java | 2 +- .../client/nei/ChemicalInjectionChamberRecipeHandler.java | 2 +- common/mekanism/client/nei/CombinerRecipeHandler.java | 2 +- .../mekanism/client/nei/OsmiumCompressorRecipeHandler.java | 2 +- .../client/nei/PurificationChamberRecipeHandler.java | 2 +- common/mekanism/client/render/RenderPartTransmitter.java | 2 +- common/mekanism/common/EnergyNetwork.java | 2 +- common/mekanism/common/FluidNetwork.java | 2 +- common/mekanism/common/miner/MItemStackFilter.java | 2 +- common/mekanism/common/util/TransporterUtils.java | 1 + 12 files changed, 13 insertions(+), 15 deletions(-) rename common/mekanism/{common/util => api}/ListUtils.java (99%) diff --git a/common/mekanism/common/util/ListUtils.java b/common/mekanism/api/ListUtils.java similarity index 99% rename from common/mekanism/common/util/ListUtils.java rename to common/mekanism/api/ListUtils.java index c50e5784d..be7118b67 100644 --- a/common/mekanism/common/util/ListUtils.java +++ b/common/mekanism/api/ListUtils.java @@ -1,4 +1,4 @@ -package mekanism.common.util; +package mekanism.api; import java.util.ArrayList; import java.util.Arrays; diff --git a/common/mekanism/api/gas/GasNetwork.java b/common/mekanism/api/gas/GasNetwork.java index da05ec271..bff273eb7 100644 --- a/common/mekanism/api/gas/GasNetwork.java +++ b/common/mekanism/api/gas/GasNetwork.java @@ -8,18 +8,15 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.FluidNetwork; -import mekanism.common.util.ListUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.common.FMLCommonHandler; /** @@ -379,7 +376,7 @@ public class GasNetwork extends DynamicNetwork for(ITransmitterNetwork network : networks) { - if(network instanceof FluidNetwork) + if(network instanceof GasNetwork) { GasNetwork net = (GasNetwork)network; diff --git a/common/mekanism/client/gui/GuiRotaryCondensentrator.java b/common/mekanism/client/gui/GuiRotaryCondensentrator.java index 5e934637b..f2d8d4502 100644 --- a/common/mekanism/client/gui/GuiRotaryCondensentrator.java +++ b/common/mekanism/client/gui/GuiRotaryCondensentrator.java @@ -3,6 +3,7 @@ package mekanism.client.gui; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.ListUtils; import mekanism.api.gas.GasStack; import mekanism.client.render.MekanismRenderer; import mekanism.common.PacketHandler; @@ -10,7 +11,6 @@ import mekanism.common.PacketHandler.Transmission; import mekanism.common.inventory.container.ContainerRotaryCondensentrator; import mekanism.common.network.PacketTileEntity; import mekanism.common.tileentity.TileEntityRotaryCondensentrator; -import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 976dfae65..725f3869d 100644 --- a/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/common/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -3,11 +3,11 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiChemicalInjectionChamber; import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; -import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/client/nei/CombinerRecipeHandler.java b/common/mekanism/client/nei/CombinerRecipeHandler.java index 6b78dcf50..02dd9825b 100644 --- a/common/mekanism/client/nei/CombinerRecipeHandler.java +++ b/common/mekanism/client/nei/CombinerRecipeHandler.java @@ -3,9 +3,9 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.client.gui.GuiCombiner; import mekanism.common.RecipeHandler.Recipe; -import mekanism.common.util.ListUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 010a70505..021f17a10 100644 --- a/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -3,10 +3,10 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.common.Mekanism; import mekanism.common.RecipeHandler.Recipe; -import mekanism.common.util.ListUtils; import net.minecraft.item.ItemStack; public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler diff --git a/common/mekanism/client/nei/PurificationChamberRecipeHandler.java b/common/mekanism/client/nei/PurificationChamberRecipeHandler.java index dd9a22bbf..036a01baf 100644 --- a/common/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/common/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -3,10 +3,10 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiPurificationChamber; import mekanism.common.RecipeHandler.Recipe; -import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/client/render/RenderPartTransmitter.java b/common/mekanism/client/render/RenderPartTransmitter.java index 0b1469f41..f62fbe282 100644 --- a/common/mekanism/client/render/RenderPartTransmitter.java +++ b/common/mekanism/client/render/RenderPartTransmitter.java @@ -266,7 +266,7 @@ public class RenderPartTransmitter implements IIconRegister MekanismRenderer.glowOn(fluid.getLuminosity()); - CCRenderState.changeTexture((MekanismRenderer.getBlocksTexture())); + CCRenderState.changeTexture(MekanismRenderer.getBlocksTexture()); GL11.glTranslated(pos.x, pos.y, pos.z); boolean gas = fluid.isGaseous(); diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index c12027edf..75e1be35e 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -10,13 +10,13 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.common.util.CableUtils; -import mekanism.common.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/FluidNetwork.java b/common/mekanism/common/FluidNetwork.java index b5b74f1a5..ed038ac00 100644 --- a/common/mekanism/common/FluidNetwork.java +++ b/common/mekanism/common/FluidNetwork.java @@ -8,12 +8,12 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import mekanism.api.ListUtils; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; import mekanism.common.tileentity.TileEntityMechanicalPipe; -import mekanism.common.util.ListUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; diff --git a/common/mekanism/common/miner/MItemStackFilter.java b/common/mekanism/common/miner/MItemStackFilter.java index 0a905c7f1..d53a61152 100644 --- a/common/mekanism/common/miner/MItemStackFilter.java +++ b/common/mekanism/common/miner/MItemStackFilter.java @@ -3,7 +3,7 @@ package mekanism.common.miner; import java.util.ArrayList; import java.util.List; -import mekanism.common.util.ListUtils; +import mekanism.api.ListUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/common/util/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java index cce0431ca..ec4a53a77 100644 --- a/common/mekanism/common/util/TransporterUtils.java +++ b/common/mekanism/common/util/TransporterUtils.java @@ -5,6 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.ListUtils; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.ILogisticalTransporter; import mekanism.common.tileentity.TileEntityDiversionTransporter;