Added an API.

src/main/java/de/ellpeck/actuallyadditions/PLANNED.txt

@@ -1,151 +0,0 @@
--Quartz Enchanter
-    -Lets you enchant Tools with Black Quartz
-    -Doesn't use Levels
-    -Needs Quartz and Diamond Blocks instead of Bookcases around
-
--Chestie
-    -Follows you around
-    -Has an Inventory, a Crafting Table and a Furnace
-
--Ender Attractor / Repulsor
-    -Attracts/Repulses Mobs
-    -Has an aggressive and a friendly version
-    -Maybe for Items
-
--Void Bag
-    -Sucks up picked up Items
-    -Has a Filter
-    -Destroys excess Items (also determined by a Filter)
-    -Gets emptied into Chest on Right-Click
-
--Auto-Crafting Item
-    -Has a Recipe saved
-    -Crafts Recipe on Shift-Right-Click if all Items are in Inventory
-
--TNT Arrows
-
--Teleport Arrows
-    -Teleport hit Entities randomly
-
--Thorn Plant
-    -Grows on the Floor
-    -Damages Entities walking on it
-    -Has Thorn Armor which damages the Enemy
-
--Cobblestone and Stone Signs
-
--Binoculars
-    -Allow you to see farther and closer
-    -With Night Vision Addon
-
--Sound Irritation Device
-    -Plays Random or Configured Sounds randomly
-
--Uncrafting Table
-
--Decorative Lead
-    -Can be placed between two Fences for Decoration
-
--Crafting Table Minecart
--Anvil Minecart
--Dropper Minecart
--Super Speed Track
-
--File Jukebox
-    -Plays Sound Files put into your Minecraft Folder
-
--Pharmacy Plants
-    -Give you different effects
-
--Multi-Block Ore Factory
-    -Fluids and things higher Multiplying Chance (x2, x3..)
-    -Speed Upgrades etc.
-
--Advanced Redstone Transmitter
-    -You can mark an area
-    -On Activation, all blocks in the area get a Signal
-
--Thermopile
-    -Needs a hot and a cold fluid
-    -Depending on the fluids, it generates more power
-
--More Effect Rings
-    -Ring of Thorns: Hurts Attackers when they hit you with a Projectile
-    -Ring of Water Walking
-    -Ring of Aquadive: Fast underwater movement
-    -Ring of Unarmoring: Attacker lose parts of their Armor
-
--Food Cannon
-    -Shoots Food Items
-    -Damage varies with Food
-
--Furniture
-    -Can be put into a Crafting Table with a Banner to give it a pattern (1.8!)
-    -Parts of the furniture can have different types (eg. Wood, Stone etc.) -> Via Crafting or Tool?
-
--Tinker's Concrete
-    -Customizable with Items in Concrete Mixer
-    -(eg. Redstone->Speed Glowstone->Light etc.)
-
--Alarm
-    -Gets triggered when Mobs are in the Area
-    -Configurable Range
-    -Configurable Mobs
-
--Industrial Fertilizer
-    -Grows the whole Plant with one Click
-
--Dog Bones
-    -Breed Dogs faster
-    -Makes them have Babies too
-
--Testificate Bucks
-    -Village House that has a Coffee Machine
-    -Villager who sells Coffee and Cookies
-
--Inventory Emitter
-    -Emits a Redstone Signal dependant on the Amount of a specified Item in it
-    -Items are configurable in the GUI
-
--Enderman Teleport Stopper
-
--Placable Buckets
-    -Buckets can be placed as Bucket Blocks
-
--Milking Machine
-
--Shearing Machine
-
--Sunken City Biome
-    -Normal Houses, but destroyed
-    -With Loot Chests
-
--Weeping Angel-like Statues
-    -Only move when you don't look
-    -Teleport you away
-
--ME Phantomface
-
--Redstone Phantomface
-
--Player Phantomface
-    -Boosters make it work across dimensions
-
--Crafting Table for Overrides
-    -When multiple Items have the same crafting recipe, you can switch through and pick what you want
-
--Crafting Crate
-    -Storage Crate with Crafting Table inside
-
--Crafting Viewer
-    -Crafting Table that shows you every recipe you can craft with all of the Items in your Inventory
-
--Laser Transport System
-    -Lasers that shoot between different transmitters
-    -Transmitters can have prisms etc. to change direction, split up or decide if items, fluids or energy should be moved and how much and how fast
-
--Tool Table
-    -Put in any tool and special items
-    -Make the tool more awesome (Lumberaxe, Battleaxe, Silk Pick, Fortune Pick etc.)
-    -Every item in the table results in a special feature (e.g. Black Quartz -> Silk, Emeralds -> Fortune etc.)
-    -> Make drill more endgame, make this midgame stuff

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

