diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java
index 7a882f69f..42a97e883 100644
--- a/src/main/java/mekanism/api/MekanismAPI.java
+++ b/src/main/java/mekanism/api/MekanismAPI.java
@@ -5,7 +5,6 @@ import java.util.Set;
import mekanism.api.util.BlockInfo;
import net.minecraft.block.Block;
-import net.minecraft.item.Item;
import net.minecraftforge.fml.common.eventhandler.Event;
import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
index 3fad1b505..3c78f6e8e 100644
--- a/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
+++ b/src/main/java/mekanism/api/transmitters/DynamicNetwork.java
@@ -202,11 +202,8 @@ public abstract class DynamicNetwork> implemen
transmitters.add(transmitter);
transmittersAdded.add(transmitter);
}
-
- for(IGridTransmitter transmitter : net.transmittersToAdd)
- {
- transmittersToAdd.add(transmitter);
- }
+
+ transmittersToAdd.addAll(net.transmittersToAdd);
possibleAcceptors.putAll(net.possibleAcceptors);
diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java
index 6e361d066..e3997c43b 100644
--- a/src/main/java/mekanism/client/ClientProxy.java
+++ b/src/main/java/mekanism/client/ClientProxy.java
@@ -3,7 +3,6 @@ package mekanism.client;
import static mekanism.common.block.states.BlockStatePlastic.colorProperty;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -199,7 +198,6 @@ import mekanism.common.tile.transmitter.TileEntityPressurizedTube;
import mekanism.common.tile.transmitter.TileEntityRestrictiveTransporter;
import mekanism.common.tile.transmitter.TileEntityThermodynamicConductor;
import mekanism.common.tile.transmitter.TileEntityUniversalCable;
-import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiScreen;
@@ -208,12 +206,7 @@ import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.IStateMapper;
-import net.minecraft.client.renderer.color.IBlockColor;
-import net.minecraft.client.renderer.color.IItemColor;
-import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderSkeleton;
-import net.minecraft.entity.monster.AbstractSkeleton;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.item.Item;
@@ -224,7 +217,6 @@ import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.WorldServer;
import net.minecraftforge.client.event.ModelBakeEvent;
@@ -234,7 +226,6 @@ import net.minecraftforge.client.model.obj.OBJLoader;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.FMLClientHandler;
import net.minecraftforge.fml.client.registry.ClientRegistry;
-import net.minecraftforge.fml.client.registry.IRenderFactory;
import net.minecraftforge.fml.client.registry.RenderingRegistry;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -487,7 +478,7 @@ public class ClientProxy extends CommonProxy
entries.add("facing=north");
}
- String properties = new String();
+ String properties = "";
for(int i = 0; i < entries.size(); i++)
{
@@ -555,7 +546,7 @@ public class ClientProxy extends CommonProxy
entries.add("facing=north");
}
- String properties = new String();
+ String properties = "";
for(int i = 0; i < entries.size(); i++)
{
diff --git a/src/main/java/mekanism/client/HolidayManager.java b/src/main/java/mekanism/client/HolidayManager.java
index 5ac7a79f1..75b614ef0 100644
--- a/src/main/java/mekanism/client/HolidayManager.java
+++ b/src/main/java/mekanism/client/HolidayManager.java
@@ -233,7 +233,7 @@ public final class HolidayManager
for(int i = 0; i < amount; i++)
{
- builder.append(colors[i%colors.length] + "-");
+ builder.append(colors[i % colors.length]).append("-");
}
return builder.toString();
diff --git a/src/main/java/mekanism/client/ThreadClientUpdate.java b/src/main/java/mekanism/client/ThreadClientUpdate.java
index ff65a1ad8..77e1a8037 100644
--- a/src/main/java/mekanism/client/ThreadClientUpdate.java
+++ b/src/main/java/mekanism/client/ThreadClientUpdate.java
@@ -172,7 +172,7 @@ public class ThreadClientUpdate extends Thread
private void prepareForDownload()
{
- File[] modsList = new File(new StringBuilder().append(Mekanism.proxy.getMinecraftDir()).append(File.separator + "mods").toString()).listFiles();
+ File[] modsList = new File(String.valueOf(Mekanism.proxy.getMinecraftDir()) + File.separator + "mods").listFiles();
if(Mekanism.versionNumber.comparedState(Version.get(Mekanism.latestVersionNumber)) == -1)
{
diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
index 796fb0ec2..37e085864 100644
--- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
+++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
@@ -1,9 +1,6 @@
package mekanism.client.gui;
-import java.util.List;
-
import mekanism.api.gas.GasStack;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
diff --git a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java
index 71a48f2e7..3a5ac05ef 100644
--- a/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java
+++ b/src/main/java/mekanism/client/gui/GuiAmbientAccumulator.java
@@ -1,8 +1,6 @@
package mekanism.client.gui;
-import mekanism.api.gas.GasTank;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.common.inventory.container.ContainerNull;
import mekanism.common.tile.TileEntityAmbientAccumulator;
diff --git a/src/main/java/mekanism/client/gui/GuiBoilerStats.java b/src/main/java/mekanism/client/gui/GuiBoilerStats.java
index 845f606d3..154b366c6 100644
--- a/src/main/java/mekanism/client/gui/GuiBoilerStats.java
+++ b/src/main/java/mekanism/client/gui/GuiBoilerStats.java
@@ -1,12 +1,8 @@
package mekanism.client.gui;
-import java.util.List;
-
import mekanism.client.gui.element.GuiBoilerTab;
import mekanism.client.gui.element.GuiBoilerTab.BoilerTab;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiGraph;
-import mekanism.client.gui.element.GuiGraph.GraphDataHandler;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.content.boiler.SynchronizedBoilerData;
diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java
index 4c7f62b12..240c68483 100644
--- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java
+++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java
@@ -1,8 +1,5 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
index fcc80eb85..81b40bb6d 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
@@ -4,12 +4,9 @@ import java.util.ArrayList;
import java.util.List;
import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasTank;
import mekanism.api.gas.OreGas;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
index dc86903c4..4c135e4aa 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
@@ -1,12 +1,7 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.gas.GasTank;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiProgress;
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
index a37e63096..317e36647 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
@@ -1,12 +1,7 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.gas.GasTank;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiProgress;
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
index 2c8b7b502..2dc11c8b1 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
@@ -1,12 +1,7 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.gas.GasTank;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiProgress;
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java
index 90c78c0a0..6dc1680f1 100644
--- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java
+++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java
@@ -1,15 +1,9 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.gas.GasTank;
import mekanism.client.gui.element.GuiBucketIO;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.client.gui.element.GuiProgress;
@@ -28,7 +22,6 @@ import mekanism.common.util.ListUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java
index 8fcbb3ba8..e4a3cbd0d 100644
--- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java
+++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java
@@ -2,11 +2,9 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java
index a874e79ce..cf2fdb9a0 100644
--- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java
+++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java
@@ -1,8 +1,5 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java
index 4931cd0bc..d04a6cafc 100644
--- a/src/main/java/mekanism/client/gui/GuiElectricPump.java
+++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java
@@ -1,11 +1,7 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
@@ -22,7 +18,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
index 762df0fc1..a3204945e 100755
--- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
+++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
@@ -2,16 +2,11 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.api.gas.GasTank;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
@@ -35,7 +30,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.SoundEvents;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java
index 2e6ffa270..f213c20fd 100644
--- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java
+++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java
@@ -1,11 +1,6 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.energy.IStrictEnergyStorage;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyGauge;
-import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiRedstoneControl;
import mekanism.client.gui.element.GuiSecurityTab;
diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java
index 3f582b49e..cc7df36f9 100644
--- a/src/main/java/mekanism/client/gui/GuiFactory.java
+++ b/src/main/java/mekanism/client/gui/GuiFactory.java
@@ -2,10 +2,8 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiRecipeType;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/client/gui/GuiFluidTank.java b/src/main/java/mekanism/client/gui/GuiFluidTank.java
index 46de832b6..ecae0a7e6 100644
--- a/src/main/java/mekanism/client/gui/GuiFluidTank.java
+++ b/src/main/java/mekanism/client/gui/GuiFluidTank.java
@@ -2,7 +2,6 @@ package mekanism.client.gui;
import mekanism.client.gui.element.GuiContainerEditMode;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiSecurityTab;
import mekanism.client.gui.element.GuiSlot;
import mekanism.client.gui.element.GuiSlot.SlotOverlay;
@@ -13,7 +12,6 @@ import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java
index cb2c1ade3..6221760e1 100644
--- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java
+++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java
@@ -1,11 +1,7 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
@@ -22,7 +18,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
index f3136efd4..8e959016c 100644
--- a/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
+++ b/src/main/java/mekanism/client/gui/GuiFormulaicAssemblicator.java
@@ -2,10 +2,8 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
index a5b49ff4d..e2f328427 100644
--- a/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
+++ b/src/main/java/mekanism/client/gui/GuiFuelwoodHeater.java
@@ -1,8 +1,5 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.client.gui.element.GuiSecurityTab;
import mekanism.client.gui.element.GuiSlot;
diff --git a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java
index fc6c15667..f594fa5fe 100644
--- a/src/main/java/mekanism/client/gui/GuiInductionMatrix.java
+++ b/src/main/java/mekanism/client/gui/GuiInductionMatrix.java
@@ -1,8 +1,5 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiMatrixTab;
import mekanism.client.gui.element.GuiMatrixTab.MatrixTab;
diff --git a/src/main/java/mekanism/client/gui/GuiMatrixStats.java b/src/main/java/mekanism/client/gui/GuiMatrixStats.java
index fecb2e060..e9d97486d 100644
--- a/src/main/java/mekanism/client/gui/GuiMatrixStats.java
+++ b/src/main/java/mekanism/client/gui/GuiMatrixStats.java
@@ -1,11 +1,6 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.energy.IStrictEnergyStorage;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyGauge;
-import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiMatrixTab;
import mekanism.client.gui.element.GuiMatrixTab.MatrixTab;
diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
index d46e09e16..071e6e3ab 100644
--- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
+++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
@@ -2,10 +2,8 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
diff --git a/src/main/java/mekanism/client/gui/GuiPRC.java b/src/main/java/mekanism/client/gui/GuiPRC.java
index aa0139cf9..537db4997 100644
--- a/src/main/java/mekanism/client/gui/GuiPRC.java
+++ b/src/main/java/mekanism/client/gui/GuiPRC.java
@@ -1,14 +1,8 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.api.gas.GasTank;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiProgress;
@@ -29,7 +23,6 @@ import mekanism.common.util.ListUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java
index 91d5cbb81..1b818aba5 100644
--- a/src/main/java/mekanism/client/gui/GuiResistiveHeater.java
+++ b/src/main/java/mekanism/client/gui/GuiResistiveHeater.java
@@ -2,10 +2,8 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.client.gui.element.GuiPowerBar;
diff --git a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
index d2d57bfd1..91132e014 100644
--- a/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
+++ b/src/main/java/mekanism/client/gui/GuiRotaryCondensentrator.java
@@ -2,16 +2,11 @@ package mekanism.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.api.gas.GasTank;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiProgress;
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
@@ -33,7 +28,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.SoundEvents;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java
index 5504d4c38..2b1359d30 100644
--- a/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java
+++ b/src/main/java/mekanism/client/gui/GuiSeismicVibrator.java
@@ -1,8 +1,5 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java
index afc12f333..671745db0 100644
--- a/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java
+++ b/src/main/java/mekanism/client/gui/GuiSolarNeutronActivator.java
@@ -1,8 +1,6 @@
package mekanism.client.gui;
-import mekanism.api.gas.GasTank;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiProgress;
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
diff --git a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
index 749c8b319..034741613 100644
--- a/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
+++ b/src/main/java/mekanism/client/gui/GuiThermalEvaporationController.java
@@ -1,10 +1,6 @@
package mekanism.client.gui;
-import java.util.List;
-
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGauge;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.common.config.MekanismConfig.general;
@@ -17,7 +13,6 @@ import mekanism.common.util.UnitDisplayUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.common.util.UnitDisplayUtils.TemperatureUnit;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
index 5e5f8d3f4..61cc7169d 100644
--- a/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
+++ b/src/main/java/mekanism/client/gui/GuiThermoelectricBoiler.java
@@ -1,10 +1,7 @@
package mekanism.client.gui;
-import java.util.List;
-
import mekanism.client.gui.element.GuiBoilerTab;
import mekanism.client.gui.element.GuiBoilerTab.BoilerTab;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.client.gui.element.GuiRateBar;
import mekanism.client.gui.element.GuiRateBar.IRateInfoHandler;
diff --git a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java
index 314a75aac..69954f590 100644
--- a/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java
+++ b/src/main/java/mekanism/client/gui/element/GuiEnergyInfo.java
@@ -48,11 +48,8 @@ public class GuiEnergyInfo extends GuiElement
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160)
{
List info = new ArrayList<>();
-
- for(String s : infoHandler.getInfo())
- {
- info.add(s);
- }
+
+ info.addAll(infoHandler.getInfo());
info.add(LangUtils.localize("gui.unit") + ": " + general.energyUnit);
displayTooltips(info, xAxis, yAxis);
diff --git a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java
index f8a75490a..53e418a8a 100644
--- a/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java
+++ b/src/main/java/mekanism/client/gui/element/GuiHeatInfo.java
@@ -47,11 +47,8 @@ public class GuiHeatInfo extends GuiElement
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 116 && yAxis <= 134)
{
List info = new ArrayList<>();
-
- for(String s : infoHandler.getInfo())
- {
- info.add(s);
- }
+
+ info.addAll(infoHandler.getInfo());
info.add(LangUtils.localize("gui.unit") + ": " + general.tempUnit);
displayTooltips(info, xAxis, yAxis);
diff --git a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java
index 3bb6bf7e7..f6124ab10 100644
--- a/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java
+++ b/src/main/java/mekanism/client/jei/machine/chemical/ChemicalWasherRecipeCategory.java
@@ -7,15 +7,12 @@ import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.ITickTimer;
-import mezz.jei.api.gui.ITooltipCallback;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
-import java.util.List;
-
public class ChemicalWasherRecipeCategory extends BaseRecipeCategory
{
public IGuiHelper guiHelper;
diff --git a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java
index c9480d864..2fabb8c3b 100644
--- a/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java
+++ b/src/main/java/mekanism/client/jei/machine/other/ElectrolyticSeparatorRecipeCategory.java
@@ -20,15 +20,12 @@ import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.ITickTimer;
-import mezz.jei.api.gui.ITooltipCallback;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
-import java.util.List;
-
public class ElectrolyticSeparatorRecipeCategory extends BaseRecipeCategory
{
public IGuiHelper guiHelper;
diff --git a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java
index 16490b03d..211b4b962 100644
--- a/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java
+++ b/src/main/java/mekanism/client/jei/machine/other/PRCRecipeCategory.java
@@ -21,14 +21,10 @@ import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IGuiItemStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.ITickTimer;
-import mezz.jei.api.gui.ITooltipCallback;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.List;
public class PRCRecipeCategory extends BaseRecipeCategory
{
diff --git a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java
index f1c34106f..b474b20f5 100644
--- a/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java
+++ b/src/main/java/mekanism/client/jei/machine/other/ThermalEvaporationRecipeCategory.java
@@ -7,14 +7,10 @@ import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IGuiFluidStackGroup;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.gui.ITickTimer;
-import mezz.jei.api.gui.ITooltipCallback;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.List;
public class ThermalEvaporationRecipeCategory extends BaseRecipeCategory
{
diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java
index 32e678ccf..4746da8ba 100644
--- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java
+++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java
@@ -1,15 +1,11 @@
package mekanism.client.render.obj;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import javax.vecmath.Matrix4f;
-
import mekanism.client.render.obj.MekanismOBJModel.OBJModelType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
diff --git a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java
index ead3bf507..643226b48 100644
--- a/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java
+++ b/src/main/java/mekanism/client/render/tileentity/RenderThermalEvaporationController.java
@@ -1,18 +1,15 @@
package mekanism.client.render.tileentity;
import java.util.HashMap;
-import java.util.Map;
import mekanism.client.render.FluidRenderer;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.FluidType;
import mekanism.client.render.MekanismRenderer.Model3D;
-import mekanism.common.content.tank.TankUpdateProtocol;
import mekanism.common.tile.TileEntityThermalEvaporationController;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.init.Blocks;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fml.relauncher.Side;
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
index 9fdc10891..b8d89940e 100644
--- a/src/main/java/mekanism/common/CommonProxy.java
+++ b/src/main/java/mekanism/common/CommonProxy.java
@@ -13,7 +13,6 @@ import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.config.MekanismConfig.usage;
-import mekanism.common.config.TypeConfigManager;
import mekanism.common.entity.EntityRobit;
import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
import mekanism.common.inventory.container.ContainerChanceMachine;
diff --git a/src/main/java/mekanism/common/CreativeTabMekanism.java b/src/main/java/mekanism/common/CreativeTabMekanism.java
index de97a8c0d..8ba31a941 100644
--- a/src/main/java/mekanism/common/CreativeTabMekanism.java
+++ b/src/main/java/mekanism/common/CreativeTabMekanism.java
@@ -1,7 +1,6 @@
package mekanism.common;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class CreativeTabMekanism extends CreativeTabs
diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java
index f712935f4..88759b6c1 100644
--- a/src/main/java/mekanism/common/Mekanism.java
+++ b/src/main/java/mekanism/common/Mekanism.java
@@ -4,7 +4,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -122,7 +121,6 @@ import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
-import net.minecraftforge.fml.common.IFuelHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
@@ -234,10 +232,10 @@ public class Mekanism
public static KeySync keyMap = new KeySync();
- public static Set jetpackOn = new HashSet<>();
- public static Set gasmaskOn = new HashSet<>();
- public static Set freeRunnerOn = new HashSet<>();
- public static Set flamethrowerActive = new HashSet<>();
+ public static final Set jetpackOn = new HashSet<>();
+ public static final Set gasmaskOn = new HashSet<>();
+ public static final Set freeRunnerOn = new HashSet<>();
+ public static final Set flamethrowerActive = new HashSet<>();
public static Set activeVibrators = new HashSet<>();
diff --git a/src/main/java/mekanism/common/MekanismSounds.java b/src/main/java/mekanism/common/MekanismSounds.java
index 381dcb0f6..7b05a5fe3 100644
--- a/src/main/java/mekanism/common/MekanismSounds.java
+++ b/src/main/java/mekanism/common/MekanismSounds.java
@@ -2,7 +2,6 @@ package mekanism.common;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
-import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.registries.IForgeRegistry;
public final class MekanismSounds
diff --git a/src/main/java/mekanism/common/Tier.java b/src/main/java/mekanism/common/Tier.java
index e4faa83cb..8a05ccc3f 100644
--- a/src/main/java/mekanism/common/Tier.java
+++ b/src/main/java/mekanism/common/Tier.java
@@ -6,7 +6,6 @@ import java.util.ArrayList;
import java.util.List;
import mekanism.api.EnumColor;
-import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.util.LangUtils;
import net.minecraft.util.IStringSerializable;
import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/mekanism/common/Version.java b/src/main/java/mekanism/common/Version.java
index ff1eb97e1..582e5634c 100644
--- a/src/main/java/mekanism/common/Version.java
+++ b/src/main/java/mekanism/common/Version.java
@@ -60,17 +60,7 @@ public class Version
}
else if(version.minor == minor)
{
- if(version.build > build)
- {
- return -1;
- }
- else if(version.build == build)
- {
- return 0;
- }
- else {
- return 1;
- }
+ return (byte) Integer.compare(build, version.build);
}
else {
return 1;
diff --git a/src/main/java/mekanism/common/base/IModule.java b/src/main/java/mekanism/common/base/IModule.java
index ed73a4c58..66d266624 100644
--- a/src/main/java/mekanism/common/base/IModule.java
+++ b/src/main/java/mekanism/common/base/IModule.java
@@ -2,8 +2,6 @@ package mekanism.common.base;
import io.netty.buffer.ByteBuf;
-import java.io.IOException;
-
import mekanism.common.Version;
/**
diff --git a/src/main/java/mekanism/common/base/ITankManager.java b/src/main/java/mekanism/common/base/ITankManager.java
index 547a77e73..8ce654ece 100644
--- a/src/main/java/mekanism/common/base/ITankManager.java
+++ b/src/main/java/mekanism/common/base/ITankManager.java
@@ -6,7 +6,6 @@ import mekanism.common.item.ItemGaugeDropper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fluids.FluidUtil;
diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java
index 67e9bf8b7..101d7e23a 100644
--- a/src/main/java/mekanism/common/block/BlockEnergyCube.java
+++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java
@@ -42,8 +42,6 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
import buildcraft.api.tools.IToolWrench;
/**
diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java
index 6d1b2b924..134fc0dbf 100644
--- a/src/main/java/mekanism/common/block/BlockMachine.java
+++ b/src/main/java/mekanism/common/block/BlockMachine.java
@@ -19,8 +19,6 @@ import mekanism.common.base.ISustainedInventory;
import mekanism.common.base.ISustainedTank;
import mekanism.common.base.ITierItem;
import mekanism.common.base.IUpgradeTile;
-import mekanism.common.block.states.BlockStateBasic;
-import mekanism.common.block.states.BlockStateBasic.BasicBlockType;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineBlock;
@@ -78,7 +76,6 @@ import net.minecraft.util.math.Vec3d;
import net.minecraft.world.Explosion;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandlerItem;
diff --git a/src/main/java/mekanism/common/block/BlockOre.java b/src/main/java/mekanism/common/block/BlockOre.java
index 2884bfe36..efb90bf2a 100644
--- a/src/main/java/mekanism/common/block/BlockOre.java
+++ b/src/main/java/mekanism/common/block/BlockOre.java
@@ -8,11 +8,8 @@ import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
/**
* Block class for handling multiple ore block IDs.
diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java
index 864be07ec..66029f299 100644
--- a/src/main/java/mekanism/common/block/BlockPlastic.java
+++ b/src/main/java/mekanism/common/block/BlockPlastic.java
@@ -11,14 +11,11 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.EnumDyeColor;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockPlastic extends Block
{
diff --git a/src/main/java/mekanism/common/block/BlockPlasticFence.java b/src/main/java/mekanism/common/block/BlockPlasticFence.java
index b648f52b8..754b2147a 100644
--- a/src/main/java/mekanism/common/block/BlockPlasticFence.java
+++ b/src/main/java/mekanism/common/block/BlockPlasticFence.java
@@ -12,12 +12,9 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumDyeColor;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
public class BlockPlasticFence extends BlockFence
{
diff --git a/src/main/java/mekanism/common/block/BlockTransmitter.java b/src/main/java/mekanism/common/block/BlockTransmitter.java
index 137fb0735..8e9659c91 100644
--- a/src/main/java/mekanism/common/block/BlockTransmitter.java
+++ b/src/main/java/mekanism/common/block/BlockTransmitter.java
@@ -37,7 +37,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/mekanism/common/block/states/BlockStateMachine.java b/src/main/java/mekanism/common/block/states/BlockStateMachine.java
index fff2fcb8d..c71a37f60 100644
--- a/src/main/java/mekanism/common/block/states/BlockStateMachine.java
+++ b/src/main/java/mekanism/common/block/states/BlockStateMachine.java
@@ -1,8 +1,6 @@
package mekanism.common.block.states;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import mekanism.common.Mekanism;
diff --git a/src/main/java/mekanism/common/config/TypeConfigManager.java b/src/main/java/mekanism/common/config/TypeConfigManager.java
index 727d7445a..ac80e5416 100644
--- a/src/main/java/mekanism/common/config/TypeConfigManager.java
+++ b/src/main/java/mekanism/common/config/TypeConfigManager.java
@@ -1,12 +1,8 @@
package mekanism.common.config;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import mekanism.common.base.IBlockType;
-import net.minecraft.item.crafting.CraftingManager;
-
public class TypeConfigManager
{
private Map config = new HashMap<>();
diff --git a/src/main/java/mekanism/common/content/transporter/TransporterManager.java b/src/main/java/mekanism/common/content/transporter/TransporterManager.java
index 1f849c35a..c9df9f772 100644
--- a/src/main/java/mekanism/common/content/transporter/TransporterManager.java
+++ b/src/main/java/mekanism/common/content/transporter/TransporterManager.java
@@ -23,7 +23,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
-import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.items.IItemHandler;
public class TransporterManager
diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
index d98691657..08c3f0c39 100644
--- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
+++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java
@@ -21,7 +21,6 @@ import mekanism.common.transmitters.grid.InventoryNetwork;
import mekanism.common.transmitters.grid.InventoryNetwork.AcceptorData;
import mekanism.common.util.CapabilityUtils;
import mekanism.common.util.InventoryUtils;
-import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.world.World;
diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java
index f48a61bde..d6ce39ede 100644
--- a/src/main/java/mekanism/common/entity/EntityRobit.java
+++ b/src/main/java/mekanism/common/entity/EntityRobit.java
@@ -54,7 +54,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.energy.IEnergyStorage;
diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java
index af9692b5b..fcb6e5358 100644
--- a/src/main/java/mekanism/common/frequency/Frequency.java
+++ b/src/main/java/mekanism/common/frequency/Frequency.java
@@ -11,7 +11,6 @@ import mekanism.api.Coord4D;
import mekanism.common.PacketHandler;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.UsernameCache;
public class Frequency
{
diff --git a/src/main/java/mekanism/common/integration/IMCHandler.java b/src/main/java/mekanism/common/integration/IMCHandler.java
index 6e86a453a..45419b5f1 100644
--- a/src/main/java/mekanism/common/integration/IMCHandler.java
+++ b/src/main/java/mekanism/common/integration/IMCHandler.java
@@ -7,9 +7,6 @@ import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.RecipeHandler.Recipe;
import mekanism.common.recipe.inputs.MachineInput;
import mekanism.common.recipe.machines.MachineRecipe;
-import mekanism.common.util.RecipeUtils;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLInterModComms.IMCMessage;
public class IMCHandler
diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java
index 11aba2d1b..f2a65a26e 100644
--- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java
+++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java
@@ -1,7 +1,6 @@
package mekanism.common.inventory.container;
import mekanism.api.infuse.InfuseRegistry;
-import mekanism.common.Tier;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java
index 0bedb2e08..e501dcc11 100644
--- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java
+++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java
@@ -14,7 +14,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java
index d5c761c76..afc8a47a5 100644
--- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java
+++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java
@@ -36,7 +36,6 @@ import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java
index daef3e1bc..eefa01262 100644
--- a/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java
+++ b/src/main/java/mekanism/common/item/ItemBlockGlowPanel.java
@@ -2,7 +2,6 @@ package mekanism.common.item;
import java.util.ArrayList;
-import mcmultipart.api.multipart.IMultipart;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
@@ -14,13 +13,11 @@ import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.translation.I18n;
import net.minecraft.world.World;
diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java
index 577ffe9cf..8df4c2e0e 100644
--- a/src/main/java/mekanism/common/item/ItemBlockOre.java
+++ b/src/main/java/mekanism/common/item/ItemBlockOre.java
@@ -10,7 +10,6 @@ import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
diff --git a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java
index 7670231bb..b64e65a41 100644
--- a/src/main/java/mekanism/common/item/ItemBlockTransmitter.java
+++ b/src/main/java/mekanism/common/item/ItemBlockTransmitter.java
@@ -13,7 +13,6 @@ import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.ITierItem;
-import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.transmitter.TileEntitySidedPipe;
diff --git a/src/main/java/mekanism/common/item/ItemClump.java b/src/main/java/mekanism/common/item/ItemClump.java
index 5b2406740..bb318f656 100644
--- a/src/main/java/mekanism/common/item/ItemClump.java
+++ b/src/main/java/mekanism/common/item/ItemClump.java
@@ -3,7 +3,6 @@ package mekanism.common.item;
import mekanism.common.Resource;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemConfigurator.java b/src/main/java/mekanism/common/item/ItemConfigurator.java
index d3403ce9f..ca736c834 100644
--- a/src/main/java/mekanism/common/item/ItemConfigurator.java
+++ b/src/main/java/mekanism/common/item/ItemConfigurator.java
@@ -29,8 +29,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.SecurityUtils;
import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java
index 1d548628d..97ab3cfa8 100644
--- a/src/main/java/mekanism/common/item/ItemControlCircuit.java
+++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java
@@ -3,7 +3,6 @@ package mekanism.common.item;
import mekanism.common.Tier.BaseTier;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemCrystal.java b/src/main/java/mekanism/common/item/ItemCrystal.java
index c1230fbf3..14670e326 100644
--- a/src/main/java/mekanism/common/item/ItemCrystal.java
+++ b/src/main/java/mekanism/common/item/ItemCrystal.java
@@ -3,7 +3,6 @@ package mekanism.common.item;
import mekanism.common.Resource;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemDirtyDust.java b/src/main/java/mekanism/common/item/ItemDirtyDust.java
index 4eadba410..6f03c2930 100644
--- a/src/main/java/mekanism/common/item/ItemDirtyDust.java
+++ b/src/main/java/mekanism/common/item/ItemDirtyDust.java
@@ -4,7 +4,6 @@ import mekanism.common.Mekanism;
import mekanism.common.Resource;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemDust.java b/src/main/java/mekanism/common/item/ItemDust.java
index 62777e78e..18998fe71 100644
--- a/src/main/java/mekanism/common/item/ItemDust.java
+++ b/src/main/java/mekanism/common/item/ItemDust.java
@@ -3,7 +3,6 @@ package mekanism.common.item;
import mekanism.common.Resource;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemElectricBow.java b/src/main/java/mekanism/common/item/ItemElectricBow.java
index 3e8308131..7ea024f4e 100644
--- a/src/main/java/mekanism/common/item/ItemElectricBow.java
+++ b/src/main/java/mekanism/common/item/ItemElectricBow.java
@@ -6,7 +6,6 @@ import java.util.List;
import mekanism.api.EnumColor;
import mekanism.common.base.IItemNetwork;
-import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
import mekanism.common.util.ItemDataUtils;
import mekanism.common.util.LangUtils;
import net.minecraft.client.util.ITooltipFlag;
diff --git a/src/main/java/mekanism/common/item/ItemFlamethrower.java b/src/main/java/mekanism/common/item/ItemFlamethrower.java
index 1dd505bff..3337ddf91 100644
--- a/src/main/java/mekanism/common/item/ItemFlamethrower.java
+++ b/src/main/java/mekanism/common/item/ItemFlamethrower.java
@@ -12,8 +12,6 @@ import mekanism.common.util.ItemDataUtils;
import mekanism.common.util.LangUtils;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemGaugeDropper.java b/src/main/java/mekanism/common/item/ItemGaugeDropper.java
index 346c23b74..6a8a51c4b 100644
--- a/src/main/java/mekanism/common/item/ItemGaugeDropper.java
+++ b/src/main/java/mekanism/common/item/ItemGaugeDropper.java
@@ -12,7 +12,6 @@ import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;
diff --git a/src/main/java/mekanism/common/item/ItemHDPE.java b/src/main/java/mekanism/common/item/ItemHDPE.java
index 23e4426e1..c752d2cfc 100644
--- a/src/main/java/mekanism/common/item/ItemHDPE.java
+++ b/src/main/java/mekanism/common/item/ItemHDPE.java
@@ -3,7 +3,6 @@ package mekanism.common.item;
import mekanism.common.Mekanism;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemIngot.java b/src/main/java/mekanism/common/item/ItemIngot.java
index 74d3031e6..30a250422 100644
--- a/src/main/java/mekanism/common/item/ItemIngot.java
+++ b/src/main/java/mekanism/common/item/ItemIngot.java
@@ -2,7 +2,6 @@ package mekanism.common.item;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java
index b706372a1..f81ecad88 100644
--- a/src/main/java/mekanism/common/item/ItemJetpack.java
+++ b/src/main/java/mekanism/common/item/ItemJetpack.java
@@ -22,7 +22,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/mekanism/common/item/ItemOtherDust.java b/src/main/java/mekanism/common/item/ItemOtherDust.java
index e8237b913..23d9f67a9 100644
--- a/src/main/java/mekanism/common/item/ItemOtherDust.java
+++ b/src/main/java/mekanism/common/item/ItemOtherDust.java
@@ -2,7 +2,6 @@ package mekanism.common.item;
import mekanism.common.base.IMetaItem;
import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
diff --git a/src/main/java/mekanism/common/item/ItemScubaTank.java b/src/main/java/mekanism/common/item/ItemScubaTank.java
index b80f5a914..dea718536 100644
--- a/src/main/java/mekanism/common/item/ItemScubaTank.java
+++ b/src/main/java/mekanism/common/item/ItemScubaTank.java
@@ -18,10 +18,8 @@ import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/mekanism/common/item/ItemTierInstaller.java b/src/main/java/mekanism/common/item/ItemTierInstaller.java
index 58c35ed41..edd4ae60d 100644
--- a/src/main/java/mekanism/common/item/ItemTierInstaller.java
+++ b/src/main/java/mekanism/common/item/ItemTierInstaller.java
@@ -6,7 +6,6 @@ import mekanism.common.base.ITierUpgradeable;
import mekanism.common.tile.prefab.TileEntityBasicBlock;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumActionResult;
diff --git a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java
index ef1687215..95694b078 100644
--- a/src/main/java/mekanism/common/item/ItemWalkieTalkie.java
+++ b/src/main/java/mekanism/common/item/ItemWalkieTalkie.java
@@ -8,7 +8,6 @@ import java.util.Map;
import mekanism.api.EnumColor;
import mekanism.common.base.IItemNetwork;
-import mekanism.common.item.ItemConfigurator.ConfiguratorMode;
import mekanism.common.util.ItemDataUtils;
import mekanism.common.util.LangUtils;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
diff --git a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java
index cf643a6e8..219109905 100644
--- a/src/main/java/mekanism/common/network/PacketPortableTeleporter.java
+++ b/src/main/java/mekanism/common/network/PacketPortableTeleporter.java
@@ -149,18 +149,12 @@ public class PacketPortableTeleporter implements IMessageHandler publicFreqs = new ArrayList<>();
-
- for(Frequency f : getManager(null, world).getFrequencies())
- {
- publicFreqs.add(f);
- }
+
+ publicFreqs.addAll(getManager(null, world).getFrequencies());
List privateFreqs = new ArrayList<>();
-
- for(Frequency f : getManager(player.getUniqueID(), world).getFrequencies())
- {
- privateFreqs.add(f);
- }
+
+ privateFreqs.addAll(getManager(player.getUniqueID(), world).getFrequencies());
byte status = 3;
diff --git a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java
index 98f883228..c485bb4e2 100644
--- a/src/main/java/mekanism/common/network/PacketSecurityUpdate.java
+++ b/src/main/java/mekanism/common/network/PacketSecurityUpdate.java
@@ -14,7 +14,6 @@ import mekanism.common.network.PacketSecurityUpdate.SecurityUpdateMessage;
import mekanism.common.security.SecurityData;
import mekanism.common.security.SecurityFrequency;
import mekanism.common.util.MekanismUtils;
-import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java
index 973f209b0..67ff6a009 100644
--- a/src/main/java/mekanism/common/recipe/RecipeHandler.java
+++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java
@@ -3,7 +3,6 @@ package mekanism.common.recipe;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
diff --git a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java
index f895dc846..27c9f06b6 100644
--- a/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java
+++ b/src/main/java/mekanism/common/recipe/generation/RecipeGenerator.java
@@ -3,9 +3,7 @@ package mekanism.common.recipe.generation;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import mekanism.common.Mekanism;
-import mekanism.common.block.BlockMachine;
import mekanism.common.block.states.BlockStateMachine;
-import mekanism.common.item.ItemBlockMachine;
import mekanism.generators.common.block.states.BlockStateGenerator;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
diff --git a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java
index 736521298..d9a1e8cc2 100644
--- a/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java
+++ b/src/main/java/mekanism/common/recipe/machines/AdvancedMachineRecipe.java
@@ -1,7 +1,6 @@
package mekanism.common.recipe.machines;
import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasTank;
import mekanism.common.recipe.inputs.AdvancedMachineInput;
import mekanism.common.recipe.outputs.ItemStackOutput;
diff --git a/src/main/java/mekanism/common/security/SecurityFrequency.java b/src/main/java/mekanism/common/security/SecurityFrequency.java
index 29af68d08..a990820c0 100644
--- a/src/main/java/mekanism/common/security/SecurityFrequency.java
+++ b/src/main/java/mekanism/common/security/SecurityFrequency.java
@@ -12,7 +12,6 @@ import mekanism.common.security.ISecurityTile.SecurityMode;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
-import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.common.util.Constants.NBT;
public class SecurityFrequency extends Frequency
diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
index 948b3b8f9..75a9f89f9 100644
--- a/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedFactory.java
@@ -3,12 +3,10 @@ package mekanism.common.tile;
import mekanism.api.EnumColor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.SideData;
-import mekanism.common.Upgrade;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.tile.component.TileComponentConfig;
import mekanism.common.tile.component.TileComponentEjector;
-import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.util.InventoryUtils;
public class TileEntityAdvancedFactory extends TileEntityFactory
diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java
index 74878afe6..196a56a05 100644
--- a/src/main/java/mekanism/common/tile/TileEntityBin.java
+++ b/src/main/java/mekanism/common/tile/TileEntityBin.java
@@ -39,7 +39,6 @@ import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TextComponentString;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.fml.common.FMLCommonHandler;
-import net.minecraftforge.fml.common.Optional.Interface;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
index 35ceb290e..29ce25706 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
@@ -6,7 +6,6 @@ import mekanism.api.EnumColor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.MekanismItems;
import mekanism.common.SideData;
-import mekanism.common.Upgrade;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.inputs.ItemStackInput;
import mekanism.common.recipe.machines.ChanceMachineRecipe;
diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java
index 7055b46ec..ca3756d46 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java
@@ -6,7 +6,6 @@ import ic2.api.item.IElectricItem;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import java.util.List;
import java.util.Random;
diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java
index 0a8965102..845175454 100644
--- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java
+++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java
@@ -4,7 +4,6 @@ import java.util.Map;
import mekanism.api.EnumColor;
import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasItem;
import mekanism.api.transmitters.TransmissionType;
diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
index 6359c3e3e..f83909b50 100644
--- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
+++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java
@@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.BitSet;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
index 62541d509..0a6c97cb3 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
@@ -5,7 +5,6 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
index 7de9571d3..8fa9d4046 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
@@ -29,7 +29,6 @@ import mekanism.common.recipe.machines.SeparatorRecipe;
import mekanism.common.recipe.outputs.ChemicalPairOutput;
import mekanism.common.tile.TileEntityGasTank.GasMode;
import mekanism.common.tile.component.TileComponentSecurity;
-import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.tile.prefab.TileEntityMachine;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.FluidContainerUtils;
diff --git a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
index 69d0e9ad0..212d109c1 100644
--- a/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityEliteFactory.java
@@ -3,12 +3,10 @@ package mekanism.common.tile;
import mekanism.api.EnumColor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.SideData;
-import mekanism.common.Upgrade;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.tile.component.TileComponentConfig;
import mekanism.common.tile.component.TileComponentEjector;
-import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.util.InventoryUtils;
public class TileEntityEliteFactory extends TileEntityFactory
diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
index 4e5052ca0..e8a61181a 100644
--- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
+++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java
index af2aad448..05d98ce3d 100644
--- a/src/main/java/mekanism/common/tile/TileEntityFactory.java
+++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import java.util.List;
import mekanism.api.Coord4D;
@@ -36,8 +35,6 @@ import mekanism.common.base.SoundWrapper;
import mekanism.common.block.states.BlockStateMachine;
import mekanism.common.block.states.BlockStateMachine.MachineType;
import mekanism.common.capabilities.Capabilities;
-import mekanism.common.config.MekanismConfig.general;
-import mekanism.common.config.MekanismConfig.usage;
import mekanism.common.integration.computer.IComputerIntegration;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.recipe.RecipeHandler;
@@ -47,8 +44,6 @@ import mekanism.common.recipe.machines.BasicMachineRecipe;
import mekanism.common.recipe.machines.MetallurgicInfuserRecipe;
import mekanism.common.tile.component.TileComponentConfig;
import mekanism.common.tile.component.TileComponentEjector;
-import mekanism.common.tile.component.TileComponentSecurity;
-import mekanism.common.tile.component.TileComponentUpgrade;
import mekanism.common.tile.prefab.TileEntityAdvancedElectricMachine;
import mekanism.common.tile.prefab.TileEntityMachine;
import mekanism.common.util.ChargeUtils;
@@ -190,11 +185,8 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt
factory.soundURL = soundURL;
//Factory
-
- for(int i = 0; i < tier.processes; i++)
- {
- factory.progress[i] = progress[i];
- }
+
+ System.arraycopy(progress, 0, factory.progress, 0, tier.processes);
factory.recipeTicks = recipeTicks;
factory.clientActive = clientActive;
diff --git a/src/main/java/mekanism/common/tile/TileEntityLaser.java b/src/main/java/mekanism/common/tile/TileEntityLaser.java
index d0ca936fd..764c5c486 100644
--- a/src/main/java/mekanism/common/tile/TileEntityLaser.java
+++ b/src/main/java/mekanism/common/tile/TileEntityLaser.java
@@ -3,11 +3,9 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.Range4D;
-import mekanism.api.lasers.ILaserReceptor;
import mekanism.common.LaserManager;
import mekanism.common.LaserManager.LaserInfo;
import mekanism.common.Mekanism;
diff --git a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
index e2dd8d22b..718b5ab60 100644
--- a/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
+++ b/src/main/java/mekanism/common/tile/TileEntityLogisticalSorter.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import java.util.Iterator;
import mekanism.api.Coord4D;
diff --git a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java
index 422e07137..2c1b703fc 100644
--- a/src/main/java/mekanism/common/tile/TileEntityMultiblock.java
+++ b/src/main/java/mekanism/common/tile/TileEntityMultiblock.java
@@ -16,7 +16,6 @@ import mekanism.common.multiblock.UpdateProtocol;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.tile.prefab.TileEntityContainerBlock;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.ItemStackHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
index 3afdbe38f..bb156f9fc 100644
--- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
+++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import java.util.List;
import mekanism.api.Coord4D;
diff --git a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
index 483fbaf46..8a55ed1c2 100644
--- a/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
+++ b/src/main/java/mekanism/common/tile/TileEntityResistiveHeater.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.IHeatTransfer;
diff --git a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java
index c4274f92c..9d34fe175 100644
--- a/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java
+++ b/src/main/java/mekanism/common/tile/TileEntitySecurityDesk.java
@@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
index f14779ff3..a6d70beee 100644
--- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
+++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java
@@ -3,7 +3,6 @@ package mekanism.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.Range4D;
diff --git a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
index 57abcd40e..a418adac2 100644
--- a/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
+++ b/src/main/java/mekanism/common/tile/TileEntityThermalEvaporationController.java
@@ -9,7 +9,6 @@ import java.util.Set;
import mekanism.api.Coord4D;
import mekanism.api.IEvaporationSolar;
import mekanism.api.Range4D;
-import mekanism.client.SparkleAnimation.INodeChecker;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.base.IActiveState;
diff --git a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java
index 3bf566b34..b7608fc41 100644
--- a/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java
+++ b/src/main/java/mekanism/common/tile/component/TileComponentSecurity.java
@@ -17,7 +17,6 @@ import mekanism.common.security.SecurityFrequency;
import mekanism.common.tile.prefab.TileEntityContainerBlock;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.UsernameCache;
public class TileComponentSecurity implements ITileComponent
{
diff --git a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java
index 98cd8e60e..aa6e23401 100644
--- a/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java
+++ b/src/main/java/mekanism/common/tile/prefab/TileEntityBasicMachine.java
@@ -1,7 +1,5 @@
package mekanism.common.tile.prefab;
-import java.util.EnumSet;
-
import mekanism.api.IConfigCardAccess;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.base.IElectricMachine;
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java
index 7477e018d..e6586863d 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityDiversionTransporter.java
@@ -8,7 +8,6 @@ import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.Range4D;
import mekanism.common.Mekanism;
-import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.content.transporter.TransporterStack;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java
index ba66073c3..1b25eb575 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityPressurizedTube.java
@@ -13,7 +13,6 @@ import mekanism.api.transmitters.TransmissionType;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.TubeTier;
-import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.transmitters.grid.GasNetwork;
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityRestrictiveTransporter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityRestrictiveTransporter.java
index 070175016..6514445a8 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntityRestrictiveTransporter.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityRestrictiveTransporter.java
@@ -1,6 +1,5 @@
package mekanism.common.tile.transmitter;
-import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumActionResult;
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java
index fbc28cd84..6155b1727 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityThermodynamicConductor.java
@@ -14,7 +14,6 @@ import mekanism.common.Mekanism;
import mekanism.common.Tier;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.ConductorTier;
-import mekanism.common.block.states.BlockStateTransmitter;
import mekanism.common.block.states.BlockStateTransmitter.TransmitterType;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
diff --git a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java
index 28ad3fb7f..8d116bafb 100644
--- a/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java
+++ b/src/main/java/mekanism/common/tile/transmitter/TileEntityTransmitter.java
@@ -2,7 +2,6 @@ package mekanism.common.tile.transmitter;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Comparator;
import java.util.LinkedHashSet;
import mekanism.api.Coord4D;
diff --git a/src/main/java/mekanism/common/transmitters/TransporterImpl.java b/src/main/java/mekanism/common/transmitters/TransporterImpl.java
index eebca471c..564ccd948 100644
--- a/src/main/java/mekanism/common/transmitters/TransporterImpl.java
+++ b/src/main/java/mekanism/common/transmitters/TransporterImpl.java
@@ -24,7 +24,6 @@ import mekanism.common.util.CapabilityUtils;
import mekanism.common.util.InventoryUtils;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.TransporterUtils;
-import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
diff --git a/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java b/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java
index 6aa277bee..0f2557bc8 100644
--- a/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java
+++ b/src/main/java/mekanism/common/transmitters/grid/InventoryNetwork.java
@@ -14,7 +14,6 @@ import mekanism.api.transmitters.IGridTransmitter;
import mekanism.common.content.transporter.TransitRequest;
import mekanism.common.content.transporter.TransitRequest.TransitResponse;
import mekanism.common.content.transporter.TransporterManager;
-import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.fml.common.FMLCommonHandler;
diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java
index cadea6056..773589d08 100644
--- a/src/main/java/mekanism/common/util/InventoryUtils.java
+++ b/src/main/java/mekanism/common/util/InventoryUtils.java
@@ -4,7 +4,6 @@ import java.util.Map;
import mekanism.api.EnumColor;
import mekanism.common.base.ISideConfiguration;
-import mekanism.common.content.transporter.Finder;
import mekanism.common.content.transporter.InvStack;
import mekanism.common.content.transporter.TransitRequest;
import mekanism.common.content.transporter.TransitRequest.TransitResponse;
diff --git a/src/main/java/mekanism/common/util/ListUtils.java b/src/main/java/mekanism/common/util/ListUtils.java
index 2a9e3d8f4..526a5fd9a 100644
--- a/src/main/java/mekanism/common/util/ListUtils.java
+++ b/src/main/java/mekanism/common/util/ListUtils.java
@@ -2,6 +2,7 @@ package mekanism.common.util;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -50,10 +51,7 @@ public class ListUtils
{
List toReturn = new ArrayList<>();
- for(V obj : list)
- {
- toReturn.add(obj);
- }
+ toReturn.addAll(list);
return toReturn;
}
@@ -62,15 +60,8 @@ public class ListUtils
{
List newList = new ArrayList<>();
- for(V obj : listOne)
- {
- newList.add(obj);
- }
-
- for(V obj : listTwo)
- {
- newList.add(obj);
- }
+ newList.addAll(listOne);
+ newList.addAll(listTwo);
return newList;
}
@@ -141,10 +132,7 @@ public class ListUtils
toAdd--;
}
- for(V obj : removed)
- {
- list.remove(obj);
- }
+ list.removeAll(removed);
}
return toReturn;
@@ -168,11 +156,8 @@ public class ListUtils
public static ArrayList asArrayList(V... values)
{
ArrayList ret = new ArrayList<>();
-
- for(V value : values)
- {
- ret.add(value);
- }
+
+ Collections.addAll(ret, values);
return ret;
}
diff --git a/src/main/java/mekanism/common/util/RecipeUtils.java b/src/main/java/mekanism/common/util/RecipeUtils.java
index 606f652bc..394d6a40c 100644
--- a/src/main/java/mekanism/common/util/RecipeUtils.java
+++ b/src/main/java/mekanism/common/util/RecipeUtils.java
@@ -1,9 +1,6 @@
package mekanism.common.util;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import mekanism.api.energy.IEnergizedItem;
@@ -25,12 +22,9 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
-import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
-import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary;
-import net.minecraftforge.registries.GameData;
public class RecipeUtils
{
diff --git a/src/main/java/mekanism/common/util/SecurityUtils.java b/src/main/java/mekanism/common/util/SecurityUtils.java
index 652c5e104..8594b62a1 100644
--- a/src/main/java/mekanism/common/util/SecurityUtils.java
+++ b/src/main/java/mekanism/common/util/SecurityUtils.java
@@ -16,7 +16,6 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextComponentString;
-import net.minecraftforge.common.UsernameCache;
import net.minecraftforge.fml.relauncher.Side;
public final class SecurityUtils
diff --git a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java
index ba4d1e8cb..5b27dcdc1 100644
--- a/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java
+++ b/src/main/java/mekanism/generators/client/GeneratorsClientProxy.java
@@ -1,7 +1,5 @@
package mekanism.generators.client;
-import java.io.IOException;
-
import mekanism.client.render.MekanismRenderer;
import mekanism.generators.client.gui.GuiBioGenerator;
import mekanism.generators.client.gui.GuiGasGenerator;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java
index c17141ae4..0d6acead1 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java
@@ -1,9 +1,6 @@
package mekanism.generators.client.gui;
-import java.util.List;
-
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java
index 83908275b..3a2ede9b6 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java
@@ -1,13 +1,8 @@
package mekanism.generators.client.gui;
-import java.util.List;
-
-import mekanism.api.gas.GasTank;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
index 9bd271dfd..7adb71bb1 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java
@@ -1,12 +1,8 @@
package mekanism.generators.client.gui;
-import java.util.List;
-
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.client.gui.element.GuiHeatInfo;
import mekanism.client.gui.element.GuiPowerBar;
@@ -25,7 +21,6 @@ import mekanism.common.util.UnitDisplayUtils.TemperatureUnit;
import mekanism.generators.common.inventory.container.ContainerHeatGenerator;
import mekanism.generators.common.tile.TileEntityHeatGenerator;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
index 21a680f47..4fb1a8521 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java
@@ -2,11 +2,9 @@ package mekanism.generators.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRateBar;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java
index 53badc2e6..3f548c586 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java
@@ -1,10 +1,8 @@
package mekanism.generators.client.gui;
import java.util.ArrayList;
-import java.util.List;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiSlot;
import mekanism.client.gui.element.GuiSlot.SlotType;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
index 42cbe229a..fd2b6057a 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java
@@ -2,15 +2,11 @@ package mekanism.generators.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.api.gas.GasTank;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiGasGauge;
-import mekanism.client.gui.element.GuiGasGauge.IGasInfoHandler;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.client.gui.element.GuiProgress;
import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
index 88b8f7e97..917f234a6 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java
@@ -2,17 +2,12 @@ package mekanism.generators.client.gui;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
-import mekanism.api.energy.IStrictEnergyStorage;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyGauge;
-import mekanism.client.gui.element.GuiEnergyGauge.IEnergyInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiFluidGauge;
-import mekanism.client.gui.element.GuiFluidGauge.IFluidInfoHandler;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.client.gui.element.GuiNumberGauge;
import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler;
@@ -37,7 +32,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidTank;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java
index addb9f6f2..36b9b0b9c 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiReactorStats.java
@@ -3,12 +3,10 @@ package mekanism.generators.client.gui;
import java.io.IOException;
import java.text.NumberFormat;
import java.util.ArrayList;
-import java.util.List;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.sound.SoundHandler;
import mekanism.common.Mekanism;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
index 93d7661a8..afacc3f31 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java
@@ -1,9 +1,6 @@
package mekanism.generators.client.gui;
-import java.util.List;
-
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
index 58d3a88e5..6529be134 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java
@@ -1,10 +1,7 @@
package mekanism.generators.client.gui;
-import java.util.List;
-
import mekanism.api.EnumColor;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.config.MekanismConfig.generators;
diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
index 2ca611d94..df93df776 100644
--- a/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
+++ b/src/main/java/mekanism/generators/client/gui/GuiWindGenerator.java
@@ -1,11 +1,9 @@
package mekanism.generators.client.gui;
import java.text.DecimalFormat;
-import java.util.List;
import mekanism.api.EnumColor;
import mekanism.client.gui.GuiMekanism;
-import mekanism.client.gui.element.GuiElement.IInfoHandler;
import mekanism.client.gui.element.GuiEnergyInfo;
import mekanism.client.gui.element.GuiPowerBar;
import mekanism.client.gui.element.GuiRedstoneControl;
diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java
index b77e67d45..1a9c9b270 100644
--- a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java
+++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java
@@ -9,7 +9,6 @@ import mekanism.generators.common.item.ItemBlockGenerator;
import mekanism.generators.common.item.ItemBlockReactor;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
-import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.registries.IForgeRegistry;
diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java
index fba279e79..72162940f 100644
--- a/src/main/java/mekanism/generators/common/GeneratorsItems.java
+++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java
@@ -9,7 +9,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
-import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.registries.IForgeRegistry;
diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java
index a1e8a9da4..6025a1f2e 100644
--- a/src/main/java/mekanism/generators/common/MekanismGenerators.java
+++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java
@@ -14,7 +14,6 @@ import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
import mekanism.common.Version;
import mekanism.common.base.IModule;
-import mekanism.common.config.TypeConfigManager;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.config.MekanismConfig.generators;
import mekanism.common.multiblock.MultiblockManager;
diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java
index cc6c55e54..3a321d39a 100644
--- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java
+++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java
@@ -9,7 +9,6 @@ import mekanism.common.base.IBoundingBlock;
import mekanism.common.base.ISustainedData;
import mekanism.common.base.ISustainedInventory;
import mekanism.common.base.ISustainedTank;
-import mekanism.common.block.states.BlockStateBasic;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.config.MekanismConfig.client;
import mekanism.common.multiblock.IMultiblock;
@@ -56,7 +55,6 @@ import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
-import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import buildcraft.api.tools.IToolWrench;
diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java
index a5daaac17..da361499c 100644
--- a/src/main/java/mekanism/generators/common/block/BlockReactor.java
+++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java
@@ -22,7 +22,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockRenderLayer;
diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java
index 546dde772..eee5f5b64 100644
--- a/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java
+++ b/src/main/java/mekanism/generators/common/block/states/BlockStateGenerator.java
@@ -1,13 +1,10 @@
package mekanism.generators.common.block.states;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import mekanism.common.Mekanism;
import mekanism.common.base.IBlockType;
-import mekanism.common.block.states.BlockStateBasic;
import mekanism.common.block.states.BlockStateFacing;
import mekanism.common.config.MekanismConfig.general;
import mekanism.common.config.MekanismConfig.generators;
diff --git a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java
index 0981b1d51..17930f41d 100644
--- a/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java
+++ b/src/main/java/mekanism/generators/common/block/states/BlockStateReactor.java
@@ -1,7 +1,6 @@
package mekanism.generators.common.block.states;
import mekanism.common.Mekanism;
-import mekanism.common.block.states.BlockStateBasic;
import mekanism.common.tile.prefab.TileEntityElectricBlock;
import mekanism.common.util.LangUtils;
import mekanism.generators.common.GeneratorsBlocks;
diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java
index 62e637670..f25676c76 100644
--- a/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java
+++ b/src/main/java/mekanism/generators/common/item/ItemBlockReactor.java
@@ -8,7 +8,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.block.states.BlockStateReactor.ReactorBlockType;
import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
index 0f3e2d81b..277aba7e5 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java
@@ -1,7 +1,5 @@
package mekanism.generators.common.tile;
-import java.util.EnumSet;
-
import mekanism.api.Coord4D;
import mekanism.api.IEvaporationSolar;
import mekanism.common.base.IBoundingBlock;
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
index 34b69850b..3b7ff0779 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java
@@ -3,7 +3,6 @@ package mekanism.generators.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.Range4D;
diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
index ca1ac9e5e..5b40148ba 100644
--- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
+++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
@@ -3,7 +3,6 @@ package mekanism.generators.common.tile;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.common.config.MekanismConfig.generators;
import mekanism.common.util.ChargeUtils;
diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java
index 8e636ca52..070780f79 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorBlock.java
@@ -1,6 +1,5 @@
package mekanism.generators.common.tile.reactor;
-import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
index f95d8da4d..1a1a78d57 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorController.java
@@ -5,10 +5,8 @@ import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
import mekanism.api.Coord4D;
-import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;
-import mekanism.client.SparkleAnimation.INodeChecker;
import mekanism.client.sound.ISoundSource;
import mekanism.common.Mekanism;
import mekanism.common.MekanismFluids;
@@ -22,7 +20,6 @@ import mekanism.generators.common.FusionReactor;
import net.minecraft.client.audio.ISound.AttenuationType;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
diff --git a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
index e7a1ec655..b1e486901 100644
--- a/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
+++ b/src/main/java/mekanism/generators/common/tile/reactor/TileEntityReactorPort.java
@@ -3,7 +3,6 @@ package mekanism.generators.common.tile.reactor;
import io.netty.buffer.ByteBuf;
import java.util.ArrayList;
-import java.util.EnumSet;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
@@ -11,7 +10,6 @@ import mekanism.api.IConfigurable;
import mekanism.api.IHeatTransfer;
import mekanism.api.Range4D;
import mekanism.api.gas.Gas;
-import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.IGasHandler;
import mekanism.api.gas.ITubeConnection;
diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java
index 852e24c02..f50fdebd5 100644
--- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java
+++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java
@@ -13,7 +13,6 @@ import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.ItemArmor;
diff --git a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java
index c44060b13..430056a05 100644
--- a/src/main/java/mekanism/tools/item/ItemMekanismAxe.java
+++ b/src/main/java/mekanism/tools/item/ItemMekanismAxe.java
@@ -7,7 +7,6 @@ import mekanism.common.util.LangUtils;
import mekanism.common.util.StackUtils;
import mekanism.tools.common.MekanismTools;
import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemAxe;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
diff --git a/src/main/java/mekanism/tools/item/ItemMekanismSword.java b/src/main/java/mekanism/tools/item/ItemMekanismSword.java
index 4569cec5d..874ed0486 100644
--- a/src/main/java/mekanism/tools/item/ItemMekanismSword.java
+++ b/src/main/java/mekanism/tools/item/ItemMekanismSword.java
@@ -6,7 +6,6 @@ import mekanism.common.Mekanism;
import mekanism.common.util.LangUtils;
import mekanism.common.util.StackUtils;
import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.world.World;
diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java
index 71a4ee0c1..5f1c6618d 100644
--- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java
+++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java
@@ -10,7 +10,6 @@ import mekanism.common.util.StackUtils;
import mekanism.tools.common.MekanismTools;
import net.minecraft.block.Block;
import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemTool;