Cleanup imports again.

src/main/java/mekanism/client/gui/GuiFactory.java

@@ -7,7 +7,6 @@ import mekanism.api.util.ListUtils;
 import mekanism.client.gui.GuiEnergyInfo.IInfoHandler;
 import mekanism.client.render.MekanismRenderer;
 import mekanism.common.Tier.FactoryTier;
-import mekanism.common.base.IFactory.RecipeType;
 import mekanism.common.inventory.container.ContainerFactory;
 import mekanism.common.tile.TileEntityFactory;
 import mekanism.common.util.MekanismUtils;

src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java

@@ -3,13 +3,9 @@ package mekanism.client.nei;
 import java.awt.*;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasStack;
-import mekanism.common.recipe.inputs.AdvancedMachineInput;
 import mekanism.client.gui.GuiElement;
 import mekanism.client.gui.GuiPowerBar;
 import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler;
@@ -20,6 +16,7 @@ import mekanism.client.gui.GuiSlot;
 import mekanism.client.gui.GuiSlot.SlotOverlay;
 import mekanism.client.gui.GuiSlot.SlotType;
 import mekanism.common.ObfuscatedNames;
+import mekanism.common.recipe.inputs.AdvancedMachineInput;
 import mekanism.common.recipe.machines.AdvancedMachineRecipe;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;

src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java

@@ -2,13 +2,7 @@ package mekanism.client.nei;
 
 import java.awt.*;
 import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
-import mekanism.common.recipe.inputs.ItemStackInput;
-import mekanism.common.recipe.machines.ChanceMachineRecipe;
-import mekanism.common.recipe.outputs.ChanceOutput;
 import mekanism.client.gui.GuiElement;
 import mekanism.client.gui.GuiPowerBar;
 import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler;
@@ -18,6 +12,8 @@ import mekanism.client.gui.GuiProgress.ProgressBar;
 import mekanism.client.gui.GuiSlot;
 import mekanism.client.gui.GuiSlot.SlotOverlay;
 import mekanism.client.gui.GuiSlot.SlotType;
+import mekanism.common.recipe.machines.ChanceMachineRecipe;
+import mekanism.common.recipe.outputs.ChanceOutput;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
 

src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java

@@ -3,9 +3,6 @@ package mekanism.client.nei;
 import java.awt.*;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.gas.GasStack;
 import mekanism.client.gui.GuiChemicalCrystallizer;

src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java

@@ -3,9 +3,6 @@ package mekanism.client.nei;
 import java.awt.*;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;

src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java

@@ -3,15 +3,12 @@ package mekanism.client.nei;
 import java.awt.*;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.gas.GasStack;
-import mekanism.common.recipe.inputs.ChemicalPairInput;
 import mekanism.client.gui.GuiChemicalInfuser;
 import mekanism.common.ObfuscatedNames;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.inputs.ChemicalPairInput;
 import mekanism.common.recipe.machines.ChemicalInfuserRecipe;
 import mekanism.common.util.MekanismUtils;
 

src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java

@@ -3,7 +3,6 @@ package mekanism.client.nei;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;

src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java

@@ -3,9 +3,6 @@ package mekanism.client.nei;
 import java.awt.*;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.gas.GasStack;
 import mekanism.client.gui.GuiChemicalOxidizer;

src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java

@@ -3,9 +3,6 @@ package mekanism.client.nei;
 import java.awt.*;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.gas.GasStack;
 import mekanism.client.gui.GuiChemicalWasher;

src/main/java/mekanism/client/nei/CombinerRecipeHandler.java

@@ -2,7 +2,6 @@ package mekanism.client.nei;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import mekanism.api.gas.Gas;
 import mekanism.api.util.ListUtils;

src/main/java/mekanism/client/nei/CrusherRecipeHandler.java

@@ -1,7 +1,6 @@
 package mekanism.client.nei;
 
 import java.util.Collection;
-import java.util.Set;
 
 import mekanism.client.gui.GuiCrusher;
 import mekanism.client.gui.GuiProgress.ProgressBar;