@@ -0,0 +1,152 @@
+/*
+ * This file ("ActuallyAdditionsAPI.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api;
+
+import de.ellpeck.actuallyadditions.api.lens.Lens;
+import de.ellpeck.actuallyadditions.api.recipe.BallOfFurReturn;
+import de.ellpeck.actuallyadditions.api.recipe.CrusherRecipe;
+import de.ellpeck.actuallyadditions.api.recipe.LensNoneRecipe;
+import de.ellpeck.actuallyadditions.api.recipe.TreasureChestLoot;
+import de.ellpeck.actuallyadditions.api.recipe.coffee.CoffeeIngredient;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.oredict.OreDictionary;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ActuallyAdditionsAPI{
+
+    public static List<CrusherRecipe> crusherRecipes = new ArrayList<CrusherRecipe>();
+    public static List<BallOfFurReturn> ballOfFurReturnItems = new ArrayList<BallOfFurReturn>();
+    public static List<TreasureChestLoot> treasureChestLoot = new ArrayList<TreasureChestLoot>();
+    public static List<Lens> reconstructorLenses = new ArrayList<Lens>();
+    public static List<LensNoneRecipe> reconstructorLensNoneRecipes = new ArrayList<LensNoneRecipe>();
+    public static List<CoffeeIngredient> coffeeMachineIngredients = new ArrayList<CoffeeIngredient>();
+
+    /**
+     * Adds a Recipe to the Crusher Recipe Registry
+     * The second output will be nothing
+     *
+     * @param input           The input's OreDictionary name
+     * @param outputOne       The first output's OreDictionary name
+     * @param outputOneAmount The amount of the first output
+     */
+    public static void addCrusherRecipe(String input, String outputOne, int outputOneAmount){
+        addCrusherRecipe(input, outputOne, outputOneAmount, "", 0, 0);
+    }
+
+    /**
+     * Adds a Recipe to the Crusher Recipe Registry
+     *
+     * @param input           The input's OreDictionary name
+     * @param outputOne       The first output's OreDictionary name
+     * @param outputOneAmount The amount of the first output
+     * @param outputTwo       The second output's OreDictionary name
+     * @param outputTwoAmount The amount of the second output
+     * @param outputTwoChance The chance of the second output (0 won't occur at all, 100 will all the time)
+     */
+    public static void addCrusherRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){
+        if(!OreDictionary.getOres(input, false).isEmpty() && !OreDictionary.getOres(outputOne, false).isEmpty() && (outputTwo == null || outputTwo.isEmpty() || !OreDictionary.getOres(outputTwo, false).isEmpty())){
+            crusherRecipes.add(new CrusherRecipe(input, outputOne, outputOneAmount, outputTwo, outputTwoAmount, outputTwoChance));
+        }
+    }
+
+    /**
+     * Adds a Recipe to the Crusher Recipe Registry
+     * The second output will be nothing
+     *
+     * @param input     The input as an ItemStack
+     * @param outputOne The first output as an ItemStack
+     */
+    public static void addCrusherRecipe(ItemStack input, ItemStack outputOne){
+        addCrusherRecipe(input, outputOne, null, 0);
+    }
+
+    /**
+     * Adds a Recipe to the Crusher Recipe Registry
+     * The second output will be nothing
+     *
+     * @param input           The input as an ItemStack
+     * @param outputOne       The first output as an ItemStack
+     * @param outputTwo       The second output as an ItemStack
+     * @param outputTwoChance The chance of the second output (0 won't occur at all, 100 will all the time)
+     */
+    public static void addCrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){
+        crusherRecipes.add(new CrusherRecipe(input, outputOne, outputTwo, outputTwoChance));
+    }
+
+    /**
+     * Adds a Recipe to the Crusher Recipe Registry
+     * The second output will be nothing
+     *
+     * @param input           The input as an ItemStack
+     * @param outputOne       The first output's OreDictionary name
+     * @param outputOneAmount The amount of the first output
+     */
+    public static void addCrusherRecipe(ItemStack input, String outputOne, int outputOneAmount){
+        if(!OreDictionary.getOres(outputOne, false).isEmpty()){
+            crusherRecipes.add(new CrusherRecipe(input, outputOne, outputOneAmount));
+        }
+    }
+
+    /**
+     * Adds an item to the list of possible items to be returned when right-clicking a Ball Of Fur
+     *
+     * @param stack  The ItemStack to be returned
+     * @param chance The chance (this is from WeightedRandom.Item)
+     */
+    public static void addBallOfFurReturnItem(ItemStack stack, int chance){
+        ActuallyAdditionsAPI.ballOfFurReturnItems.add(new BallOfFurReturn(stack, chance));
+    }
+
+    /**
+     * Adds an item to the list of possible items to be returned when opening a Treasure Chest
+     *
+     * @param stack     The ItemStack to be returned, the stacksize is ignored
+     * @param chance    The chance (this is from WeightedRandom.Item)
+     * @param minAmount The minimum stacksize of the returned stack
+     * @param maxAmount The maximum stacksize of the returned stack
+     */
+    public static void addTreasureChestLoot(ItemStack stack, int chance, int minAmount, int maxAmount){
+        ActuallyAdditionsAPI.treasureChestLoot.add(new TreasureChestLoot(stack, chance, minAmount, maxAmount));
+    }
+
+    /**
+     * Adds a recipe to the Atomic Reconstructor conversion without lens
+     * StackSizes can only be 1 and greater ones will be ignored
+     *
+     * @param input     The input as an ItemStack
+     * @param output    The output as an ItemStack
+     * @param energyUse The amount of RF used per conversion
+     */
+    public static void addReconstructorLensNoneRecipe(ItemStack input, ItemStack output, int energyUse){
+        reconstructorLensNoneRecipes.add(new LensNoneRecipe(input, output, energyUse));
+    }
+
+    /**
+     * Adds a recipe to the Atomic Reconstructor conversion without lens
+     *
+     * @param input     The input's OreDictionary name
+     * @param output    The output's OreDictionary name
+     * @param energyUse The amount of RF used per conversion
+     */
+    public static void addReconstructorLensNoneRecipe(String input, String output, int energyUse){
+        reconstructorLensNoneRecipes.add(new LensNoneRecipe(input, output, energyUse));
+    }
+
+    /**
+     * Adds an ingredient to the Coffee Machine ingredient list
+     * @param ingredient The ingredient to add
+     */
+    public static void addCoffeeMachineIngredient(CoffeeIngredient ingredient){
+        coffeeMachineIngredients.add(ingredient);
+    }
+}

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

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.util;
+package de.ellpeck.actuallyadditions.api;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -17,6 +17,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
+/**
+ * This utility class describes a position in the world
+ */
 public class Position{
 
     private int x;

src/main/java/de/ellpeck/actuallyadditions/api/block/IHudDisplay.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.api.block;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -19,6 +19,9 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.util.MovingObjectPosition;
 
+/**
+ * Extending this will cause displayHud() to be called when hovering over it in-world
+ */
 public interface IHudDisplay{
 
     @SideOnly(Side.CLIENT)

src/main/java/de/ellpeck/actuallyadditions/api/lens/IAtomicReconstructor.java

@@ -0,0 +1,50 @@
+/*
+ * This file ("IAtomicReconstructor.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.lens;
+
+import net.minecraft.world.World;
+
+/**
+ * This is a helper interface for Lens' invoke() method.
+ * This is not supposed to be implemented.
+ */
+public interface IAtomicReconstructor{
+
+    /**
+     * Returns the x coord of the reconstructor
+     */
+    int getX();
+
+    /**
+     * Returns the y coord of the reconstructor
+     */
+    int getY();
+
+    /**
+     * Returns the z coord of the reconstructor
+     */
+    int getZ();
+
+    /**
+     * Returns the world of the reconstructor
+     */
+    World getWorldObj();
+
+    /**
+     * Extracts a specified amount of energy from the Reconstructor's RF storage
+     */
+    void extractEnergy(int amount);
+
+    /**
+     * Gets the amount of energy the Reconstructor has stored in its RF storage
+     */
+    int getEnergy();
+}

src/main/java/de/ellpeck/actuallyadditions/api/lens/ILensItem.java

@@ -0,0 +1,22 @@
+/*
+ * This file ("ILensItem.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.lens;
+
+/**
+ * This is the base class for a Reconstructor Lens Item
+ */
+public interface ILensItem{
+
+    /**
+     * Returns the lens type that belongs to this lens item
+     */
+    Lens getLens();
+}

src/main/java/de/ellpeck/actuallyadditions/api/lens/Lens.java

@@ -0,0 +1,60 @@
+/*
+ * This file ("Lens.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.lens;
+
+import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
+import de.ellpeck.actuallyadditions.api.Position;
+import net.minecraft.item.Item;
+
+/**
+ * This is the base class for a Reconstructor Lens Type (NOT THE ITEM!)
+ * You need to call register() to register the type
+ */
+public abstract class Lens{
+
+    /**
+     * The item that belongs to this lens type
+     */
+    protected Item lensItem;
+
+    /**
+     * Invokes the lens type's behavior on a block
+     * @param hitBlock The block that was hit
+     * @param tile The tile the lens was invoked from
+     * @return If the Reconstructor should stop continuing (return false if you want it to go through blocks)
+     */
+    public abstract boolean invoke(Position hitBlock, IAtomicReconstructor tile);
+
+    /**
+     * Returns the color in an array of 3 float values that are r, g, b
+     */
+    public abstract float[] getColor();
+
+    /**
+     * Gets the maximum distance the beam goes with this lense
+     */
+    public abstract int getDistance();
+
+    /**
+     * Registers the lense type
+     */
+    public Lens register(){
+        ActuallyAdditionsAPI.reconstructorLenses.add(this);
+        return this;
+    }
+
+    /**
+     * Sets the item corresponding to the lense
+     */
+    public void setLensItem(Item item){
+        this.lensItem = item;
+    }
+}

src/main/java/de/ellpeck/actuallyadditions/api/package-info.java

@@ -0,0 +1,13 @@
+/*
+ * This file ("package-info.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+@API(owner = "Ellpeck", apiVersion = "1", provides = "ActuallyAdditionsAPI")
+package de.ellpeck.actuallyadditions.api;
+
+import cpw.mods.fml.common.API;

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

@@ -0,0 +1,25 @@
+/*
+ * This file ("BallOfFurReturn.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.recipe;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.WeightedRandom;
+
+public class BallOfFurReturn extends WeightedRandom.Item{
+
+    public ItemStack returnItem;
+
+    public BallOfFurReturn(ItemStack returnItem, int chance){
+        super(chance);
+        this.returnItem = returnItem;
+    }
+
+}

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

@@ -0,0 +1,125 @@
+/*
+ * This file ("CrusherRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+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{
+
+    public int outputTwoChance;
+    public String input;
+    public String outputOne;
+    public int outputOneAmount;
+    public String outputTwo;
+    public int outputTwoAmount;
+    private ItemStack inputStack;
+    private ItemStack outputOneStack;
+    private ItemStack outputTwoStack;
+
+    public CrusherRecipe(ItemStack input, String outputOne, int outputOneAmount){
+        this.inputStack = input;
+        this.outputOne = outputOne;
+        this.outputOneAmount = outputOneAmount;
+    }
+
+    public CrusherRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int outputTwoChance){
+        this.inputStack = input;
+        this.outputOneStack = outputOne;
+        this.outputTwoStack = outputTwo;
+        this.outputTwoChance = outputTwoChance;
+    }
+
+    public CrusherRecipe(String input, String outputOne, int outputOneAmount, String outputTwo, int outputTwoAmount, int outputTwoChance){
+        this.input = input;
+        this.outputOne = outputOne;
+        this.outputOneAmount = outputOneAmount;
+        this.outputTwo = outputTwo;
+        this.outputTwoAmount = outputTwoAmount;
+        this.outputTwoChance = outputTwoChance;
+    }
+
+    public List<ItemStack> getRecipeOutputOnes(){
+        if(this.outputOneStack != null){
+            return Collections.singletonList(this.outputOneStack.copy());
+        }
+
+        if(this.outputOne == null || this.outputOne.isEmpty()){
+            return null;
+        }
+
+        List<ItemStack> stacks = OreDictionary.getOres(this.outputOne, false);
+        if(stacks != null && !stacks.isEmpty()){
+            List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
+            for(ItemStack stack : stacks){
+                if(stack != null){
+                    ItemStack stackCopy = stack.copy();
+                    stackCopy.stackSize = this.outputOneAmount;
+                    stacksCopy.add(stackCopy);
+                }
+            }
+            return stacksCopy;
+        }
+        return null;
+    }
+
+    public List<ItemStack> getRecipeOutputTwos(){
+        if(this.outputTwoStack != null){
+            return Collections.singletonList(this.outputTwoStack.copy());
+        }
+
+        if(this.outputTwo == null || this.outputTwo.isEmpty()){
+            return null;
+        }
+
+        List<ItemStack> stacks = OreDictionary.getOres(this.outputTwo, false);
+        if(stacks != null && !stacks.isEmpty()){
+            List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
+            for(ItemStack stack : stacks){
+                if(stack != null){
+                    ItemStack stackCopy = stack.copy();
+                    stackCopy.stackSize = this.outputTwoAmount;
+                    stacksCopy.add(stackCopy);
+                }
+            }
+            return stacksCopy;
+        }
+        return null;
+    }
+
+    public List<ItemStack> getRecipeInputs(){
+        if(this.inputStack != null){
+            return Collections.singletonList(this.inputStack.copy());
+        }
+
+        if(this.input == null || this.input.isEmpty()){
+            return null;
+        }
+
+        List<ItemStack> stacks = OreDictionary.getOres(this.input, false);
+        if(stacks != null && !stacks.isEmpty()){
+            List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
+            for(ItemStack stack : stacks){
+                if(stack != null){
+                    ItemStack stackCopy = stack.copy();
+                    stackCopy.stackSize = 1;
+                    stacksCopy.add(stackCopy);
+                }
+            }
+            return stacksCopy;
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,87 @@
+/*
+ * This file ("LensNoneRecipe.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+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 LensNoneRecipe{
+
+    public int energyUse;
+    private String input;
+    private String output;
+    private ItemStack inputStack;
+    private ItemStack outputStack;
+
+    public LensNoneRecipe(ItemStack input, ItemStack output, int energyUse){
+        this.inputStack = input;
+        this.outputStack = output;
+        this.energyUse = energyUse;
+    }
+
+    public LensNoneRecipe(String input, String output, int energyUse){
+        this.input = input;
+        this.output = output;
+        this.energyUse = energyUse;
+    }
+
+    public List<ItemStack> getOutputs(){
+        if(this.outputStack != null){
+            return Collections.singletonList(this.outputStack.copy());
+        }
+
+        if(this.output == null || this.output.isEmpty()){
+            return null;
+        }
+
+        List<ItemStack> stacks = OreDictionary.getOres(this.output, false);
+        if(stacks != null && !stacks.isEmpty()){
+            List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
+            for(ItemStack stack : stacks){
+                if(stack != null){
+                    ItemStack stackCopy = stack.copy();
+                    stackCopy.stackSize = 1;
+                    stacksCopy.add(stackCopy);
+                }
+            }
+            return stacksCopy;
+        }
+        return null;
+    }
+
+    public List<ItemStack> getInputs(){
+        if(this.inputStack != null){
+            return Collections.singletonList(this.inputStack.copy());
+        }
+
+        if(this.input == null || this.input.isEmpty()){
+            return null;
+        }
+
+        List<ItemStack> stacks = OreDictionary.getOres(this.input, false);
+        if(stacks != null && !stacks.isEmpty()){
+            List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
+            for(ItemStack stack : stacks){
+                if(stack != null){
+                    ItemStack stackCopy = stack.copy();
+                    stackCopy.stackSize = 1;
+                    stacksCopy.add(stackCopy);
+                }
+            }
+            return stacksCopy;
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,29 @@
+/*
+ * This file ("TreasureChestLoot.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.recipe;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.WeightedRandom;
+
+public class TreasureChestLoot extends WeightedRandom.Item{
+
+    public ItemStack returnItem;
+    public int minAmount;
+    public int maxAmount;
+
+    public TreasureChestLoot(ItemStack returnItem, int chance, int minAmount, int maxAmount){
+        super(chance);
+        this.returnItem = returnItem;
+        this.minAmount = minAmount;
+        this.maxAmount = maxAmount;
+    }
+
+}

src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeBrewing.java

@@ -0,0 +1,107 @@
+/*
+ * This file ("CoffeeBrewing.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.recipe.coffee;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.PotionEffect;
+
+import java.util.ArrayList;
+
+/**
+ * This is a util class for adding Ingredients to ItemStacks
+ * Use when making a custom Coffee Ingredient
+ */
+public class CoffeeBrewing{
+
+    public static boolean addEffectToStack(ItemStack stack, CoffeeIngredient ingredient){
+        boolean worked = false;
+        if(ingredient != null){
+            PotionEffect[] effects = ingredient.getEffects();
+            if(effects != null && effects.length > 0){
+                for(PotionEffect effect : effects){
+                    PotionEffect effectHas = getSameEffectFromStack(stack, effect);
+                    if(effectHas != null){
+                        if(effectHas.getAmplifier() < ingredient.maxAmplifier-1){
+                            addEffectProperties(stack, effect, false, true);
+                            worked = true;
+                        }
+                    }
+                    else{
+                        addEffectToStack(stack, effect);
+                        worked = true;
+                    }
+                }
+            }
+        }
+        return worked;
+    }
+
+    public static PotionEffect getSameEffectFromStack(ItemStack stack, PotionEffect effect){
+        PotionEffect[] effectsStack = getEffectsFromStack(stack);
+        if(effectsStack != null && effectsStack.length > 0){
+            for(PotionEffect effectStack : effectsStack){
+                if(effect.getPotionID() == effectStack.getPotionID()){
+                    return effectStack;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static void addEffectProperties(ItemStack stack, PotionEffect effect, boolean addDur, boolean addAmp){
+        PotionEffect[] effects = getEffectsFromStack(stack);
+        stack.setTagCompound(new NBTTagCompound());
+        for(int i = 0; i < effects.length; i++){
+            if(effects[i].getPotionID() == effect.getPotionID()){
+                effects[i] = new PotionEffect(effects[i].getPotionID(), effects[i].getDuration()+(addDur ? effect.getDuration() : 0), effects[i].getAmplifier()+(addAmp ? (effect.getAmplifier() > 0 ? effect.getAmplifier() : 1) : 0));
+            }
+            addEffectToStack(stack, effects[i]);
+        }
+    }
+
+    public static void addEffectToStack(ItemStack stack, PotionEffect effect){
+        NBTTagCompound tag = stack.getTagCompound();
+        if(tag == null){
+            tag = new NBTTagCompound();
+        }
+
+        int prevCounter = tag.getInteger("Counter");
+        NBTTagCompound compound = new NBTTagCompound();
+        compound.setInteger("ID", effect.getPotionID());
+        compound.setInteger("Duration", effect.getDuration());
+        compound.setInteger("Amplifier", effect.getAmplifier());
+
+        int counter = prevCounter+1;
+        tag.setTag(counter+"", compound);
+        tag.setInteger("Counter", counter);
+
+        stack.setTagCompound(tag);
+    }
+
+    public static PotionEffect[] getEffectsFromStack(ItemStack stack){
+        ArrayList<PotionEffect> effects = new ArrayList<PotionEffect>();
+        NBTTagCompound tag = stack.getTagCompound();
+        if(tag != null){
+            int counter = tag.getInteger("Counter");
+            while(counter > 0){
+                NBTTagCompound compound = (NBTTagCompound)tag.getTag(counter+"");
+                PotionEffect effect = new PotionEffect(compound.getInteger("ID"), compound.getInteger("Duration"), compound.getByte("Amplifier"));
+                if(effect.getPotionID() > 0){
+                    effects.add(effect);
+                }
+                counter--;
+            }
+        }
+        return effects.size() > 0 ? effects.toArray(new PotionEffect[effects.size()]) : null;
+    }
+
+}

src/main/java/de/ellpeck/actuallyadditions/api/recipe/coffee/CoffeeIngredient.java

@@ -0,0 +1,39 @@
+/*
+ * This file ("CoffeeIngredient.java") is part of the Actually Additions Mod for Minecraft.
+ * It is created and owned by Ellpeck and distributed
+ * under the Actually Additions License to be found at
+ * http://ellpeck.de/actaddlicense/
+ * View the source code at https://github.com/Ellpeck/ActuallyAdditions
+ *
+ * © 2016 Ellpeck
+ */
+
+package de.ellpeck.actuallyadditions.api.recipe.coffee;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.potion.PotionEffect;
+
+public class CoffeeIngredient{
+
+    public final ItemStack ingredient;
+    public final int maxAmplifier;
+    protected PotionEffect[] effects;
+
+    public CoffeeIngredient(ItemStack ingredient, PotionEffect[] effects, int maxAmplifier){
+        this.ingredient = ingredient.copy();
+        this.effects = effects;
+        this.maxAmplifier = maxAmplifier;
+    }
+
+    public PotionEffect[] getEffects(){
+        return this.effects;
+    }
+
+    public boolean effect(ItemStack stack){
+        return CoffeeBrewing.addEffectToStack(stack, this);
+    }
+
+    public String getExtraText(){
+        return null;
+    }
+}

src/main/java/de/ellpeck/actuallyadditions/api/tile/IEnergyDisplay.java

@@ -8,11 +8,14 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.tile;
+package de.ellpeck.actuallyadditions.api.tile;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+/**
+ * Extending this will cause a block to show "getEnergy()/maxEnergy() RF" when hovering over it in-world
+ */
 public interface IEnergyDisplay{
 
     @SideOnly(Side.CLIENT)

src/main/java/de/ellpeck/actuallyadditions/api/tile/IPhantomTile.java

@@ -8,10 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.tile;
+package de.ellpeck.actuallyadditions.api.tile;
 
-import de.ellpeck.actuallyadditions.util.Position;
+import de.ellpeck.actuallyadditions.api.Position;
 
+/**
+ * Extending this will cause a TileEntity to be able to be connected via a Phantom Connector
+ */
 public interface IPhantomTile{
 
     /**
@@ -29,6 +32,9 @@ public interface IPhantomTile{
      */
     Position getBoundPosition();
 
+    /**
+     * Sets the bound position
+     */
     void setBoundPosition(Position pos);
 
     /**

src/main/java/de/ellpeck/actuallyadditions/crafting/CrusherCrafting.java

@@ -1,108 +0,0 @@
-/*
- * This file ("CrusherCrafting.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2016 Ellpeck
- */
-
-package de.ellpeck.actuallyadditions.crafting;
-
-import de.ellpeck.actuallyadditions.config.values.ConfigCrafting;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.items.metalists.TheFoods;
-import de.ellpeck.actuallyadditions.recipe.CrusherRecipeRegistry;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.Util;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-import java.util.ArrayList;
-
-public class CrusherCrafting{
-
-    public static CrusherRecipeRegistry.CrusherRecipe recipeIronHorseArmor;
-    public static CrusherRecipeRegistry.CrusherRecipe recipeGoldHorseArmor;
-    public static CrusherRecipeRegistry.CrusherRecipe recipeDiamondHorseArmor;
-    public static ArrayList<CrusherRecipeRegistry.CrusherRecipe> miscRecipes = new ArrayList<CrusherRecipeRegistry.CrusherRecipe>();
-
-    public static void init(){
-        ModUtil.LOGGER.info("Initializing Crusher Recipes...");
-
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Items.bone), new ItemStack(Items.dye, 6, 15));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Items.reeds), new ItemStack(Items.sugar, 3));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.yellow_flower), new ItemStack(Items.dye, 3, 11));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 0), new ItemStack(Items.dye, 3, 1));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 1), new ItemStack(Items.dye, 3, 12));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 2), new ItemStack(Items.dye, 3, 13));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 3), new ItemStack(Items.dye, 3, 7));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 4), new ItemStack(Items.dye, 3, 1));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 5), new ItemStack(Items.dye, 3, 14));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 6), new ItemStack(Items.dye, 3, 7));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 7), new ItemStack(Items.dye, 3, 9));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.red_flower, 1, 8), new ItemStack(Items.dye, 3, 7));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 0), new ItemStack(Items.dye, 4, 11));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 1), new ItemStack(Items.dye, 4, 13));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 4), new ItemStack(Items.dye, 4, 1));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.double_plant, 1, 5), new ItemStack(Items.dye, 4, 9));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-
-        CrusherRecipeRegistry.addRecipe("oreRedstone", "dustRedstone", 10);
-        CrusherRecipeRegistry.addRecipe("oreLapis", "gemLapis", 12);
-        CrusherRecipeRegistry.addRecipe("coal", "dustCoal", 1);
-        CrusherRecipeRegistry.addRecipe("oreCoal", "coal", 3);
-        CrusherRecipeRegistry.addRecipe("blockCoal", "coal", 9);
-        CrusherRecipeRegistry.addRecipe("oreQuartz", "gemQuartz", 3);
-        CrusherRecipeRegistry.addRecipe("cobblestone", "sand", 1);
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint), new ItemStack(Items.flint), 50);
-        CrusherRecipeRegistry.addRecipe("stone", "cobblestone", 1);
-
-        CrusherRecipeRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.RICE.ordinal()), new ItemStack(Items.sugar, 2));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-
-        CrusherRecipeRegistry.addRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4));
-        miscRecipes.add(Util.GetRecipes.lastCrusherRecipe());
-
-        CrusherRecipeRegistry.addRecipe("oreNickel", "dustNickel", 2, "dustPlatinum", 1, 15);
-        CrusherRecipeRegistry.addRecipe("oreIron", "dustIron", 2, "dustGold", 1, 20);
-
-        if(ConfigCrafting.HORSE_ARMORS.isEnabled()){
-            CrusherRecipeRegistry.addRecipe(new ItemStack(Items.iron_horse_armor), "dustIron", 8);
-            recipeIronHorseArmor = Util.GetRecipes.lastCrusherRecipe();
-
-            CrusherRecipeRegistry.addRecipe(new ItemStack(Items.golden_horse_armor), "dustGold", 8);
-            recipeGoldHorseArmor = Util.GetRecipes.lastCrusherRecipe();
-
-            CrusherRecipeRegistry.addRecipe(new ItemStack(Items.diamond_horse_armor), "dustDiamond", 8);
-            recipeDiamondHorseArmor = Util.GetRecipes.lastCrusherRecipe();
-        }
-
-        CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("oreNether", 6));
-        CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("orePoor", 4, "nugget"));
-        CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("denseore", 8));
-        CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("gem", 1));
-        CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("ingot", 1));
-        CrusherRecipeRegistry.searchCases.add(new CrusherRecipeRegistry.SearchCase("ore", 2));
-
-        CrusherRecipeRegistry.registerFinally();
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/items/ItemCoffee.java

