Refactor no. 3

I think that's enough until 1.1.x

30 files changed, 67 insertions, 439 deletions

diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index 42c2a75282..3ee9f1f2fd 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -5,13 +5,13 @@ import java.awt.event.ActionListener;
 
 import miscutil.core.commands.CommandMath;
 import miscutil.core.common.CommonProxy;
-import miscutil.core.creativetabs.AddToCreativeTab;
-import miscutil.core.handler.DebugRenderManager;
-import miscutil.core.handler.XEventHandler;
+import miscutil.core.creative.AddToCreativeTab;
+import miscutil.core.handler.events.PickaxeBlockBreakEventHandler;
 import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.util.PlayerCache;
 import miscutil.core.util.Utils;
+import miscutil.core.util.debug.DEBUG_ScreenOverlay;
 import net.minecraftforge.common.MinecraftForge;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
@@ -55,9 +55,9 @@ implements ActionListener
 		proxy.init(event);
 		proxy.registerOreDict();
 		MinecraftForge.EVENT_BUS.register(this);
-		MinecraftForge.EVENT_BUS.register(new XEventHandler());
+		MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler());
 		if (CORE.DEBUG){
-			MinecraftForge.EVENT_BUS.register(new DebugRenderManager());	
+			MinecraftForge.EVENT_BUS.register(new DEBUG_ScreenOverlay());	
 		}
 		FMLCommonHandler.instance().bus().register(this);
 		proxy.registerNetworkStuff();
diff --git a/src/Java/miscutil/core/block/BasicBlock.java b/src/Java/miscutil/core/block/BasicBlock.java
index 31a92d47a5..061e66d9c5 100644
--- a/src/Java/miscutil/core/block/BasicBlock.java
+++ b/src/Java/miscutil/core/block/BasicBlock.java
@@ -1,6 +1,6 @@
 package miscutil.core.block;
 
-import miscutil.core.creativetabs.AddToCreativeTab;
+import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index 90cfbdca7d..7ddc3d07af 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -3,7 +3,7 @@ package miscutil.core.block;
 import miscutil.core.block.fluids.BlocktestFluid;
 import miscutil.core.lib.CORE;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCasingBlocks;
+import miscutil.gregtech.common.blocks.GregtechMetaCasingBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
diff --git a/src/Java/miscutil/core/block/antigrief/TowerDevice.java b/src/Java/miscutil/core/block/antigrief/TowerDevice.java
index 7e9a3d78a9..c3b0ab69a8 100644
--- a/src/Java/miscutil/core/block/antigrief/TowerDevice.java
+++ b/src/Java/miscutil/core/block/antigrief/TowerDevice.java
@@ -5,7 +5,7 @@ import static miscutil.core.block.ModBlocks.blockGriefSaver;
 import java.util.List;
 import java.util.Random;
 
-import miscutil.core.creativetabs.AddToCreativeTab;
+import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.lib.CORE;
 import miscutil.core.tileentities.TileEntityReverter;
 import miscutil.core.util.Utils;
diff --git a/src/Java/miscutil/core/block/fluids/BlocktestFluid.java b/src/Java/miscutil/core/block/fluids/BlocktestFluid.java
index 07addf45a8..8676f21d81 100644
--- a/src/Java/miscutil/core/block/fluids/BlocktestFluid.java
+++ b/src/Java/miscutil/core/block/fluids/BlocktestFluid.java
@@ -1,6 +1,6 @@
 package miscutil.core.block.fluids;
 
-import miscutil.core.creativetabs.AddToCreativeTab;
+import miscutil.core.creative.AddToCreativeTab;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.util.IIcon;
diff --git a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java b/src/Java/miscutil/core/creative/AddToCreativeTab.java
index 57ab17168d..5f73ca75c7 100644
--- a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java
+++ b/src/Java/miscutil/core/creative/AddToCreativeTab.java
@@ -1,4 +1,4 @@
-package miscutil.core.creativetabs;
+package miscutil.core.creative;
 
 import miscutil.core.lib.CORE;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabBlock.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java
index 2db845e04c..b1b330f93c 100644
--- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabBlock.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java
@@ -1,4 +1,4 @@
-package miscutil.core.creativetabs;
+package miscutil.core.creative;
 
 import miscutil.core.block.ModBlocks;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java
index 02a0069a38..53d0e92a89 100644
--- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java
@@ -1,4 +1,4 @@
-package miscutil.core.creativetabs;
+package miscutil.core.creative;
 
 import miscutil.core.block.ModBlocks;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMisc.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java