src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java

@@ -7,7 +7,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import mekanism.api.gas.GasStack;
-import mekanism.common.recipe.inputs.ChemicalPairInput;
 import mekanism.client.gui.GuiElectrolyticSeparator;
 import mekanism.client.gui.GuiElement;
 import mekanism.client.gui.GuiFluidGauge;
@@ -23,6 +22,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay;
 import mekanism.client.gui.GuiSlot.SlotType;
 import mekanism.common.ObfuscatedNames;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.inputs.ChemicalPairInput;
 import mekanism.common.util.LangUtils;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;

src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java

@@ -1,7 +1,6 @@
 package mekanism.client.nei;
 
 import java.util.Collection;
-import java.util.Set;
 
 import mekanism.client.gui.GuiEnrichmentChamber;
 import mekanism.client.gui.GuiProgress.ProgressBar;

src/main/java/mekanism/client/nei/MachineRecipeHandler.java

@@ -2,9 +2,6 @@ package mekanism.client.nei;
 
 import java.awt.*;
 import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.client.gui.GuiElement;
 import mekanism.client.gui.GuiPowerBar;

src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java

@@ -5,13 +5,10 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import mekanism.api.infuse.InfuseObject;
 import mekanism.api.infuse.InfuseRegistry;
 import mekanism.api.infuse.InfuseType;
-import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
 import mekanism.client.gui.GuiElement;
 import mekanism.client.gui.GuiMetallurgicInfuser;
 import mekanism.client.gui.GuiPowerBar;
@@ -23,6 +20,7 @@ import mekanism.client.gui.GuiSlot;
 import mekanism.client.gui.GuiSlot.SlotOverlay;
 import mekanism.client.gui.GuiSlot.SlotType;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;
 

src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java

@@ -2,7 +2,6 @@ package mekanism.client.nei;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import mekanism.api.gas.Gas;
 import mekanism.api.util.ListUtils;

src/main/java/mekanism/client/nei/PRCRecipeHandler.java

@@ -7,8 +7,6 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import mekanism.api.gas.GasStack;
-import mekanism.common.recipe.inputs.PressurizedInput;
-import mekanism.common.recipe.machines.PressurizedRecipe;
 import mekanism.client.gui.GuiElement;
 import mekanism.client.gui.GuiFluidGauge;
 import mekanism.client.gui.GuiGasGauge;
@@ -24,6 +22,8 @@ import mekanism.client.gui.GuiSlot.SlotOverlay;
 import mekanism.client.gui.GuiSlot.SlotType;
 import mekanism.common.ObfuscatedNames;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.inputs.PressurizedInput;
+import mekanism.common.recipe.machines.PressurizedRecipe;
 import mekanism.common.util.LangUtils;
 import mekanism.common.util.MekanismUtils;
 import mekanism.common.util.MekanismUtils.ResourceType;

src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java

@@ -1,12 +1,10 @@
 package mekanism.client.nei;
 
 import java.util.Collection;
-import java.util.Set;
 
 import mekanism.client.gui.GuiPrecisionSawmill;
 import mekanism.client.gui.GuiProgress.ProgressBar;
 import mekanism.common.recipe.RecipeHandler.Recipe;
-import mekanism.common.recipe.machines.ChanceMachineRecipe;
 import mekanism.common.recipe.machines.SawmillRecipe;
 import mekanism.common.util.MekanismUtils;
 

src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java

@@ -3,7 +3,6 @@ package mekanism.client.nei;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;

src/main/java/mekanism/common/integration/OreDictManager.java

@@ -6,8 +6,6 @@ import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
 import mekanism.api.infuse.InfuseObject;
 import mekanism.api.infuse.InfuseRegistry;
-import mekanism.common.recipe.inputs.InfusionInput;
-import mekanism.common.recipe.outputs.ChanceOutput;
 import mekanism.api.util.StackUtils;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismBlocks;

src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java

@@ -2,9 +2,9 @@ package mekanism.common.inventory.container;
 
 import java.util.Map;
 
