+ Added Base classes for meta blocks.

+ Added Base classes for ItemBlocks.
% Changed a Few tooltips for newly generated material items.

3 files changed, 24 insertions, 25 deletions

diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 75f4ecdcbc..ba6ad6ce41 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -321,8 +321,8 @@ public enum GregtechOrePrefixes {
 		/* TODO*/ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1|2|16|32|64, 178,34,34, 0, "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))),
 
 		//Needs more Use, I think. 
-		Tantaloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantaloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))),
-		Tantaloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantaloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3)));
+		Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 213, 231, 237, 0, "Tantalloy 60", 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3))),
+		Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 193, 211, 217, 0, "Tantalloy 61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 8), new TC_AspectStack(TC_Aspects.STRONTIO, 3)));
 
 		
 		
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index 7a252d9bfb..d085d39a50 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -112,58 +112,58 @@ extends GregtechMeta_MultiBlockBase {
 			return false;
 		}*/
 
-		Utils.LOG_INFO("Centrifuge Debug - 1");
+		Utils.LOG_WARNING("Centrifuge Debug - 1");
 		GT_Recipe.GT_Recipe_Map map = getRecipeMap();
 		if (map == null) {
-			Utils.LOG_INFO("Centrifuge Debug - False - No recipe map");
+			Utils.LOG_WARNING("Centrifuge Debug - False - No recipe map");
 			return false;
 		}
-		Utils.LOG_INFO("Centrifuge Debug - 2");
+		Utils.LOG_WARNING("Centrifuge Debug - 2");
 		ArrayList<ItemStack> tInputList = getStoredInputs();
 		long tVoltage = getMaxInputVoltage();
 		byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
-		Utils.LOG_INFO("Centrifuge Debug - Tier variable: "+tTier);
+		Utils.LOG_WARNING("Centrifuge Debug - Tier variable: "+tTier);
 		ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]);
 		ArrayList<FluidStack> tFluidList = getStoredFluids();
 		FluidStack[] tFluids = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]);
 		if (tInputList.size() > 0 || tFluids.length > 0) {
 			GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
 			if (tRecipe != null) {
-				Utils.LOG_INFO("Recipe was not invalid");
+				Utils.LOG_WARNING("Recipe was not invalid");
 				mLastRecipe = tRecipe;
 				this.mEUt = 0;
 				this.mOutputItems = null;
 				this.mOutputFluids = null;
 				if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) {
 
-					Utils.LOG_INFO("False: 1");
+					Utils.LOG_WARNING("False: 1");
 					return false;
 				}
 
 				this.mMaxProgresstime = tRecipe.mDuration;
 				this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
 				this.mEfficiencyIncrease = 10000;
-				Utils.LOG_INFO("Centrifuge Debug - 2 - Max Progress Time: "+this.mMaxProgresstime);
+				Utils.LOG_WARNING("Centrifuge Debug - 2 - Max Progress Time: "+this.mMaxProgresstime);
 				if (tRecipe.mEUt <= 16) {
-					Utils.LOG_INFO("Centrifuge Debug - Using < 16eu/t");
+					Utils.LOG_WARNING("Centrifuge Debug - Using < 16eu/t");
 					this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
 					this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));
-					Utils.LOG_INFO("Centrifuge Debug - 3.1 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]);
+					Utils.LOG_WARNING("Centrifuge Debug - 3.1 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]);
 				} else {
-					Utils.LOG_INFO("Centrifuge Debug - using > 16eu/t");
+					Utils.LOG_WARNING("Centrifuge Debug - using > 16eu/t");
 					this.mEUt = tRecipe.mEUt;
 					this.mMaxProgresstime = tRecipe.mDuration;
-					Utils.LOG_INFO("Centrifuge Debug - 3.2 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]);
+					Utils.LOG_WARNING("Centrifuge Debug - 3.2 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]);
 					while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
 						this.mEUt *= 4;
 						this.mMaxProgresstime /= 2;
-						Utils.LOG_INFO("Centrifuge Debug - 4 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
+						Utils.LOG_WARNING("Centrifuge Debug - 4 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
 					}
 				}
 				this.mEUt *= 1;
 				if (this.mEUt > 0) {
 					this.mEUt = (-this.mEUt);
-					Utils.LOG_INFO("Centrifuge Debug - 5 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
+					Utils.LOG_WARNING("Centrifuge Debug - 5 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
 				}
 				ItemStack[] tOut = new ItemStack[tRecipe.mOutputs.length];
 				for (int h = 0; h < tRecipe.mOutputs.length; h++) {
@@ -189,7 +189,7 @@ extends GregtechMeta_MultiBlockBase {
 				if (this.mMaxProgresstime <= 0){
 					this.mMaxProgresstime++;
 				}
-				Utils.LOG_INFO("Centrifuge Debug - 6 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
+				Utils.LOG_WARNING("Centrifuge Debug - 6 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
 				List<ItemStack> overStacks = new ArrayList<ItemStack>();
 				for (int f = 0; f < tOut.length; f++) {
 					if (tOut[f].getMaxStackSize() < tOut[f].stackSize) {
@@ -214,11 +214,11 @@ extends GregtechMeta_MultiBlockBase {
 				this.mOutputItems = tOut;
 				this.mOutputFluids = new FluidStack[]{tFOut};
 				updateSlots();
-				Utils.LOG_INFO("Centrifuge: True");
+				Utils.LOG_WARNING("Centrifuge: True");
 				return true;
 			}
 		}
-		Utils.LOG_INFO("Centrifuge: Recipe was invalid.");
+		Utils.LOG_WARNING("Centrifuge: Recipe was invalid.");
 		return false;
 	}
 
@@ -249,7 +249,7 @@ extends GregtechMeta_MultiBlockBase {
 		int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
 		int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY;
 		int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
-		//Utils.LOG_INFO("X:"+xDir+" Y:"+yDir+" Z:"+zDir);
+		//Utils.LOG_WARNING("X:"+xDir+" Y:"+yDir+" Z:"+zDir);
 		if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
 			return false;
 		}
@@ -260,14 +260,14 @@ extends GregtechMeta_MultiBlockBase {
 					if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) {			
 
 						IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
-						//Utils.LOG_INFO("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord());
+						//Utils.LOG_WARNING("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord());
 						if ((!addMaintenanceToMachineList(tTileEntity, 57)) && (!addInputToMachineList(tTileEntity, 57)) && (!addOutputToMachineList(tTileEntity, 57)) && (!addEnergyInputToMachineList(tTileEntity, 57))) {
 
 							//Maintenance Hatch
 							if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
 								if (tTileEntity.getXCoord() == aBaseMetaTileEntity.getXCoord() && tTileEntity.getYCoord() == aBaseMetaTileEntity.getYCoord() && tTileEntity.getZCoord() == (aBaseMetaTileEntity.getZCoord()+2)) {
 									if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
-										Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE");
+										Utils.LOG_WARNING("MAINT HATCH IN CORRECT PLACE");
 										this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
 										((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex();
 									} else {
@@ -275,7 +275,7 @@ extends GregtechMeta_MultiBlockBase {
 									}
 								}	
 								else {
-									Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE");
+									Utils.LOG_WARNING("MAINT HATCH IN WRONG PLACE");
 								}
 							}
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index 5becb4c59b..d206156da0 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -14,7 +14,6 @@ import java.util.Arrays;
 
 import miscutil.core.block.ModBlocks;
 import miscutil.core.lib.CORE;
-import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
 import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
@@ -141,11 +140,11 @@ public class GregtechMetaTileEntityIndustrialCokeOven
                 this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
                 this.mOutputFluids = new FluidStack[]{tRecipe.getFluidOutput(0)};
                 updateSlots();
-                Utils.LOG_INFO("Coke oven: True");
+                //Utils.LOG_INFO("Coke oven: True");
                 return true;
             }
         }
-        Utils.LOG_INFO("Coke oven: False");
+        //Utils.LOG_INFO("Coke oven: False");
         return false;
     }
 	/*public boolean checkRecipe(ItemStack aStack) {