$ Cleaned up the entire project.

> Much neat, very nices.

44 files changed, 8595 insertions, 6826 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
index 1d6ba126b6..dde081e520 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/Meta_GT_Proxy.java
@@ -29,199 +29,267 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 public class Meta_GT_Proxy {
-	
-	//Store Some MetaTileEntity Data here, why not?
-	public static final IMetaTileEntity[] METATILEENTITIES = new IMetaTileEntity[GregTech_API.MAXIMUM_METATILE_IDS];
 
-	public static List<Runnable> GT_BlockIconload = new ArrayList<Runnable>();
-	public static List<Runnable> GT_ItemIconload = new ArrayList<Runnable>();
-	
-	
-	
+	// Dunno
+	public static class GregtechOreDictEventContainer {
+		public final OreDictionary.OreRegisterEvent	mEvent;
+		public final GregtechOrePrefixes			mPrefix;
+		public final GT_Materials					mMaterial;
+		public final String							mModID;
+
+		public GregtechOreDictEventContainer(final OreDictionary.OreRegisterEvent aEvent,
+				final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aModID) {
+			this.mEvent = aEvent;
+			this.mPrefix = aPrefix;
+			this.mMaterial = aMaterial;
+			this.mModID = aModID == null || aModID.equals("UNKNOWN") ? null : aModID;
+		}
+	}
+
+	// Store Some MetaTileEntity Data here, why not?
+	public static final IMetaTileEntity[]							METATILEENTITIES	= new IMetaTileEntity[GregTech_API.MAXIMUM_METATILE_IDS];
+	public static List<Runnable>									GT_BlockIconload	= new ArrayList<Runnable>();
+
+	public static List<Runnable>									GT_ItemIconload		= new ArrayList<Runnable>();
+
 	@SideOnly(Side.CLIENT)
-    public static IIconRegister sBlockIcons, sItemIcons;
+	public static IIconRegister										sBlockIcons, sItemIcons;
+	// Silly Vars
+	private static final Collection<String>							mIgnoredItems		= new HashSet<String>(
+			Arrays.asList(new String[] {
+					"itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater", "itemBucketFreshWater",
+					"itemBucketWater", "itemRock", "itemReed", "itemArrow", "itemSaw", "itemKnife", "itemHammer",
+					"itemChisel", "itemRubber", "itemEssence", "itemIlluminatedPanel", "itemSkull", "itemRawRubber",
+					"itemBacon", "itemJetpackAccelerator", "itemLazurite", "itemIridium", "itemTear", "itemClaw",
+					"itemFertilizer", "itemTar", "itemSlimeball", "itemCoke", "itemBeeswax", "itemBeeQueen",
+					"itemForcicium", "itemForcillium", "itemRoyalJelly", "itemHoneydew", "itemHoney", "itemPollen",
+					"itemReedTypha", "itemSulfuricAcid", "itemPotash", "itemCompressedCarbon", "itemBitumen",
+					"itemBioFuel", "itemCokeSugar", "itemCokeCactus", "itemCharcoalSugar", "itemCharcoalCactus",
+					"itemSludge", "itemEnrichedAlloy", "itemQuicksilver", "itemMercury", "itemOsmium",
+					"itemUltimateCircuit", "itemEnergizedStar", "itemAntimatterMolecule", "itemAntimatterGlob",
+					"itemCoal", "itemBoat", "itemHerbalMedicineCake", "itemCakeSponge", "itemFishandPumpkinCakeSponge",
+					"itemSoulCleaver", "itemInstantCake", "itemWhippingCream", "itemGlisteningWhippingCream",
+					"itemCleaver", "itemHerbalMedicineWhippingCream", "itemStrangeWhippingCream", "itemBlazeCleaver",
+					"itemBakedCakeSponge", "itemMagmaCake", "itemGlisteningCake", "itemOgreCleaver",
+					"itemFishandPumpkinCake", "itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor"
+			}));
+	private static final Collection<String>							mIgnoredNames		= new HashSet<String>(
+			Arrays.asList(new String[] {
+					"grubBee", "chainLink", "candyCane", "bRedString", "bVial", "bFlask", "anorthositeSmooth",
+					"migmatiteSmooth", "slateSmooth", "travertineSmooth", "limestoneSmooth", "orthogneissSmooth",
+					"marbleSmooth", "honeyDrop", "lumpClay", "honeyEqualssugar", "flourEqualswheat",
+					"bluestoneInsulated", "blockWaterstone", "blockSand", "blockTorch", "blockPumpkin",
+					"blockClothRock", "blockStainedHardenedClay", "blockQuartzPillar", "blockQuartzChiselled",
+					"blockSpawner", "blockCloth", "mobHead", "mobEgg", "enderFlower", "enderChest", "clayHardened",
+					"dayGemMaterial", "nightGemMaterial", "snowLayer", "bPlaceholder", "hardenedClay",
+					"eternalLifeEssence", "sandstone", "wheatRice", "transdimBlock", "bambooBasket", "lexicaBotania",
+					"livingwoodTwig", "redstoneCrystal", "pestleAndMortar", "glowstone", "whiteStone", "stoneSlab",
+					"transdimBlock", "clayBowl", "clayPlate", "ceramicBowl", "ceramicPlate", "ovenRack", "clayCup",
+					"ceramicCup", "batteryBox", "transmutationStone", "torchRedstoneActive", "coal", "charcoal",
+					"cloth", "cobblestoneSlab", "stoneBrickSlab", "cobblestoneWall", "stoneBrickWall",
+					"cobblestoneStair", "stoneBrickStair", "blockCloud", "blockDirt", "blockTyrian", "blockCarpet",
+					"blockFft", "blockLavastone", "blockHolystone", "blockConcrete", "sunnariumPart",
+					"brSmallMachineCyaniteProcessor", "meteoriteCoal", "blockCobble", "pressOreProcessor",
+					"crusherOreProcessor", "grinderOreProcessor", "blockRubber", "blockHoney", "blockHoneydew",
+					"blockPeat", "blockRadioactive", "blockSlime", "blockCocoa", "blockSugarCane", "blockLeather",
+					"blockClayBrick", "solarPanelHV", "cableRedNet", "stoneBowl", "crafterWood", "taintedSoil",
+					"brickXyEngineering", "breederUranium", "wireMill", "chunkLazurite", "aluminumNatural",
+					"aluminiumNatural", "naturalAluminum", "naturalAluminium", "antimatterMilligram", "antimatterGram",
+					"strangeMatter", "coalGenerator", "electricFurnace", "unfinishedTank", "valvePart", "aquaRegia",
+					"leatherSeal", "leatherSlimeSeal", "hambone", "slimeball", "clay", "enrichedUranium", "camoPaste",
+					"antiBlock", "burntQuartz", "salmonRaw", "blockHopper", "blockEnderObsidian", "blockIcestone",
+					"blockMagicWood", "blockEnderCore", "blockHeeEndium", "oreHeeEndPowder", "oreHeeStardust",
+					"oreHeeIgneousRock", "oreHeeInstabilityOrb", "crystalPureFluix", "shardNether", "gemFluorite",
+					"stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal", "shardFire", "shardWater", "shardAir",
+					"shardEarth", "ingotRefinedIron", "blockMarble", "ingotUnstable"
+			}));
+	private static final Collection<String>							mInvalidNames		= new HashSet<String>(
+			Arrays.asList(new String[] {
+					"diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre", "universalCable", "bronzeTube",
+					"ironTube", "netherTube", "obbyTube", "infiniteBattery", "eliteBattery", "advancedBattery",
+					"10kEUStore", "blueDye", "MonazitOre", "quartzCrystal", "whiteLuminiteCrystal", "darkStoneIngot",
+					"invisiumIngot", "demoniteOrb", "enderGem", "starconiumGem", "osmoniumIngot", "tapaziteGem",
+					"zectiumIngot", "foolsRubyGem", "rubyGem", "meteoriteGem", "adamiteShard", "sapphireGem",
+					"copperIngot", "ironStick", "goldStick", "diamondStick", "reinforcedStick", "draconicStick",
+					"emeraldStick", "copperStick", "tinStick", "silverStick", "bronzeStick", "steelStick", "leadStick",
+					"manyullynStick", "arditeStick", "cobaltStick", "aluminiumStick", "alumiteStick", "oilsandsOre",
+					"copperWire", "superconductorWire", "sulfuricAcid", "conveyorBelt", "ironWire", "aluminumWire",
+					"aluminiumWire", "silverWire", "tinWire", "dustSiliconSmall", "AluminumOre", "plateHeavyT2",
+					"blockWool", "alloyPlateEnergizedHardened", "gasWood", "alloyPlateEnergized", "SilverOre",
+					"LeadOre", "TinOre", "CopperOre", "silverOre", "leadOre", "tinOre", "copperOre", "bauxiteOre",
+					"HSLivingmetalIngot", "oilMoving", "oilStill", "oilBucket", "petroleumOre", "dieselFuel",
+					"diamondNugget", "planks", "wood", "stick", "sticks", "naquadah", "obsidianRod", "stoneRod",
+					"thaumiumRod", "steelRod", "netherrackRod", "woodRod", "ironRod", "cactusRod", "flintRod",
+					"copperRod", "cobaltRod", "alumiteRod", "blueslimeRod", "arditeRod", "manyullynRod", "bronzeRod",
+					"boneRod", "slimeRod", "redalloyBundled", "bluestoneBundled", "infusedteslatiteInsulated",
+					"redalloyInsulated", "infusedteslatiteBundled"
+			}));
+	public static boolean											mOreDictActivated	= false;
+	public static boolean											mSortToTheEnd		= true;
+	public final static HashSet<ItemStack>							mRegisteredOres		= new HashSet<ItemStack>(10000);
+	public final static Collection<GregtechOreDictEventContainer>	mEvents				= new HashSet<GregtechOreDictEventContainer>();
 
-	//Silly Vars
-	private static final Collection<String> mIgnoredItems = new HashSet<String>(Arrays.asList(new String[]{"itemGhastTear", "itemFlint", "itemClay", "itemBucketSaltWater",
-			"itemBucketFreshWater", "itemBucketWater", "itemRock", "itemReed", "itemArrow", "itemSaw", "itemKnife", "itemHammer", "itemChisel", "itemRubber",
-			"itemEssence", "itemIlluminatedPanel", "itemSkull", "itemRawRubber", "itemBacon", "itemJetpackAccelerator", "itemLazurite", "itemIridium",
-			"itemTear", "itemClaw", "itemFertilizer", "itemTar", "itemSlimeball", "itemCoke", "itemBeeswax", "itemBeeQueen", "itemForcicium", "itemForcillium",
-			"itemRoyalJelly", "itemHoneydew", "itemHoney", "itemPollen", "itemReedTypha", "itemSulfuricAcid", "itemPotash", "itemCompressedCarbon",
-			"itemBitumen", "itemBioFuel", "itemCokeSugar", "itemCokeCactus", "itemCharcoalSugar", "itemCharcoalCactus", "itemSludge", "itemEnrichedAlloy",
-			"itemQuicksilver", "itemMercury", "itemOsmium", "itemUltimateCircuit", "itemEnergizedStar", "itemAntimatterMolecule", "itemAntimatterGlob",
-			"itemCoal", "itemBoat", "itemHerbalMedicineCake", "itemCakeSponge", "itemFishandPumpkinCakeSponge", "itemSoulCleaver", "itemInstantCake",
-			"itemWhippingCream", "itemGlisteningWhippingCream", "itemCleaver", "itemHerbalMedicineWhippingCream", "itemStrangeWhippingCream",
-			"itemBlazeCleaver", "itemBakedCakeSponge", "itemMagmaCake", "itemGlisteningCake", "itemOgreCleaver", "itemFishandPumpkinCake",
-			"itemMagmaWhippingCream", "itemMultimeter", "itemSuperconductor"}));
-	private static final Collection<String> mIgnoredNames = new HashSet<String>(Arrays.asList(new String[]{"grubBee", "chainLink", "candyCane", "bRedString", "bVial",
-			"bFlask", "anorthositeSmooth", "migmatiteSmooth", "slateSmooth", "travertineSmooth", "limestoneSmooth", "orthogneissSmooth", "marbleSmooth",
-			"honeyDrop", "lumpClay", "honeyEqualssugar", "flourEqualswheat", "bluestoneInsulated", "blockWaterstone", "blockSand", "blockTorch",
-			"blockPumpkin", "blockClothRock", "blockStainedHardenedClay", "blockQuartzPillar", "blockQuartzChiselled", "blockSpawner", "blockCloth", "mobHead",
-			"mobEgg", "enderFlower", "enderChest", "clayHardened", "dayGemMaterial", "nightGemMaterial", "snowLayer", "bPlaceholder", "hardenedClay",
-			"eternalLifeEssence", "sandstone", "wheatRice", "transdimBlock", "bambooBasket", "lexicaBotania", "livingwoodTwig", "redstoneCrystal",
-			"pestleAndMortar", "glowstone", "whiteStone", "stoneSlab", "transdimBlock", "clayBowl", "clayPlate", "ceramicBowl", "ceramicPlate", "ovenRack",
-			"clayCup", "ceramicCup", "batteryBox", "transmutationStone", "torchRedstoneActive", "coal", "charcoal", "cloth", "cobblestoneSlab",
-			"stoneBrickSlab", "cobblestoneWall", "stoneBrickWall", "cobblestoneStair", "stoneBrickStair", "blockCloud", "blockDirt", "blockTyrian",
-			"blockCarpet", "blockFft", "blockLavastone", "blockHolystone", "blockConcrete", "sunnariumPart", "brSmallMachineCyaniteProcessor", "meteoriteCoal",
-			"blockCobble", "pressOreProcessor", "crusherOreProcessor", "grinderOreProcessor", "blockRubber", "blockHoney", "blockHoneydew", "blockPeat",
-			"blockRadioactive", "blockSlime", "blockCocoa", "blockSugarCane", "blockLeather", "blockClayBrick", "solarPanelHV", "cableRedNet", "stoneBowl",
-			"crafterWood", "taintedSoil", "brickXyEngineering", "breederUranium", "wireMill", "chunkLazurite", "aluminumNatural", "aluminiumNatural",
-			"naturalAluminum", "naturalAluminium", "antimatterMilligram", "antimatterGram", "strangeMatter", "coalGenerator", "electricFurnace",
-			"unfinishedTank", "valvePart", "aquaRegia", "leatherSeal", "leatherSlimeSeal", "hambone", "slimeball", "clay", "enrichedUranium", "camoPaste",
-			"antiBlock", "burntQuartz", "salmonRaw", "blockHopper", "blockEnderObsidian", "blockIcestone", "blockMagicWood", "blockEnderCore", "blockHeeEndium",
-			"oreHeeEndPowder", "oreHeeStardust", "oreHeeIgneousRock", "oreHeeInstabilityOrb", "crystalPureFluix", "shardNether", "gemFluorite",
-			"stickObsidian", "caveCrystal", "shardCrystal", "dyeCrystal","shardFire","shardWater","shardAir","shardEarth","ingotRefinedIron","blockMarble","ingotUnstable"}));
-	private static final Collection<String> mInvalidNames = new HashSet<String>(Arrays.asList(new String[]{"diamondShard", "redstoneRoot", "obsidianStick", "bloodstoneOre",
-			"universalCable", "bronzeTube", "ironTube", "netherTube", "obbyTube", "infiniteBattery", "eliteBattery", "advancedBattery", "10kEUStore",
-			"blueDye", "MonazitOre", "quartzCrystal", "whiteLuminiteCrystal", "darkStoneIngot", "invisiumIngot", "demoniteOrb", "enderGem", "starconiumGem",
-			"osmoniumIngot", "tapaziteGem", "zectiumIngot", "foolsRubyGem", "rubyGem", "meteoriteGem", "adamiteShard", "sapphireGem", "copperIngot",
-			"ironStick", "goldStick", "diamondStick", "reinforcedStick", "draconicStick", "emeraldStick", "copperStick", "tinStick", "silverStick",
-			"bronzeStick", "steelStick", "leadStick", "manyullynStick", "arditeStick", "cobaltStick", "aluminiumStick", "alumiteStick", "oilsandsOre",
-			"copperWire", "superconductorWire", "sulfuricAcid", "conveyorBelt", "ironWire", "aluminumWire", "aluminiumWire", "silverWire", "tinWire",
-			"dustSiliconSmall", "AluminumOre", "plateHeavyT2", "blockWool", "alloyPlateEnergizedHardened", "gasWood", "alloyPlateEnergized", "SilverOre",
-			"LeadOre", "TinOre", "CopperOre", "silverOre", "leadOre", "tinOre", "copperOre", "bauxiteOre", "HSLivingmetalIngot", "oilMoving", "oilStill",
-			"oilBucket", "petroleumOre", "dieselFuel", "diamondNugget", "planks", "wood", "stick", "sticks", "naquadah", "obsidianRod", "stoneRod",
-			"thaumiumRod", "steelRod", "netherrackRod", "woodRod", "ironRod", "cactusRod", "flintRod", "copperRod", "cobaltRod", "alumiteRod", "blueslimeRod",
-			"arditeRod", "manyullynRod", "bronzeRod", "boneRod", "slimeRod", "redalloyBundled", "bluestoneBundled", "infusedteslatiteInsulated",
-			"redalloyInsulated", "infusedteslatiteBundled"}));
-	public static boolean mOreDictActivated = false;
-	public static boolean mSortToTheEnd = true;
-	public final static HashSet<ItemStack> mRegisteredOres = new HashSet<ItemStack>(10000);
-	public final static Collection<GregtechOreDictEventContainer> mEvents = new HashSet<GregtechOreDictEventContainer>();
-	public final static Collection<OreDictEventContainer> mEventsFake = new HashSet<OreDictEventContainer>();
+	public final static Collection<OreDictEventContainer>			mEventsFake			= new HashSet<OreDictEventContainer>();
 
-	public Meta_GT_Proxy() {	
-		Utils.LOG_INFO("GT_PROXY - initialized.");
-		for (String tOreName : OreDictionary.getOreNames()) {
-			ItemStack tOreStack;
-			for (Iterator<?> i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) {
-				tOreStack = (ItemStack) i$.next();
-			}
+	/*
+	 * public static Fluid addFluid(String aName, String aLocalized,
+	 * GT_Materials aMaterial, int aState, int aTemperatureK) { return
+	 * addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null,
+	 * 0); }
+	 * 
+	 * public static Fluid addFluid(String aName, String aLocalized,
+	 * GT_Materials aMaterial, int aState, int aTemperatureK, ItemStack
+	 * aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { return
+	 * addFluid(aName, aName.toLowerCase(), aLocalized, aMaterial, null, aState,
+	 * aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount); }
+	 * 
+	 * public static Fluid addFluid(String aName, String aTexture, String
+	 * aLocalized, GT_Materials aMaterial, short[] aRGBa, int aState, int
+	 * aTemperatureK, ItemStack aFullContainer, ItemStack aEmptyContainer, int
+	 * aFluidAmount) { aName = aName.toLowerCase(); Fluid rFluid = new
+	 * GregtechFluid(aName, aTexture, aRGBa != null ? aRGBa :
+	 * Dyes._NULL.getRGBA());
+	 * GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(),
+	 * aLocalized == null ? aName : aLocalized); if
+	 * (FluidRegistry.registerFluid(rFluid)) { switch (aState) { case 0:
+	 * rFluid.setGaseous(false); rFluid.setViscosity(10000); break; case 1: case
+	 * 4: rFluid.setGaseous(false); rFluid.setViscosity(1000); break; case 2:
+	 * rFluid.setGaseous(true); rFluid.setDensity(-100);
+	 * rFluid.setViscosity(200); break; case 3: rFluid.setGaseous(true);
+	 * rFluid.setDensity(55536); rFluid.setViscosity(10);
+	 * rFluid.setLuminosity(15); } } else { rFluid =
+	 * FluidRegistry.getFluid(aName); } if (rFluid.getTemperature() == new
+	 * Fluid("test").getTemperature()) { rFluid.setTemperature(aTemperatureK); }
+	 * if (aMaterial != null) { switch (aState) { case 0: aMaterial.mSolid =
+	 * rFluid; break; case 1: aMaterial.mFluid = rFluid; break; case 2:
+	 * aMaterial.mGas = rFluid; break; case 3: aMaterial.mPlasma = rFluid;
+	 * break; case 4: aMaterial.mStandardMoltenFluid = rFluid; } } if
+	 * ((aFullContainer != null) && (aEmptyContainer != null) &&
+	 * (!FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid,
+	 * aFluidAmount), aFullContainer, aEmptyContainer))) {
+	 * GT_Values.RA.addFluidCannerRecipe(aFullContainer,
+	 * GT_Utility.getContainerItem(aFullContainer, false), null, new
+	 * FluidStack(rFluid, aFluidAmount)); } return rFluid; }
+	 */
+
+	/**
+	 * This gives you a new BaseMetaTileEntity. As some Interfaces are not
+	 * always loaded (Buildcraft, Univeral Electricity) I have to use Invocation
+	 * at the Constructor of the BaseMetaTileEntity
+	 */
+	private static Class<BaseMetaTileEntity> sBaseMetaTileEntityClass = null;
+
+	public static void activateOreDictHandler() {
+		Meta_GT_Proxy.mOreDictActivated = true;
+		GregtechOreDictEventContainer tEvent;
+		if (Meta_GT_Proxy.mEvents.size() == 0) {
+			Utils.LOG_INFO("Found nothing to iterate over for use in material addition.");
+		}
+		for (final Iterator<GregtechOreDictEventContainer> i$ = Meta_GT_Proxy.mEvents.iterator(); i$
+				.hasNext(); Meta_GT_Proxy.registerRecipes(tEvent)) {
+			tEvent = i$.next();
+		}
+		OreDictEventContainer tEvent2;
+		if (Meta_GT_Proxy.mEventsFake.size() == 0) {
+			Utils.LOG_INFO("Found nothing to iterate over for use in GT material addition.");
+		}
+		for (final Iterator<OreDictEventContainer> i$ = Meta_GT_Proxy.mEventsFake.iterator(); i$
+				.hasNext(); Meta_GT_Proxy.registerRecipes(tEvent2)) {
+			tEvent2 = i$.next();
 		}
 	}
 
-	/*public static Fluid addFluid(String aName, String aLocalized, GT_Materials aMaterial, int aState, int aTemperatureK) {
-		return addFluid(aName, aLocalized, aMaterial, aState, aTemperatureK, null, null, 0);
+	public static boolean areWeUsingGregtech5uExperimental() {
+		final int version = GregTech_API.VERSION;
+		if (version == 508 || version == 507) {
+			return false;
+		}
+		else if (version == 509) {
+			return true;
+		}
+		else {
+			return false;
+		}
 	}
 
-	public static Fluid addFluid(String aName, String aLocalized, GT_Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer,
-			ItemStack aEmptyContainer, int aFluidAmount) {
-		return addFluid(aName, aName.toLowerCase(), aLocalized, aMaterial, null, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
-	}
+	public static BaseMetaTileEntity constructBaseMetaTileEntity() {
+		if (Meta_GT_Proxy.sBaseMetaTileEntityClass == null) {
+			try {
+				return (Meta_GT_Proxy.sBaseMetaTileEntityClass = BaseMetaTileEntity.class).newInstance();
+			}
+			catch (final Throwable e) {
+				/* Do nothing */}
+		}
 
-	public static Fluid addFluid(String aName, String aTexture, String aLocalized, GT_Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK,
-			ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) {
-		aName = aName.toLowerCase();
-		Fluid rFluid = new GregtechFluid(aName, aTexture, aRGBa != null ? aRGBa : Dyes._NULL.getRGBA());
-		GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalized == null ? aName : aLocalized);
-		if (FluidRegistry.registerFluid(rFluid)) {
-			switch (aState) {
-			case 0:
-				rFluid.setGaseous(false);
-				rFluid.setViscosity(10000);
-				break;
-			case 1:
-			case 4:
-				rFluid.setGaseous(false);
-				rFluid.setViscosity(1000);
-				break;
-			case 2:
-				rFluid.setGaseous(true);
-				rFluid.setDensity(-100);
-				rFluid.setViscosity(200);
-				break;
-			case 3:
-				rFluid.setGaseous(true);
-				rFluid.setDensity(55536);
-				rFluid.setViscosity(10);
-				rFluid.setLuminosity(15);
-			}
-		} else {
-			rFluid = FluidRegistry.getFluid(aName);
-		}
-		if (rFluid.getTemperature() == new Fluid("test").getTemperature()) {
-			rFluid.setTemperature(aTemperatureK);
-		}
-		if (aMaterial != null) {
-			switch (aState) {
-			case 0:
-				aMaterial.mSolid = rFluid;
-				break;
-			case 1:
-				aMaterial.mFluid = rFluid;
-				break;
-			case 2:
-				aMaterial.mGas = rFluid;
-				break;
-			case 3:
-				aMaterial.mPlasma = rFluid;
-				break;
-			case 4:
-				aMaterial.mStandardMoltenFluid = rFluid;
-			}
-		}
-		if ((aFullContainer != null) && (aEmptyContainer != null)
-				&& (!FluidContainerRegistry.registerFluidContainer(new FluidStack(rFluid, aFluidAmount), aFullContainer, aEmptyContainer))) {
-			GT_Values.RA.addFluidCannerRecipe(aFullContainer, GT_Utility.getContainerItem(aFullContainer, false), null, new FluidStack(rFluid, aFluidAmount));
-		}
-		return rFluid;
-	}*/
+		try {
+			return Meta_GT_Proxy.sBaseMetaTileEntityClass.newInstance();
+		}
+		catch (final Throwable e) {
+			Utils.LOG_INFO("Fatal Error ocurred while initializing TileEntities, crashing Minecraft.");
+			e.printStackTrace(GT_Log.err);
+			throw new RuntimeException(e);
+		}
+	}
 
 	@SubscribeEvent