@@ -1,289 +0,0 @@
-/*
- * This file ("ItemCoffee.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2016 Ellpeck
- */
-
-package de.ellpeck.actuallyadditions.items;
-
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.items.base.ItemFoodBase;
-import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import de.ellpeck.actuallyadditions.util.ItemUtil;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.EnumRarity;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.StringUtils;
-import net.minecraft.world.World;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ItemCoffee extends ItemFoodBase{
-
-    public static ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
-
-    public ItemCoffee(String name){
-        super(8, 5.0F, false, name);
-        this.setMaxDamage(3);
-        this.setAlwaysEdible();
-        this.setMaxStackSize(1);
-        this.setNoRepair();
-    }
-
-    public static void initIngredients(){
-        registerIngredient(new MilkIngredient(new ItemStack(Items.milk_bucket)));
-        //Pam's Soy Milk (For Jemx because he's lactose intolerant. YER HAPPY NAO!?)
-        if(Loader.isModLoaded("harvestcraft")){
-            Item item = ItemUtil.getItemFromName("harvestcraft:soymilkItem");
-            if(item != null){
-                registerIngredient(new MilkIngredient(new ItemStack(item)));
-            }
-        }
-
-        registerIngredient(new Ingredient(new ItemStack(Items.sugar), new PotionEffect[]{new PotionEffect(Potion.moveSpeed.getId(), 30, 0)}, 4));
-        registerIngredient(new Ingredient(new ItemStack(Items.magma_cream), new PotionEffect[]{new PotionEffect(Potion.fireResistance.getId(), 20, 0)}, 2));
-        registerIngredient(new Ingredient(new ItemStack(Items.fish, 1, 3), new PotionEffect[]{new PotionEffect(Potion.waterBreathing.getId(), 10, 0)}, 2));
-        registerIngredient(new Ingredient(new ItemStack(Items.golden_carrot), new PotionEffect[]{new PotionEffect(Potion.nightVision.getId(), 30, 0)}, 2));
-        registerIngredient(new Ingredient(new ItemStack(Items.ghast_tear), new PotionEffect[]{new PotionEffect(Potion.regeneration.getId(), 5, 0)}, 3));
-        registerIngredient(new Ingredient(new ItemStack(Items.blaze_powder), new PotionEffect[]{new PotionEffect(Potion.damageBoost.getId(), 15, 0)}, 4));
-        registerIngredient(new Ingredient(new ItemStack(Items.fermented_spider_eye), new PotionEffect[]{new PotionEffect(Potion.invisibility.getId(), 25, 0)}, 2));
-    }
-
-    public static void registerIngredient(Ingredient ingredient){
-        ingredients.add(ingredient);
-    }
-
-    public static Ingredient getIngredientFromStack(ItemStack stack){
-        for(Ingredient ingredient : ingredients){
-            if(ingredient.ingredient.copy().isItemEqual(stack)){
-                return ingredient;
-            }
-        }
-        return null;
-    }
-
-    public static boolean addEffectToStack(ItemStack stack, Ingredient ingredient){
-        boolean worked = false;
-        if(ingredient != null){
-            PotionEffect[] effects = ingredient.getEffects();
-            if(effects != null && effects.length > 0){
-                for(PotionEffect effect : effects){
-                    PotionEffect effectHas = getSameEffectFromStack(stack, effect);
-                    if(effectHas != null){
-                        if(effectHas.getAmplifier() < ingredient.maxAmplifier-1){
-                            addEffectProperties(stack, effect, false, true);
-                            worked = true;
-                        }
-                    }
-                    else{
-                        addEffectToStack(stack, effect);
-                        worked = true;
-                    }
-                }
-            }
-        }
-        return worked;
-    }
-
-    public static PotionEffect getSameEffectFromStack(ItemStack stack, PotionEffect effect){
-        PotionEffect[] effectsStack = getEffectsFromStack(stack);
-        if(effectsStack != null && effectsStack.length > 0){
-            for(PotionEffect effectStack : effectsStack){
-                if(effect.getPotionID() == effectStack.getPotionID()){
-                    return effectStack;
-                }
-            }
-        }
-        return null;
-    }
-
-    public static void addEffectProperties(ItemStack stack, PotionEffect effect, boolean addDur, boolean addAmp){
-        PotionEffect[] effects = getEffectsFromStack(stack);
-        stack.setTagCompound(new NBTTagCompound());
-        for(int i = 0; i < effects.length; i++){
-            if(effects[i].getPotionID() == effect.getPotionID()){
-                effects[i] = new PotionEffect(effects[i].getPotionID(), effects[i].getDuration()+(addDur ? effect.getDuration() : 0), effects[i].getAmplifier()+(addAmp ? (effect.getAmplifier() > 0 ? effect.getAmplifier() : 1) : 0));
-            }
-            addEffectToStack(stack, effects[i]);
-        }
-    }
-
-    public static void addEffectToStack(ItemStack stack, PotionEffect effect){
-        NBTTagCompound tag = stack.getTagCompound();
-        if(tag == null){
-            tag = new NBTTagCompound();
-        }
-
-        int prevCounter = tag.getInteger("Counter");
-        NBTTagCompound compound = new NBTTagCompound();
-        compound.setInteger("ID", effect.getPotionID());
-        compound.setInteger("Duration", effect.getDuration());
-        compound.setInteger("Amplifier", effect.getAmplifier());
-
-        int counter = prevCounter+1;
-        tag.setTag(counter+"", compound);
-        tag.setInteger("Counter", counter);
-
-        stack.setTagCompound(tag);
-    }
-
-    public static PotionEffect[] getEffectsFromStack(ItemStack stack){
-        ArrayList<PotionEffect> effects = new ArrayList<PotionEffect>();
-        NBTTagCompound tag = stack.getTagCompound();
-        if(tag != null){
-            int counter = tag.getInteger("Counter");
-            while(counter > 0){
-                NBTTagCompound compound = (NBTTagCompound)tag.getTag(counter+"");
-                PotionEffect effect = new PotionEffect(compound.getInteger("ID"), compound.getInteger("Duration"), compound.getByte("Amplifier"));
-                if(effect.getPotionID() > 0){
-                    effects.add(effect);
-                }
-                counter--;
-            }
-        }
-        return effects.size() > 0 ? effects.toArray(new PotionEffect[effects.size()]) : null;
-    }
-
-    @Override
-    public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){
-        ItemStack theStack = stack.copy();
-        super.onEaten(stack, world, player);
-        applyPotionEffectsFromStack(stack, player);
-        theStack.setItemDamage(theStack.getItemDamage()+1);
-        if(theStack.getMaxDamage()-theStack.getItemDamage() < 0){
-            return new ItemStack(InitItems.itemMisc, 1, TheMiscItems.CUP.ordinal());
-        }
-        else{
-            return theStack;
-        }
-    }
-
-    public static void applyPotionEffectsFromStack(ItemStack stack, EntityPlayer player){
-        PotionEffect[] effects = getEffectsFromStack(stack);
-        if(effects != null && effects.length > 0){
-            for(PotionEffect effect : effects){
-                player.addPotionEffect(new PotionEffect(effect.getPotionID(), effect.getDuration()*20, effect.getAmplifier()));
-            }
-        }
-    }
-
-    @Override
-    public EnumAction getItemUseAction(ItemStack stack){
-        return EnumAction.drink;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public IIcon getIconFromDamage(int par1){
-        return this.itemIcon;
-    }
-
-    @Override
-    public int getMetadata(int damage){
-        return damage;
-    }
-
-    @Override
-    public boolean getShareTag(){
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool){
-        PotionEffect[] effects = getEffectsFromStack(stack);
-        if(effects != null){
-            for(PotionEffect effect : effects){
-                list.add(StringUtil.localize(effect.getEffectName())+" "+(effect.getAmplifier()+1)+", "+StringUtils.ticksToElapsedTime(effect.getDuration()*20));
-            }
-        }
-        else{
-            list.add("No Effects");
-        }
-    }
-
-    @Override
-    public EnumRarity getRarity(ItemStack stack){
-        return EnumRarity.rare;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerIcons(IIconRegister iconReg){
-        itemIcon = iconReg.registerIcon(ModUtil.MOD_ID_LOWER+":"+this.getBaseName());
-    }
-
-    public static class Ingredient{
-
-        public final ItemStack ingredient;
-        public final int maxAmplifier;
-        protected PotionEffect[] effects;
-
-        public Ingredient(ItemStack ingredient, PotionEffect[] effects, int maxAmplifier){
-            this.ingredient = ingredient.copy();
-            this.effects = effects;
-            this.maxAmplifier = maxAmplifier;
-        }
-
-        public PotionEffect[] getEffects(){
-            return this.effects;
-        }
-
-        public boolean effect(ItemStack stack){
-            return ItemCoffee.addEffectToStack(stack, this);
-        }
-
-        public String getExtraText(){
-            return null;
-        }
-    }
-
-    public static class MilkIngredient extends Ingredient{
-
-        public MilkIngredient(ItemStack ingredient){
-            super(ingredient, null, 0);
-        }
-
-        @Override
-        public boolean effect(ItemStack stack){
-            PotionEffect[] effects = getEffectsFromStack(stack);
-            ArrayList<PotionEffect> effectsNew = new ArrayList<PotionEffect>();
-            if(effects != null && effects.length > 0){
-                for(PotionEffect effect : effects){
-                    if(effect.getAmplifier() > 0){
-                        effectsNew.add(new PotionEffect(effect.getPotionID(), effect.getDuration()+120, effect.getAmplifier()-1));
-                    }
-                }
-                stack.setTagCompound(new NBTTagCompound());
-                if(effectsNew.size() > 0){
-                    this.effects = effectsNew.toArray(new PotionEffect[effectsNew.size()]);
-                    ItemCoffee.addEffectToStack(stack, this);
-                }
-            }
-            this.effects = null;
-            return true;
-        }
-
-        @Override
-        public String getExtraText(){
-            return StringUtil.localize("container.nei."+ModUtil.MOD_ID_LOWER+".coffee.extra.milk");
-        }
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/items/lens/Lens.java

@@ -1,35 +0,0 @@
-/*
- * This file ("Lens.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2016 Ellpeck
- */
-
-package de.ellpeck.actuallyadditions.items.lens;
-
-import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor;
-import de.ellpeck.actuallyadditions.util.Position;
-import net.minecraft.item.Item;
-
-public abstract class Lens{
-
-    protected Item lensItem;
-
-    public abstract boolean invoke(Position hitBlock, TileEntityAtomicReconstructor tile);
-
-    public abstract float[] getColor();
-
-    public abstract int getDistance();
-
-    public Lens register(){
-        Lenses.allLenses.add(this);
-        return this;
-    }
-
-    public void setLensItem(Item item){
-        this.lensItem = item;
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/items/lens/LensNoneRecipeHandler.java

@@ -1,186 +0,0 @@
-/*
- * This file ("LensNoneRecipeHandler.java") is part of the Actually Additions Mod for Minecraft.
- * It is created and owned by Ellpeck and distributed
- * under the Actually Additions License to be found at
- * http://ellpeck.de/actaddlicense/
- * View the source code at https://github.com/Ellpeck/ActuallyAdditions
- *
- * © 2016 Ellpeck
- */
-
-package de.ellpeck.actuallyadditions.items.lens;
-
-import de.ellpeck.actuallyadditions.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.config.values.ConfigCrafting;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.items.metalists.TheCrystals;
-import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import de.ellpeck.actuallyadditions.util.ItemUtil;
-import de.ellpeck.actuallyadditions.util.Util;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class LensNoneRecipeHandler{
-
-    public static ArrayList<Recipe> recipes = new ArrayList<Recipe>();
-
-    public static ArrayList<Recipe> mainPageRecipes = new ArrayList<Recipe>();
-    public static Recipe recipeColorLens;
-    public static Recipe recipeSoulSand;
-    public static Recipe recipeGreenWall;
-    public static Recipe recipeWhiteWall;
-    public static Recipe recipeExplosionLens;
-    public static Recipe recipeDamageLens;
-    public static Recipe recipeLeather;
-
-    public static void init(){
-        //Crystal Blocks
-        addRecipe(new ItemStack(Blocks.redstone_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.REDSTONE.ordinal()), 400);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Blocks.lapis_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.LAPIS.ordinal()), 400);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Blocks.diamond_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.DIAMOND.ordinal()), 600);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Blocks.emerald_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.EMERALD.ordinal()), 1000);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Blocks.coal_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.COAL.ordinal()), 600);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Blocks.iron_block), new ItemStack(InitBlocks.blockCrystal, 1, TheCrystals.IRON.ordinal()), 800);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-
-        //Crystal Items
-        addRecipe(new ItemStack(Items.redstone), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.REDSTONE.ordinal()), 40);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Items.dye, 1, 4), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.LAPIS.ordinal()), 40);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Items.diamond), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.DIAMOND.ordinal()), 60);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Items.emerald), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.EMERALD.ordinal()), 100);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Items.coal), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.COAL.ordinal()), 60);
-        mainPageRecipes.add(Util.GetRecipes.lastReconstructorRecipe());
-        addRecipe(new ItemStack(Items.iron_ingot), new ItemStack(InitItems.itemCrystal, 1, TheCrystals.IRON.ordinal()), 80);
-
-        //Lenses
-        addRecipe(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), new ItemStack(InitItems.itemColorLens), 5000);
-        recipeColorLens = Util.GetRecipes.lastReconstructorRecipe();
-
-        if(ConfigCrafting.RECONSTRUCTOR_EXPLOSION_LENS.isEnabled()){
-            addRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemExplosionLens), 5000);
-            recipeExplosionLens = Util.GetRecipes.lastReconstructorRecipe();
-            addRecipe(new ItemStack(InitItems.itemExplosionLens), new ItemStack(InitItems.itemDamageLens), 5000);
-        }
-        else{
-            addRecipe(new ItemStack(InitItems.itemColorLens), new ItemStack(InitItems.itemDamageLens), 5000);
-        }
-        recipeDamageLens = Util.GetRecipes.lastReconstructorRecipe();
-
-        addRecipe(new ItemStack(InitItems.itemDamageLens), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.LENS.ordinal()), 5000);
-
-        //Misc
-        if(ConfigCrafting.RECONSTRUCTOR_MISC.isEnabled()){
-            addRecipe(new ItemStack(Blocks.sand), new ItemStack(Blocks.soul_sand), 20000);
-            recipeSoulSand = Util.GetRecipes.lastReconstructorRecipe();
-            addRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(Items.leather), 8000);
-            recipeLeather = Util.GetRecipes.lastReconstructorRecipe();
-        }
-
-        addRecipe(new ItemStack(Blocks.quartz_block), new ItemStack(InitBlocks.blockTestifiBucksWhiteWall), 10);
-        recipeWhiteWall = Util.GetRecipes.lastReconstructorRecipe();
-        addRecipe(new ItemStack(Blocks.quartz_block, 1, 1), new ItemStack(InitBlocks.blockTestifiBucksGreenWall), 10);
-        recipeGreenWall = Util.GetRecipes.lastReconstructorRecipe();
-    }
-
-    public static void addRecipe(ItemStack input, ItemStack output, int energyUse){
-        recipes.add(new Recipe(input, output, energyUse));
-    }
-
-    public static void addRecipe(String input, String output, int energyUse){
-        recipes.add(new Recipe(input, output, energyUse));
-    }
-
-    public static ArrayList<Recipe> getRecipesFor(ItemStack input){
-        ArrayList<Recipe> possibleRecipes = new ArrayList<Recipe>();
-        for(Recipe recipe : recipes){
-            if(ItemUtil.contains(recipe.getInputs(), input, true)){
-                possibleRecipes.add(recipe);
-            }
-        }
-        return possibleRecipes;
-    }
-
-    public static class Recipe{
-
-        public int energyUse;
-        private String input;
-        private String output;
-        private ItemStack inputStack;
-        private ItemStack outputStack;
-
-        public Recipe(ItemStack input, ItemStack output, int energyUse){
-            this.inputStack = input;
-            this.outputStack = output;
-            this.energyUse = energyUse;
-        }
-
-        public Recipe(String input, String output, int energyUse){
-            this.input = input;
-            this.output = output;
-            this.energyUse = energyUse;
-        }
-
-        public List<ItemStack> getOutputs(){
-            if(this.outputStack != null){
-                return Collections.singletonList(this.outputStack.copy());
-            }
-
-            if(this.output == null || this.output.isEmpty()){
-                return null;
-            }
-
-            List<ItemStack> stacks = OreDictionary.getOres(this.output, false);
-            if(stacks != null && !stacks.isEmpty()){
-                List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
-                for(ItemStack stack : stacks){
-                    if(stack != null){
-                        ItemStack stackCopy = stack.copy();
-                        stackCopy.stackSize = 1;
-                        stacksCopy.add(stackCopy);
-                    }
-                }
-                return stacksCopy;
-            }
-            return null;
-        }
-
-        public List<ItemStack> getInputs(){
-            if(this.inputStack != null){
-                return Collections.singletonList(this.inputStack.copy());
-            }
-
-            if(this.input == null || this.input.isEmpty()){
-                return null;
-            }
-
-            List<ItemStack> stacks = OreDictionary.getOres(this.input, false);
-            if(stacks != null && !stacks.isEmpty()){
-                List<ItemStack> stacksCopy = new ArrayList<ItemStack>();
-                for(ItemStack stack : stacks){
-                    if(stack != null){
-                        ItemStack stackCopy = stack.copy();
-                        stackCopy.stackSize = 1;
-                        stacksCopy.add(stackCopy);
-                    }
-                }
-                return stacksCopy;
-            }
-            return null;
-        }
-    }
-}

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

