The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

37 files changed, 0 insertions, 5570 deletions

diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
deleted file mode 100644
index ffab6a0716..0000000000
--- a/src/main/java/common/Blocks.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package common;
-
-import net.minecraft.block.Block;
-
-import common.blocks.Block_GDCUnit;
-import common.blocks.Block_IchorJar;
-import common.blocks.Block_LapotronicEnergyUnit;
-import common.blocks.Block_LargeHexPlate;
-import common.blocks.Block_TFFTStorageField;
-import common.blocks.Block_ThaumiumReinforcedJar;
-import common.blocks.Block_YSZUnit;
-
-import gregtech.api.enums.Mods;
-import kekztech.KekzCore;
-
-public class Blocks {
-
-    public static Block yszUnit;
-    public static Block gdcUnit;
-    public static Block tfftStorageField;
-    public static Block jarThaumiumReinforced;
-    public static Block jarIchor;
-    public static Block lscLapotronicEnergyUnit;
-
-    public static Block largeHexPlate;
-
-    public static void preInit() {
-        KekzCore.LOGGER.info("Registering blocks...");
-
-        registerBlocks_SOFC();
-        registerBlocks_TFFT();
-        if (Mods.Thaumcraft.isModLoaded()) {
-            registerBlocks_Jars();
-        }
-        registerBlocks_LSC();
-        registerBlocks_Cosmetics();
-
-        KekzCore.LOGGER.info("Finished registering blocks");
-    }
-
-    private static void registerBlocks_SOFC() {
-        yszUnit = Block_YSZUnit.registerBlock();
-        gdcUnit = Block_GDCUnit.registerBlock();
-    }
-
-    private static void registerBlocks_TFFT() {
-        tfftStorageField = Block_TFFTStorageField.registerBlock();
-    }
-
-    private static void registerBlocks_Jars() {
-        jarThaumiumReinforced = Block_ThaumiumReinforcedJar.registerBlock();
-        jarIchor = Block_IchorJar.registerBlock();
-    }
-
-    private static void registerBlocks_LSC() {
-        lscLapotronicEnergyUnit = Block_LapotronicEnergyUnit.registerBlock();
-    }
-
-    private static void registerBlocks_Cosmetics() {
-        largeHexPlate = Block_LargeHexPlate.registerBlock();
-    }
-}
diff --git a/src/main/java/common/CommonProxy.java b/src/main/java/common/CommonProxy.java
deleted file mode 100644
index 0687f109be..0000000000
--- a/src/main/java/common/CommonProxy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package common;
-
-import common.items.ErrorItem;
-import common.items.MetaItem_CraftingComponent;
-import common.tileentities.GTMTE_TFFTHatch;
-
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gregtech.api.enums.Mods;
-import kekztech.Items;
-
-public class CommonProxy {
-
-    public void preInit(final FMLPreInitializationEvent e) {
-        // Items
-        ErrorItem.getInstance()
-            .registerItem();
-        MetaItem_CraftingComponent.getInstance()
-            .registerItem();
-        Items.registerOreDictNames();
-        // Blocks
-        Blocks.preInit();
-        // TileEntities
-        TileEntities.preInit();
-        if (Mods.Thaumcraft.isModLoaded() && Mods.ThaumicTinkerer.isModLoaded()) {
-            // TC Research
-            Researches.preInit();
-        }
-    }
-
-    public void init(final FMLInitializationEvent e) {
-        // GregTech Meta TileEntities
-        TileEntities.init();
-    }
-
-    public void postInit(final FMLPostInitializationEvent e) {
-        // Recipes
-        Recipes.postInit();
-        if (Mods.Thaumcraft.isModLoaded() && Mods.ThaumicTinkerer.isModLoaded()) {
-            // Research
-            Researches.postInit();
-        }
-
-        GTMTE_TFFTHatch.registerAEIntegration();
-    }
-}
diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
deleted file mode 100644
index ba8876ff2e..0000000000
--- a/src/main/java/common/Recipes.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package common;
-
-import static gregtech.api.enums.Mods.ThaumicTinkerer;
-
-import java.util.HashMap;
-
-import net.minecraft.item.ItemStack;
-
-import common.recipeLoaders.AlloySmelter;
-import common.recipeLoaders.Assembler;
-import common.recipeLoaders.AssemblyLine;
-import common.recipeLoaders.ChemicalReactor;
-import common.recipeLoaders.Crafting;
-import common.recipeLoaders.FormingPress;
-import common.recipeLoaders.Mixer;
-import common.recipeLoaders.ResearchableAssemblyLine;
-import common.recipeLoaders.Unpackager;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.Mods;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import kekztech.KekzCore;
-import thaumcraft.api.ItemApi;
-import thaumcraft.api.ThaumcraftApi;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.crafting.InfusionRecipe;
-
-public class Recipes {
-
-    public static final HashMap<String, InfusionRecipe> infusionRecipes = new HashMap<>();
-
-    public static void postInit() {
-        KekzCore.LOGGER.info("Registering recipes...");
-
-        new AlloySmelter().run();
-        new Assembler().run();
-        new AssemblyLine().run();
-        new ChemicalReactor().run();
-        new Crafting().run();
-        new FormingPress().run();
-        new Mixer().run();
-        new ResearchableAssemblyLine().run();
-        new Unpackager().run();
-
-        if (Mods.Thaumcraft.isModLoaded()) {
-            registerRecipes_Jars();
-        }
-
-        KekzCore.LOGGER.info("Finished registering recipes");
-    }
-
-    private static void registerRecipes_Jars() {
-
-        // Thaumium Reinforced Jar
-        final ItemStack[] recipe_jarthaumiumreinforced = {
-            GameRegistry.makeItemStack("Thaumcraft:ItemResource", 15, 1, null),
-            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane),
-            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane),
-            GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1),
-            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane),
-            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Thaumium, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane), };
-        final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 64)
-            .add(Aspect.ORDER, 32)
-            .add(Aspect.WATER, 32)
-            .add(Aspect.GREED, 16)
-            .add(Aspect.VOID, 16)
-            .add(Aspect.AIR, 8);
-        infusionRecipes.put(
-            "THAUMIUMREINFORCEDJAR",
-            ThaumcraftApi.addInfusionCraftingRecipe(
-                "THAUMIUMREINFORCEDJAR",
-                new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
-                5,
-                aspects_jarthaumiumreinforced,
-                ItemApi.getBlock("blockJar", 0),
-                recipe_jarthaumiumreinforced));
-        // Thaumium Reinforced Void Jar
-        final ItemStack[] recipe_voidjarupgrade = {
-            GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Obsidian, 1),
-            GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.EnderEye, 1), ItemApi.getItem("itemNugget", 5) };
-        final AspectList aspects_voidjarupgrade = new AspectList().add(Aspect.VOID, 14)
-            .add(Aspect.MAGIC, 14)
-            .add(Aspect.ENTROPY, 14)
-            .add(Aspect.WATER, 14);
-        infusionRecipes.put(
-            "THAUMIUMREINFORCEDVOIDJAR",
-            ThaumcraftApi.addInfusionCraftingRecipe(
-                "THAUMIUMREINFORCEDJAR",
-                new ItemStack(Blocks.jarThaumiumReinforced, 1, 3),
-                2,
-                aspects_voidjarupgrade,
-                new ItemStack(Blocks.jarThaumiumReinforced, 1, 0),
-                recipe_voidjarupgrade));
-
-        final ItemStack[] recipe_jarichor = { GT_ModHandler.getModItem(ThaumicTinkerer.ID, "kamiResource", 1, 0),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane),
-            GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane),
-            GT_OreDictUnificator.get(OrePrefixes.gemExquisite, Materials.Diamond, 1),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane),
-            GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmiridium, 1),
-            GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Diamond, 1),
-            new ItemStack(net.minecraft.init.Blocks.glass_pane), };
-        final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 256)
-            .add(Aspect.ELDRITCH, 128)
-            .add(Aspect.ORDER, 128)
-            .add(Aspect.WATER, 128)
-            .add(Aspect.GREED, 64)
-            .add(Aspect.VOID, 64)
-            .add(Aspect.AIR, 32);
-        infusionRecipes.put(
-            "ICHORJAR",
-            ThaumcraftApi.addInfusionCraftingRecipe(
-                "ICHORJAR",
-                new ItemStack(Blocks.jarIchor, 1, 0),
-                15,
-                aspects_jarichor,
-                ItemApi.getBlock("blockJar", 0),
-                recipe_jarichor));
-        // Ichor Void Jar
-        infusionRecipes.put(
-            "ICHORVOIDJAR",
-            ThaumcraftApi.addInfusionCraftingRecipe(
-                "ICHORJAR",
-                new ItemStack(Blocks.jarIchor, 1, 3),
-                5,
-                aspects_voidjarupgrade,
-                new ItemStack(Blocks.jarIchor, 1, 0),
-                recipe_voidjarupgrade));
-    }
-
-}
diff --git a/src/main/java/common/Researches.java b/src/main/java/common/Researches.java
deleted file mode 100644
index 0ebe161da4..0000000000
--- a/src/main/java/common/Researches.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package common;
-
-import net.minecraft.item.ItemStack;
-
-import kekztech.KekzCore;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.api.research.ResearchItem;
-import thaumcraft.api.research.ResearchPage;
-import thaumic.tinkerer.common.research.KamiResearchItem;
-
-public class Researches {
-
-    public static final String THAUMIUMREINFORCEDJAR = "THAUMIUMREINFORCEDJAR";
-    public static final String ICHORJAR = "ICHORJAR";
-
-    public static void preInit() {
-        // Blacklist these researches from being a requirement to unlock TTKami
-        KekzCore.LOGGER.info("Blacklisting research " + THAUMIUMREINFORCEDJAR + " from /iskamiunlocked");
-        KamiResearchItem.Blacklist.add(ICHORJAR);
-        KekzCore.LOGGER.info("Blacklisting research" + ICHORJAR + "from /iskamiunlocked");
-        KamiResearchItem.Blacklist.add(ICHORJAR);
-    }
-
-    public static void postInit() {
-        final AspectList aspects_jarthaumiumreinforced = new AspectList().add(Aspect.ARMOR, 3)
-            .add(Aspect.WATER, 3)
-            .add(Aspect.GREED, 3)
-            .add(Aspect.VOID, 3);
-        @SuppressWarnings("unused")
-        final ResearchItem jar_thaumiumreinforced = new ResearchItem(
-            "THAUMIUMREINFORCEDJAR",
-            "ALCHEMY",
-            aspects_jarthaumiumreinforced,
-            3,
-            -4,
-            2,
-            new ItemStack(Blocks.jarThaumiumReinforced, 1))
-                .setPages(
-                    new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.0"),
-                    new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDJAR")),
-                    new ResearchPage(Recipes.infusionRecipes.get("THAUMIUMREINFORCEDVOIDJAR")),
-                    new ResearchPage("kekztech.research_page.THAUMIUMREINFORCEDJAR.1"))
-                .setConcealed()
-                .setParents("JARLABEL")
-                .registerResearchItem();
-
-        final AspectList aspects_jarichor = new AspectList().add(Aspect.ARMOR, 3)
-            .add(Aspect.ELDRITCH, 3)
-            .add(Aspect.WATER, 3)
-            .add(Aspect.GREED, 5)
-            .add(Aspect.VOID, 5);
-        @SuppressWarnings("unused")
-        final ResearchItem jar_ichor = new ResearchItem(
-            "ICHORJAR",
-            "ALCHEMY",
-            aspects_jarichor,
-            2,
-            -5,
-            3,
-            new ItemStack(Blocks.jarIchor, 1))
-                .setPages(
-                    new ResearchPage("kekztech.research_page.ICHORJAR.0"),
-                    new ResearchPage(Recipes.infusionRecipes.get("ICHORJAR")),
-                    new ResearchPage(Recipes.infusionRecipes.get("ICHORVOIDJAR")))
-                .setConcealed()
-                .setParents("THAUMIUMREINFORCEDJAR")
-                .setParentsHidden("ICHOR")
-                .registerResearchItem();
-    }
-}
diff --git a/src/main/java/common/TileEntities.java b/src/main/java/common/TileEntities.java
deleted file mode 100644
index 8d1b288c7c..0000000000
--- a/src/main/java/common/TileEntities.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package common;
-
-import common.tileentities.GTMTE_LapotronicSuperCapacitor;
-import common.tileentities.GTMTE_SOFuelCellMK1;
-import common.tileentities.GTMTE_SOFuelCellMK2;
-import common.tileentities.GTMTE_TFFT;
-import common.tileentities.GTMTE_TFFTHatch;
-import common.tileentities.TE_IchorJar;
-import common.tileentities.TE_IchorVoidJar;
-import common.tileentities.TE_ThaumiumReinforcedJar;
-import common.tileentities.TE_ThaumiumReinforcedVoidJar;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import gregtech.api.enums.MetaTileEntityIDs;
-import gregtech.api.enums.Mods;
-
-public class TileEntities {
-
-    // Multiblock controllers
-    public static GTMTE_SOFuelCellMK1 sofc1;
-    public static GTMTE_SOFuelCellMK2 sofc2;
-    public static GTMTE_TFFT tfft;
-    public static GTMTE_LapotronicSuperCapacitor lsc;
-
-    // Singleblocks
-    public static GTMTE_TFFTHatch tfftHatch;
-
-    public static void preInit() {
-        if (Mods.Thaumcraft.isModLoaded()) {
-            GameRegistry.registerTileEntity(TE_ThaumiumReinforcedJar.class, "kekztech_thaumiumreinforcedjar");
-            GameRegistry.registerTileEntity(TE_ThaumiumReinforcedVoidJar.class, "kekztech_thaumiumreinforcedvoidjar");
-            GameRegistry.registerTileEntity(TE_IchorJar.class, "kekztech_ichorjar");
-            GameRegistry.registerTileEntity(TE_IchorVoidJar.class, "kekztech_ichorvoidjar");
-        }
-    }
-
-    public static void init() {
-        // Multiblock controllers
-        sofc1 = new GTMTE_SOFuelCellMK1(
-            MetaTileEntityIDs.sofc1.ID,
-            "multimachine.fuelcellmk1",
-            "Solid-Oxide Fuel Cell Mk I");
-        sofc2 = new GTMTE_SOFuelCellMK2(
-            MetaTileEntityIDs.sofc2.ID,
-            "multimachine.fuelcellmk2",
-            "Solid-Oxide Fuel Cell Mk II");
-        tfft = new GTMTE_TFFT(MetaTileEntityIDs.tfft.ID, "multimachine.tfft", "T.F.F.T");
-        lsc = new GTMTE_LapotronicSuperCapacitor(
-            MetaTileEntityIDs.lsc.ID,
-            "multimachine.supercapacitor",
-            "Lapotronic Supercapacitor");
-
-        // Singleblocks
-        tfftHatch = new GTMTE_TFFTHatch(MetaTileEntityIDs.tfftHatch.ID, "machine.tffthatch", "T.F.F.T Multi I/O Hatch");
-    }
-}
diff --git a/src/main/java/common/blocks/BaseGTUpdateableBlock.java b/src/main/java/common/blocks/BaseGTUpdateableBlock.java
deleted file mode 100644
index ff38365d79..0000000000
--- a/src/main/java/common/blocks/BaseGTUpdateableBlock.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-import gregtech.api.GregTech_API;
-
-/**
- * Any blocks that are used as structure parts for GregTech multi machines have to inherit from this class. Otherwise
- * the checkMachine() method that verifies a machine's structure won't be called correctly.
- */
-public abstract class BaseGTUpdateableBlock extends Block {
-
-    protected BaseGTUpdateableBlock(Material material) {
-        super(material);
-        GregTech_API.registerMachineBlock(this, -1);
-        super.setHarvestLevel("wrench", 2);
-    }
-
-    @Override
-    public int damageDropped(int meta) {
-        return meta;
-    }
-
-    @Override
-    public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) {
-        return false;
-    }
-
-    @Override
-    public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) {
-        return false;
-    }
-
-    @Override
-    public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) {
-        return false;
-    }
-
-    @Override
-    public void onBlockAdded(World aWorld, int aX, int aY, int aZ) {
-        if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-        }
-    }
-
-    @Override
-    public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) {
-        if (GregTech_API.isMachineBlock(this, aMetaData)) {
-            GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
-        }
-    }
-}
diff --git a/src/main/java/common/blocks/Block_GDCUnit.java b/src/main/java/common/blocks/Block_GDCUnit.java
deleted file mode 100644
index 27bc95759d..0000000000
--- a/src/main/java/common/blocks/Block_GDCUnit.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package common.blocks;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import kekztech.KekzCore;
-
-public class Block_GDCUnit extends BaseGTUpdateableBlock {
-
-    private static final Block_GDCUnit instance = new Block_GDCUnit();
-
-    private Block_GDCUnit() {
-        super(Material.iron);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_gdcceramicelectrolyteunit_block";
-        instance.setBlockName(blockName);
-        instance.setCreativeTab(CreativeTabs.tabMisc);
-        instance.setBlockTextureName(KekzCore.MODID + ":" + "GDCCeramicElectrolyteUnit");
-        instance.setHardness(5.0f);
-        instance.setResistance(6.0f);
-        GameRegistry.registerBlock(instance, blockName);
-
-        return instance;
-    }
-}
diff --git a/src/main/java/common/blocks/Block_IchorJar.java b/src/main/java/common/blocks/Block_IchorJar.java
deleted file mode 100644
index a82f9862f0..0000000000
--- a/src/main/java/common/blocks/Block_IchorJar.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package common.blocks;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.Explosion;
-import net.minecraft.world.World;
-
-import common.itemBlocks.IB_IchorJar;
-import common.tileentities.TE_IchorJar;
-import common.tileentities.TE_IchorVoidJar;
-
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import thaumcraft.api.aspects.Aspect;
-import thaumcraft.api.aspects.AspectList;
-import thaumcraft.common.blocks.BlockJar;
-import thaumcraft.common.config.ConfigBlocks;
-import thaumcraft.common.config.ConfigItems;
-import thaumcraft.common.items.ItemEssence;
-import thaumcraft.common.tiles.TileJarFillable;
-
-public class Block_IchorJar extends BlockJar {
-
-    private static final Block_IchorJar INSTANCE = new Block_IchorJar();
-
-    private Block_IchorJar() {
-        super();
-
-        super.setHardness(12.0F);
-        super.setResistance(3.0f);
-    }
-
-    public static Block registerBlock() {
-        final String blockName = "kekztech_ichorjar_block";
-        INSTANCE.setBlockName(blockName);
-        INSTANCE.setHarvestLevel("pickaxe", 3);
-        GameRegistry.registerBlock(INSTANCE, IB_IchorJar.class, blockName);
-
-        return INSTANCE;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public void registerBlockIcons(IIconRegister ir) {
-        super.iconLiquid = ir.registerIcon("thaumcraft:animatedglow");
-        super.iconJarSide = ir.registerIcon("kekztech:ichor_jar_side");
-        super.iconJarTop = ir.registerIcon("kekztech:ichor_jar_top");
-        super.iconJarTopVoid = ir.registerIcon("kekztech:ichor_jar_top_void");
-        super.iconJarSideVoid = ir.registerIcon("kekztech:ichor_jar_side_void");
-        super.iconJarBottom = ir.registerIcon("kekztech:ichor_jar_bottom");
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    @SuppressWarnings({ "unchecked" })
-    public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
-        par3List.add(new ItemStack(par1, 1, 0)); // Normal jar
-        par3List.add(new ItemStack(par1, 1, 3)); // Void jar
-    }
-
-    @Override
-    public TileEntity createTileEntity(World world, int meta) {
-        if (meta == 3) {
-            return new TE_IchorVoidJar();
-        } else {
-            return new TE_IchorJar();
-        }
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float f1, float f2,
-        float f3) {
-        // Call parent method to handle jar emptying, labels stuff etc
-        super.onBlockActivated(world, x, y, z, player, side, f1, f2, f3);
-        // Interact with Essentia Phials if the player holds one
-        final ItemStack heldItem = player.getHeldItem();
-        if (heldItem != null && heldItem.getItem() == ConfigItems.itemEssence) {
-            final TileEntity te = world.getTileEntity(x, y, z);
-            if (te instanceof TE_IchorJar) {
-                return dealWithPhial(world, player, x, y, z);
-            } else if (te instanceof TE_IchorVoidJar) {
-                return dealWithPhial(world, player, x, y, z);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Handle compatibility with Essentia Phials
-     *
-     * @param world  Pass through from onBlockActivated()
-     * @param player Pass through from onBlockActivated()
-     * @param x      Pass through from onBlockActivated()
-     * @param y      Pass through from onBlockActivated()
-     * @param z      Pass through from onBlockActivated()
-     * @return Not sure tbh
-     */
-    private boolean dealWithPhial(World world, EntityPlayer player, int x, int y, int z) {
-        final TileJarFillable jarTE = (TileJarFillable) world.getTileEntity(x, y, z);
-        final ItemStack heldItem = player.getHeldItem();
-        // Check whether to fill or to drain the phial
-        if (heldItem.getItemDamage() == 0) {
-            if (jarTE.amount >= 8) {
-                if (world.isRemote) {
-                    player.swingItem();
-                    return false;
-                }
-
-                final Aspect jarAspect = Aspect.getAspect(jarTE.aspect.getTag());
-                if (jarTE.takeFromContainer(jarAspect, 8)) {
-                    // Take an empty phial from the player's inventory
-                    heldItem.stackSize--;
-                    // Fill a new phial
-                    final ItemStack filledPhial = new ItemStack(ConfigItems.itemEssence, 1, 1);
-                    final AspectList phialContent = new AspectList().add(jarAspect, 8);
-                    ((ItemEssence) ConfigItems.itemEssence).setAspects(filledPhial, phialContent);
-                    // Drop on ground if there's no inventory space
-                    if (!player.inventory.addItemStackToInventory(filledPhial)) {
-                        world.spawnEntityInWorld(
-                            new EntityItem(world, (float) x + 0.5F, (fl