index 2893146f93..16de793be8 100644
--- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMisc.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java
@@ -1,4 +1,4 @@
-package miscutil.core.creativetabs;
+package miscutil.core.creative;
 
 import miscutil.core.item.ModItems;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabTools.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java
index aa7cf227aa..eb0bf320cc 100644
--- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabTools.java
+++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java
@@ -1,4 +1,4 @@
-package miscutil.core.creativetabs;
+package miscutil.core.creative;
 
 import miscutil.core.item.ModItems;
 import net.minecraft.creativetab.CreativeTabs;
diff --git a/src/Java/miscutil/core/gui/GUI_Bat_Buf.java b/src/Java/miscutil/core/gui/GUI_Bat_Buf.java
deleted file mode 100644
index db37520885..0000000000
--- a/src/Java/miscutil/core/gui/GUI_Bat_Buf.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package miscutil.core.gui;
-
-import miscutil.core.lib.CORE;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.ResourceLocation;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-
-
-public class GUI_Bat_Buf extends GuiScreen
-{
-    private final int bookImageHeight = 192;
-    private final int bookImageWidth = 192;
-    private int currPage = 0;
-    private static final int bookTotalPages = 4;
-    private static ResourceLocation[] bookPageTextures = 
-
-          new ResourceLocation[bookTotalPages];
-    private static String[] stringPageText = new String[bookTotalPages];
-    private GuiButton buttonDone;
-    private NextPageButton buttonNextPage;
-    private NextPageButton buttonPreviousPage;
-    
-    public GUI_Bat_Buf()
-    {
-
-        bookPageTextures[0] = new ResourceLocation(
-
-              CORE.MODID+":textures/gui/book_cover.png");
-
-        bookPageTextures[1] = new ResourceLocation(
-
-        		CORE.MODID+":textures/gui/book.png");
-
-        bookPageTextures[2] = new ResourceLocation(
-
-        		CORE.MODID+":textures/gui/book.png");
-
-        stringPageText[0] = "";
-
-        stringPageText[1] = "The Mysterious Stranger admired your family cow and asked if it was for sale.\n\nWhen you nodded, he offered to trade some Magic Beans, that (if planted in tilled dirt) would lead to more wealth than you could imagine.";
-
-    stringPageText[2]="So you handed him your cow, and grabbed the Magic Beans.\n\nPleased with yourself, you hurried away, looking for tilled dirt in which to plant the Magic Beans.\n\nYou couldn't wait to see how proud your mother would be for";
-     stringPageText[3]="being so shrewd!  Untold wealth in return for an old, milkless cow; what a good deal you made!\n\nSo off you went, looking for a place to plant the Magic Beans with room to grow...";
- }
-
-    /**
-     * Adds the buttons (and other controls) to the screen in question.
-     */
-    @Override
-    public void initGui() 
-    {
-     // DEBUG
-     System.out.println("GuiMysteriousStranger initGUI()");
-        buttonList.clear();
-        Keyboard.enableRepeatEvents(true);
-
-        buttonDone = new GuiButton(0, width / 2 + 2, 4 + bookImageHeight, 
-
-              98, 20, I18n.format("gui.done", new Object[0]));
-  
-        buttonList.add(buttonDone);
-        int offsetFromScreenLeft = (width - bookImageWidth) / 2;
-        buttonList.add(buttonNextPage = new NextPageButton(1, 
-
-              offsetFromScreenLeft + 120, 156, true));
-        buttonList.add(buttonPreviousPage = new NextPageButton(2, 
-
-              offsetFromScreenLeft + 38, 156, false));
-    }
-
-    /**
-     * Called from the main game loop to update the screen.
-     */
-    @Override
-    public void updateScreen() 
-    {
-        buttonDone.visible = (currPage == bookTotalPages - 1);
-        buttonNextPage.visible = (currPage < bookTotalPages - 1);
-        buttonPreviousPage.visible = currPage > 0;
-    }
- 
-    /**
-     * Draws the screen and all the components in it.
-     */
-    @Override
-    public void drawScreen(int parWidth, int parHeight, float p_73863_3_)
-    {
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        if (currPage == 0)
-     {
-         mc.getTextureManager().bindTexture(bookPageTextures[0]);
-     }
-        else
-        {
-         mc.getTextureManager().bindTexture(bookPageTextures[1]);
-        }
-        int offsetFromScreenLeft = (width - bookImageWidth ) / 2;
-        drawTexturedModalRect(offsetFromScreenLeft, 2, 0, 0, bookImageWidth, 
-
-              bookImageHeight);
-        int widthOfString;
-        String stringPageIndicator = I18n.format("book.pageIndicator", 
-
-              new Object[] {Integer.valueOf(currPage + 1), bookTotalPages});
-
-        widthOfString = fontRendererObj.getStringWidth(stringPageIndicator);
-        fontRendererObj.drawString(stringPageIndicator, 
-
-              offsetFromScreenLeft - widthOfString + bookImageWidth - 44, 
-
-              18, 0);
-
-        fontRendererObj.drawSplitString(stringPageText[currPage], 
-
-              offsetFromScreenLeft + 36, 34, 116, 0);
-
-        super.drawScreen(parWidth, parHeight, p_73863_3_);
-
-    }
-
-    /**
-     * Called when a mouse button is pressed and the mouse is moved around. 
-
-     * Parameters are : mouseX, mouseY, lastButtonClicked & 
-
-     * timeSinceMouseClick.
-     */
-    @Override
-    protected void mouseClickMove(int parMouseX, int parMouseY, 
-
-          int parLastButtonClicked, long parTimeSinceMouseClick) 
-
-    {
-     
-    }
-
-    @Override
-    protected void actionPerformed(GuiButton parButton) 
-    {
-     if (parButton == buttonDone)
-     {
-         // You can send a packet to server here if you need server to do 
-
-         // something
-         mc.displayGuiScreen((GuiScreen)null);
-     }
-        else if (parButton == buttonNextPage)
-        {
-            if (currPage < bookTotalPages - 1)
-            {
-                ++currPage;
-            }
-        }
-        else if (parButton == buttonPreviousPage)
-        {
-            if (currPage > 0)
-            {
-                --currPage;
-            }
-        }
-   }
-
-    /**
-     * Called when the screen is unloaded. Used to disable keyboard repeat 
-
-     * events
-     */
-    @Override
-    public void onGuiClosed() 
-    {
-     
-    }
-
-    /**
-     * Returns true if this GUI should pause the game when it is displayed in 
-
-     * single-player
-     */
-    @Override
-    public boolean doesGuiPauseGame()
-    {
-        return true;
-    }
-    
-    @SideOnly(Side.CLIENT)
-    static class NextPageButton extends GuiButton
-    {
-        private final boolean isNextButton;
-
-        public NextPageButton(int parButtonId, int parPosX, int parPosY, 
-
-              boolean parIsNextButton)
-        {
-            super(parButtonId, parPosX, parPosY, 23, 13, "");
-            isNextButton = parIsNextButton;
-        }
-
-        /**
-         * Draws this button to the screen.
-         */
-        @Override
-        public void drawButton(Minecraft mc, int parX, int parY)
-        {
-            if (visible)
-            {
-                boolean isButtonPressed = (parX >= xPosition 
-
-                      && parY >= yPosition 
-
-                      && parX < xPosition + width 
-
-                      && parY < yPosition + height);
-
-                GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-                mc.getTextureManager().bindTexture(bookPageTextures[1]);
-                int textureX = 0;
-                int textureY = 192;
-
-                if (isButtonPressed)
-                {
-                    textureX += 23;
-                }
-
-                if (!isNextButton)
-                {
-                    textureY += 13;
-                }
-
-                drawTexturedModalRect(xPosition, yPosition, 
-
-                      textureX, textureY, 
-
-                      23, 13);
-            }
-        }
-    }
-}
-
diff --git a/src/Java/miscutil/core/gui/GUI_Battery_Buffer.java b/src/Java/miscutil/core/gui/GUI_Battery_Buffer.java
deleted file mode 100644
index c4bdf3666b..0000000000
--- a/src/Java/miscutil/core/gui/GUI_Battery_Buffer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package miscutil.core.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-
-public class GUI_Battery_Buffer extends GuiScreen {
-
-	private GuiButton a;
-	private GuiButton b;
-
-	@Override
-	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-		this.drawDefaultBackground();
-		super.drawScreen(mouseX, mouseY, partialTicks);
-	}
-
-	@Override
-	public boolean doesGuiPauseGame() {
-		return false;
-	}
-
-	/*
-	@SuppressWarnings("unchecked")
-	public void initGui() {
-	    this.buttonList.add(this.a = new GuiButton(0, this.width / 2 - 100, this.height / 2 - 24, "This is button a"));
-	    this.buttonList.add(this.b = new GuiButton(1, this.width / 2 - 100, this.height / 2 + 4, "This is button b"));
-	}*/
-
-	/*	@Override
-	protected void actionPerformed(GuiButton button) {
-	    if (button == this.a) {
-	        //Main.packetHandler.sendToServer(...);
-	        this.mc.displayGuiScreen(null);
-	        if (this.mc.currentScreen == null)
-	            this.mc.setIngameFocus();
-	    }
-	    if (button == this.b){
-	        //Main.packetHandler.sendToServer(...);
-	        this.mc.displayGuiScreen(null);
-	        if (this.mc.currentScreen == null)
-	            this.mc.setIngameFocus();
-	    }
-	}*/
-	/**
-	 * if (worldIn.isRemote) {
-            playerIn.openGui(Main.instance, 0, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);
-        }
-	 */
-
-
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/gui/GUI_Tool_Builder.java b/src/Java/miscutil/core/gui/GUI_Tool_Builder.java
deleted file mode 100644
index e6a81a7d80..0000000000
--- a/src/Java/miscutil/core/gui/GUI_Tool_Builder.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package miscutil.core.gui;
-
-public class GUI_Tool_Builder {
-
-}
diff --git a/src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java b/src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java
deleted file mode 100644
index 7a8f7d3e97..0000000000
--- a/src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package miscutil.core.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-
-public class Gui_No_Inventory_Base extends GuiScreen {
-
-	private GuiButton a;
-	private GuiButton b;
-
-	@Override
-	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-		this.drawDefaultBackground();
-		super.drawScreen(mouseX, mouseY, partialTicks);
-	}
-
-	@Override
-	public boolean doesGuiPauseGame() {
-		return false;
-	}
-
-	/*
-	@SuppressWarnings("unchecked")
-	public void initGui() {
-	    this.buttonList.add(this.a = new GuiButton(0, this.width / 2 - 100, this.height / 2 - 24, "This is button a"));
-	    this.buttonList.add(this.b = new GuiButton(1, this.width / 2 - 100, this.height / 2 + 4, "This is button b"));
-	}*/
-
-	/*	@Override
-	protected void actionPerformed(GuiButton button) {
-	    if (button == this.a) {
-	        //Main.packetHandler.sendToServer(...);
-	        this.mc.displayGuiScreen(null);
-	        if (this.mc.currentScreen == null)
-	            this.mc.setIngameFocus();
-	    }
-	    if (button == this.b){
-	        //Main.packetHandler.sendToServer(...);
-	        this.mc.displayGuiScreen(null);
-	        if (this.mc.currentScreen == null)
-	            this.mc.setIngameFocus();
-	    }
-	}*/
-	/**
-	 * if (worldIn.isRemote) {
-            playerIn.openGui(Main.instance, 0, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ);
-        }
-	 */
-
-
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/core/handler/CraftingManager.java b/src/Java/miscutil/core/handler/CraftingManager.java
index 42b602440d..144b5a0726 100644
--- a/src/Java/miscutil/core/handler/CraftingManager.java
+++ b/src/Java/miscutil/core/handler/CraftingManager.java
@@ -8,14 +8,10 @@ public class CraftingManager {
 	}
 
 	public static void addCraftingRecipies() {
-		// Shaped Recipie
-		//GameRegistry.addRecipe(new ItemStack(ModItems.tutPickaxe, 1), new Object[] { "###", " S ", " S ", '#', ModItems.tutItem, 'S', Items.stick });
 		
-		//Shapeless Recipie
-		//GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tutItem, 10), new Object[]{Blocks.dirt , Blocks.cobblestone});
 	}
 
 	public static void addSmeltingRecipies() {
-		//GameRegistry.addSmelting(ModItems.tutItem, new ItemStack(Blocks.diamond_block, 5), 20.0F);
+		
 	}
 }
diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/miscutil/core/handler/GuiHandler.java
index 9412ed8983..951b697aab 100644
--- a/src/Java/miscutil/core/handler/GuiHandler.java
+++ b/src/Java/miscutil/core/handler/GuiHandler.java
@@ -1,7 +1,5 @@
 package miscutil.core.handler;
 
-import miscutil.core.gui.GUI_Bat_Buf;
-import miscutil.core.gui.GUI_Battery_Buffer;
 import miscutil.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
@@ -16,8 +14,8 @@ public class GuiHandler implements IGuiHandler {
 
 	@Override //ContainerModTileEntity
 	public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
-		if (ID == GUI1)
-			return new GUI_Battery_Buffer();
+		if (ID == GUI1){}
+			//return new GUI_Battery_Buffer();
 
 		return null;
 	}
@@ -27,11 +25,11 @@ public class GuiHandler implements IGuiHandler {
 		Utils.LOG_WARNING("getClientGuiElement Called by: "+player+", in world: "+player.dimension+" at x:"+x+", y:"+y+", z:"+z+".");
 		if (ID == GUI1){
 			Utils.LOG_WARNING("Opening Gui with Id: "+ID);
-			return new GUI_Battery_Buffer();
+			//return new GUI_Battery_Buffer();
 		}
 		else  if (ID == GUI2){
 			Utils.LOG_WARNING("Opening Gui with Id: "+ID+" Energy Buffer");
-			return new GUI_Bat_Buf();
+			//return new GUI_Bat_Buf();
 		}
 		return null;
 	}
