Grab the broom and sweep~

src/main/java/de/ellpeck/actuallyadditions/api/ActuallyAdditionsAPI.java

@@ -150,6 +150,7 @@ public final class ActuallyAdditionsAPI{
 
     /**
      * Adds a Recipe to the Oil generator
+     *
      * @param fluidName The name of the fluid to be consumed
      * @param genAmount The amount of energy generated per operation
      */

src/main/java/de/ellpeck/actuallyadditions/api/booklet/BookletPage.java

@@ -20,9 +20,9 @@ import java.util.HashMap;
 
 public abstract class BookletPage{
 
+    protected final HashMap<String, String> textReplacements = new HashMap<String, String>();
     public boolean arePageStacksWildcard;
     protected IBookletChapter chapter;
-    protected final HashMap<String, String> textReplacements = new HashMap<String, String>();
     protected boolean hasNoText;
 
     public void onOpened(IBookletGui gui){

src/main/java/de/ellpeck/actuallyadditions/api/laser/IConnectionPair.java

@@ -27,6 +27,7 @@ public interface IConnectionPair{
 
     boolean contains(BlockPos pos);
 
-    @Deprecated //TODO Remove this once removing the temporary type fixer
+    @Deprecated
+        //TODO Remove this once removing the temporary type fixer
     void setType(LaserType type);
 }

src/main/java/de/ellpeck/actuallyadditions/api/recipe/CrusherRecipe.java

@@ -11,11 +11,6 @@
 package de.ellpeck.actuallyadditions.api.recipe;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
 
 public class CrusherRecipe{
 

src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java

@@ -82,7 +82,7 @@ public class ActuallyAdditions{
 
         if(Loader.isModLoaded("tesla")){
             ModUtil.LOGGER.info("Tesla loaded... Activating Tesla Power System integration...");
-            ActuallyAdditions.teslaLoaded = true;
+            teslaLoaded = true;
         }
         else{
             ModUtil.LOGGER.info("Tesla not found! Skipping Tesla Power System integration.");

src/main/java/de/ellpeck/actuallyadditions/mod/achievement/InitAchievements.java

@@ -12,12 +12,7 @@ package de.ellpeck.actuallyadditions.mod.achievement;
 
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.stats.Achievement;
-import net.minecraft.stats.AchievementList;
-import net.minecraft.stats.StatisticsManager;
-import net.minecraft.util.JsonSerializableSet;
 import net.minecraftforge.common.AchievementPage;
 
 import java.util.ArrayList;

src/main/java/de/ellpeck/actuallyadditions/mod/achievement/TheAchievements.java

@@ -20,7 +20,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
-import net.minecraft.stats.AchievementList;
 import net.minecraft.stats.StatisticsManager;
 import net.minecraft.util.JsonSerializableSet;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.blocks;
 
 import de.ellpeck.actuallyadditions.api.lens.ILensItem;
-import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java

@@ -14,7 +14,6 @@ package de.ellpeck.actuallyadditions.mod.blocks;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.blocks;
 
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import net.minecraft.block.SoundType;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.blocks;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinderDouble;
 import net.minecraft.block.SoundType;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewer.java

@@ -17,7 +17,6 @@ import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class BlockItemViewer extends BlockContainerBase{

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java

@@ -14,7 +14,6 @@ package de.ellpeck.actuallyadditions.mod.blocks;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java

@@ -26,7 +26,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nullable;
 import java.util.Random;
 
 //Copied from BlockTorch.

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java

@@ -14,15 +14,12 @@ package de.ellpeck.actuallyadditions.mod.blocks;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.blocks.base;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase;
-import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderEmpowerer.java

@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.blocks.render;
 
-import de.ellpeck.actuallyadditions.mod.tile.TileEntityDisplayStand;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityEmpowerer;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.blocks.render;
 
 import de.ellpeck.actuallyadditions.mod.misc.cloud.ISmileyCloudEasterEgg;
 import de.ellpeck.actuallyadditions.mod.misc.cloud.SmileyCloudEasterEggs;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.state.IBlockState;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/GuiBooklet.java

@@ -24,10 +24,7 @@ import de.ellpeck.actuallyadditions.mod.config.GuiConfiguration;
 import de.ellpeck.actuallyadditions.mod.data.PlayerData;
 import de.ellpeck.actuallyadditions.mod.items.ItemBooklet;
 import de.ellpeck.actuallyadditions.mod.misc.SoundHandler;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.update.UpdateChecker;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCoffeeRecipe.java

@@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrafting.java

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageCrusherRecipe.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
@@ -21,7 +20,6 @@ import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import java.util.ArrayList;
 import java.util.List;
 
 

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageEmpowerer.java

@@ -12,11 +12,11 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
-import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
-import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-import de.ellpeck.actuallyadditions.mod.util.*;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextFormatting;
@@ -24,7 +24,6 @@ import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class PageEmpowerer extends BookletPageAA{
 

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageFurnace.java

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.booklet.page;
 
 import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/page/PageReconstructor.java

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.api.internal.IBookletGui;
 import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
 import de.ellpeck.actuallyadditions.mod.util.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;

src/main/java/de/ellpeck/actuallyadditions/mod/data/WorldData.java

@@ -28,7 +28,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class WorldData{

src/main/java/de/ellpeck/actuallyadditions/mod/entity/EntityWorm.java

@@ -30,6 +30,20 @@ public class EntityWorm extends Entity{
         this.setEntityBoundingBox(null);
     }
 
+    public static boolean canWormify(World world, BlockPos pos, IBlockState state){
+        Block block = state.getBlock();
+        boolean rightBlock = block instanceof BlockFarmland || block == Blocks.GRASS || block == Blocks.GRASS_PATH || (block == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT);
+        if(rightBlock){
+            BlockPos posUp = pos.up();
+            IBlockState stateUp = world.getBlockState(posUp);
+            Block blockUp = stateUp.getBlock();
+            return blockUp instanceof IPlantable || blockUp instanceof BlockBush || blockUp.isReplaceable(world, posUp);
+        }
+        else{
+            return false;
+        }
+    }
+
     @Override
     protected void entityInit(){
 
@@ -107,18 +121,4 @@ public class EntityWorm extends Entity{
             }
         }
     }
-
-    public static boolean canWormify(World world, BlockPos pos, IBlockState state){
-        Block block = state.getBlock();
-        boolean rightBlock = block instanceof BlockFarmland || block == Blocks.GRASS || block == Blocks.GRASS_PATH || (block == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT);
-        if(rightBlock){
-            BlockPos posUp = pos.up();
-            IBlockState stateUp = world.getBlockState(posUp);
-            Block blockUp = stateUp.getBlock();
-            return blockUp instanceof IPlantable || blockUp instanceof BlockBush || blockUp.isReplaceable(world, posUp);
-        }
-        else{
-            return false;
-        }
-    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java

@@ -26,14 +26,13 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 @SideOnly(Side.CLIENT)
 public class RenderWorm extends Render<EntityWorm>{
 
-    private static final ItemStack STACK = new ItemStack(InitItems.itemWorm);
-
     public static final IRenderFactory FACTORY = new IRenderFactory(){
         @Override
         public Render createRenderFor(RenderManager manager){
             return new RenderWorm(manager);
         }
     };
+    private static final ItemStack STACK = new ItemStack(InitItems.itemWorm);
 
     protected RenderWorm(RenderManager renderManager){
         super(renderManager);

src/main/java/de/ellpeck/actuallyadditions/mod/event/CommonEvents.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.event;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.mod.misc.ConnectionPair;
 import de.ellpeck.actuallyadditions.api.laser.LaserType;
 import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
 import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements;
@@ -19,6 +18,7 @@ import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.data.PlayerData;
 import de.ellpeck.actuallyadditions.mod.data.WorldData;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.misc.ConnectionPair;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBag.java

@@ -27,13 +27,11 @@ import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
-import javax.annotation.Nullable;
-
 
 public class ContainerBag extends Container implements IButtonReactor{
 
-    private final InventoryBag bagInventory;
     public final FilterSettings filter = new FilterSettings(0, 4, false, true, false, 0, -1000);
+    private final InventoryBag bagInventory;
     private final InventoryPlayer inventory;
     private final boolean isVoid;
     public boolean autoInsert;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java

@@ -12,8 +12,6 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import cofh.api.energy.EnergyStorage;
 import de.ellpeck.actuallyadditions.mod.data.PlayerData;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java

@@ -29,7 +29,6 @@ import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @SideOnly(Side.CLIENT)
@@ -39,8 +38,8 @@ public class GuiBag extends GuiContainer{
     private static final ResourceLocation RES_LOC_VOID = AssetUtil.getGuiLocation("guiVoidBag");
 
     private final ContainerBag container;
-    private FilterSettingsGui filter;
     private final boolean isVoid;
+    private FilterSettingsGui filter;
     private GuiButton buttonAutoInsert;
 
     public GuiBag(InventoryPlayer inventory, boolean isVoid){

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java

@@ -11,20 +11,16 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerFurnaceDouble;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java

@@ -11,20 +11,16 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestLarge;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestMedium;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java

@@ -12,20 +12,16 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerLaserRelayItemWhitelist;
 import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter.SmallerButton;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.relauncher.Side;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java

@@ -11,19 +11,15 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java

@@ -11,22 +11,17 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerPhantomPlacer;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java

@@ -11,18 +11,14 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerRangedCollector;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;

src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java

@@ -11,8 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.inventory.gui;
 
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerXPSolidifier;
-import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
@@ -23,7 +21,6 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemBooklet.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.items;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
 import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements;
 import de.ellpeck.actuallyadditions.mod.blocks.IHudDisplay;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemChestToCrateUpgrade.java

@@ -10,20 +10,15 @@
 
 package de.ellpeck.actuallyadditions.mod.items;
 
-import de.ellpeck.actuallyadditions.mod.blocks.BlockGiantChest;
-import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
-import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockChest;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemLaserWrench.java

@@ -13,18 +13,14 @@ package de.ellpeck.actuallyadditions.mod.items;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.mod.data.PlayerData;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
-import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
-import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;

src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPhantomConnector.java

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;

src/main/java/de/ellpeck/actuallyadditions/mod/jei/booklet/BookletRecipeWrapper.java

@@ -21,7 +21,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fluids.FluidStack;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/main/java/de/ellpeck/actuallyadditions/mod/jei/coffee/CoffeeMachineRecipeWrapper.java

@@ -25,7 +25,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

src/main/java/de/ellpeck/actuallyadditions/mod/jei/crusher/CrusherRecipeWrapper.java

@@ -22,7 +22,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeCategory.java

@@ -10,9 +10,7 @@
 
 package de.ellpeck.actuallyadditions.mod.jei.empowerer;
 
-import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;

src/main/java/de/ellpeck/actuallyadditions/mod/jei/empowerer/EmpowererRecipeWrapper.java

@@ -12,17 +12,14 @@ package de.ellpeck.actuallyadditions.mod.jei.empowerer;
 
 import de.ellpeck.actuallyadditions.api.booklet.BookletPage;
 import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
-import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
-import de.ellpeck.actuallyadditions.mod.util.RecipeUtil;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;

src/main/java/de/ellpeck/actuallyadditions/mod/jei/reconstructor/ReconstructorRecipeWrapper.java

@@ -21,7 +21,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/de/ellpeck/actuallyadditions/mod/misc/LaserRelayConnectionHandler.java

@@ -46,6 +46,18 @@ public final class LaserRelayConnectionHandler implements ILaserRelayConnectionH
         return network;
     }
 
+    /**
+     * Merges two laserRelayNetworks together
+     * (Actually puts everything from the second network into the first one and removes the second one)
+     */
+    private static void mergeNetworks(Network firstNetwork, Network secondNetwork, World world){
+        for(IConnectionPair secondPair : secondNetwork.connections){
+            firstNetwork.connections.add(secondPair);
+        }
+        WorldData.getDataForWorld(world).laserRelayNetworks.remove(secondNetwork);
+        //System.out.println("Merged Two Networks!");
+    }
+
     /**
      * Gets all Connections for a Relay
      */
@@ -152,16 +164,4 @@ public final class LaserRelayConnectionHandler implements ILaserRelayConnectionH
         return true;
     }
 
-    /**
-     * Merges two laserRelayNetworks together
-     * (Actually puts everything from the second network into the first one and removes the second one)
-     */
-    private static void mergeNetworks(Network firstNetwork, Network secondNetwork, World world){
-        for(IConnectionPair secondPair : secondNetwork.connections){
-            firstNetwork.connections.add(secondPair);
-        }
-        WorldData.getDataForWorld(world).laserRelayNetworks.remove(secondNetwork);
-        //System.out.println("Merged Two Networks!");
-    }
-
 }

src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandler.java

@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.network;
 
-import de.ellpeck.actuallyadditions.mod.booklet.entry.EntrySet;
 import de.ellpeck.actuallyadditions.mod.data.PlayerData;
 import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor;
 import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor;
@@ -20,7 +19,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -41,9 +39,7 @@ import java.util.UUID;
 
 public final class PacketHandler{
 
-    public static SimpleNetworkWrapper theNetwork;
     public static final List<IDataHandler> DATA_HANDLERS = new ArrayList<IDataHandler>();
-
     public static final IDataHandler PARTICLE_HANDLER = new IDataHandler(){
         @Override
         @SideOnly(Side.CLIENT)
@@ -128,6 +124,7 @@ public final class PacketHandler{
             }
         }
     };
+    public static SimpleNetworkWrapper theNetwork;
     public static final IDataHandler BOOKLET_STAND_BUTTON_HANDLER = new IDataHandler(){
         @Override
         public void handleData(NBTTagCompound compound){

src/main/java/de/ellpeck/actuallyadditions/mod/proxy/ClientProxy.java

@@ -45,7 +45,10 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ClientProxy implements IProxy{
 

src/main/java/de/ellpeck/actuallyadditions/mod/tile/FilterSettings.java

@@ -22,23 +22,18 @@ public class FilterSettings{
 
     public final int startSlot;
     public final int endSlot;
-
-    public boolean isWhitelist;
-    private boolean lastWhitelist;
-
-    public boolean respectMeta;
-    private boolean lastRespectMeta;
-
-    public boolean respectNBT;
-    private boolean lastRespectNBT;
-
-    public int respectOredict;
-    private int lastRecpectOredict;
-
     public final int whitelistButtonId;
     public final int metaButtonId;
     public final int nbtButtonId;
     public final int oredictButtonId;
+    public boolean isWhitelist;
+    public boolean respectMeta;
+    public boolean respectNBT;
+    public int respectOredict;
+    private boolean lastWhitelist;
+    private boolean lastRespectMeta;
+    private boolean lastRespectNBT;
+    private int lastRecpectOredict;
 
     public FilterSettings(int startSlot, int endSlot, boolean defaultWhitelist, boolean defaultRespectMeta, boolean defaultRespectNBT, int defaultRespectOredict, int buttonIdStart){
         this.startSlot = startSlot;
@@ -55,58 +50,6 @@ public class FilterSettings{
         this.oredictButtonId = buttonIdStart+3;
     }
 
-    public void writeToNBT(NBTTagCompound tag, String name){
-        NBTTagCompound compound = new NBTTagCompound();
-        compound.setBoolean("Whitelist", this.isWhitelist);
-        compound.setBoolean("Meta", this.respectMeta);
-        compound.setBoolean("NBT", this.respectNBT);
-        compound.setInteger("Oredict", this.respectOredict);
-        tag.setTag(name, compound);
-    }
-
-    public void readFromNBT(NBTTagCompound tag, String name){
-        NBTTagCompound compound = tag.getCompoundTag(name);
-        this.isWhitelist = compound.getBoolean("Whitelist");
-        this.respectMeta = compound.getBoolean("Meta");
-        this.respectNBT = compound.getBoolean("NBT");
-        this.respectOredict = compound.getInteger("Oredict");
-    }
-
-    public boolean needsUpdateSend(){
-        return this.lastWhitelist != this.isWhitelist || this.lastRespectMeta != this.respectMeta || this.lastRespectNBT != this.respectNBT || this.lastRecpectOredict != this.respectOredict;
-    }
-
-    public void updateLasts(){
-        this.lastWhitelist = this.isWhitelist;
-        this.lastRespectMeta = this.respectMeta;
-        this.lastRespectNBT = this.respectNBT;
-        this.lastRecpectOredict = this.respectOredict;
-    }
-
-    public void onButtonPressed(int id){
-        if(id == this.whitelistButtonId){
-            this.isWhitelist = !this.isWhitelist;
-        }
-        else if(id == this.metaButtonId){
-            this.respectMeta = !this.respectMeta;
-        }
-        else if(id == this.nbtButtonId){
-            this.respectNBT = !this.respectNBT;
-        }
-        else if(id == this.oredictButtonId){
-            if(this.respectOredict+1 > 2){
-                this.respectOredict = 0;
-            }
-            else{
-                this.respectOredict++;
-            }
-        }
-    }
-
-    public boolean check(ItemStack stack, ItemStack[] slots){
-        return check(stack, slots, this.startSlot, this.endSlot, this.isWhitelist, this.respectMeta, this.respectNBT, this.respectOredict);
-    }
-
     public static boolean check(ItemStack stack, ItemStack[] slots, int startSlot, int endSlot, boolean whitelist, boolean meta, boolean nbt, int oredict){
         if(stack != null){
             for(int i = startSlot; i < endSlot; i++){
@@ -181,4 +124,56 @@ public class FilterSettings{
             }
         }
     }
+
+    public void writeToNBT(NBTTagCompound tag, String name){
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setBoolean("Whitelist", this.isWhitelist);
+        compound.setBoolean("Meta", this.respectMeta);
+        compound.setBoolean("NBT", this.respectNBT);
+        compound.setInteger("Oredict", this.respectOredict);
+        tag.setTag(name, compound);
+    }
+
+    public void readFromNBT(NBTTagCompound tag, String name){
+        NBTTagCompound compound = tag.getCompoundTag(name);
+        this.isWhitelist = compound.getBoolean("Whitelist");
+        this.respectMeta = compound.getBoolean("Meta");
+        this.respectNBT = compound.getBoolean("NBT");
+        this.respectOredict = compound.getInteger("Oredict");
+    }
+
+    public boolean needsUpdateSend(){
+        return this.lastWhitelist != this.isWhitelist || this.lastRespectMeta != this.respectMeta || this.lastRespectNBT != this.respectNBT || this.lastRecpectOredict != this.respectOredict;
+    }
+
+    public void updateLasts(){
+        this.lastWhitelist = this.isWhitelist;
+        this.lastRespectMeta = this.respectMeta;
+        this.lastRespectNBT = this.respectNBT;
+        this.lastRecpectOredict = this.respectOredict;
+    }
+
+    public void onButtonPressed(int id){
+        if(id == this.whitelistButtonId){
+            this.isWhitelist = !this.isWhitelist;
+        }
+        else if(id == this.metaButtonId){
+            this.respectMeta = !this.respectMeta;
+        }
+        else if(id == this.nbtButtonId){
+            this.respectNBT = !this.respectNBT;
+        }
+        else if(id == this.oredictButtonId){
+            if(this.respectOredict+1 > 2){
+                this.respectOredict = 0;
+            }
+            else{
+                this.respectOredict++;
+            }
+        }
+    }
+
+    public boolean check(ItemStack stack, ItemStack[] slots){
+        return check(stack, slots, this.startSlot, this.endSlot, this.isWhitelist, this.respectMeta, this.respectNBT, this.respectOredict);
+    }
 }

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
-import cofh.api.energy.IEnergyProvider;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntityFurnace;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDistributorItem.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 public class TileEntityDistributorItem extends TileEntityInventoryBase{
 
-    private int putSide;
     private final Map<EnumFacing, IItemHandler> handlersAround = new HashMap<EnumFacing, IItemHandler>();
+    private int putSide;
 
     public TileEntityDistributorItem(){
         super(1, "distributorItem");

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEmpowerer.java

@@ -35,6 +35,17 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{
         super(1, "empowerer");
     }
 
+    public static EmpowererRecipe getRecipeForInput(ItemStack input){
+        if(input != null){
+            for(EmpowererRecipe recipe : ActuallyAdditionsAPI.EMPOWERER_RECIPES){
+                if(recipe.input != null && recipe.input.isItemEqual(input)){
+                    return recipe;
+                }
+            }
+        }
+        return null;
+    }
+
     @Override
     public void updateEntity(){
         super.updateEntity();
@@ -128,17 +139,6 @@ public class TileEntityEmpowerer extends TileEntityInventoryBase{
         }
     }
 
-    public static EmpowererRecipe getRecipeForInput(ItemStack input){
-        if(input != null){
-            for(EmpowererRecipe recipe : ActuallyAdditionsAPI.EMPOWERER_RECIPES){
-                if(recipe.input != null && recipe.input.isItemEqual(input)){
-                    return recipe;
-                }
-            }
-        }
-        return null;
-    }
-
     @Override
     public boolean shouldSyncSlots(){
         return true;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
 import cofh.api.energy.IEnergyContainerItem;
-import cofh.api.energy.IEnergyProvider;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.util.compat.TeslaUtil;
 import net.darkhax.tesla.api.ITeslaHolder;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java

@@ -34,17 +34,47 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements
     public final EnergyStorage storage = new EnergyStorage(30000);
     public int firstSmeltTime;
     public int secondSmeltTime;
+    public boolean isAutoSplit;
     private int lastEnergy;
     private int lastFirstSmelt;
     private int lastSecondSmelt;
-
-    public boolean isAutoSplit;
     private boolean lastAutoSplit;
 
     public TileEntityFurnaceDouble(){
         super(4, "furnaceDouble");
     }
 
+    public static void autoSplit(ItemStack[] slots, int slot1, int slot2){
+        ItemStack first = slots[slot1];
+        ItemStack second = slots[slot2];
+
+        if(first != null || second != null){
+            ItemStack toSplit = null;
+            if(first == null && second != null){
+                toSplit = second;
+            }
+            else if(second == null && first != null){
+                toSplit = first;
+            }
+            else if(ItemUtil.canBeStacked(first, second)){
+                if(first.stackSize < first.getMaxStackSize() || second.stackSize < second.getMaxStackSize()){
+                    if(!((first.stackSize <= second.stackSize+1 && first.stackSize >= second.stackSize-1) || (second.stackSize <= first.stackSize+1 && second.stackSize >= first.stackSize-1))){
+                        toSplit = first;
+                        toSplit.stackSize += second.stackSize;
+                    }
+                }
+            }
+
+            if(toSplit != null && toSplit.stackSize > 1){
+                ItemStack splitFirst = toSplit.copy();
+                ItemStack secondSplit = splitFirst.splitStack(splitFirst.stackSize/2);
+
+                slots[slot1] = splitFirst;
+                slots[slot2] = secondSplit;
+            }
+        }
+    }
+
     @Override
     public void writeSyncableNBT(NBTTagCompound compound, NBTType type){
         super.writeSyncableNBT(compound, type);
@@ -132,37 +162,6 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements
         }
     }
 
-    public static void autoSplit(ItemStack[] slots, int slot1, int slot2){
-        ItemStack first = slots[slot1];
-        ItemStack second = slots[slot2];
-
-        if(first != null || second != null){
-            ItemStack toSplit = null;
-            if(first == null && second != null){
-                toSplit = second;
-            }
-            else if(second == null && first != null){
-                toSplit = first;
-            }
-            else if(ItemUtil.canBeStacked(first, second)){
-                if(first.stackSize < first.getMaxStackSize() || second.stackSize < second.getMaxStackSize()){
-                    if(!((first.stackSize <= second.stackSize+1 && first.stackSize >= second.stackSize-1) || (second.stackSize <= first.stackSize+1 && second.stackSize >= first.stackSize-1))){
-                        toSplit = first;
-                        toSplit.stackSize += second.stackSize;
-                    }
-                }
-            }
-
-            if(toSplit != null && toSplit.stackSize > 1){
-                ItemStack splitFirst = toSplit.copy();
-                ItemStack secondSplit = splitFirst.splitStack(splitFirst.stackSize/2);
-
-                slots[slot1] = splitFirst;
-                slots[slot2] = secondSplit;
-            }
-        }
-    }
-
     @Override
     public boolean isItemValidForSlot(int i, ItemStack stack){
         return (i == SLOT_INPUT_1 || i == SLOT_INPUT_2) && FurnaceRecipes.instance().getSmeltingResult(stack) != null;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
-import cofh.api.energy.IEnergyProvider;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java

@@ -42,11 +42,10 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements ICusto
     public int firstCrushTime;
     public int secondCrushTime;
     public boolean isDouble;
+    public boolean isAutoSplit;
     private int lastEnergy;
     private int lastFirstCrush;
     private int lastSecondCrush;
-
-    public boolean isAutoSplit;
     private boolean lastAutoSplit;
 
     public TileEntityGrinder(int slots, String name){

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
-import cofh.api.energy.IEnergyProvider;
 import de.ellpeck.actuallyadditions.mod.util.Util;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
 import net.minecraft.block.Block;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java

@@ -39,14 +39,14 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
     public int slotToPullEnd;
     public TileEntity placeToPull;
     public boolean isAdvanced;
+    public FilterSettings leftFilter = new FilterSettings(PULL_FILTER_START, PULL_FILTER_START+12, true, true, false, 0, -1000);
+    public FilterSettings rightFilter = new FilterSettings(PUT_FILTER_START, PUT_FILTER_START+12, true, true, false, 0, -2000);
     private int lastPutSide;
     private int lastPutStart;
     private int lastPutEnd;
     private int lastPullSide;
     private int lastPullStart;
     private int lastPullEnd;
-    public FilterSettings leftFilter = new FilterSettings(PULL_FILTER_START, PULL_FILTER_START+12, true, true, false, 0, -1000);
-    public FilterSettings rightFilter = new FilterSettings(PUT_FILTER_START, PUT_FILTER_START+12, true, true, false, 0, -2000);
 
     public TileEntityInputter(int slots, String name){
         super(slots, name);

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java

@@ -12,13 +12,13 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.laser.IConnectionPair;
-import de.ellpeck.actuallyadditions.mod.misc.ConnectionPair;
 import de.ellpeck.actuallyadditions.api.laser.LaserType;
 import de.ellpeck.actuallyadditions.api.laser.Network;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.data.PlayerData;
 import de.ellpeck.actuallyadditions.mod.items.ItemLaserWrench;
 import de.ellpeck.actuallyadditions.mod.items.ItemLaserWrench.WrenchMode;
+import de.ellpeck.actuallyadditions.mod.misc.ConnectionPair;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.Util;
 import io.netty.util.internal.ConcurrentSet;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
 import cofh.api.energy.IEnergyReceiver;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.laser.IConnectionPair;
-import de.ellpeck.actuallyadditions.mod.misc.ConnectionPair;
 import de.ellpeck.actuallyadditions.api.laser.LaserType;
 import de.ellpeck.actuallyadditions.api.laser.Network;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
@@ -32,9 +31,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay implements ICustomEnergyReceiver{
 
-    public final ConcurrentHashMap<EnumFacing, TileEntity> receiversAround = new ConcurrentHashMap<EnumFacing, TileEntity>();
-
     public static final int CAP = 1000;
+    public final ConcurrentHashMap<EnumFacing, TileEntity> receiversAround = new ConcurrentHashMap<EnumFacing, TileEntity>();
 
     public TileEntityLaserRelayEnergy(String name){
         super(name, LaserType.ENERGY);

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItem.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.api.laser.IConnectionPair;
-import de.ellpeck.actuallyadditions.mod.misc.ConnectionPair;
 import de.ellpeck.actuallyadditions.api.laser.LaserType;
 import de.ellpeck.actuallyadditions.api.laser.Network;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityItemViewer.GenericItemHandlerInfo;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayItemWhitelist.java

@@ -18,20 +18,16 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraftforge.items.IItemHandler;
 
-import java.util.List;
-import java.util.Map;
-
 public class TileEntityLaserRelayItemWhitelist extends TileEntityLaserRelayItem implements IButtonReactor{
 
     public final IInventory filterInventory;
-    private ItemStack[] slots = new ItemStack[24];
     public FilterSettings leftFilter = new FilterSettings(0, 12, true, true, false, 0, -1000);
     public FilterSettings rightFilter = new FilterSettings(12, 24, true, true, false, 0, -2000);
+    private ItemStack[] slots = new ItemStack[24];
 
     public TileEntityLaserRelayItemWhitelist(){
         super("laserRelayItemWhitelist");

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
-import cofh.api.energy.IEnergyProvider;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.Block;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityXPSolidifier.java

@@ -21,7 +21,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.AxisAlignedBB;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class TileEntityXPSolidifier extends TileEntityInventoryBase implements IButtonReactor{

src/main/java/de/ellpeck/actuallyadditions/mod/util/RecipeUtil.java

@@ -11,11 +11,9 @@
 package de.ellpeck.actuallyadditions.mod.util;
 
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
-import de.ellpeck.actuallyadditions.api.lens.LensConversion;
 import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
 import de.ellpeck.actuallyadditions.api.recipe.EmpowererRecipe;
 import de.ellpeck.actuallyadditions.api.recipe.LensConversionRecipe;
-import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;

src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/ItemTeslaWrapper.java

@@ -19,8 +19,6 @@ import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 
-import javax.annotation.Nullable;
-
 public class ItemTeslaWrapper implements ITeslaProducer, ITeslaHolder, ITeslaConsumer, ICapabilityProvider{
 
     private final ItemStack stack;