Sweepededeep~

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

@@ -154,7 +154,7 @@ public final class ActuallyAdditionsAPI{
      * Higher weight means higher occurence.
      *
      * @param oreName The ore's name
-     * @param weight The ore's weight
+     * @param weight  The ore's weight
      */
     public static void addMiningLensStoneOre(String oreName, int weight){
         STONE_ORES.add(new WeightedOre(oreName, weight));
@@ -165,7 +165,7 @@ public final class ActuallyAdditionsAPI{
      * Higher weight means higher occurence.
      *
      * @param oreName The ore's name
-     * @param weight The ore's weight
+     * @param weight  The ore's weight
      */
     public static void addMiningLensNetherOre(String oreName, int weight){
         NETHERRACK_ORES.add(new WeightedOre(oreName, weight));

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

@@ -17,7 +17,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.SoundType;

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

@@ -20,7 +20,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputterAdvanced;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntityInventoryBase;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
@@ -94,9 +93,9 @@ public class BlockInputter extends BlockContainerBase{
 
     public static class TheItemBlock extends ItemBlockBase{
 
+        private final Random rand = new Random();
         private long lastSysTime;
         private int toPick;
-        private final Random rand = new Random();
 
         public TheItemBlock(Block block){
             super(block);

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

@@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
 import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
 import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;

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

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot;
 import de.ellpeck.actuallyadditions.mod.achievement.TheAchievements;
 import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.PropertyInteger;

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

@@ -14,7 +14,6 @@ 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.util.ItemUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.BlockRedstoneTorch;

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

@@ -29,7 +29,6 @@ import de.ellpeck.actuallyadditions.mod.update.UpdateChecker;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 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.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;
@@ -88,10 +87,10 @@ public class GuiBooklet extends GuiScreen implements IBookletGui{
     public GuiTextField searchField;
     public boolean shouldSaveDataNextClose;
     public String bookletName;
+    public GuiButton buttonIntroduction;
     private int ticksElapsed;
     private boolean mousePressed;
     private int hisNameIsAt;
-    public GuiButton buttonIntroduction;
 
     public GuiBooklet(GuiScreen parentScreen, boolean tryOpenMainPage, boolean saveOnClose){
         this.xSize = 146;

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

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.entity;
 
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;

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

@@ -20,7 +20,6 @@ import de.ellpeck.actuallyadditions.mod.misc.DungeonLoot;
 import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper;
 import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.monster.EntitySpider;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/de/ellpeck/actuallyadditions/mod/gen/InitVillager.java

@@ -11,12 +11,7 @@
 package de.ellpeck.actuallyadditions.mod.gen;
 
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
-import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
-import net.minecraft.entity.passive.EntityVillager.PriceInfo;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraftforge.fml.common.registry.VillagerRegistry;
 import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerCareer;

src/main/java/de/ellpeck/actuallyadditions/mod/gen/OreGen.java

@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.gen;
 
-import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
 import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants;

src/main/java/de/ellpeck/actuallyadditions/mod/gen/VillageComponentJamHouse.java

@@ -19,7 +19,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
 import net.minecraft.world.gen.structure.StructureVillagePieces;
-import net.minecraftforge.fml.common.registry.VillagerRegistry;
 import net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession;
 
 import java.util.List;

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

@@ -37,6 +37,52 @@ public class ItemFillingWand extends ItemEnergy{
         super(800000, 2000, name);
     }
 
+    private static boolean removeFittingItem(IBlockState state, EntityPlayer player){
+        Block block = state.getBlock();
+        ItemStack stack = new ItemStack(block, 1, block.getMetaFromState(state));
+
+        if(stack != null && stack.getItem() != null){
+            for(int i = 0; i < player.inventory.getSizeInventory(); i++){
+                ItemStack slot = player.inventory.getStackInSlot(i);
+                if(slot != null && slot.isItemEqual(stack) && slot.stackSize > 0){
+                    slot.stackSize--;
+                    if(slot.stackSize <= 0){
+                        player.inventory.setInventorySlotContents(i, null);
+                    }
+
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static void saveBlock(IBlockState state, ItemStack stack){
+        if(!stack.hasTagCompound()){
+            stack.setTagCompound(new NBTTagCompound());
+        }
+        NBTTagCompound compound = stack.getTagCompound();
+
+        Block block = state.getBlock();
+        compound.setString("Block", block.getRegistryName().toString());
+        compound.setInteger("Meta", block.getMetaFromState(state));
+    }
+
+    private static IBlockState loadBlock(ItemStack stack){
+        if(stack.hasTagCompound()){
+            NBTTagCompound compound = stack.getTagCompound();
+            String blockName = compound.getString("Block");
+            int meta = compound.getInteger("Meta");
+
+            Block block = Block.getBlockFromName(blockName);
+            if(block != null){
+                return block.getStateFromMeta(meta);
+            }
+        }
+        return null;
+    }
+
     @Override
     public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ){
         if(!world.isRemote && player.getItemInUseCount() <= 0){
@@ -199,52 +245,6 @@ public class ItemFillingWand extends ItemEnergy{
         list.add("Selected Block: "+display);
     }
 
-    private static boolean removeFittingItem(IBlockState state, EntityPlayer player){
-        Block block = state.getBlock();
-        ItemStack stack = new ItemStack(block, 1, block.getMetaFromState(state));
-
-        if(stack != null && stack.getItem() != null){
-            for(int i = 0; i < player.inventory.getSizeInventory(); i++){
-                ItemStack slot = player.inventory.getStackInSlot(i);
-                if(slot != null && slot.isItemEqual(stack) && slot.stackSize > 0){
-                    slot.stackSize--;
-                    if(slot.stackSize <= 0){
-                        player.inventory.setInventorySlotContents(i, null);
-                    }
-
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    private static void saveBlock(IBlockState state, ItemStack stack){
-        if(!stack.hasTagCompound()){
-            stack.setTagCompound(new NBTTagCompound());
-        }
-        NBTTagCompound compound = stack.getTagCompound();
-
-        Block block = state.getBlock();
-        compound.setString("Block", block.getRegistryName().toString());
-        compound.setInteger("Meta", block.getMetaFromState(state));
-    }
-
-    private static IBlockState loadBlock(ItemStack stack){
-        if(stack.hasTagCompound()){
-            NBTTagCompound compound = stack.getTagCompound();
-            String blockName = compound.getString("Block");
-            int meta = compound.getInteger("Meta");
-
-            Block block = Block.getBlockFromName(blockName);
-            if(block != null){
-                return block.getStateFromMeta(meta);
-            }
-        }
-        return null;
-    }
-
     @Override
     public int getMaxItemUseDuration(ItemStack stack){
         return Integer.MAX_VALUE;

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

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.items;
 
 import de.ellpeck.actuallyadditions.mod.items.base.ItemEnergy;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockGrass;
 import net.minecraft.block.IGrowable;

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

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.items;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.passive.EntityOcelot;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -11,23 +11,18 @@
 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.PacketHandlerHelper;
 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.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;

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

@@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import de.ellpeck.actuallyadditions.mod.items.metalists.ThePotionRings;
 import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.client.renderer.color.IItemColor;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;

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

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.items;
 import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.items.base.ItemBase;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.entity.passive.EntityBat;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumRarity;

src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensColor.java

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.api.recipe.IColorLensChanger;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;
@@ -32,9 +31,7 @@ import java.util.Random;
 
 public class LensColor extends Lens{
 
-    private final Random rand = new Random();
     public static final int ENERGY_USE = 200;
-
     //Thanks to xdjackiexd for this, as I couldn't be bothered
     public static final float[][] POSSIBLE_COLORS = {
             {158F, 43F, 39F}, //Red
@@ -50,6 +47,7 @@ public class LensColor extends Lens{
             {217F, 129F, 153F}, //Pink
             {86F, 51F, 28F}, //Brown
     };
+    private final Random rand = new Random();
 
     @Override
     public boolean invoke(IBlockState hitState, BlockPos hitBlock, IAtomicReconstructor tile){

src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensDisruption.java

@@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.items.lens;
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.item.EntityItem;

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

@@ -17,7 +17,6 @@ import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -21,7 +21,6 @@ import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -17,7 +17,6 @@ import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -16,7 +16,6 @@ import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
 import de.ellpeck.actuallyadditions.mod.jei.RecipeWrapperWithButton;
 import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;

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

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.misc;
 
 import de.ellpeck.actuallyadditions.mod.util.ModUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.text.ITextComponent;

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

@@ -15,7 +15,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor;
 import de.ellpeck.actuallyadditions.api.lens.ILensItem;
 import de.ellpeck.actuallyadditions.api.lens.Lens;
-import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.misc.SoundHandler;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
@@ -40,7 +39,7 @@ public class TileEntityAtomicReconstructor extends TileEntityInventoryBase imple
     }
 
     public static void shootLaser(World world, double startX, double startY, double startZ, double endX, double endY, double endZ, Lens currentLens){
-            world.playSound(null, startX, startY, startZ, SoundHandler.reconstructor, SoundCategory.BLOCKS, 0.35F, 1.0F);
+        world.playSound(null, startX, startY, startZ, SoundHandler.reconstructor, SoundCategory.BLOCKS, 0.35F, 1.0F);
         AssetUtil.shootParticles(world, startX, startY, startZ, endX, endY, endZ, currentLens.getColor(), 8, 2F, 1F);
     }
 

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

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
 import de.ellpeck.actuallyadditions.api.recipe.CoffeeIngredient;
-import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.items.InitItems;
 import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
 import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;

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

@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.init.Items;

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

@@ -11,7 +11,6 @@
 package de.ellpeck.actuallyadditions.mod.tile;
 
 import cofh.api.energy.EnergyStorage;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.entity.item.EntityFireworkRocket;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemDye;

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

@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;

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

@@ -10,7 +10,6 @@
 
 package de.ellpeck.actuallyadditions.mod.tile;
 
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockGrass;
 import net.minecraft.block.IGrowable;

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

@@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 
 import cofh.api.energy.EnergyStorage;
-import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
 import de.ellpeck.actuallyadditions.mod.misc.SoundHandler;
 import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor;
 import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry;

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 de.ellpeck.actuallyadditions.mod.util.Util;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;

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

@@ -13,23 +13,11 @@ package de.ellpeck.actuallyadditions.mod.tile;
 import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
 import de.ellpeck.actuallyadditions.api.laser.IConnectionPair;
 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;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.util.Set;
 

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

@@ -44,7 +44,7 @@ public class TileEntityLaserRelayFluids extends TileEntityLaserRelay implements
 
     @Override
     public void saveDataOnChangeOrWorldStart(){
-        Map<EnumFacing,  TileEntity> old = new HashMap<EnumFacing, TileEntity>(this.receiversAround);
+        Map<EnumFacing, TileEntity> old = new HashMap<EnumFacing, TileEntity>(this.receiversAround);
         boolean change = false;
 
         this.receiversAround.clear();

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

@@ -52,7 +52,7 @@ public class TileEntityLaserRelayItem extends TileEntityLaserRelay{
 
     @Override
     public void saveDataOnChangeOrWorldStart(){
-        Map<BlockPos,  IItemHandler> old = new HashMap<BlockPos, IItemHandler>(this.handlersAround);
+        Map<BlockPos, IItemHandler> old = new HashMap<BlockPos, IItemHandler>(this.handlersAround);
         boolean change = false;
 
         this.handlersAround.clear();

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

@@ -14,7 +14,6 @@ import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
 import de.ellpeck.actuallyadditions.mod.blocks.BlockPhantom;
 import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
-import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

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

@@ -285,30 +285,30 @@ public final class AssetUtil{
             tessy.draw();
         }
         else{*/
-            GlStateManager.disableTexture2D();
+        GlStateManager.disableTexture2D();
-            render.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
+        render.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
-            render.pos(length, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(length, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
 
-            render.pos(length, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(length, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
 
-            render.pos(length, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(length, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
 
-            render.pos(length, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, -beamWidth, beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(0, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(0, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            render.pos(length, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
+        render.pos(length, -beamWidth, -beamWidth).color(r, g, b, alpha).endVertex();
-            tessy.draw();
+        tessy.draw();
 
-            GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture2D();
         //}
 
         GlStateManager.disableBlend();