@@ -8,55 +8,55 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions;
+package de.ellpeck.actuallyadditions.mod;
 
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.*;
-import de.ellpeck.actuallyadditions.achievement.InitAchievements;
-import de.ellpeck.actuallyadditions.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.booklet.InitBooklet;
-import de.ellpeck.actuallyadditions.config.ConfigurationHandler;
-import de.ellpeck.actuallyadditions.crafting.CrusherCrafting;
-import de.ellpeck.actuallyadditions.crafting.InitCrafting;
-import de.ellpeck.actuallyadditions.crafting.ItemCrafting;
-import de.ellpeck.actuallyadditions.event.InitEvents;
-import de.ellpeck.actuallyadditions.gen.InitVillager;
-import de.ellpeck.actuallyadditions.gen.OreGen;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.items.InitForeignPaxels;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.items.ItemCoffee;
-import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler;
-import de.ellpeck.actuallyadditions.material.InitArmorMaterials;
-import de.ellpeck.actuallyadditions.material.InitToolMaterials;
-import de.ellpeck.actuallyadditions.misc.*;
-import de.ellpeck.actuallyadditions.network.PacketHandler;
-import de.ellpeck.actuallyadditions.ore.InitOreDict;
-import de.ellpeck.actuallyadditions.proxy.IProxy;
-import de.ellpeck.actuallyadditions.recipe.FuelHandler;
-import de.ellpeck.actuallyadditions.recipe.HairyBallHandler;
-import de.ellpeck.actuallyadditions.recipe.TreasureChestHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityBase;
-import de.ellpeck.actuallyadditions.update.UpdateChecker;
-import de.ellpeck.actuallyadditions.util.FakePlayerUtil;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.Util;
+import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
+import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
+import de.ellpeck.actuallyadditions.mod.booklet.InitBooklet;
+import de.ellpeck.actuallyadditions.mod.config.ConfigurationHandler;
+import de.ellpeck.actuallyadditions.mod.crafting.CrusherCrafting;
+import de.ellpeck.actuallyadditions.mod.crafting.InitCrafting;
+import de.ellpeck.actuallyadditions.mod.crafting.ItemCrafting;
+import de.ellpeck.actuallyadditions.mod.event.InitEvents;
+import de.ellpeck.actuallyadditions.mod.gen.InitVillager;
+import de.ellpeck.actuallyadditions.mod.gen.OreGen;
+import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
+import de.ellpeck.actuallyadditions.mod.items.InitForeignPaxels;
+import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.items.ItemCoffee;
+import de.ellpeck.actuallyadditions.mod.items.lens.LensNoneRecipeHandler;
+import de.ellpeck.actuallyadditions.mod.material.InitArmorMaterials;
+import de.ellpeck.actuallyadditions.mod.material.InitToolMaterials;
+import de.ellpeck.actuallyadditions.mod.misc.*;
+import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
+import de.ellpeck.actuallyadditions.mod.ore.InitOreDict;
+import de.ellpeck.actuallyadditions.mod.proxy.IProxy;
+import de.ellpeck.actuallyadditions.mod.recipe.FuelHandler;
+import de.ellpeck.actuallyadditions.mod.recipe.HairyBallHandler;
+import de.ellpeck.actuallyadditions.mod.recipe.TreasureChestHandler;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
+import de.ellpeck.actuallyadditions.mod.update.UpdateChecker;
+import de.ellpeck.actuallyadditions.mod.util.FakePlayerUtil;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.init.Items;
 import net.minecraft.server.MinecraftServer;
 
 import java.util.Locale;
 
 //                                                                           So that BuildCraft Oil always gets used