-	public static void registerOre2(OreDictionary.OreRegisterEvent aEvent) {
-		ModContainer tContainer = Loader.instance().activeModContainer();
+	public static void registerOre2(final OreDictionary.OreRegisterEvent aEvent) {
+		final ModContainer tContainer = Loader.instance().activeModContainer();
 		String aMod = tContainer == null ? "UNKNOWN" : tContainer.getModId();
 		String aOriginalMod = aMod;
 		if (GregtechOreDictUnificator.isRegisteringOres()) {
 			aMod = CORE.MODID;
-		} else if (aMod.equals(CORE.MODID)) {
+		}
+		else if (aMod.equals(CORE.MODID)) {
 			aMod = "UNKNOWN";
 		}
-		if ((aEvent == null) || (aEvent.Ore == null) || (aEvent.Ore.getItem() == null) || (aEvent.Name == null) || (aEvent.Name.isEmpty())
-				|| (aEvent.Name.replaceAll("_", "").length() - aEvent.Name.length() == 9)) {
+		if (aEvent == null || aEvent.Ore == null || aEvent.Ore.getItem() == null || aEvent.Name == null
+				|| aEvent.Name.isEmpty() || aEvent.Name.replaceAll("_", "").length() - aEvent.Name.length() == 9) {
 			if (aOriginalMod.equals(CORE.MODID)) {
 				aOriginalMod = "UNKNOWN";
 			}
-			GT_Log.ore
-			.println(aOriginalMod
+			GT_Log.ore.println(aOriginalMod
 					+ " did something very bad! The registration is too invalid to even be shown properly. This happens only if you register null, invalid Items, empty Strings or even nonexisting Events to the OreDict.");
-			throw new IllegalArgumentException(
-					aOriginalMod
+			throw new IllegalArgumentException(aOriginalMod
 					+ " did something very bad! The registration is too invalid to even be shown properly. This happens only if you register null, invalid Items, empty Strings or even nonexisting Events to the OreDict.");
 		}
 		try {
 			aEvent.Ore.stackSize = 1;
 
 			String tModToName = aMod + " -> " + aEvent.Name;
-			if ((mOreDictActivated) || (GregTech_API.sPostloadStarted) || ((mSortToTheEnd) && (GregTech_API.sLoadFinished))) {
+			if (Meta_GT_Proxy.mOreDictActivated || GregTech_API.sPostloadStarted
+					||