diff --git a/src/Java/miscutil/core/handler/XEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
index 4aa3154cee..9169249136 100644
--- a/src/Java/miscutil/core/handler/XEventHandler.java
+++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler;
+package miscutil.core.handler.events;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
@@ -13,7 +13,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent.BreakEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
-public class XEventHandler {
+public class PickaxeBlockBreakEventHandler {
 	@SubscribeEvent
 	public void onBreakBlock(BreakEvent event) {
 		try{
diff --git a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java
index b15f5bb561..9ce59cb2c2 100644
--- a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java
+++ b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler;
+package miscutil.core.handler.events;
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 140ec76b95..d71c60f1e3 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -1,8 +1,8 @@
 package miscutil.core.item;
 
-import static miscutil.core.creativetabs.AddToCreativeTab.tabMisc;
+import static miscutil.core.creative.AddToCreativeTab.tabMisc;
 import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT;
-import miscutil.core.creativetabs.AddToCreativeTab;
+import miscutil.core.creative.AddToCreativeTab;
 import miscutil.core.item.effects.RarityUncommon;
 import miscutil.core.item.general.BufferCore;
 import miscutil.core.item.tool.misc.SandstoneHammer;
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 2302337ef9..fcb6d245f9 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -2,7 +2,7 @@ package miscutil.core.lib;
 
 import java.util.Map;
 
-import miscutil.core.creativetabs.AddToCreativeTab;
+import miscutil.core.creative.AddToCreativeTab;
 
 public class CORE {
 
diff --git a/src/Java/miscutil/core/handler/DebugRenderManager.java b/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java
index 451d465e5e..9752127d73 100644
--- a/src/Java/miscutil/core/handler/DebugRenderManager.java
+++ b/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler;
+package miscutil.core.util.debug;
 
 import miscutil.core.item.tool.staballoy.StaballoyPickaxe;
 import net.minecraft.client.Minecraft;
@@ -9,7 +9,7 @@ import net.minecraft.item.Item;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
-public class DebugRenderManager extends Gui {
+public class DEBUG_ScreenOverlay extends Gui {
 
 	int width, height;
 	Minecraft mc = Minecraft.getMinecraft();
diff --git a/src/Java/miscutil/core/handler/ResourceHandler.java b/src/Java/miscutil/deprecated/ResourceHandler.java
index e8f81f4d02..c9604bf923 100644
--- a/src/Java/miscutil/core/handler/ResourceHandler.java
+++ b/src/Java/miscutil/deprecated/ResourceHandler.java
@@ -1,4 +1,4 @@
-package miscutil.core.handler;
+package miscutil.deprecated;
 
 import org.apache.commons.lang3.Validate;
 
diff --git a/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java b/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java
deleted file mode 100644
index dff0483470..0000000000
--- a/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package miscutil.gregtech.api.enums;
-
-import gregtech.loaders.preload.GT_Loader_OreDictionary;
-
-public class AddExtraOreDict extends GT_Loader_OreDictionary {
-
-	@Override
-	public void run()
-	  {
-		//GT_OreDictUnificator.registerOre(ExtraOreDictNames.buffer_core, new ItemStack(GregtechEnergyBuffer.itemBufferCore));
-	  }
-	
-}
diff --git a/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java b/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java
deleted file mode 100644
index 8ca492c9dd..0000000000
--- a/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package miscutil.gregtech.api.enums;
-
-/**
- * 
- * 
- * @author Jordan
- *Adds in extra names for items (No idea yet why anyone does this in such a fashion..)
- */
-public enum ExtraOreDictNames {
-	buffer_core, itemGregConduit;
-
-public String unlocalisedName;
-
-private void ModObject() {
-  unlocalisedName = name();
-}
-
-}
\ No newline at end of file
diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java
new file mode 100644
index 0000000000..56079d38c1
--- /dev/null
+++ b/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java
@@ -0,0 +1,13 @@
+package miscutil.gregtech.api.enums;
+
+
+public enum GregtechOreDictNames {
+	buffer_core, itemGregConduit;
+
+	public String unlocalisedName;
+
+	private void ModObject() {
+		unlocalisedName = name();
+	}
+
+}
\ No newline at end of file
diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java
index c54e9f9d76..46b7fd8a53 100644
--- a/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java
@@ -5,10 +5,10 @@ import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_ModHandler;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.api.enums.ExtraOreDictNames;
+import miscutil.gregtech.api.enums.GregtechOreDictNames;
 import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCreativeEnergyBuffer;
 import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
+import miscutil.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer;
 
 public class GregtechEnergyBuffer
 {
@@ -55,16 +55,16 @@ public class GregtechEnergyBuffer
 						"512V Creative Energy Buffer", 3, "", 0)
 						.getStackForm(1L));
 
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
-		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), ExtraOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
+		GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core });
 		/*GT_ModHandler.addCraftingRecipe(
 				GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]),
 				GT_ModHandler.RecipeBits.DISMANTLEABLE
@@ -74,7 +74,7 @@ public class GregtechEnergyBuffer
 						"WTW", "WMW", Character.valueOf('M'),
 						ItemList.Hull_MAX, Character.valueOf('W'),
 						OrePrefixes.wireGt08.get(Materials.Superconductor),
-						Character.valueOf('T'), ExtraOreDictNames.buffer_core });*/
+						Character.valueOf('T'), GregtechOreDictNames.buffer_core });*/
 		
 		
 		
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index 57c88c0cd3..ef4508c7e9 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -300,7 +300,6 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity implements
 
 		return new String[] {
 				getLocalName(),
-				"Stored Items:",
 				GT_Utility.formatNumbers(mStored)+" EU /",
 				GT_Utility.formatNumbers(mMax)+" EU"};
 	}
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
index 6914e2d9d4..c852299db8 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
@@ -7,7 +7,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
-import miscutil.core.handler.UnbreakableBlockManager;
+import miscutil.core.handler.events.UnbreakableBlockManager;
 import miscutil.core.util.PlayerCache;
 import miscutil.core.util.Utils;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
index 0509b0f8e9..25df527d30 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/Java/miscutil/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations;
+package miscutil.gregtech.api.metatileentity.implementations.creative;
 
 import static gregtech.api.enums.GT_Values.V;
 import gregtech.api.enums.Textures;
@@ -18,10 +18,12 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
 import ic2.api.item.IElectricItem;
+import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -46,6 +48,11 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
 	public boolean mCharge = false, mDecharge = false;
 	public int mBatteryCount = 1, mChargeableCount = 1;
 
+	@Override
+	public String[] getDescription() {
+		return new String[] {mDescription, "Added by: "	+ EnumChatFormatting.DARK_GREEN+"Alkalus"};
+	}
+
 	/*
 	 * MACHINE_STEEL_SIDE
 	 */
@@ -54,10 +61,10 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
 		ITexture[][][] rTextures = new ITexture[2][17][];
 		for (byte i = -1; i < 16; i++) {
 			rTextures[0][i + 1] = new ITexture[] { new GT_RenderedTexture(
-					Textures.BlockIcons.MACHINE_STEEL_SIDE) };
+					Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT) };
 			rTextures[1][i + 1] = new ITexture[] {
 					new GT_RenderedTexture(
-							Textures.BlockIcons.MACHINE_STEEL_SIDE),
+							Textures.BlockIcons.MACHINE_CASING_MAGIC_FRONT),
 							mInventory.length > 4 ? Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[mTier]
 									: Textures.BlockIcons.OVERLAYS_ENERGY_OUT[mTier] };
 		}
@@ -249,7 +256,7 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
 
 		return new String[] {
 				getLocalName(),
-				"Stored Items:",
+				"THIS IS A CREATIVE ITEM - FOR TESTING",
 				GT_Utility.formatNumbers(mStored)+" EU /",
 				GT_Utility.formatNumbers(mMax)+" EU"};
 	}
diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java
index 729747acdc..113c64a0c1 100644
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
+++ b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.api.metatileentity.implementations;
+package miscutil.gregtech.common.blocks;
 
 import gregtech.api.enums.Textures;
 import gregtech.api.objects.GT_CopiedBlockTexture;