-@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", guiFactory = "de.ellpeck.actuallyadditions.config.GuiFactory")
+@Mod(modid = ModUtil.MOD_ID, name = ModUtil.NAME, version = ModUtil.VERSION, dependencies = "after:BuildCraft|Energy", guiFactory = "GuiFactory")
 public class ActuallyAdditions{
 
     @Instance(ModUtil.MOD_ID)
     public static ActuallyAdditions instance;
 
-    @SidedProxy(clientSide = "de.ellpeck.actuallyadditions.proxy.ClientProxy", serverSide = "de.ellpeck.actuallyadditions.proxy.ServerProxy")
+    @SidedProxy(clientSide = "ClientProxy", serverSide = "ServerProxy")
     public static IProxy proxy;
 
     @EventHandler

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

@@ -8,10 +8,10 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.achievement;
+package de.ellpeck.actuallyadditions.mod.achievement;
 
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.stats.Achievement;
 import net.minecraftforge.common.AchievementPage;
 

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

@@ -8,11 +8,11 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.achievement;
+package de.ellpeck.actuallyadditions.mod.achievement;
 
-import de.ellpeck.actuallyadditions.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
+import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
 

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

@@ -8,16 +8,17 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.items.lens.ItemLens;
-import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.api.lens.ILensItem;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+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 net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;
@@ -104,7 +105,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
             if(reconstructor != null){
                 ItemStack heldItem = player.getCurrentEquippedItem();
                 if(heldItem != null){
-                    if(heldItem.getItem() instanceof ItemLens && reconstructor.getStackInSlot(0) == null){
+                    if(heldItem.getItem() instanceof ILensItem && reconstructor.getStackInSlot(0) == null){
                         ItemStack toPut = heldItem.copy();
                         toPut.stackSize = 1;
                         reconstructor.setInventorySlotContents(0, toPut);

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

@@ -8,12 +8,12 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBushBase;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
 

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

@@ -8,18 +8,19 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.booklet.EntrySet;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.tile.TileEntityBookletStand;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
+import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler;
+import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityBreaker;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityBreaker;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityCanolaPress;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityCanolaPress;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.tile.TileEntityCoalGenerator;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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 de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityCoffeeMachine;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+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.tile.TileEntityCoffeeMachine;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
-import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,17 +8,18 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.items.ItemFertilizer;
-import de.ellpeck.actuallyadditions.items.ItemMisc;
-import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import de.ellpeck.actuallyadditions.tile.TileEntityCompost;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.items.ItemFertilizer;
+import de.ellpeck.actuallyadditions.mod.items.ItemMisc;
+import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
-import de.ellpeck.actuallyadditions.items.metalists.TheCrystals;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
+import de.ellpeck.actuallyadditions.mod.items.metalists.TheCrystals;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityDirectionalBreaker;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityDirectionalBreaker;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityDropper;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityDropper;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityEnergizer;
-import de.ellpeck.actuallyadditions.tile.TileEntityEnervator;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityEnergizer;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityFeeder;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityFeeder;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityFermentingBarrel;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityFermentingBarrel;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityFireworkBox;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityFishingNet;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityFishingNet;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityFluidCollector;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityFluidCollector;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.TileEntityFurnaceDouble;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityFurnaceSolar;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceSolar;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;

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

@@ -8,12 +8,12 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;

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

@@ -8,17 +8,17 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.tile.TileEntityGiantChest;
-import de.ellpeck.actuallyadditions.util.ItemUtil;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.TileEntityGiantChest;
+import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityGreenhouseGlass;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityGreenhouseGlass;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.tile.TileEntityGrinder;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityHeatCollector;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityHeatCollector;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;

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

@@ -8,19 +8,19 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityInputter;
-import de.ellpeck.actuallyadditions.tile.TileEntityInventoryBase;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
-import de.ellpeck.actuallyadditions.util.Util;
+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.tile.TileEntityInputter;
+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.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityItemRepairer;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityItemRepairer;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,14 +8,14 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.Position;
-import de.ellpeck.actuallyadditions.util.WorldUtil;
+import de.ellpeck.actuallyadditions.api.Position;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockPistonBase;
 import net.minecraft.block.material.Material;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityLaserRelay;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;

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

@@ -8,14 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityLavaFactoryController;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityLavaFactoryController;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityLeafGenerator;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityLeafGenerator;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,16 +8,17 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityMiner;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+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.tile.TileEntityMiner;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
-import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
+import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.tile.TileEntityOilGenerator;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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 de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,16 +8,18 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.tile.*;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.api.block.IHudDisplay;
+import de.ellpeck.actuallyadditions.api.tile.IPhantomTile;
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy;
+import de.ellpeck.actuallyadditions.mod.tile.*;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityPhantomBooster;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockContainerBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomBooster;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.init.Blocks;

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityRangedCollector;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+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.tile.TileEntityRangedCollector;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,12 +8,12 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.Entity;

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

@@ -8,17 +8,17 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.achievement.TheAchievements;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
-import de.ellpeck.actuallyadditions.util.Util;
+import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
+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.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,15 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.achievement.TheAchievements;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBase;
-import de.ellpeck.actuallyadditions.recipe.TreasureChestHandler;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.Util;
+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.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.EntityLivingBase;
@@ -146,7 +147,7 @@ public class BlockTreasureChest extends BlockBase{
 
     private void dropItems(World world, int x, int y, int z){
         for(int i = 0; i < MathHelper.getRandomIntegerInRange(Util.RANDOM, 3, 6); i++){
-            TreasureChestHandler.Return theReturn = (TreasureChestHandler.Return)WeightedRandom.getRandomItem(Util.RANDOM, TreasureChestHandler.returns);
+            TreasureChestLoot theReturn = (TreasureChestLoot)WeightedRandom.getRandomItem(Util.RANDOM, ActuallyAdditionsAPI.treasureChestLoot);
             ItemStack itemStack = theReturn.returnItem.copy();
             itemStack.stackSize = MathHelper.getRandomIntegerInRange(Util.RANDOM, theReturn.minAmount, theReturn.maxAmount);
 

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.blocks.base.BlockBushBase;
-import de.ellpeck.actuallyadditions.blocks.base.BlockPlant;
-import de.ellpeck.actuallyadditions.blocks.base.ItemBlockBase;
-import de.ellpeck.actuallyadditions.blocks.metalists.TheWildPlants;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockBushBase;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant;
+import de.ellpeck.actuallyadditions.mod.blocks.base.ItemBlockBase;
+import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheWildPlants;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,17 +8,17 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.ActuallyAdditions;
-import de.ellpeck.actuallyadditions.blocks.base.BlockContainerBase;
-import de.ellpeck.actuallyadditions.inventory.GuiHandler;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.tile.TileEntityXPSolidifier;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.Util;
+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.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;

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

@@ -8,9 +8,9 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraftforge.fluids.Fluid;
 
 public class FluidAA extends Fluid{

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

@@ -8,16 +8,16 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks;
+package de.ellpeck.actuallyadditions.mod.blocks;
 
-import de.ellpeck.actuallyadditions.blocks.base.BlockFluidFlowing;
-import de.ellpeck.actuallyadditions.blocks.base.BlockPlant;
-import de.ellpeck.actuallyadditions.blocks.base.BlockStair;
-import de.ellpeck.actuallyadditions.blocks.base.BlockWallAA;
-import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
-import de.ellpeck.actuallyadditions.config.values.ConfigBoolValues;
-import de.ellpeck.actuallyadditions.util.CompatUtil;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockFluidFlowing;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockPlant;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockStair;
+import de.ellpeck.actuallyadditions.mod.blocks.base.BlockWallAA;
+import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
+import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues;
+import de.ellpeck.actuallyadditions.mod.util.CompatUtil;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumRarity;

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

@@ -8,11 +8,11 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.EnumRarity;

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

@@ -8,11 +8,11 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.BlockBush;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemStack;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.tile.*;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.Util;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.tile.*;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
+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/blocks/base/BlockFluidFlowing.java

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.BlockCrops;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.item.EnumRarity;

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

@@ -8,12 +8,12 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 
 import cpw.mods.fml.common.registry.GameRegistry;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockStairs;
 import net.minecraft.item.EnumRarity;

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

@@ -8,13 +8,13 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.creative.CreativeTab;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.creative.CreativeTab;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockWall;
 import net.minecraft.creativetab.CreativeTabs;

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

@@ -8,9 +8,9 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.base;
+package de.ellpeck.actuallyadditions.mod.blocks.base;
 
-import de.ellpeck.actuallyadditions.util.Util;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.block.Block;
 import net.minecraft.item.EnumRarity;
 import net.minecraft.item.ItemBlock;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheColoredLampColors.java

@@ -8,9 +8,9 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.metalists;
+package de.ellpeck.actuallyadditions.mod.blocks.metalists;
 
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 
 public enum TheColoredLampColors{
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheMiscBlocks.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.metalists;
+package de.ellpeck.actuallyadditions.mod.blocks.metalists;
 
 import net.minecraft.item.EnumRarity;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/metalists/TheWildPlants.java

@@ -8,9 +8,9 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.metalists;
+package de.ellpeck.actuallyadditions.mod.blocks.metalists;
 
-import de.ellpeck.actuallyadditions.blocks.InitBlocks;
+import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.item.EnumRarity;
 

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

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render;
+package de.ellpeck.actuallyadditions.mod.blocks.render;
 
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import net.minecraft.block.Block;

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

@@ -8,9 +8,9 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render;
+package de.ellpeck.actuallyadditions.mod.blocks.render;
 
-import de.ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA;
+import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA;
 import net.minecraft.tileentity.TileEntity;
 import org.lwjgl.opengl.GL11;
 

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

@@ -8,11 +8,11 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render;
+package de.ellpeck.actuallyadditions.mod.blocks.render;
 
-import de.ellpeck.actuallyadditions.items.lens.ItemLens;
-import de.ellpeck.actuallyadditions.tile.TileEntityAtomicReconstructor;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+import de.ellpeck.actuallyadditions.api.lens.ILensItem;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityAtomicReconstructor;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -27,7 +27,7 @@ public class RenderReconstructorLens extends TileEntitySpecialRenderer{
         }
         ItemStack stack = ((TileEntityAtomicReconstructor)tile).getStackInSlot(0);
 
-        if(stack != null && stack.getItem() instanceof ItemLens){
+        if(stack != null && stack.getItem() instanceof ILensItem){
             GL11.glPushMatrix();
             GL11.glTranslatef((float)x+0.5F, (float)y-0.5F, (float)z+0.5F);
             GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);

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

@@ -8,15 +8,15 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render;
+package de.ellpeck.actuallyadditions.mod.blocks.render;
 
-import de.ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA;
-import de.ellpeck.actuallyadditions.misc.cloud.ISmileyCloudEasterEgg;
-import de.ellpeck.actuallyadditions.misc.cloud.SmileyCloudEasterEggs;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.tile.TileEntitySmileyCloud;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA;
+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.ModUtil;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;

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

@@ -8,10 +8,10 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render;
+package de.ellpeck.actuallyadditions.mod.blocks.render;
 
-import de.ellpeck.actuallyadditions.blocks.render.model.ModelBaseAA;
-import de.ellpeck.actuallyadditions.util.ModUtil;
+import de.ellpeck.actuallyadditions.mod.blocks.render.model.ModelBaseAA;
+import de.ellpeck.actuallyadditions.mod.util.ModUtil;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBaseAA.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.tileentity.TileEntity;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelBookletStand.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCoffeeMachine.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelCompost.java

@@ -8,10 +8,10 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.tile.TileEntityCompost;
+import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityCompost;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.item.ItemStack;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFishingNet.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelFurnaceSolar.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelLaserRelay.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 import org.lwjgl.opengl.GL11;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelPhantomBooster.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/model/ModelSmileyCloud.java

@@ -8,7 +8,7 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.blocks.render.model;
+package de.ellpeck.actuallyadditions.mod.blocks.render.model;
 
 import net.minecraft.client.model.ModelRenderer;
 

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

@@ -8,17 +8,17 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet;
+package de.ellpeck.actuallyadditions.mod.booklet;
 
-import de.ellpeck.actuallyadditions.achievement.InitAchievements;
-import de.ellpeck.actuallyadditions.booklet.button.BookmarkButton;
-import de.ellpeck.actuallyadditions.booklet.button.IndexButton;
-import de.ellpeck.actuallyadditions.booklet.button.TexturedButton;
-import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry;
-import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllSearch;
-import de.ellpeck.actuallyadditions.booklet.page.BookletPage;
-import de.ellpeck.actuallyadditions.util.*;
+import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
+import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton;
+import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton;
+import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton;
+import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch;
+import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
+import de.ellpeck.actuallyadditions.mod.util.*;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.item.ItemStack;

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

@@ -8,11 +8,11 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet;
+package de.ellpeck.actuallyadditions.mod.booklet;
 
-import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry;
-import de.ellpeck.actuallyadditions.booklet.page.BookletPage;
+import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
+import de.ellpeck.actuallyadditions.mod.booklet.page.BookletPage;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class EntrySet{

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

@@ -8,10 +8,10 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet;
+package de.ellpeck.actuallyadditions.mod.booklet;
 
 import cpw.mods.fml.relauncher.ReflectionHelper;
-import de.ellpeck.actuallyadditions.achievement.InitAchievements;
+import de.ellpeck.actuallyadditions.mod.achievement.InitAchievements;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.achievement.GuiAchievements;

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

@@ -8,22 +8,22 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet;
+package de.ellpeck.actuallyadditions.mod.booklet;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.booklet.button.BookmarkButton;
-import de.ellpeck.actuallyadditions.booklet.button.IndexButton;
-import de.ellpeck.actuallyadditions.booklet.button.TexturedButton;
-import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllSearch;
-import de.ellpeck.actuallyadditions.config.GuiConfiguration;
-import de.ellpeck.actuallyadditions.items.ItemBooklet;
-import de.ellpeck.actuallyadditions.proxy.ClientProxy;
-import de.ellpeck.actuallyadditions.update.UpdateChecker;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
-import de.ellpeck.actuallyadditions.util.ModUtil;
-import de.ellpeck.actuallyadditions.util.StringUtil;
-import de.ellpeck.actuallyadditions.util.playerdata.PersistentClientData;
+import de.ellpeck.actuallyadditions.mod.booklet.button.BookmarkButton;
+import de.ellpeck.actuallyadditions.mod.booklet.button.IndexButton;
+import de.ellpeck.actuallyadditions.mod.booklet.button.TexturedButton;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch;
+import de.ellpeck.actuallyadditions.mod.config.GuiConfiguration;
+import de.ellpeck.actuallyadditions.mod.items.ItemBooklet;
+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;
+import de.ellpeck.actuallyadditions.mod.util.StringUtil;
+import de.ellpeck.actuallyadditions.mod.util.playerdata.PersistentClientData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;

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

@@ -8,14 +8,14 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet;
+package de.ellpeck.actuallyadditions.mod.booklet;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import de.ellpeck.actuallyadditions.network.PacketBookletStandButton;
-import de.ellpeck.actuallyadditions.network.PacketHandler;
-import de.ellpeck.actuallyadditions.tile.TileEntityBase;
-import de.ellpeck.actuallyadditions.tile.TileEntityBookletStand;
+import de.ellpeck.actuallyadditions.mod.network.PacketBookletStandButton;
+import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
+import de.ellpeck.actuallyadditions.mod.tile.TileEntityBookletStand;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 

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

@@ -8,26 +8,26 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet;
+package de.ellpeck.actuallyadditions.mod.booklet;
 
-import de.ellpeck.actuallyadditions.blocks.InitBlocks;
-import de.ellpeck.actuallyadditions.blocks.metalists.TheColoredLampColors;
-import de.ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
-import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterCoffee;
-import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapterCrusher;
-import de.ellpeck.actuallyadditions.booklet.entry.BookletEntry;
-import de.ellpeck.actuallyadditions.booklet.entry.BookletEntryAllSearch;
-import de.ellpeck.actuallyadditions.booklet.page.*;
-import de.ellpeck.actuallyadditions.config.values.ConfigIntValues;
-import de.ellpeck.actuallyadditions.crafting.*;
-import de.ellpeck.actuallyadditions.gen.OreGen;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.items.lens.LensNoneRecipeHandler;
-import de.ellpeck.actuallyadditions.items.metalists.TheFoods;
-import de.ellpeck.actuallyadditions.items.metalists.TheMiscItems;
-import de.ellpeck.actuallyadditions.tile.*;
-import de.ellpeck.actuallyadditions.util.Util;
+import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
+import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheColoredLampColors;
+import de.ellpeck.actuallyadditions.mod.blocks.metalists.TheMiscBlocks;
+import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
+import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterCoffee;
+import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapterCrusher;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntry;
+import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryAllSearch;
+import de.ellpeck.actuallyadditions.mod.booklet.page.*;
+import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues;
+import de.ellpeck.actuallyadditions.mod.crafting.*;
+import de.ellpeck.actuallyadditions.mod.gen.OreGen;
+import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.items.lens.LensNoneRecipeHandler;
+import de.ellpeck.actuallyadditions.mod.items.metalists.TheFoods;
+import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems;
+import de.ellpeck.actuallyadditions.mod.tile.*;
+import de.ellpeck.actuallyadditions.mod.util.Util;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java

@@ -8,14 +8,14 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet.button;
+package de.ellpeck.actuallyadditions.mod.booklet.button;
 
-import de.ellpeck.actuallyadditions.booklet.BookletUtils;
-import de.ellpeck.actuallyadditions.booklet.EntrySet;
-import de.ellpeck.actuallyadditions.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.items.InitItems;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
-import de.ellpeck.actuallyadditions.util.KeyUtil;
+import de.ellpeck.actuallyadditions.mod.booklet.BookletUtils;
+import de.ellpeck.actuallyadditions.mod.booklet.EntrySet;
+import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
+import de.ellpeck.actuallyadditions.mod.items.InitItems;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.util.KeyUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.OpenGlHelper;

src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/IndexButton.java

@@ -8,11 +8,11 @@
  * © 2016 Ellpeck
  */
 
-package de.ellpeck.actuallyadditions.booklet.button;
+package de.ellpeck.actuallyadditions.mod.booklet.button;
 
-import de.ellpeck.actuallyadditions.booklet.GuiBooklet;
-import de.ellpeck.actuallyadditions.booklet.chapter.BookletChapter;
-import de.ellpeck.actuallyadditions.util.AssetUtil;
+import de.ellpeck.actuallyadditions.mod.booklet.GuiBooklet;
+import de.ellpeck.actuallyadditions.mod.booklet.chapter.BookletChapter;
+import de.ellpeck.actuallyadditions.mod.util.AssetUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.OpenGlHelper;