From 90de6297e365edff5675bd9dc27227f1c2b89907 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Wed, 28 May 2014 16:04:14 +0100 Subject: [PATCH] Clean up the tile namespace. --- .../botania/client/core/proxy/ClientProxy.java | 4 ++-- .../botania/client/render/block/RenderPool.java | 2 +- .../botania/client/render/block/RenderSpreader.java | 2 +- .../botania/client/render/tile/RenderTilePool.java | 2 +- .../client/render/tile/RenderTileSpreader.java | 2 +- .../botania/common/block/BlockDistributor.java | 2 +- .../botania/common/block/BlockManaDetector.java | 2 +- .../vazkii/botania/common/block/BlockManaVoid.java | 2 +- MODSRC/vazkii/botania/common/block/BlockPool.java | 2 +- .../vazkii/botania/common/block/BlockSpreader.java | 2 +- .../vazkii/botania/common/block/BlockTurntable.java | 2 +- MODSRC/vazkii/botania/common/block/ModBlocks.java | 12 ++++++------ .../block/tile/{ => mana}/TileDistributor.java | 3 ++- .../block/tile/{ => mana}/TileManaDetector.java | 3 ++- .../common/block/tile/{ => mana}/TileManaVoid.java | 3 ++- .../common/block/tile/{ => mana}/TilePool.java | 3 ++- .../common/block/tile/{ => mana}/TileSpreader.java | 3 ++- .../common/block/tile/{ => mana}/TileTurntable.java | 4 +++- .../core/handler/TerrasteelCraftingHandler.java | 2 +- .../botania/common/entity/EntityManaBurst.java | 2 +- .../vazkii/botania/common/item/ItemManaMirror.java | 2 +- .../common/lexicon/page/PageManaInfusionRecipe.java | 2 +- .../botania/common/lexicon/page/PageRuneRecipe.java | 2 +- 23 files changed, 36 insertions(+), 29 deletions(-) rename MODSRC/vazkii/botania/common/block/tile/{ => mana}/TileDistributor.java (95%) rename MODSRC/vazkii/botania/common/block/tile/{ => mana}/TileManaDetector.java (91%) rename MODSRC/vazkii/botania/common/block/tile/{ => mana}/TileManaVoid.java (89%) rename MODSRC/vazkii/botania/common/block/tile/{ => mana}/TilePool.java (98%) rename MODSRC/vazkii/botania/common/block/tile/{ => mana}/TileSpreader.java (99%) rename MODSRC/vazkii/botania/common/block/tile/{ => mana}/TileTurntable.java (96%) diff --git a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java index 71395b2eb..a52071c60 100644 --- a/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/MODSRC/vazkii/botania/client/core/proxy/ClientProxy.java @@ -43,10 +43,10 @@ import vazkii.botania.client.render.tile.RenderTileRuneAltar; import vazkii.botania.client.render.tile.RenderTileSpreader; import vazkii.botania.common.block.tile.TileAltar; import vazkii.botania.common.block.tile.TileEnchanter; -import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; -import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.core.proxy.CommonProxy; diff --git a/MODSRC/vazkii/botania/client/render/block/RenderPool.java b/MODSRC/vazkii/botania/client/render/block/RenderPool.java index 39476c00b..5e756148f 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderPool.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderPool.java @@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.client.render.tile.RenderTilePool; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderPool implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java b/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java index 827fba9b3..adc6e9a11 100644 --- a/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java +++ b/MODSRC/vazkii/botania/client/render/block/RenderSpreader.java @@ -19,7 +19,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.mana.TileSpreader; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class RenderSpreader implements ISimpleBlockRenderingHandler { diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java b/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java index 61233d75a..9e2b04b4c 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTilePool.java @@ -27,7 +27,7 @@ import org.lwjgl.opengl.GL12; import vazkii.botania.client.core.helper.ShaderHelper; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelPool; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; public class RenderTilePool extends TileEntitySpecialRenderer { diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java index 511930c8f..bbeec027d 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -25,7 +25,7 @@ import vazkii.botania.api.mana.ILens; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.client.render.item.RenderLens; -import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.mana.TileSpreader; public class RenderTileSpreader extends TileEntitySpecialRenderer { diff --git a/MODSRC/vazkii/botania/common/block/BlockDistributor.java b/MODSRC/vazkii/botania/common/block/BlockDistributor.java index a99961e9b..34be7bc53 100644 --- a/MODSRC/vazkii/botania/common/block/BlockDistributor.java +++ b/MODSRC/vazkii/botania/common/block/BlockDistributor.java @@ -21,7 +21,7 @@ import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.tile.TileDistributor; +import vazkii.botania.common.block.tile.mana.TileDistributor; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java index 21dde32dd..0b9351ee6 100644 --- a/MODSRC/vazkii/botania/common/block/BlockManaDetector.java +++ b/MODSRC/vazkii/botania/common/block/BlockManaDetector.java @@ -28,7 +28,7 @@ import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.tile.TileManaDetector; +import vazkii.botania.common.block.tile.mana.TileManaDetector; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/BlockManaVoid.java b/MODSRC/vazkii/botania/common/block/BlockManaVoid.java index 849ec1e55..d55f5c058 100644 --- a/MODSRC/vazkii/botania/common/block/BlockManaVoid.java +++ b/MODSRC/vazkii/botania/common/block/BlockManaVoid.java @@ -19,7 +19,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.tile.TileManaVoid; +import vazkii.botania.common.block.tile.mana.TileManaVoid; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/BlockPool.java b/MODSRC/vazkii/botania/common/block/BlockPool.java index 8ef25341e..de60c27b7 100644 --- a/MODSRC/vazkii/botania/common/block/BlockPool.java +++ b/MODSRC/vazkii/botania/common/block/BlockPool.java @@ -32,7 +32,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.lib.LibRenderIDs; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/BlockSpreader.java b/MODSRC/vazkii/botania/common/block/BlockSpreader.java index d04f7e231..5e469a4a3 100644 --- a/MODSRC/vazkii/botania/common/block/BlockSpreader.java +++ b/MODSRC/vazkii/botania/common/block/BlockSpreader.java @@ -39,7 +39,7 @@ import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.client.lib.LibRenderIDs; import vazkii.botania.common.block.tile.TileSimpleInventory; -import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; import vazkii.botania.common.lexicon.LexiconData; diff --git a/MODSRC/vazkii/botania/common/block/BlockTurntable.java b/MODSRC/vazkii/botania/common/block/BlockTurntable.java index 613492571..4eaf97ce6 100644 --- a/MODSRC/vazkii/botania/common/block/BlockTurntable.java +++ b/MODSRC/vazkii/botania/common/block/BlockTurntable.java @@ -25,7 +25,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.tile.TileTurntable; +import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 73c6a85b9..814059741 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -46,20 +46,20 @@ import vazkii.botania.common.block.subtile.generating.SubTileMunchdew; import vazkii.botania.common.block.subtile.generating.SubTileNightshade; import vazkii.botania.common.block.subtile.generating.SubTileThermalily; import vazkii.botania.common.block.tile.TileAltar; -import vazkii.botania.common.block.tile.TileDistributor; import vazkii.botania.common.block.tile.TileEnchanter; import vazkii.botania.common.block.tile.TileForestEye; import vazkii.botania.common.block.tile.TileManaBeacon; -import vazkii.botania.common.block.tile.TileManaDetector; -import vazkii.botania.common.block.tile.TileManaVoid; import vazkii.botania.common.block.tile.TileOpenCrate; -import vazkii.botania.common.block.tile.TilePool; import vazkii.botania.common.block.tile.TilePylon; import vazkii.botania.common.block.tile.TileRuneAltar; import vazkii.botania.common.block.tile.TileSpecialFlower; -import vazkii.botania.common.block.tile.TileSpreader; import vazkii.botania.common.block.tile.TileTinyPlanet; -import vazkii.botania.common.block.tile.TileTurntable; +import vazkii.botania.common.block.tile.mana.TileDistributor; +import vazkii.botania.common.block.tile.mana.TileManaDetector; +import vazkii.botania.common.block.tile.mana.TileManaVoid; +import vazkii.botania.common.block.tile.mana.TilePool; +import vazkii.botania.common.block.tile.mana.TileSpreader; +import vazkii.botania.common.block.tile.mana.TileTurntable; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibOreDict; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java b/MODSRC/vazkii/botania/common/block/tile/mana/TileDistributor.java similarity index 95% rename from MODSRC/vazkii/botania/common/block/tile/TileDistributor.java rename to MODSRC/vazkii/botania/common/block/tile/mana/TileDistributor.java index fb4f8d8a1..01876a7b6 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileDistributor.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -9,7 +9,7 @@ * * File Created @ [Mar 3, 2014, 1:51:34 AM (GMT)] */ -package vazkii.botania.common.block.tile; +package vazkii.botania.common.block.tile.mana; import java.util.ArrayList; import java.util.List; @@ -18,6 +18,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.block.tile.TileMod; public class TileDistributor extends TileMod implements IManaReceiver { diff --git a/MODSRC/vazkii/botania/common/block/tile/TileManaDetector.java b/MODSRC/vazkii/botania/common/block/tile/mana/TileManaDetector.java similarity index 91% rename from MODSRC/vazkii/botania/common/block/tile/TileManaDetector.java rename to MODSRC/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 1f0d06fb9..29e2fd67e 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileManaDetector.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -9,11 +9,12 @@ * * File Created @ [Mar 10, 2014, 7:55:12 PM (GMT)] */ -package vazkii.botania.common.block.tile; +package vazkii.botania.common.block.tile.mana; import net.minecraft.util.AxisAlignedBB; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaCollisionGhost; +import vazkii.botania.common.block.tile.TileMod; public class TileManaDetector extends TileMod implements IManaCollisionGhost { diff --git a/MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java b/MODSRC/vazkii/botania/common/block/tile/mana/TileManaVoid.java similarity index 89% rename from MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java rename to MODSRC/vazkii/botania/common/block/tile/mana/TileManaVoid.java index 4ce49bdb6..21eda4735 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileManaVoid.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TileManaVoid.java @@ -9,9 +9,10 @@ * * File Created @ [Mar 5, 2014, 12:59:27 AM (GMT)] */ -package vazkii.botania.common.block.tile; +package vazkii.botania.common.block.tile.mana; import vazkii.botania.api.mana.IManaReceiver; +import vazkii.botania.common.block.tile.TileMod; public class TileManaVoid extends TileMod implements IManaReceiver { diff --git a/MODSRC/vazkii/botania/common/block/tile/TilePool.java b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java similarity index 98% rename from MODSRC/vazkii/botania/common/block/tile/TilePool.java rename to MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java index b54558afc..e84020925 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TilePool.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TilePool.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 26, 2014, 12:23:55 AM (GMT)] */ -package vazkii.botania.common.block.tile; +package vazkii.botania.common.block.tile.mana; import java.awt.Color; import java.util.List; @@ -37,6 +37,7 @@ import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileMod; public class TilePool extends TileMod implements IManaPool { diff --git a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java b/MODSRC/vazkii/botania/common/block/tile/mana/TileSpreader.java similarity index 99% rename from MODSRC/vazkii/botania/common/block/tile/TileSpreader.java rename to MODSRC/vazkii/botania/common/block/tile/mana/TileSpreader.java index 34a8b79f3..1f9af8b01 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileSpreader.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -9,7 +9,7 @@ * * File Created @ [Jan 25, 2014, 9:40:57 PM (GMT)] */ -package vazkii.botania.common.block.tile; +package vazkii.botania.common.block.tile.mana; import java.util.List; @@ -45,6 +45,7 @@ import vazkii.botania.api.wand.ITileBound; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.TileSimpleInventory; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.entity.EntityManaBurst; import vazkii.botania.common.entity.EntityManaBurst.PositionProperties; diff --git a/MODSRC/vazkii/botania/common/block/tile/TileTurntable.java b/MODSRC/vazkii/botania/common/block/tile/mana/TileTurntable.java similarity index 96% rename from MODSRC/vazkii/botania/common/block/tile/TileTurntable.java rename to MODSRC/vazkii/botania/common/block/tile/mana/TileTurntable.java index af41d89bf..c67499417 100644 --- a/MODSRC/vazkii/botania/common/block/tile/TileTurntable.java +++ b/MODSRC/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -9,7 +9,7 @@ * * File Created @ [Mar 16, 2014, 10:15:05 PM (GMT)] */ -package vazkii.botania.common.block.tile; +package vazkii.botania.common.block.tile.mana; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; @@ -22,6 +22,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import vazkii.botania.common.block.tile.TileMod; + public class TileTurntable extends TileMod { private static final String TAG_SPEED = "speed"; diff --git a/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java b/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java index 6536ac7c2..342c16bbf 100644 --- a/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/TerrasteelCraftingHandler.java @@ -22,7 +22,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ModItems; diff --git a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java index 5af0f2ef2..d8e52cd77 100644 --- a/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java +++ b/MODSRC/vazkii/botania/common/entity/EntityManaBurst.java @@ -39,7 +39,7 @@ import vazkii.botania.api.mana.IManaCollisionGhost; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.tile.TileSpreader; +import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; diff --git a/MODSRC/vazkii/botania/common/item/ItemManaMirror.java b/MODSRC/vazkii/botania/common/item/ItemManaMirror.java index d2d548a34..34d546a92 100644 --- a/MODSRC/vazkii/botania/common/item/ItemManaMirror.java +++ b/MODSRC/vazkii/botania/common/item/ItemManaMirror.java @@ -26,7 +26,7 @@ import net.minecraft.world.World; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.client.core.helper.IconHelper; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibItemNames; diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index 3d077edf5..527a3f45d 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -32,7 +32,7 @@ import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java index 754c1a463..b302697ff 100644 --- a/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java +++ b/MODSRC/vazkii/botania/common/lexicon/page/PageRuneRecipe.java @@ -24,7 +24,7 @@ import vazkii.botania.api.internal.IGuiLexiconEntry; import vazkii.botania.api.recipe.RecipeRuneAltar; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.tile.TilePool; +import vazkii.botania.common.block.tile.mana.TilePool; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly;