Refactor no. 3

I think that's enough until 1.1.x

4 files changed, 12 insertions, 88 deletions

diff --git a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
deleted file mode 100644
index 729747acdc..0000000000
--- a/src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package miscutil.gregtech.api.metatileentity.implementations;
-
-import gregtech.api.enums.Textures;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.util.GT_LanguageManager;
-import gregtech.common.blocks.GT_Block_Casings_Abstract;
-import gregtech.common.blocks.GT_Item_Casings1;
-import gregtech.common.blocks.GT_Material_Casings;
-import miscutil.gregtech.api.enums.GregtechItemList;
-import miscutil.gregtech.api.enums.GregtechTextures;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraft.world.IBlockAccess;
-
-public class GregtechMetaCasingBlocks
-extends GT_Block_Casings_Abstract {
-	public GregtechMetaCasingBlocks() {
-		super(GT_Item_Casings1.class, "miscutils.blockcasings", GT_Material_Casings.INSTANCE);
-		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-			GregtechTextures.BlockIcons.GT_CASING_BLOCKS[i] = new GT_CopiedBlockTexture(this, 6, i);
-		}
-		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Centrifuge Casing");
-		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Centrifuge Casing II");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "MV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "HV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "EV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "IV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "LuV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "ZPM Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "UV Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "MAX Machine Casing");
-		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Iron Plated Bricks");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Heat Proof Machine Casing");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Cupronickel Coil Block");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Kanthal Coil Block");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Nichrome Coil Block");
-		//GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Superconducting Coil Block");
-		GregtechItemList.Casing_Centrifuge1.set(new ItemStack(this, 1, 0));
-		GregtechItemList.Casing_Centrifuge2.set(new ItemStack(this, 1, 1));
-        /*ItemList.Casing_MV.set(new ItemStack(this, 1, 2));
-        ItemList.Casing_HV.set(new ItemStack(this, 1, 3));
-        ItemList.Casing_EV.set(new ItemStack(this, 1, 4));
-        ItemList.Casing_IV.set(new ItemStack(this, 1, 5));
-        ItemList.Casing_LuV.set(new ItemStack(this, 1, 6));
-        ItemList.Casing_ZPM.set(new ItemStack(this, 1, 7));
-        ItemList.Casing_UV.set(new ItemStack(this, 1, 8));
-        ItemList.Casing_MAX.set(new ItemStack(this, 1, 9));*/
-		GregtechItemList.Casing_IronPlatedBricks.set(new ItemStack(this, 1, 10));
-       /*ItemList.Casing_HeatProof.set(new ItemStack(this, 1, 11));
-        ItemList.Casing_Coil_Cupronickel.set(new ItemStack(this, 1, 12));
-        ItemList.Casing_Coil_Kanthal.set(new ItemStack(this, 1, 13));
-        ItemList.Casing_Coil_Nichrome.set(new ItemStack(this, 1, 14));
-        ItemList.Casing_Coil_Superconductor.set(new ItemStack(this, 1, 15));*/
-	}
-
-	public IIcon getIcon(int aSide, int aMeta) {
-		if ((aMeta >= 0) && (aMeta < 16)) {
-			switch (aMeta) {
-            case 0:
-                return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon();
-            case 1:
-                return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
-			case 10:
-				return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
-			case 12:
-				return Textures.BlockIcons.MACHINE_COIL_CUPRONICKEL.getIcon();
-			case 13:
-				return Textures.BlockIcons.MACHINE_COIL_KANTHAL.getIcon();
-			case 14:
-				return Textures.BlockIcons.MACHINE_COIL_NICHROME.getIcon();
-			case 15:
-				return Textures.BlockIcons.MACHINE_COIL_SUPERCONDUCTOR.getIcon();
-			}
-			return Textures.BlockIcons.MACHINECASINGS_SIDE[aMeta].getIcon();
-		}
-		return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
-	}
-
-	public int colorMultiplier(IBlockAccess aWorld, int aX, int aY, int aZ) {
-		return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2];
-	}
-}
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"};
 	}