-import mekanism.common.recipe.inputs.AdvancedMachineInput;
 import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
 import mekanism.common.inventory.slot.SlotOutput;
+import mekanism.common.recipe.inputs.AdvancedMachineInput;
 import mekanism.common.tile.TileEntityAdvancedElectricMachine;
 import mekanism.common.util.ChargeUtils;
 

src/main/java/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java

@@ -1,11 +1,11 @@
 package mekanism.common.inventory.container;
 
 import mekanism.api.infuse.InfuseRegistry;
-import mekanism.common.recipe.inputs.InfusionInput;
 import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
 import mekanism.common.inventory.slot.SlotOutput;
 import mekanism.common.recipe.RecipeHandler;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.inputs.InfusionInput;
 import mekanism.common.tile.TileEntityMetallurgicInfuser;
 import mekanism.common.util.ChargeUtils;
 

src/main/java/mekanism/common/recipe/inputs/InfusionInput.java

@@ -1,12 +1,10 @@
 package mekanism.common.recipe.inputs;
 
-import mekanism.api.gas.GasTank;
 import mekanism.api.infuse.InfuseType;
 import mekanism.api.util.StackUtils;
 import mekanism.common.InfuseStorage;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidTank;
 
 /**
  * An infusion input, containing the type of and amount of infuse the operation requires, as well as the input ItemStack.

src/main/java/mekanism/common/recipe/inputs/PressurizedInput.java

@@ -1,7 +1,5 @@
 package mekanism.common.recipe.inputs;
 
-import java.util.Stack;
-
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
 import mekanism.api.util.StackUtils;

src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java

@@ -5,7 +5,6 @@ import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasTank;
 import mekanism.common.recipe.inputs.AdvancedMachineInput;
 import mekanism.common.recipe.outputs.ItemStackOutput;
-import mekanism.common.util.MekanismUtils;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/mekanism/common/recipe/machines/WasherRecipe.java

@@ -7,7 +7,6 @@ import mekanism.common.recipe.inputs.GasInput;
 import mekanism.common.recipe.outputs.GasOutput;
 import mekanism.common.tile.TileEntityChemicalWasher;
 
-import net.minecraftforge.fluids.FluidEvent.FluidDrainingEvent;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;

src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java

@@ -1,7 +1,6 @@
 package mekanism.common.tile;
 
 import java.util.ArrayList;
-import java.util.Map;
 
 import mekanism.api.EnumColor;
 import mekanism.api.gas.Gas;
@@ -9,13 +8,11 @@ import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.ITubeConnection;
-import mekanism.common.recipe.inputs.AdvancedMachineInput;
-import mekanism.api.util.StackUtils;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismItems;
 import mekanism.common.SideData;
 import mekanism.common.recipe.RecipeHandler;
-import mekanism.common.recipe.inputs.ItemStackInput;
+import mekanism.common.recipe.inputs.AdvancedMachineInput;
 import mekanism.common.recipe.machines.AdvancedMachineRecipe;
 import mekanism.common.recipe.outputs.ItemStackOutput;
 import mekanism.common.tile.component.TileComponentEjector;

src/main/java/mekanism/common/tile/TileEntityAmbientAccumulator.java

@@ -1,18 +1,14 @@
 package mekanism.common.tile;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Random;
 
 import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasRegistry;
 import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.ITubeConnection;
 import mekanism.common.recipe.RecipeHandler;
-import mekanism.common.recipe.RecipeHandler.Recipe;
 import mekanism.common.recipe.inputs.IntegerInput;
 import mekanism.common.recipe.machines.AmbientGasRecipe;
 

src/main/java/mekanism/common/tile/TileEntityChanceMachine.java

@@ -3,12 +3,12 @@ package mekanism.common.tile;
 import java.util.Map;
 
 import mekanism.api.EnumColor;
-import mekanism.common.recipe.inputs.ItemStackInput;
-import mekanism.common.recipe.machines.ChanceMachineRecipe;
-import mekanism.common.recipe.outputs.ChanceOutput;
 import mekanism.common.MekanismItems;
 import mekanism.common.SideData;
 import mekanism.common.recipe.RecipeHandler;
+import mekanism.common.recipe.inputs.ItemStackInput;
+import mekanism.common.recipe.machines.ChanceMachineRecipe;
+import mekanism.common.recipe.outputs.ChanceOutput;
 import mekanism.common.tile.component.TileComponentEjector;
 import mekanism.common.tile.component.TileComponentUpgrade;
 import mekanism.common.util.ChargeUtils;

src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java

@@ -3,7 +3,6 @@ package mekanism.common.tile;
 import java.util.ArrayList;
 
 import mekanism.api.Coord4D;
-import mekanism.api.MekanismConfig.general;
 import mekanism.api.Range4D;
 import mekanism.api.gas.Gas;
 import mekanism.api.gas.GasRegistry;
@@ -13,15 +12,15 @@ import mekanism.api.gas.GasTransmission;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.IGasItem;
 import mekanism.api.gas.ITubeConnection;
-import mekanism.common.recipe.inputs.FluidInput;
-import mekanism.common.recipe.machines.SeparatorRecipe;
-import mekanism.common.recipe.outputs.ChemicalPairOutput;
 import mekanism.common.Mekanism;
 import mekanism.common.base.ISustainedData;
 import mekanism.common.block.BlockMachine.MachineType;
 import mekanism.common.network.PacketTileEntity.TileEntityMessage;
 import mekanism.common.recipe.RecipeHandler;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.inputs.FluidInput;
+import mekanism.common.recipe.machines.SeparatorRecipe;
+import mekanism.common.recipe.outputs.ChemicalPairOutput;
 import mekanism.common.util.ChargeUtils;
 import mekanism.common.util.FluidContainerUtils;
 import mekanism.common.util.InventoryUtils;

src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java

@@ -10,8 +10,6 @@ import mekanism.api.Range4D;
 import mekanism.api.infuse.InfuseObject;
 import mekanism.api.infuse.InfuseRegistry;
 import mekanism.common.InfuseStorage;
-import mekanism.common.recipe.inputs.InfusionInput;
-import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
 import mekanism.common.Mekanism;
 import mekanism.common.MekanismItems;
 import mekanism.common.PacketHandler;
@@ -24,6 +22,8 @@ import mekanism.common.block.BlockMachine.MachineType;
 import mekanism.common.network.PacketTileEntity.TileEntityMessage;
 import mekanism.common.recipe.RecipeHandler;
 import mekanism.common.recipe.RecipeHandler.Recipe;
+import mekanism.common.recipe.inputs.InfusionInput;
+import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
 import mekanism.common.tile.component.TileComponentEjector;
 import mekanism.common.tile.component.TileComponentUpgrade;
 import mekanism.common.util.ChargeUtils;

src/main/java/mekanism/common/tile/TileEntityPRC.java

@@ -12,14 +12,14 @@ import mekanism.api.gas.GasStack;
 import mekanism.api.gas.GasTank;
 import mekanism.api.gas.IGasHandler;
 import mekanism.api.gas.ITubeConnection;
-import mekanism.common.recipe.inputs.PressurizedInput;
-import mekanism.common.recipe.outputs.PressurizedProducts;
-import mekanism.common.recipe.machines.PressurizedRecipe;
 import mekanism.common.SideData;
 import mekanism.common.base.ISustainedData;
 import mekanism.common.block.BlockMachine.MachineType;
 import mekanism.common.item.ItemUpgrade;
 import mekanism.common.recipe.RecipeHandler;
+import mekanism.common.recipe.inputs.PressurizedInput;
+import mekanism.common.recipe.machines.PressurizedRecipe;
+import mekanism.common.recipe.outputs.PressurizedProducts;
 import mekanism.common.tile.component.TileComponentEjector;
 import mekanism.common.tile.component.TileComponentUpgrade;
 import mekanism.common.util.ChargeUtils;