diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/preload')
10 files changed, 3615 insertions, 4207 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java b/src/main/java/gregtech/loaders/preload/GTPreLoad.java index a2e6137cff..f0eb4c6d8c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_PreLoad.java +++ b/src/main/java/gregtech/loaders/preload/GTPreLoad.java @@ -1,6 +1,6 @@ package gregtech.loaders.preload; -import static gregtech.GT_Mod.GT_FML_LOGGER; +import static gregtech.GTMod.GT_FML_LOGGER; import static gregtech.api.enums.Mods.CraftTweaker; import static gregtech.api.enums.Mods.GalacticraftCore; import static gregtech.api.enums.Mods.GregTech; @@ -31,22 +31,22 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.discovery.ASMDataTable; import cpw.mods.fml.common.discovery.ModDiscoverer; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.GTMod; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.recipe.RecipeCategory; import gregtech.api.recipe.RecipeCategoryHolder; import gregtech.api.recipe.RecipeCategorySetting; -import gregtech.api.util.GT_Config; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_RecipeBuilder; -import gregtech.api.util.GT_Utility; -import gregtech.common.GT_Proxy; +import gregtech.api.util.GTConfig; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTRecipeBuilder; +import gregtech.api.util.GTUtility; +import gregtech.common.GTProxy; import gregtech.common.config.client.ConfigColorModulation; import gregtech.common.config.client.ConfigInterface; import gregtech.common.config.client.ConfigRender; @@ -57,15 +57,15 @@ import gregtech.common.config.gregtech.ConfigGeneral; import gregtech.common.config.gregtech.ConfigMachines; import gregtech.common.config.gregtech.ConfigOreDropBehavior; import gregtech.common.config.gregtech.ConfigPollution; -import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineBase; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom; +import gregtech.common.tileentities.machines.long_distance.MTELongDistancePipelineBase; +import gregtech.common.tileentities.machines.multi.MTECleanroom; -public class GT_PreLoad { +public class GTPreLoad { public static void sortToTheEnd() { try { - GT_FML_LOGGER.info("GT_Mod: Sorting GregTech to the end of the Mod List for further processing."); - LoadController tLoadController = (LoadController) GT_Utility + GT_FML_LOGGER.info("GTMod: Sorting GregTech to the end of the Mod List for further processing."); + LoadController tLoadController = (LoadController) GTUtility .getFieldContent(Loader.instance(), "modController", true, true); assert tLoadController != null; List<ModContainer> tModList = tLoadController.getActiveModList(); @@ -84,15 +84,15 @@ public class GT_PreLoad { if (tGregTech != null) { tNewModsList.add(tGregTech); } - Objects.requireNonNull(GT_Utility.getField(tLoadController, "activeModList", true, true)) + Objects.requireNonNull(GTUtility.getField(tLoadController, "activeModList", true, true)) .set(tLoadController, tNewModsList); } catch (Throwable e) { - GT_Mod.logStackTrace(e); + GTMod.logStackTrace(e); } } public static void initLocalization(File languageDir) { - GT_FML_LOGGER.info("GT_Mod: Generating Lang-File"); + GT_FML_LOGGER.info("GTMod: Generating Lang-File"); if (FMLCommonHandler.instance() .getEffectiveSide() @@ -104,107 +104,107 @@ public class GT_PreLoad { GT_FML_LOGGER.info("User lang is " + userLang); if (userLang.equals("en_US")) { GT_FML_LOGGER.info("Loading GregTech.lang"); - GT_LanguageManager.isEN_US = true; - GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); + GTLanguageManager.isEN_US = true; + GTLanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); } else { String l10nFileName = "GregTech_" + userLang + ".lang"; File l10nFile = new File(languageDir, l10nFileName); if (l10nFile.isFile()) { GT_FML_LOGGER.info("Loading l10n file: " + l10nFileName); - GT_LanguageManager.sEnglishFile = new Configuration(l10nFile); + GTLanguageManager.sEnglishFile = new Configuration(l10nFile); } else { GT_FML_LOGGER.info("Cannot find l10n file " + l10nFileName + ", fallback to GregTech.lang"); - GT_LanguageManager.isEN_US = true; - GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); + GTLanguageManager.isEN_US = true; + GTLanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); } } } else { - GT_LanguageManager.isEN_US = true; - GT_LanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); + GTLanguageManager.isEN_US = true; + GTLanguageManager.sEnglishFile = new Configuration(new File(languageDir, "GregTech.lang")); } - GT_LanguageManager.sEnglishFile.load(); + GTLanguageManager.sEnglishFile.load(); Materials.getMaterialsMap() .values() .parallelStream() .filter(Objects::nonNull) .forEach( - aMaterial -> aMaterial.mLocalizedName = GT_LanguageManager + aMaterial -> aMaterial.mLocalizedName = GTLanguageManager .addStringLocalization("Material." + aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName)); } public static void getConfiguration(File configDir) { File tFile = new File(new File(configDir, "GregTech"), "IDs.cfg"); - GT_Config.sConfigFileIDs = new Configuration(tFile); - GT_Config.sConfigFileIDs.load(); - GT_Config.sConfigFileIDs.save(); + GTConfig.sConfigFileIDs = new Configuration(tFile); + GTConfig.sConfigFileIDs.load(); + GTConfig.sConfigFileIDs.save(); tFile = new File(new File(configDir, "GregTech"), "Cleanroom.cfg"); - GT_Config.cleanroomFile = new Configuration(tFile); - GT_Config.cleanroomFile.load(); - GT_Config.cleanroomFile.save(); + GTConfig.cleanroomFile = new Configuration(tFile); + GTConfig.cleanroomFile.load(); + GTConfig.cleanroomFile.save(); tFile = new File(new File(configDir, "GregTech"), "UndergroundFluids.cfg"); - GT_Config.undergroundFluidsFile = new Configuration(tFile); - GT_Config.undergroundFluidsFile.load(); - GT_Config.undergroundFluidsFile.save(); + GTConfig.undergroundFluidsFile = new Configuration(tFile); + GTConfig.undergroundFluidsFile.load(); + GTConfig.undergroundFluidsFile.save(); - GregTech_API.NEIClientFIle = new GT_Config( + GregTechAPI.NEIClientFIle = new GTConfig( new Configuration(new File(new File(configDir, "GregTech"), "NEIClient.cfg"))); } public static void createLogFiles(File parentFile) { - GT_Log.mLogFile = new File(parentFile, "logs/GregTech.log"); - if (!GT_Log.mLogFile.exists()) { + GTLog.mLogFile = new File(parentFile, "logs/GregTech.log"); + if (!GTLog.mLogFile.exists()) { try { - GT_Log.mLogFile.createNewFile(); + GTLog.mLogFile.createNewFile(); } catch (Throwable ignored) {} } try { - GT_Log.out = GT_Log.err = new PrintStream(GT_Log.mLogFile); + GTLog.out = GTLog.err = new PrintStream(GTLog.mLogFile); } catch (FileNotFoundException ignored) {} if (ConfigGeneral.loggingOreDict) { - GT_Log.mOreDictLogFile = new File(parentFile, "logs/OreDict.log"); - if (!GT_Log.mOreDictLogFile.exists()) { + GTLog.mOreDictLogFile = new File(parentFile, "logs/OreDict.log"); + if (!GTLog.mOreDictLogFile.exists()) { try { - GT_Log.mOreDictLogFile.createNewFile(); + GTLog.mOreDictLogFile.createNewFile(); } catch (Throwable ignored) {} } - List<String> tList = ((GT_Log.LogBuffer) GT_Log.ore).mBufferedOreDictLog; + List<String> tList = ((GTLog.LogBuffer) GTLog.ore).mBufferedOreDictLog; try { - GT_Log.ore = new PrintStream(GT_Log.mOreDictLogFile); + GTLog.ore = new PrintStream(GTLog.mOreDictLogFile); } catch (Throwable ignored) {} - GT_Log.ore.println("******************************************************************************"); - GT_Log.ore.println("* This is the complete log of the GT5-Unofficial OreDictionary Handler. It *"); - GT_Log.ore.println("* processes all OreDictionary entries and can sometimes cause errors. All *"); - GT_Log.ore.println("* entries and errors are being logged. If you see an error please raise an *"); - GT_Log.ore.println("* issue at https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues. *"); - GT_Log.ore.println("******************************************************************************"); - tList.forEach(GT_Log.ore::println); + GTLog.ore.println("******************************************************************************"); + GTLog.ore.println("* This is the complete log of the GT5-Unofficial OreDictionary Handler. It *"); + GTLog.ore.println("* processes all OreDictionary entries and can sometimes cause errors. All *"); + GTLog.ore.println("* entries and errors are being logged. If you see an error please raise an *"); + GTLog.ore.println("* issue at https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues. *"); + GTLog.ore.println("******************************************************************************"); + tList.forEach(GTLog.ore::println); } if (ConfigGeneral.loggingExplosions) { - GT_Log.mExplosionLog = new File(parentFile, "logs/Explosion.log"); - if (!GT_Log.mExplosionLog.exists()) { + GTLog.mExplosionLog = new File(parentFile, "logs/Explosion.log"); + if (!GTLog.mExplosionLog.exists()) { try { - GT_Log.mExplosionLog.createNewFile(); + GTLog.mExplosionLog.createNewFile(); } catch (Throwable ignored) {} } try { - GT_Log.exp = new PrintStream(GT_Log.mExplosionLog); + GTLog.exp = new PrintStream(GTLog.mExplosionLog); } catch (Throwable ignored) {} } if (ConfigGeneral.loggingPlayerActicity) { - GT_Log.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log"); - if (!GT_Log.mPlayerActivityLogFile.exists()) { + GTLog.mPlayerActivityLogFile = new File(parentFile, "logs/PlayerActivity.log"); + if (!GTLog.mPlayerActivityLogFile.exists()) { try { - GT_Log.mPlayerActivityLogFile.createNewFile(); + GTLog.mPlayerActivityLogFile.createNewFile(); } catch (Throwable ignored) {} } try { - GT_Log.pal = new PrintStream(GT_Log.mPlayerActivityLogFile); + GTLog.pal = new PrintStream(GTLog.mPlayerActivityLogFile); } catch (Throwable ignored) {} } } @@ -272,8 +272,8 @@ public class GT_PreLoad { "gemFlawed", "gemFlawless", "gemExquisite", "gearGt" }; if (mIt == 3) tags = new String[] { "itemCasing", "nanite" }; if (tags.length > prefix) tag = tags[prefix]; - if (GregTech_API.sGeneratedMaterials[material] != null) { - tag += GregTech_API.sGeneratedMaterials[material].mName; + if (GregTechAPI.sGeneratedMaterials[material] != null) { + tag += GregTechAPI.sGeneratedMaterials[material].mName; if (!oreTags.contains(tag)) oreTags.add(tag); } else if (material > 0) { GT_FML_LOGGER.info("MaterialDisabled: " + material + " " + m.group(1)); @@ -301,7 +301,7 @@ public class GT_PreLoad { .filter(test -> StringUtils.startsWithAny(test, preS)) .forEach(test -> { mMTTags.add(test); - if (GT_Values.D1) GT_FML_LOGGER.info("oretag: " + test); + if (GTValues.D1) GT_FML_LOGGER.info("oretag: " + test); }); GT_FML_LOGGER.info("reenableMetaItems"); @@ -351,196 +351,196 @@ public class GT_PreLoad { } public static void adjustScrap() { - GT_FML_LOGGER.info("GT_Mod: Removing all original Scrapbox Drops."); + GT_FML_LOGGER.info("GTMod: Removing all original Scrapbox Drops."); try { - Objects.requireNonNull(GT_Utility.getField("ic2.core.item.ItemScrapbox$Drop", "topChance", true, true)) + Objects.requireNonNull(GTUtility.getField("ic2.core.item.ItemScrapbox$Drop", "topChance", true, true)) .set(null, 0); ((List<?>) Objects.requireNonNull( - GT_Utility.getFieldContent( - GT_Utility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true), + GTUtility.getFieldContent( + GTUtility.getFieldContent("ic2.api.recipe.Recipes", "scrapboxDrops", true, true), "drops", true, true))).clear(); } catch (Throwable e) { - if (GT_Values.D1) { - e.printStackTrace(GT_Log.err); + if (GTValues.D1) { + e.printStackTrace(GTLog.err); } } - GT_Log.out.println("GT_Mod: Adding Scrap with a Weight of 200.0F to the Scrapbox Drops."); - GT_ModHandler.addScrapboxDrop(200.0F, GT_ModHandler.getIC2Item("scrap", 1L)); + GTLog.out.println("GTMod: Adding Scrap with a Weight of 200.0F to the Scrapbox Drops."); + GTModHandler.addScrapboxDrop(200.0F, GTModHandler.getIC2Item("scrap", 1L)); } public static void loadConfig() { // general - GT_Values.D1 = ConfigDebug.D1; - GT_Values.D2 = ConfigDebug.D2; - GT_Values.allow_broken_recipemap = ConfigDebug.allowBrokenRecipeMap; - GT_Values.debugCleanroom = ConfigDebug.debugCleanroom; - GT_Values.debugDriller = ConfigDebug.debugDriller; - GT_Values.debugWorldGen = ConfigDebug.debugWorldgen; - GT_Values.debugOrevein = ConfigDebug.debugOrevein; - GT_Values.debugSmallOres = ConfigDebug.debugSmallOres; - GT_Values.debugStones = ConfigDebug.debugStones; - GT_Values.debugBlockMiner = ConfigDebug.debugBlockMiner; - GT_Values.debugBlockPump = ConfigDebug.debugBlockPump; - GT_Values.debugEntityCramming = ConfigDebug.debugEntityCramming; - GT_Values.debugWorldData = ConfigDebug.debugWorldData; - GT_Values.oreveinPercentage = ConfigGeneral.oreveinPercentage; - GT_Values.oreveinAttempts = ConfigGeneral.oreveinAttempts; - GT_Values.oreveinMaxPlacementAttempts = ConfigGeneral.oreveinMaxPlacementAttempts; - GT_Values.oreveinPlacerOres = ConfigGeneral.oreveinPlacerOres; - GT_Values.oreveinPlacerOresMultiplier = ConfigGeneral.oreveinPlacerOresMultiplier; - GregTech_API.TICKS_FOR_LAG_AVERAGING = ConfigGeneral.ticksForLagAveraging; - GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = ConfigGeneral.millisecondThesholdUntilLagWarning; - GregTech_API.sTimber = ConfigGeneral.timber; - GregTech_API.sDrinksAlwaysDrinkable = ConfigGeneral.drinksAlwaysDrinkable; - GregTech_API.sDoShowAllItemsInCreative = ConfigGeneral.doShowAllItemsInCreative; - GregTech_API.sMultiThreadedSounds = ConfigGeneral.multiThreadedSounds; - GT_Mod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = ConfigGeneral.maxEqualEntitiesAtOneSpot; - GT_Mod.gregtechproxy.mFlintChance = ConfigGeneral.flintChance; - GT_Mod.gregtechproxy.mItemDespawnTime = ConfigGeneral.itemDespawnTime; - GT_Mod.gregtechproxy.mAllowSmallBoilerAutomation = ConfigGeneral.allowSmallBoilerAutomation; - GT_Mod.gregtechproxy.mDisableVanillaOres = gregtech.common.config.worldgen.ConfigGeneral.disableVanillaOres; - GT_Mod.gregtechproxy.mIncreaseDungeonLoot = ConfigGeneral.increaseDungeonLoot; - GT_Mod.gregtechproxy.mAxeWhenAdventure = ConfigGeneral.axeWhenAdventure; - GT_Mod.gregtechproxy.mSurvivalIntoAdventure = ConfigGeneral.survivalIntoAdventure; - GT_Mod.gregtechproxy.mHungerEffect = ConfigGeneral.hungerEffect; - GT_Mod.gregtechproxy.mInventoryUnification = ConfigGeneral.inventoryUnification; - GT_Mod.gregtechproxy.mGTBees = ConfigGeneral.GTBees; - GT_Mod.gregtechproxy.mCraftingUnification = ConfigGeneral.craftingUnification; - GT_Mod.gregtechproxy.mNerfedWoodPlank = ConfigGeneral.nerfedWoodPlank; - GT_Mod.gregtechproxy.mNerfedVanillaTools = ConfigGeneral.nerfedVanillaTools; - GT_Mod.gregtechproxy.mAchievements = ConfigGeneral.achievements; - GT_Mod.gregtechproxy.mHideUnusedOres = ConfigGeneral.hideUnusedOres; - GT_Mod.gregtechproxy.mEnableAllMaterials = ConfigGeneral.enableAllMaterials; - GT_Mod.gregtechproxy.mExplosionItemDrop = ConfigGeneral.explosionItemDrop; - GT_Mod.gregtechproxy.mEnableCleanroom = ConfigGeneral.enableCleanroom; - GT_Mod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() && ConfigGeneral.lowGravProcessing; - GT_Mod.gregtechproxy.mCropNeedBlock = ConfigGeneral.cropNeedBlock; - GT_Mod.gregtechproxy.mAMHInteraction = ConfigGeneral.autoMaintenaceHatchesInteraction; - GT_Mod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = ConfigGeneral.mixedOreOnlyYieldsTwoThirdsOfPureOre; - GT_Mod.gregtechproxy.mRichOreYieldMultiplier = ConfigGeneral.richOreYieldMultiplier; - GT_Mod.gregtechproxy.mNetherOreYieldMultiplier = ConfigGeneral.netherOreYieldMultiplier; - GT_Mod.gregtechproxy.mEndOreYieldMultiplier = ConfigGeneral.endOreYieldMultiplier; - GT_Mod.gregtechproxy.gt6Pipe = ConfigGeneral.gt6Pipe; - GT_Mod.gregtechproxy.gt6Cable = ConfigGeneral.gt6Cable; - GT_Mod.gregtechproxy.ic2EnergySourceCompat = ConfigGeneral.ic2EnergySourceCompat; - GT_Mod.gregtechproxy.costlyCableConnection = ConfigGeneral.costlyCableConnection; - GT_Mod.gregtechproxy.crashOnNullRecipeInput = ConfigGeneral.crashOnNullRecipeInput; + GTValues.D1 = ConfigDebug.D1; + GTValues.D2 = ConfigDebug.D2; + GTValues.allow_broken_recipemap = ConfigDebug.allowBrokenRecipeMap; + GTValues.debugCleanroom = ConfigDebug.debugCleanroom; + GTValues.debugDriller = ConfigDebug.debugDriller; + GTValues.debugWorldGen = ConfigDebug.debugWorldgen; + GTValues.debugOrevein = ConfigDebug.debugOrevein; + GTValues.debugSmallOres = ConfigDebug.debugSmallOres; + GTValues.debugStones = ConfigDebug.debugStones; + GTValues.debugBlockMiner = ConfigDebug.debugBlockMiner; + GTValues.debugBlockPump = ConfigDebug.debugBlockPump; + GTValues.debugEntityCramming = ConfigDebug.debugEntityCramming; + GTValues.debugWorldData = ConfigDebug.debugWorldData; + GTValues.oreveinPercentage = ConfigGeneral.oreveinPercentage; + GTValues.oreveinAttempts = ConfigGeneral.oreveinAttempts; + GTValues.oreveinMaxPlacementAttempts = ConfigGeneral.oreveinMaxPlacementAttempts; + GTValues.oreveinPlacerOres = ConfigGeneral.oreveinPlacerOres; + GTValues.oreveinPlacerOresMultiplier = ConfigGeneral.oreveinPlacerOresMultiplier; + GregTechAPI.TICKS_FOR_LAG_AVERAGING = ConfigGeneral.ticksForLagAveraging; + GregTechAPI.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING = ConfigGeneral.millisecondThesholdUntilLagWarning; + GregTechAPI.sTimber = ConfigGeneral.timber; + GregTechAPI.sDrinksAlwaysDrinkable = ConfigGeneral.drinksAlwaysDrinkable; + GregTechAPI.sDoShowAllItemsInCreative = ConfigGeneral.doShowAllItemsInCreative; + GregTechAPI.sMultiThreadedSounds = ConfigGeneral.multiThreadedSounds; + GTMod.gregtechproxy.mMaxEqualEntitiesAtOneSpot = ConfigGeneral.maxEqualEntitiesAtOneSpot; + GTMod.gregtechproxy.mFlintChance = ConfigGeneral.flintChance; + GTMod.gregtechproxy.mItemDespawnTime = ConfigGeneral.itemDespawnTime; + GTMod.gregtechproxy.mAllowSmallBoilerAutomation = ConfigGeneral.allowSmallBoilerAutomation; + GTMod.gregtechproxy.mDisableVanillaOres = gregtech.common.config.worldgen.ConfigGeneral.disableVanillaOres; + GTMod.gregtechproxy.mIncreaseDungeonLoot = ConfigGeneral.increaseDungeonLoot; + GTMod.gregtechproxy.mAxeWhenAdventure = ConfigGeneral.axeWhenAdventure; + GTMod.gregtechproxy.mSurvivalIntoAdventure = ConfigGeneral.survivalIntoAdventure; + GTMod.gregtechproxy.mHungerEffect = ConfigGeneral.hungerEffect; + GTMod.gregtechproxy.mInventoryUnification = ConfigGeneral.inventoryUnification; + GTMod.gregtechproxy.mGTBees = ConfigGeneral.GTBees; + GTMod.gregtechproxy.mCraftingUnification = ConfigGeneral.craftingUnification; + GTMod.gregtechproxy.mNerfedWoodPlank = ConfigGeneral.nerfedWoodPlank; + GTMod.gregtechproxy.mNerfedVanillaTools = ConfigGeneral.nerfedVanillaTools; + GTMod.gregtechproxy.mAchievements = ConfigGeneral.achievements; + GTMod.gregtechproxy.mHideUnusedOres = ConfigGeneral.hideUnusedOres; + GTMod.gregtechproxy.mEnableAllMaterials = ConfigGeneral.enableAllMaterials; + GTMod.gregtechproxy.mExplosionItemDrop = ConfigGeneral.explosionItemDrop; + GTMod.gregtechproxy.mEnableCleanroom = ConfigGeneral.enableCleanroom; + GTMod.gregtechproxy.mLowGravProcessing = GalacticraftCore.isModLoaded() && ConfigGeneral.lowGravProcessing; + GTMod.gregtechproxy.mCropNeedBlock = ConfigGeneral.cropNeedBlock; + GTMod.gregtechproxy.mAMHInteraction = ConfigGeneral.autoMaintenaceHatchesInteraction; + GTMod.gregtechproxy.mMixedOreOnlyYieldsTwoThirdsOfPureOre = ConfigGeneral.mixedOreOnlyYieldsTwoThirdsOfPureOre; + GTMod.gregtechproxy.mRichOreYieldMultiplier = ConfigGeneral.richOreYieldMultiplier; + GTMod.gregtechproxy.mNetherOreYieldMultiplier = ConfigGeneral.netherOreYieldMultiplier; + GTMod.gregtechproxy.mEndOreYieldMultiplier = ConfigGeneral.endOreYieldMultiplier; + GTMod.gregtechproxy.gt6Pipe = ConfigGeneral.gt6Pipe; + GTMod.gregtechproxy.gt6Cable = ConfigGeneral.gt6Cable; + GTMod.gregtechproxy.ic2EnergySourceCompat = ConfigGeneral.ic2EnergySourceCompat; + GTMod.gregtechproxy.costlyCableConnection = ConfigGeneral.costlyCableConnection; + GTMod.gregtechproxy.crashOnNullRecipeInput = ConfigGeneral.crashOnNullRecipeInput; if ((boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) { - GT_Mod.gregtechproxy.crashOnNullRecipeInput = false; // Use flags in GT_RecipeBuilder instead! + GTMod.gregtechproxy.crashOnNullRecipeInput = false; // Use flags in GTRecipeBuilder instead! } - GT_LanguageManager.i18nPlaceholder = ConfigGeneral.i18nPlaceholder; - GT_MetaTileEntity_LongDistancePipelineBase.minimalDistancePoints = ConfigGeneral.minimalDistancePoints; - GT_Values.mCTMEnabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMWhitelist)); - GT_Values.mCTMDisabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMBlacklist)); + GTLanguageManager.i18nPlaceholder = ConfigGeneral.i18nPlaceholder; + MTELongDistancePipelineBase.minimalDistancePoints = ConfigGeneral.minimalDistancePoints; + GTValues.mCTMEnabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMWhitelist)); + GTValues.mCTMDisabledBlock.addAll(Arrays.asList(ConfigGeneral.CTMBlacklist)); if (ConfigGeneral.harderMobSpawner) { Blocks.mob_spawner.setHardness(500.0F) .setResistance(6000000.0F); } // machines - GT_Values.ticksBetweenSounds = ConfigMachines.ticksBetweenSounds; - GT_Values.blacklistedTileEntiyClassNamesForWA = ConfigMachines.blacklistedTileEntiyClassNamesForWA; - GT_Values.cleanroomGlass = ConfigMachines.cleanroomGlass; - GT_Values.enableChunkloaders = ConfigMachines.enableChunkloaders; - GT_Values.alwaysReloadChunkloaders = ConfigMachines.alwaysReloadChunkloaders; - GT_Values.debugChunkloaders = ConfigDebug.debugChunkloaders; - GT_Values.disableDigitalChestsExternalAccess = ConfigMachines.disableDigitalChestsExternalAccess; - GT_Values.enableMultiTileEntities = ConfigMachines.enableMultiTileEntities + GTValues.ticksBetweenSounds = ConfigMachines.ticksBetweenSounds; + GTValues.blacklistedTileEntiyClassNamesForWA = ConfigMachines.blacklistedTileEntiyClassNamesForWA; + GTValues.cleanroomGlass = ConfigMachines.cleanroomGlass; + GTValues.enableChunkloaders = ConfigMachines.enableChunkloaders; + GTValues.alwaysReloadChunkloaders = ConfigMachines.alwaysReloadChunkloaders; + GTValues.debugChunkloaders = ConfigDebug.debugChunkloaders; + GTValues.disableDigitalChestsExternalAccess = ConfigMachines.disableDigitalChestsExternalAccess; + GTValues.enableMultiTileEntities = ConfigMachines.enableMultiTileEntities || (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - GregTech_API.sMachineExplosions = ConfigMachines.machineExplosions; - GregTech_API.sMachineFlammable = ConfigMachines.machineFlammable; - GregTech_API.sMachineNonWrenchExplosions = ConfigMachines.machineNonWrenchExplosions; - GregTech_API.sMachineWireFire = ConfigMachines.machineWireFire; - GregTech_API.sMachineFireExplosions = ConfigMachines.machineFireExplosions; - GregTech_API.sMachineRainExplosions = ConfigMachines.machineRainExplosions; - GregTech_API.sMachineThunderExplosions = ConfigMachines.machineThunderExplosions; - GregTech_API.sColoredGUI = ConfigMachines.coloredGUI; - GregTech_API.sMachineMetalGUI = ConfigMachines.machineMetalGUI; + GregTechAPI.sMachineExplosions = ConfigMachines.machineExplosions; + GregTechAPI.sMachineFlammable = ConfigMachines.machineFlammable; + GregTechAPI.sMachineNonWrenchExplosions = ConfigMachines.machineNonWrenchExplosions; + GregTechAPI.sMachineWireFire = ConfigMachines.machineWireFire; + GregTechAPI.sMachineFireExplosions = ConfigMachines.machineFireExplosions; + GregTechAPI.sMachineRainExplosions = ConfigMachines.machineRainExplosions; + GregTechAPI.sMachineThunderExplosions = ConfigMachines.machineThunderExplosions; + GregTechAPI.sColoredGUI = ConfigMachines.coloredGUI; + GregTechAPI.sMachineMetalGUI = ConfigMachines.machineMetalGUI; // Implementation for this is actually handled in NewHorizonsCoreMod in MainRegistry.java! - GregTech_API.sUseMachineMetal = ConfigMachines.useMachineMetal; + GregTechAPI.sUseMachineMetal = ConfigMachines.useMachineMetal; // client loadClientConfig(); // Pollution - GT_Mod.gregtechproxy.mPollution = ConfigPollution.pollution; - GT_Mod.gregtechproxy.mPollutionSmogLimit = ConfigPollution.pollutionSmogLimit; - GT_Mod.gregtechproxy.mPollutionPoisonLimit = ConfigPollution.pollutionPoisonLimit; - GT_Mod.gregtechproxy.mPollutionVegetationLimit = ConfigPollution.pollutionVegetationLimit; - GT_Mod.gregtechproxy.mPollutionSourRainLimit = ConfigPollution.pollutionSourRainLimit; - GT_Mod.gregtechproxy.mPollutionOnExplosion = ConfigPollution.pollutionOnExplosion; - GT_Mod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = ConfigPollution.pollutionPrimitveBlastFurnacePerSecond; - GT_Mod.gregtechproxy.mPollutionCharcoalPitPerSecond = ConfigPollution.pollutionCharcoalPitPerSecond; - GT_Mod.gregtechproxy.mPollutionEBFPerSecond = ConfigPollution.pollutionEBFPerSecond; - GT_Mod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = ConfigPollution.pollutionLargeCombustionEnginePerSecond; - GT_Mod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = ConfigPollution.pollutionExtremeCombustionEnginePerSecond; - GT_Mod.gregtechproxy.mPollutionImplosionCompressorPerSecond = ConfigPollution.pollutionImplosionCompressorPerSecond; - GT_Mod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = ConfigPollution.pollutionLargeBronzeBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = ConfigPollution.pollutionLargeSteelBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = ConfigPollution.pollutionLargeTitaniumBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = ConfigPollution.pollutionLargeTungstenSteelBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionReleasedByThrottle = ConfigPollution.pollutionReleasedByThrottle; - GT_Mod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = ConfigPollution.pollutionLargeGasTurbinePerSecond; - GT_Mod.gregtechproxy.mPollutionMultiSmelterPerSecond = ConfigPollution.pollutionMultiSmelterPerSecond; - GT_Mod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = ConfigPollution.pollutionPyrolyseOvenPerSecond; - GT_Mod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = ConfigPollution.pollutionSmallCoalBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = ConfigPollution.pollutionHighPressureLavaBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = ConfigPollution.pollutionHighPressureCoalBoilerPerSecond; - GT_Mod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = ConfigPollution.pollutionBaseDieselGeneratorPerSecond; + GTMod.gregtechproxy.mPollution = ConfigPollution.pollution; + GTMod.gregtechproxy.mPollutionSmogLimit = ConfigPollution.pollutionSmogLimit; + GTMod.gregtechproxy.mPollutionPoisonLimit = ConfigPollution.pollutionPoisonLimit; + GTMod.gregtechproxy.mPollutionVegetationLimit = ConfigPollution.pollutionVegetationLimit; + GTMod.gregtechproxy.mPollutionSourRainLimit = ConfigPollution.pollutionSourRainLimit; + GTMod.gregtechproxy.mPollutionOnExplosion = ConfigPollution.pollutionOnExplosion; + GTMod.gregtechproxy.mPollutionPrimitveBlastFurnacePerSecond = ConfigPollution.pollutionPrimitveBlastFurnacePerSecond; + GTMod.gregtechproxy.mPollutionCharcoalPitPerSecond = ConfigPollution.pollutionCharcoalPitPerSecond; + GTMod.gregtechproxy.mPollutionEBFPerSecond = ConfigPollution.pollutionEBFPerSecond; + GTMod.gregtechproxy.mPollutionLargeCombustionEnginePerSecond = ConfigPollution.pollutionLargeCombustionEnginePerSecond; + GTMod.gregtechproxy.mPollutionExtremeCombustionEnginePerSecond = ConfigPollution.pollutionExtremeCombustionEnginePerSecond; + GTMod.gregtechproxy.mPollutionImplosionCompressorPerSecond = ConfigPollution.pollutionImplosionCompressorPerSecond; + GTMod.gregtechproxy.mPollutionLargeBronzeBoilerPerSecond = ConfigPollution.pollutionLargeBronzeBoilerPerSecond; + GTMod.gregtechproxy.mPollutionLargeSteelBoilerPerSecond = ConfigPollution.pollutionLargeSteelBoilerPerSecond; + GTMod.gregtechproxy.mPollutionLargeTitaniumBoilerPerSecond = ConfigPollution.pollutionLargeTitaniumBoilerPerSecond; + GTMod.gregtechproxy.mPollutionLargeTungstenSteelBoilerPerSecond = ConfigPollution.pollutionLargeTungstenSteelBoilerPerSecond; + GTMod.gregtechproxy.mPollutionReleasedByThrottle = ConfigPollution.pollutionReleasedByThrottle; + GTMod.gregtechproxy.mPollutionLargeGasTurbinePerSecond = ConfigPollution.pollutionLargeGasTurbinePerSecond; + GTMod.gregtechproxy.mPollutionMultiSmelterPerSecond = ConfigPollution.pollutionMultiSmelterPerSecond; + GTMod.gregtechproxy.mPollutionPyrolyseOvenPerSecond = ConfigPollution.pollutionPyrolyseOvenPerSecond; + GTMod.gregtechproxy.mPollutionSmallCoalBoilerPerSecond = ConfigPollution.pollutionSmallCoalBoilerPerSecond; + GTMod.gregtechproxy.mPollutionHighPressureLavaBoilerPerSecond = ConfigPollution.pollutionHighPressureLavaBoilerPerSecond; + GTMod.gregtechproxy.mPollutionHighPressureCoalBoilerPerSecond = ConfigPollution.pollutionHighPressureCoalBoilerPerSecond; + GTMod.gregtechproxy.mPollutionBaseDieselGeneratorPerSecond = ConfigPollution.pollutionBaseDieselGeneratorPerSecond; double[] mPollutionDieselGeneratorReleasedByTier = ConfigPollution.pollutionDieselGeneratorReleasedByTier; if (mPollutionDieselGeneratorReleasedByTier.length - == GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) { - GT_Mod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier; + == GTMod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier.length) { + GTMod.gregtechproxy.mPollutionDieselGeneratorReleasedByTier = mPollutionDieselGeneratorReleasedByTier; } else { GT_FML_LOGGER .error("The Length of the Diesel Turbine Pollution Array Config must be the same as the Default"); } - GT_Mod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = ConfigPollution.pollutionBaseGasTurbinePerSecond; + GTMod.gregtechproxy.mPollutionBaseGasTurbinePerSecond = ConfigPollution.pollutionBaseGasTurbinePerSecond; double[] mPollutionGasTurbineReleasedByTier = ConfigPollution.pollutionGasTurbineReleasedByTier; if (mPollutionGasTurbineReleasedByTier.length - == GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) { - GT_Mod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier; + == GTMod.gregtechproxy.mPollutionGasTurbineReleasedByTier.length) { + GTMod.gregtechproxy.mPollutionGasTurbineReleasedByTier = mPollutionGasTurbineReleasedByTier; } else { GT_FML_LOGGER.error("The Length of the Gas Turbine Pollution Array Config must be the same as the Default"); } // cleanroom file - if (GT_Mod.gregtechproxy.mEnableCleanroom) GT_MetaTileEntity_Cleanroom.loadConfig(GT_Config.cleanroomFile); + if (GTMod.gregtechproxy.mEnableCleanroom) MTECleanroom.loadConfig(GTConfig.cleanroomFile); // underground fluids file - GT_Mod.gregtechproxy.mUndergroundOil.getConfig(GT_Config.undergroundFluidsFile, "undergroundfluid"); + GTMod.gregtechproxy.mUndergroundOil.getConfig(GTConfig.undergroundFluidsFile, "undergroundfluid"); // Worldgeneration.cfg - GT_Mod.gregtechproxy.enableUndergroundGravelGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundGravelGen; - GT_Mod.gregtechproxy.enableUndergroundDirtGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundDirtGen; - GT_Mod.gregtechproxy.enableBlackGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres; - GT_Mod.gregtechproxy.enableRedGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres; - GT_Mod.gregtechproxy.enableMarbleOres = gregtech.common.config.worldgen.ConfigGeneral.generateMarbleOres; - GT_Mod.gregtechproxy.enableBasaltOres = gregtech.common.config.worldgen.ConfigGeneral.generateBasaltOres; + GTMod.gregtechproxy.enableUndergroundGravelGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundGravelGen; + GTMod.gregtechproxy.enableUndergroundDirtGen = gregtech.common.config.worldgen.ConfigGeneral.generateUndergroundDirtGen; + GTMod.gregtechproxy.enableBlackGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres; + GTMod.gregtechproxy.enableRedGraniteOres = gregtech.common.config.worldgen.ConfigGeneral.generateBlackGraniteOres; + GTMod.gregtechproxy.enableMarbleOres = gregtech.common.config.worldgen.ConfigGeneral.generateMarbleOres; + GTMod.gregtechproxy.enableBasaltOres = gregtech.common.config.worldgen.ConfigGeneral.generateBasaltOres; // OverpoweredStuff.cfg - GregTech_API.mOutputRF = gregtech.common.config.opstuff.ConfigGeneral.outputRF; - GregTech_API.mInputRF = gregtech.common.config.opstuff.ConfigGeneral.inputRF; - GregTech_API.mEUtoRF = gregtech.common.config.opstuff.ConfigGeneral.howMuchRFWith100EUInInput; - GregTech_API.mRFtoEU = gregtech.common.config.opstuff.ConfigGeneral.howMuchEUWith100RFInInput; - GregTech_API.mRFExplosions = gregtech.common.config.opstuff.ConfigGeneral.RFExplosions; + GregTechAPI.mOutputRF = gregtech.common.config.opstuff.ConfigGeneral.outputRF; + GregTechAPI.mInputRF = gregtech.common.config.opstuff.ConfigGeneral.inputRF; + GregTechAPI.mEUtoRF = gregtech.common.config.opstuff.ConfigGeneral.howMuchRFWith100EUInInput; + GregTechAPI.mRFtoEU = gregtech.common.config.opstuff.ConfigGeneral.howMuchEUWith100RFInInput; + GregTechAPI.mRFExplosions = gregtech.common.config.opstuff.ConfigGeneral.RFExplosions; // MachineStats.cfg - GT_Mod.gregtechproxy.mForceFreeFace = gregtech.common.config.machinestats.ConfigMachines.forceFreeFace; + GTMod.gregtechproxy.mForceFreeFace = gregtech.common.config.machinestats.ConfigMachines.forceFreeFace; // ore_drop_behavior try { - GT_Log.out.println("Trying to set it to: " + ConfigOreDropBehavior.setting); - GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.valueOf(ConfigOreDropBehavior.setting);; + GTLog.out.println("Trying to set it to: " + ConfigOreDropBehavior.setting); + GTMod.gregtechproxy.oreDropSystem = GTProxy.OreDropSystem.valueOf(ConfigOreDropBehavior.setting);; } catch (IllegalArgumentException e) { - GT_Log.err.println(e); - GT_Mod.gregtechproxy.oreDropSystem = GT_Proxy.OreDropSystem.FortuneItem; + GTLog.err.println(e); + GTMod.gregtechproxy.oreDropSystem = GTProxy.OreDropSystem.FortuneItem; } // features - GT_Mod.gregtechproxy.mUpgradeCount = Math.min(64, Math.max(1, ConfigFeatures.upgradeStackSize)); + GTMod.gregtechproxy.mUpgradeCount = Math.min(64, Math.max(1, ConfigFeatures.upgradeStackSize)); for (OrePrefixes tPrefix : OrePrefixes.values()) { if (tPrefix.mIsUsedForOreProcessing) { tPrefix.mDefaultStackSize = ((byte) Math.min(64, Math.max(1, ConfigFeatures.maxOreStackSize))); @@ -556,7 +556,7 @@ public class GT_PreLoad { } } - GT_RecipeBuilder.onConfigLoad(); + GTRecipeBuilder.onConfigLoad(); } public static void parseHex(Dyes dye, String hexString) { @@ -581,44 +581,44 @@ public class GT_PreLoad { } } }); - GT_Mod.gregtechproxy.mRenderTileAmbientOcclusion = ConfigRender.renderTileAmbientOcclusion; - GT_Mod.gregtechproxy.mRenderGlowTextures = ConfigRender.renderGlowTextures; - GT_Mod.gregtechproxy.mRenderFlippedMachinesFlipped = ConfigRender.renderFlippedMachinesFlipped; - GT_Mod.gregtechproxy.mRenderIndicatorsOnHatch = ConfigRender.renderIndicatorsOnHatch; - GT_Mod.gregtechproxy.mRenderDirtParticles = ConfigRender.renderDirtParticles; - GT_Mod.gregtechproxy.mRenderPollutionFog = ConfigRender.renderPollutionFog; - GT_Mod.gregtechproxy.mRenderItemDurabilityBar = ConfigRender.renderItemDurabilityBar; - GT_Mod.gregtechproxy.mRenderItemChargeBar = ConfigRender.renderItemChargeBar; - GT_Mod.gregtechproxy.mUseBlockUpdateHandler = ConfigRender.useBlockUpdateHandler; - - GT_Mod.gregtechproxy.mCoverTabsVisible = ConfigInterface.coverTabsVisible; - GT_Mod.gregtechproxy.mCoverTabsFlipped = ConfigInterface.coverTabsFlipped; - GT_Mod.gregtechproxy.mTooltipVerbosity = ConfigInterface.tooltipVerbosity; - GT_Mod.gregtechproxy.mTooltipShiftVerbosity = ConfigInterface.tooltipShiftVerbosity; - GT_Mod.gregtechproxy.mTitleTabStyle = ConfigInterface.titleTabStyle; - - GT_Mod.gregtechproxy.mNEIRecipeSecondMode = GregTech_API.NEIClientFIle.get("nei", "RecipeSecondMode", true); - GT_Mod.gregtechproxy.mNEIRecipeOwner = GregTech_API.NEIClientFIle.get("nei", "RecipeOwner", false); - GT_Mod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTech_API.NEIClientFIle + GTMod.gregtechproxy.mRenderTileAmbientOcclusion = ConfigRender.renderTileAmbientOcclusion; + GTMod.gregtechproxy.mRenderGlowTextures = ConfigRender.renderGlowTextures; + GTMod.gregtechproxy.mRenderFlippedMachinesFlipped = ConfigRender.renderFlippedMachinesFlipped; + GTMod.gregtechproxy.mRenderIndicatorsOnHatch = ConfigRender.renderIndicatorsOnHatch; + GTMod.gregtechproxy.mRenderDirtParticles = ConfigRender.renderDirtParticles; + GTMod.gregtechproxy.mRenderPollutionFog = ConfigRender.renderPollutionFog; + GTMod.gregtechproxy.mRenderItemDurabilityBar = ConfigRender.renderItemDurabilityBar; + GTMod.gregtechproxy.mRenderItemChargeBar = ConfigRender.renderItemChargeBar; + GTMod.gregtechproxy.mUseBlockUpdateHandler = ConfigRender.useBlockUpdateHandler; + + GTMod.gregtechproxy.mCoverTabsVisible = ConfigInterface.coverTabsVisible; + GTMod.gregtechproxy.mCoverTabsFlipped = ConfigInterface.coverTabsFlipped; + GTMod.gregtechproxy.mTooltipVerbosity = ConfigInterface.tooltipVerbosity; + GTMod.gregtechproxy.mTooltipShiftVerbosity = ConfigInterface.tooltipShiftVerbosity; + GTMod.gregtechproxy.mTitleTabStyle = ConfigInterface.titleTabStyle; + + GTMod.gregtechproxy.mNEIRecipeSecondMode = GregTechAPI.NEIClientFIle.get("nei", "RecipeSecondMode", true); + GTMod.gregtechproxy.mNEIRecipeOwner = GregTechAPI.NEIClientFIle.get("nei", "RecipeOwner", false); + GTMod.gregtechproxy.mNEIRecipeOwnerStackTrace = GregTechAPI.NEIClientFIle .get("nei", "RecipeOwnerStackTrace", false); - GT_Mod.gregtechproxy.mNEIOriginalVoltage = GregTech_API.NEIClientFIle.get("nei", "OriginalVoltage", false); + GTMod.gregtechproxy.mNEIOriginalVoltage = GregTechAPI.NEIClientFIle.get("nei", "OriginalVoltage", false); - GT_Mod.gregtechproxy.recipeCategorySettings.clear(); + GTMod.gregtechproxy.recipeCategorySettings.clear(); for (RecipeCategory recipeCategory : findRecipeCategories()) { RecipeCategorySetting setting = RecipeCategorySetting.find( - GregTech_API.NEIClientFIle.getWithValidValues( + GregTechAPI.NEIClientFIle.getWithValidValues( "nei.recipe_categories", recipeCategory.unlocalizedName, RecipeCategorySetting.NAMES, RecipeCategorySetting.getDefault() .toName())); - GT_Mod.gregtechproxy.recipeCategorySettings.put(recipeCategory, setting); + GTMod.gregtechproxy.recipeCategorySettings.put(recipeCategory, setting); } - GT_Mod.gregtechproxy.mWailaTransformerVoltageTier = ConfigWaila.wailaTransformerVoltageTier; - GT_Mod.gregtechproxy.wailaAverageNS = ConfigWaila.wailaAverageNS; + GTMod.gregtechproxy.mWailaTransformerVoltageTier = ConfigWaila.wailaTransformerVoltageTier; + GTMod.gregtechproxy.wailaAverageNS = ConfigWaila.wailaAverageNS; - GT_Mod.gregtechproxy.reloadNEICache(); + GTMod.gregtechproxy.reloadNEICache(); } private static List<RecipeCategory> findRecipeCategories() { diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java b/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java deleted file mode 100644 index fd66127e36..0000000000 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_CircuitBehaviors.java +++ /dev/null @@ -1,31 +0,0 @@ -package gregtech.loaders.preload; - -import gregtech.api.util.GT_Log; -import gregtech.common.redstonecircuits.GT_Circuit_BasicLogic; -import gregtech.common.redstonecircuits.GT_Circuit_BitAnd; -import gregtech.common.redstonecircuits.GT_Circuit_CombinationLock; -import gregtech.common.redstonecircuits.GT_Circuit_Equals; -import gregtech.common.redstonecircuits.GT_Circuit_Pulser; -import gregtech.common.redstonecircuits.GT_Circuit_Randomizer; -import gregtech.common.redstonecircuits.GT_Circuit_RedstoneMeter; -import gregtech.common.redstonecircuits.GT_Circuit_Repeater; -import gregtech.common.redstonecircuits.GT_Circuit_Timer; - -public class GT_Loader_CircuitBehaviors implements Runnable { - - @Override - public void run() { - GT_Log.out.println("GT_Mod: Register Redstone Circuit behaviours."); - new GT_Circuit_Timer(0); - new GT_Circuit_BasicLogic(1); - new GT_Circuit_Repeater(2); - new GT_Circuit_Pulser(3); - new GT_Circuit_RedstoneMeter(4); - - new GT_Circuit_Randomizer(8); - - new GT_Circuit_CombinationLock(16); - new GT_Circuit_BitAnd(17); - new GT_Circuit_Equals(18); - } -} diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java index c0946a7334..9b89ce9176 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java @@ -1,6 +1,6 @@ package gregtech.loaders.preload; -import static gregtech.GT_Mod.GT_FML_LOGGER; +import static gregtech.GTMod.GT_FML_LOGGER; import static gregtech.api.multitileentity.enums.GT_MultiTileCasing.*; import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.*; import static gregtech.api.multitileentity.enums.GT_MultiTileUpgradeCasing.*; @@ -85,7 +85,7 @@ public class GT_Loader_MultiTileEntities implements Runnable { @Override public void run() { - GT_FML_LOGGER.info("GT_Mod: Registering MultiTileEntities"); + GT_FML_LOGGER.info("GTMod: Registering MultiTileEntities"); registerMachines(); registerCasings(); registerComponentCasings(); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java b/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java deleted file mode 100644 index 1b4d2bdf91..0000000000 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreDictionary.java +++ /dev/null @@ -1,458 +0,0 @@ -package gregtech.loaders.preload; - -import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.Botania; -import static gregtech.api.enums.Mods.IndustrialCraft2; -import static gregtech.api.enums.Mods.NewHorizonsCoreMod; -import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.enums.Mods.Thaumcraft; -import static gregtech.api.enums.Mods.TwilightForest; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.MaterialsBotania; -import gregtech.api.enums.OreDictNames; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; - -public class GT_Loader_OreDictionary implements Runnable { - - @Override - public void run() { - GT_Log.out.println("GT_Mod: Register OreDict Entries of Non-GT-Items."); - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Empty, ItemList.Cell_Empty.get(1L)); - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Lava, ItemList.Cell_Lava.get(1L)); - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Lava, GT_ModHandler.getIC2Item("lavaCell", 1L)); - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Water, ItemList.Cell_Water.get(1L)); - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.Water, GT_ModHandler.getIC2Item("waterCell", 1L)); - GT_OreDictUnificator.set( - OrePrefixes.cell, - Materials.Creosote, - GT_ModHandler.getModItem(Railcraft.ID, "fluid.creosote.cell", 1L)); - - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GT_ModHandler.getIC2Item("uuMatterCell", 1L)); - GT_OreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GT_ModHandler.getIC2Item("CFCell", 1L)); - - GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Empty, new ItemStack(Items.bucket, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Water, new ItemStack(Items.water_bucket, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Lava, new ItemStack(Items.lava_bucket, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.bucket, Materials.Milk, new ItemStack(Items.milk_bucket, 1, 0)); - // Clay buckets handled in gregtech.common.GT_Proxy.onLoad() as they aren't registered until Iguana Tweaks - // pre-init. - - GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Empty, new ItemStack(Items.glass_bottle, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.bottle, Materials.Water, new ItemStack(Items.potionitem, 1, 0)); - - GT_OreDictUnificator - .set(OrePrefixes.plateAlloy, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumPlate", 1L)); - GT_OreDictUnificator - .set(OrePrefixes.plateAlloy, Materials.Advanced, GT_ModHandler.getIC2Item("advancedAlloy", 1L)); - GT_OreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Carbon, GT_ModHandler.getIC2Item("carbonPlate", 1L)); - - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Coal, new ItemStack(Blocks.coal_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Iron, new ItemStack(Blocks.iron_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Lapis, new ItemStack(Blocks.lapis_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.redstone_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.lit_redstone_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Gold, new ItemStack(Blocks.gold_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Diamond, new ItemStack(Blocks.diamond_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.Emerald, new ItemStack(Blocks.emerald_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ore, Materials.NetherQuartz, new ItemStack(Blocks.quartz_ore, 1)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Copper, GT_ModHandler.getIC2Item("copperIngot", 1L)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Tin, GT_ModHandler.getIC2Item("tinIngot", 1L)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Lead, GT_ModHandler.getIC2Item("leadIngot", 1L)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Bronze, GT_ModHandler.getIC2Item("bronzeIngot", 1L)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Silver, GT_ModHandler.getIC2Item("silverIngot", 1L)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Iridium, GT_ModHandler.getIC2Item("iridiumOre", 1L)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Lapis, new ItemStack(Items.dye, 1, 4)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.EnderEye, new ItemStack(Items.ender_eye, 1)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.EnderPearl, new ItemStack(Items.ender_pearl, 1)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Diamond, new ItemStack(Items.diamond, 1)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Emerald, new ItemStack(Items.emerald, 1)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Coal, new ItemStack(Items.coal, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.Charcoal, new ItemStack(Items.coal, 1, 1)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.NetherQuartz, new ItemStack(Items.quartz, 1)); - GT_OreDictUnificator.set(OrePrefixes.gem, Materials.NetherStar, new ItemStack(Items.nether_star, 1)); - GT_OreDictUnificator.set(OrePrefixes.nugget, Materials.Gold, new ItemStack(Items.gold_nugget, 1)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Gold, new ItemStack(Items.gold_ingot, 1)); - GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.Iron, new ItemStack(Items.iron_ingot, 1)); - GT_OreDictUnificator.set(OrePrefixes.plate, Materials.Paper, new ItemStack(Items.paper, 1)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Sugar, new ItemStack(Items.sugar, 1)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Bone, ItemList.Dye_Bonemeal.get(1L)); - GT_OreDictUnificator.set(OrePrefixes.stick, Materials.Wood, new ItemStack(Items.stick, 1)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Redstone, new ItemStack(Items.redstone, 1)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Gunpowder, new ItemStack(Items.gunpowder, 1)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Glowstone, new ItemStack(Items.glowstone_dust, 1)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Blaze, new ItemStack(Items.blaze_powder, 1)); - GT_OreDictUnificator.set(OrePrefixes.stick, Materials.Blaze, new ItemStack(Items.blaze_rod, 1)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Iron, new ItemStack(Blocks.iron_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Gold, new ItemStack(Blocks.gold_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Diamond, new ItemStack(Blocks.diamond_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Emerald, new ItemStack(Blocks.emerald_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Lapis, new ItemStack(Blocks.lapis_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Coal, new ItemStack(Blocks.coal_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Redstone, new ItemStack(Blocks.redstone_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.NetherQuartz, new ItemStack(Blocks.quartz_block, 1, 0)); - GT_OreDictUnificator.set(OrePrefixes.block, Materials.Clay, new ItemStack(Blocks.clay, 1, 0)); - if (Blocks.ender_chest != null) { - GT_OreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1)); - } - GT_OreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingAnvil, GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.glass, Materials.Reinforced, GT_ModHandler.getIC2Item("reinforcedGlass", 1L)); - - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Basalt, GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 6)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Marble, GT_ModHandler.getModItem(Railcraft.ID, "cube", 1L, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, - Materials.Basalt, - GT_ModHandler.getModItem(Railcraft.ID, "brick.abyssal", 1L, 32767)); - GT_OreDictUnificator.registerOre( - OrePrefixes.stone, - Materials.Marble, - GT_ModHandler.getModItem(Railcraft.ID, "brick.quarried", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Stone, new ItemStack(Blocks.stone, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.cobblestone, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneSmooth, new ItemStack(Blocks.stone, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneBricks, new ItemStack(Blocks.stonebrick, 1, 32767)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.stonebrick, 1, 1)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneCracked, new ItemStack(Blocks.stonebrick, 1, 2)); - GT_OreDictUnificator.registerOre(OrePrefixes.stoneChiseled, new ItemStack(Blocks.stonebrick, 1, 3)); - GT_OreDictUnificator.registerOre(OrePrefixes.stone, Materials.Sand, new ItemStack(Blocks.sandstone, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767)); - - GT_OreDictUnificator - .registerOre("paperResearchFragment", GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 9)); - GT_OreDictUnificator.registerOre( - "itemCertusQuartz", - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); - GT_OreDictUnificator.registerOre( - "itemCertusQuartz", - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); - GT_OreDictUnificator.registerOre( - "itemNetherQuartz", - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingQuartz, - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingQuartz, - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingQuartz, - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); - GT_OreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L)); - GT_OreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L)); - GT_OreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); - GT_OreDictUnificator.registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("reBattery", 1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.LV, GT_ModHandler.getIC2Item("chargedReBattery", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.MV, GT_ModHandler.getIC2Item("advBattery", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.HV, GT_ModHandler.getIC2Item("energyCrystal", 1L, 32767)); - GT_OreDictUnificator - .registerOre(OrePrefixes.battery, Materials.EV, GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); - - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireCopper, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireGold, GT_ModHandler.getIC2Item("insulatedGoldCableItem", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWireIron, GT_ModHandler.getIC2Item("insulatedIronCableItem", 1L)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingWireTin, - GT_ModHandler - .getIC2Item("insulatedTinCableItem", 1L, GT_ModHandler.getIC2Item("insulatedCopperCableItem", 1L))); - - GT_OreDictUnificator - .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(Blocks.crafting_table, 1)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingWorkBench, new ItemStack(GregTech_API.sBlockMachines, 1, 16)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.piston, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.sticky_piston, 1, 32767)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingSafe, new ItemStack(GregTech_API.sBlockMachines, 1, 45)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingSafe, GT_ModHandler.getIC2Item("personalSafe", 1L)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.chest, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.trapped_chest, 1, 32767)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.furnace, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.lit_furnace, 1, 32767)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingPump, GT_ModHandler.getIC2Item("pump", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingElectromagnet, GT_ModHandler.getIC2Item("magnetizer", 1L)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingTeleporter, GT_ModHandler.getIC2Item("teleporter", 1L)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingMacerator, GT_ModHandler.getIC2Item("macerator", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingMacerator, new ItemStack(GregTech_API.sBlockMachines, 1, 50)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingExtractor, GT_ModHandler.getIC2Item("extractor", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingExtractor, new ItemStack(GregTech_API.sBlockMachines, 1, 51)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingCompressor, GT_ModHandler.getIC2Item("compressor", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingCompressor, new ItemStack(GregTech_API.sBlockMachines, 1, 52)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingRecycler, GT_ModHandler.getIC2Item("recycler", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingRecycler, new ItemStack(GregTech_API.sBlockMachines, 1, 53)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingIronFurnace, GT_ModHandler.getIC2Item("ironFurnace", 1L)); - - GT_OreDictUnificator - .registerOre(OreDictNames.craftingCentrifuge, new ItemStack(GregTech_API.sBlockMachines, 1, 62)); - - GT_OreDictUnificator - .registerOre(OreDictNames.craftingInductionFurnace, GT_ModHandler.getIC2Item("inductionFurnace", 1L)); - - GT_OreDictUnificator - .registerOre(OreDictNames.craftingElectricFurnace, GT_ModHandler.getIC2Item("electroFurnace", 1L)); - GT_OreDictUnificator - .registerOre(OreDictNames.craftingElectricFurnace, new ItemStack(GregTech_API.sBlockMachines, 1, 54)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingGenerator, GT_ModHandler.getIC2Item("generator", 1L)); - - GT_OreDictUnificator - .registerOre(OreDictNames.craftingGeothermalGenerator, GT_ModHandler.getIC2Item("geothermalGenerator", 1L)); - - GT_OreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767)); - GT_OreDictUnificator.registerOre( - OreDictNames.craftingFeather, - GT_ModHandler.getModItem(TwilightForest.ID, "item.tfFeather", 1L, 32767)); - - GT_OreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767)); - GT_OreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767)); - GT_OreDictUnificator.registerOre("paperMap", new ItemStack(Items.map, 1, 32767)); - GT_OreDictUnificator.registerOre("paperMap", new ItemStack(Items.filled_map, 1, 32767)); - GT_OreDictUnificator.registerOre("bookEmpty", new ItemStack(Items.book, 1, 32767)); - GT_OreDictUnificator.registerOre("bookWritable", new ItemStack(Items.writable_book, 1, 32767)); - GT_OreDictUnificator.registerOre("bookWritten", new ItemStack(Items.written_book, 1, 32767)); - GT_OreDictUnificator.registerOre("bookEnchanted", new ItemStack(Items.enchanted_book, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.book, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.writable_book, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767)); - GT_OreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767)); - - GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("electronicCircuit", 1L)); - GT_OreDictUnificator.addToBlacklist(GT_ModHandler.getIC2Item("advancedCircuit", 1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.circuit, Materials.LV, GT_ModHandler.getIC2Item("electronicCircuit", 1L)); - GT_OreDictUnificator - .registerOre(OrePrefixes.circuit, Materials.HV, GT_ModHandler.getIC2Item("advancedCircuit", 1L)); - - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Copper, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Tin, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Bronze, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Gold, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Iron, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 4)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Steel, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 5)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Lead, - GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6)); - - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Osmium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Aluminium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.StainlessSteel, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Tungsten, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Neutronium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.TungstenSteel, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Iridium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Titanium, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0)); - GT_OreDictUnificator.registerOre( - OrePrefixes.itemCasing, - Materials.Chrome, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0)); - - // Fake Circuits - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.ULV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.LV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.MV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.HV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.EV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.IV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.LuV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.ZPM, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.UV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.UHV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.UEV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.UIV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.UMV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.UXV, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.circuit, - Materials.MAX, - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L)); - - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.Manasteel, - GT_ModHandler.getModItem(Botania.ID, "storage", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.Terrasteel, - GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 1)); - GT_OreDictUnificator.registerOre( - OrePrefixes.ingot, - MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 7)); - GT_OreDictUnificator.registerOre( - OrePrefixes.nugget, - MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 19)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.ElvenElementium, - GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.Livingrock, - GT_ModHandler.getModItem(Botania.ID, "livingrock", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.ingot, - MaterialsBotania.GaiaSpirit, - GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 14)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.Livingwood, - GT_ModHandler.getModItem(Botania.ID, "livingwood", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.Dreamwood, - GT_ModHandler.getModItem(Botania.ID, "dreamwood", 1L)); - GT_OreDictUnificator.registerOre( - OrePrefixes.gem, - MaterialsBotania.ManaDiamond, - GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 2)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.ManaDiamond, - GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 3)); - GT_OreDictUnificator.registerOre( - OrePrefixes.gem, - MaterialsBotania.BotaniaDragonstone, - GT_ModHandler.getModItem(Botania.ID, "manaResource", 1L, 9)); - GT_OreDictUnificator.registerOre( - OrePrefixes.block, - MaterialsBotania.BotaniaDragonstone, - GT_ModHandler.getModItem(Botania.ID, "storage", 1L, 4)); - } -} diff --git a/src/main/java/gregtech/loaders/preload/LoaderCircuitBehaviors.java b/src/main/java/gregtech/loaders/preload/LoaderCircuitBehaviors.java new file mode 100644 index 0000000000..8bb2300000 --- /dev/null +++ b/src/main/java/gregtech/loaders/preload/LoaderCircuitBehaviors.java @@ -0,0 +1,31 @@ +package gregtech.loaders.preload; + +import gregtech.api.util.GTLog; +import gregtech.common.redstonecircuits.CircuitBasicLogic; +import gregtech.common.redstonecircuits.CircuitBitAnd; +import gregtech.common.redstonecircuits.CircuitCombinationLock; +import gregtech.common.redstonecircuits.CircuitEquals; +import gregtech.common.redstonecircuits.CircuitPulser; +import gregtech.common.redstonecircuits.CircuitRandomizer; +import gregtech.common.redstonecircuits.CircuitRedstoneMeter; +import gregtech.common.redstonecircuits.CircuitRepeater; +import gregtech.common.redstonecircuits.CircuitTimer; + +public class LoaderCircuitBehaviors implements Runnable { + + @Override + public void run() { + GTLog.out.println("GTMod: Register Redstone Circuit behaviours."); + new CircuitTimer(0); + new CircuitBasicLogic(1); + new CircuitRepeater(2); + new CircuitPulser(3); + new CircuitRedstoneMeter(4); + + new CircuitRandomizer(8); + + new CircuitCombinationLock(16); + new CircuitBitAnd(17); + new CircuitEquals(18); + } +} diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java index f4c682d848..7bf36c1e33 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java @@ -13,9 +13,9 @@ import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.fluidCannerRecipes; import static gregtech.api.recipe.RecipeMaps.maceratorRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_RecipeBuilder.WILDCARD; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.WILDCARD; import java.util.Locale; @@ -29,10 +29,10 @@ import net.minecraftforge.fluids.FluidRegistry; import codechicken.nei.api.API; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.GTMod; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Dyes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsKevlar; @@ -40,71 +40,71 @@ import gregtech.api.enums.MaterialsUEVplus; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; -import gregtech.api.fluid.GT_FluidFactory; -import gregtech.api.items.GT_Block_LongDistancePipe; -import gregtech.api.items.GT_BreederCell_Item; -import gregtech.api.items.GT_Generic_Item; -import gregtech.api.items.GT_RadioactiveCellIC_Item; +import gregtech.api.fluid.GTFluidFactory; +import gregtech.api.items.BlockLongDistancePipe; +import gregtech.api.items.GTGenericItem; +import gregtech.api.items.ItemBreederCell; +import gregtech.api.items.ItemRadioactiveCellIC; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Block_Casings1; -import gregtech.common.blocks.GT_Block_Casings10; -import gregtech.common.blocks.GT_Block_Casings11; -import gregtech.common.blocks.GT_Block_Casings2; -import gregtech.common.blocks.GT_Block_Casings3; -import gregtech.common.blocks.GT_Block_Casings4; -import gregtech.common.blocks.GT_Block_Casings5; -import gregtech.common.blocks.GT_Block_Casings6; -import gregtech.common.blocks.GT_Block_Casings8; -import gregtech.common.blocks.GT_Block_Casings9; -import gregtech.common.blocks.GT_Block_Concretes; -import gregtech.common.blocks.GT_Block_Drone; -import gregtech.common.blocks.GT_Block_FrameBox; -import gregtech.common.blocks.GT_Block_Glass1; -import gregtech.common.blocks.GT_Block_Granites; -import gregtech.common.blocks.GT_Block_Laser; -import gregtech.common.blocks.GT_Block_Machines; -import gregtech.common.blocks.GT_Block_Metal; -import gregtech.common.blocks.GT_Block_Ores; -import gregtech.common.blocks.GT_Block_Reinforced; -import gregtech.common.blocks.GT_Block_Stones; -import gregtech.common.blocks.GT_Block_TintedIndustrialGlass; -import gregtech.common.blocks.GT_Cyclotron_Coils; -import gregtech.common.blocks.GT_TileEntity_Ores; -import gregtech.common.blocks.GT_WormholeRenderBlock; -import gregtech.common.items.GT_DepletetCell_Item; -import gregtech.common.items.GT_FluidDisplayItem; -import gregtech.common.items.GT_IntegratedCircuit_Item; -import gregtech.common.items.GT_MetaGenerated_Item_01; -import gregtech.common.items.GT_MetaGenerated_Item_02; -import gregtech.common.items.GT_MetaGenerated_Item_03; -import gregtech.common.items.GT_MetaGenerated_Item_98; -import gregtech.common.items.GT_MetaGenerated_Item_99; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.items.GT_NeutronReflector_Item; -import gregtech.common.items.GT_TierDrone; -import gregtech.common.items.GT_VolumetricFlask; -import gregtech.common.items.GT_WirelessHeadphones; -import gregtech.common.tileentities.render.TileDrone; -import gregtech.common.tileentities.render.TileLaser; -import gregtech.common.tileentities.render.TileWormhole; - -public class GT_Loader_Item_Block_And_Fluid implements Runnable { +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.blocks.BlockCasings1; +import gregtech.common.blocks.BlockCasings10; +import gregtech.common.blocks.BlockCasings11; +import gregtech.common.blocks.BlockCasings2; +import gregtech.common.blocks.BlockCasings3; +import gregtech.common.blocks.BlockCasings4; +import gregtech.common.blocks.BlockCasings5; +import gregtech.common.blocks.BlockCasings6; +import gregtech.common.blocks.BlockCasings8; +import gregtech.common.blocks.BlockCasings9; +import gregtech.common.blocks.BlockConcretes; +import gregtech.common.blocks.BlockCyclotronCoils; +import gregtech.common.blocks.BlockDrone; +import gregtech.common.blocks.BlockFrameBox; +import gregtech.common.blocks.BlockGlass1; +import gregtech.common.blocks.BlockGranites; +import gregtech.common.blocks.BlockLaser; +import gregtech.common.blocks.BlockMachines; +import gregtech.common.blocks.BlockMetal; +import gregtech.common.blocks.BlockOres; +import gregtech.common.blocks.BlockReinforced; +import gregtech.common.blocks.BlockStones; +import gregtech.common.blocks.BlockTintedIndustrialGlass; +import gregtech.common.blocks.BlockWormholeRender; +import gregtech.common.blocks.TileEntityOres; +import gregtech.common.items.ItemDepletedCell; +import gregtech.common.items.ItemFluidDisplay; +import gregtech.common.items.ItemIntegratedCircuit; +import gregtech.common.items.ItemNeutronReflector; +import gregtech.common.items.ItemTierDrone; +import gregtech.common.items.ItemVolumetricFlask; +import gregtech.common.items.ItemWirelessHeadphones; +import gregtech.common.items.MetaGeneratedItem01; +import gregtech.common.items.MetaGeneratedItem02; +import gregtech.common.items.MetaGeneratedItem03; +import gregtech.common.items.MetaGeneratedItem98; +import gregtech.common.items.MetaGeneratedItem99; +import gregtech.common.items.MetaGeneratedTool01; +import gregtech.common.tileentities.render.TileEntityDrone; +import gregtech.common.tileentities.render.TileEntityLaser; +import gregtech.common.tileentities.render.TileEntityWormhole; + +public class LoaderGTBlockFluid implements Runnable { @Override public void run() { - Materials.Water.mFluid = (Materials.Ice.mFluid = GT_ModHandler.getWater(1000L) + Materials.Water.mFluid = (Materials.Ice.mFluid = GTModHandler.getWater(1000L) .getFluid()); - Materials.Lava.mFluid = GT_ModHandler.getLava(1000L) + Materials.Lava.mFluid = GTModHandler.getLava(1000L) .getFluid(); - GT_Log.out.println("GT_Mod: Register Books."); + GTLog.out.println("GTMod: Register Books."); - GT_Utility.getWrittenBook( + GTUtility.getWrittenBook( "Manual_Printer", "Printer Manual V2.0", "Gregorius Techneticies", @@ -117,7 +117,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.", "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI."); - GT_Utility.getWrittenBook( + GTUtility.getWrittenBook( "Manual_Punch_Cards", "Punch Card Manual V0.0", "Gregorius Techneticies", @@ -135,7 +135,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.", "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card."); - GT_Utility.getWrittenBook( + GTUtility.getWrittenBook( "Manual_Microwave", "Microwave Oven Manual", "Kitchen Industries", @@ -148,81 +148,80 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { "Do not insert inflammable Objects. The Oven will catch on Fire.", "Do not insert Explosives such as Eggs. Just don't."); - GT_Log.out.println("GT_Mod: Register Items."); + GTLog.out.println("GTMod: Register Items."); - new GT_IntegratedCircuit_Item(); - new GT_MetaGenerated_Item_01(); - new GT_MetaGenerated_Item_02(); - new GT_MetaGenerated_Item_03(); - // GT_MetaGenerated_Item_98 is initialized in GT_Proxy.onPostLoad() because we need to wait for fluids to be + new ItemIntegratedCircuit(); + new MetaGeneratedItem01(); + new MetaGeneratedItem02(); + new MetaGeneratedItem03(); + // GT_MetaGenerated_Item_98 is initialized in GTProxy.onPostLoad() because we need to wait for fluids to be // registered. // Pre-initialization needs to happen before then, though, because the cell icons get deleted at some point // between load and post-load. - GT_MetaGenerated_Item_98.preInit(); - new GT_MetaGenerated_Item_99(); - new GT_MetaGenerated_Tool_01(); - new GT_FluidDisplayItem(); - new GT_WirelessHeadphones(); + MetaGeneratedItem98.preInit(); + new MetaGeneratedItem99(); + new MetaGeneratedTool01(); + new ItemFluidDisplay(); + new ItemWirelessHeadphones(); - // Tiered recipe materials actually appear to be set in GT_MetaTileEntity_BasicMachine_GT_Recipe, making these + // Tiered recipe materials actually appear to be set in MTEBasicMachineWithRecipe, making these // unused - ItemList.Rotor_LV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Tin, 1L)); - ItemList.Rotor_MV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1L)); - ItemList.Rotor_HV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1L)); - ItemList.Rotor_EV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L)); - ItemList.Rotor_IV.set(GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L)); + ItemList.Rotor_LV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Tin, 1L)); + ItemList.Rotor_MV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Bronze, 1L)); + ItemList.Rotor_HV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.Steel, 1L)); + ItemList.Rotor_EV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.StainlessSteel, 1L)); + ItemList.Rotor_IV.set(GTOreDictUnificator.get(OrePrefixes.rotor, Materials.TungstenSteel, 1L)); - ItemList.VOLUMETRIC_FLASK.set(new GT_VolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000)); + ItemList.VOLUMETRIC_FLASK.set(new ItemVolumetricFlask("Volumetric_Flask", "Volumetric flask", 1000)); - Item tItem = (Item) GT_Utility.callConstructor( + Item tItem = (Item) GTUtility.callConstructor( "gregtech.common.items.GT_SensorCard_Item", 0, null, false, new Object[] { "sensorcard", "GregTech Sensor Card" }); ItemList.NC_SensorCard.set( - tItem == null ? new GT_Generic_Item("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed") + tItem == null ? new GTGenericItem("sensorcard", "GregTech Sensor Card", "Nuclear Control not installed") : tItem); - Item advSensorCard = (Item) GT_Utility + Item advSensorCard = (Item) GTUtility .callConstructor("gregtech.common.items.GT_AdvancedSensorCard_Item", 0, null, false); ItemList.NC_AdvancedSensorCard.set( advSensorCard == null - ? new GT_Generic_Item( + ? new GTGenericItem( "advancedsensorcard", "GregTech Advanced Sensor Card", "Nuclear Control not installed") : advSensorCard); - ItemList.Neutron_Reflector - .set(new GT_NeutronReflector_Item("neutronreflector", "Iridium Neutron Reflector", 0)); + ItemList.Neutron_Reflector.set(new ItemNeutronReflector("neutronreflector", "Iridium Neutron Reflector", 0)); ItemList.Reactor_Coolant_He_1 - .set(GregTech_API.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); + .set(GregTechAPI.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000)); ItemList.Reactor_Coolant_He_3 - .set(GregTech_API.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); + .set(GregTechAPI.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000)); ItemList.Reactor_Coolant_He_6 - .set(GregTech_API.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); + .set(GregTechAPI.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000)); ItemList.Reactor_Coolant_NaK_1 - .set(GregTech_API.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); + .set(GregTechAPI.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000)); ItemList.Reactor_Coolant_NaK_3 - .set(GregTech_API.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); + .set(GregTechAPI.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000)); ItemList.Reactor_Coolant_NaK_6 - .set(GregTech_API.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); + .set(GregTechAPI.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000)); ItemList.Reactor_Coolant_Sp_1 - .set(GregTech_API.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); + .set(GregTechAPI.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000)); ItemList.Reactor_Coolant_Sp_2 - .set(GregTech_API.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); + .set(GregTechAPI.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000)); ItemList.Reactor_Coolant_Sp_3 - .set(GregTech_API.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); + .set(GregTechAPI.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000)); ItemList.Reactor_Coolant_Sp_6 - .set(GregTech_API.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); + .set(GregTechAPI.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000)); ItemList.GlowstoneCell.set( - new GT_BreederCell_Item( + new ItemBreederCell( "glowstoneCell", "Glowstone Fuel Rod", "Source of sunnarium", @@ -230,23 +229,23 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 1, 10000, () -> ItemList.SunnariumCell.get(1))); - ItemList.SunnariumCell.set(new GT_DepletetCell_Item("sunnariumCell", "Sunnarium Fuel Rod", 1)); + ItemList.SunnariumCell.set(new ItemDepletedCell("sunnariumCell", "Sunnarium Fuel Rod", 1)); ItemList.neutroniumHeatCapacitor.set( - GregTech_API + GregTechAPI .constructCoolantCellItem("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000)); - ItemList.Depleted_Thorium_1.set(new GT_DepletetCell_Item("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); + ItemList.Depleted_Thorium_1.set(new ItemDepletedCell("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1)); ItemList.Depleted_Thorium_2 - .set(new GT_DepletetCell_Item("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO - // CHECK - // num + .set(new ItemDepletedCell("Double_ThoriumcellDep", "Dual Fuel Rod (Depleted Thorium)", 1)); // TODO + // CHECK + // num ItemList.Depleted_Thorium_4 - .set(new GT_DepletetCell_Item("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO - // CHECK - // num + .set(new ItemDepletedCell("Quad_ThoriumcellDep", "Quad Fuel Rod (Depleted Thorium)", 1)); // TODO + // CHECK + // num ItemList.ThoriumCell_1.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Thoriumcell", "Fuel Rod (Thorium)", 1, @@ -257,7 +256,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_Thorium_1.get(1), false)); ItemList.ThoriumCell_2.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Double_Thoriumcell", "Dual Fuel Rod (Thorium)", 2, @@ -268,7 +267,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_Thorium_2.get(1), false)); ItemList.ThoriumCell_4.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Quad_Thoriumcell", "Quad Fuel Rod (Thorium)", 4, @@ -279,44 +278,43 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_Thorium_4.get(1), false)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_Thorium_1.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)) + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Lutetium, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L)) .duration(25 * SECONDS) .eut(48) .addTo(thermalCentrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_Thorium_2.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L)) .duration(25 * SECONDS) .eut(48) .addTo(thermalCentrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_Thorium_4.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Lutetium, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Thorium, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6L)) .duration(25 * SECONDS) .eut(48) .addTo(thermalCentrifugeRecipes); - ItemList.Depleted_Naquadah_1 - .set(new GT_DepletetCell_Item("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1)); + ItemList.Depleted_Naquadah_1.set(new ItemDepletedCell("NaquadahcellDep", "Fuel Rod (Depleted Naquadah)", 1)); ItemList.Depleted_Naquadah_2 - .set(new GT_DepletetCell_Item("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1)); + .set(new ItemDepletedCell("Double_NaquadahcellDep", "Dual Fuel Rod (Depleted Naquadah)", 1)); ItemList.Depleted_Naquadah_4 - .set(new GT_DepletetCell_Item("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1)); + .set(new ItemDepletedCell("Quad_NaquadahcellDep", "Quad Fuel Rod (Depleted Naquadah)", 1)); ItemList.NaquadahCell_1.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Naquadahcell", "Fuel Rod (Naquadah)", 1, @@ -327,7 +325,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_Naquadah_1.get(1), false)); ItemList.NaquadahCell_2.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Double_Naquadahcell", "Dual Fuel Rod (Naquadah)", 2, @@ -338,7 +336,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_Naquadah_2.get(1), false)); ItemList.NaquadahCell_4.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Quad_Naquadahcell", "Quad Fuel Rod (Naquadah)", 4, @@ -349,53 +347,53 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_Naquadah_4.get(1), false)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_Naquadah_1.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadria, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.Naquadria, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(25 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_Naquadah_2.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(50 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_Naquadah_4.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 8L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.NaquadahEnriched, 8L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(100 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - ItemList.Depleted_MNq_1.set(new GT_DepletetCell_Item("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1)); - ItemList.Depleted_MNq_2.set(new GT_DepletetCell_Item("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1)); - ItemList.Depleted_MNq_4.set(new GT_DepletetCell_Item("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1)); + ItemList.Depleted_MNq_1.set(new ItemDepletedCell("MNqCellDep", "Fuel Rod (Depleted Nq*)", 1)); + ItemList.Depleted_MNq_2.set(new ItemDepletedCell("Double_MNqCellDep", "Dual Fuel Rod (Depleted Nq*)", 1)); + ItemList.Depleted_MNq_4.set(new ItemDepletedCell("Quad_MNqCellDep", "Quad Fuel Rod (Depleted Nq*)", 1)); ItemList.MNqCell_1.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "MNqCell", "Fuel Rod (Nq* - MOX like behaviour)", 1, @@ -406,7 +404,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_MNq_1.get(1), true)); ItemList.MNqCell_2.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Double_MNqCell", "Dual Fuel Rod (Nq* - MOX like behaviour)", 2, @@ -417,7 +415,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_MNq_2.get(1), true)); ItemList.MNqCell_4.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "Quad_MNqCell", "Quad Fuel Rod (Nq* - MOX like behaviour)", 4, @@ -428,50 +426,50 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Depleted_MNq_4.get(1), true)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_MNq_1.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.NaquadahEnriched, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1L), + GTOreDictUnificator.get(OrePrefixes.dustSmall, Materials.NaquadahEnriched, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 1L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(25 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_MNq_2.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 2L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 1L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 18L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 2L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(50 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(ItemList.Depleted_MNq_4.get(1)) .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 2L), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 8L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 4L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.NaquadahEnriched, 2L), + GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.Naquadria, 8L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 38L), + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L)) .outputChances(10_000, 5_000, 5_000, 2_500, 10_000, 10_000) .duration(100 * SECONDS) .eut(TierEU.RECIPE_EV) .addTo(centrifugeRecipes); ItemList.Uraniumcell_1.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "reactorUraniumSimple", "Fuel Rod (Uranium)", 1, @@ -479,10 +477,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2F, 1, 1F, - GT_ModHandler.getIC2Item("reactorDepletedUraniumSimple", 1), + GTModHandler.getIC2Item("reactorDepletedUraniumSimple", 1), false)); ItemList.Uraniumcell_2.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "reactorUraniumDual", "Dual Fuel Rod (Uranium)", 2, @@ -490,10 +488,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2F, 1, 1F, - GT_ModHandler.getIC2Item("reactorDepletedUraniumDual", 1), + GTModHandler.getIC2Item("reactorDepletedUraniumDual", 1), false)); ItemList.Uraniumcell_4.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "reactorUraniumQuad", "Quad Fuel Rod (Uranium)", 4, @@ -501,10 +499,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2F, 1, 1F, - GT_ModHandler.getIC2Item("reactorDepletedUraniumQuad", 1), + GTModHandler.getIC2Item("reactorDepletedUraniumQuad", 1), false)); ItemList.Moxcell_1.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "reactorMOXSimple", "Fuel Rod (Mox)", 1, @@ -512,10 +510,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2F, 1, 1F, - GT_ModHandler.getIC2Item("reactorDepletedMOXSimple", 1), + GTModHandler.getIC2Item("reactorDepletedMOXSimple", 1), true)); ItemList.Moxcell_2.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "reactorMOXDual", "Dual Fuel Rod (Mox)", 2, @@ -523,10 +521,10 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2F, 1, 1F, - GT_ModHandler.getIC2Item("reactorDepletedMOXDual", 1), + GTModHandler.getIC2Item("reactorDepletedMOXDual", 1), true)); ItemList.Moxcell_4.set( - new GT_RadioactiveCellIC_Item( + new ItemRadioactiveCellIC( "reactorMOXQuad", "Quad Fuel Rod (Mox)", 4, @@ -534,36 +532,36 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { 2F, 1, 1F, - GT_ModHandler.getIC2Item("reactorDepletedMOXQuad", 1), + GTModHandler.getIC2Item("reactorDepletedMOXQuad", 1), true)); - GT_Log.out.println("GT_Mod: Adding Blocks."); - GregTech_API.sBlockMachines = new GT_Block_Machines(); - GregTech_API.sBlockCasings1 = new GT_Block_Casings1(); - GregTech_API.sBlockCasings2 = new GT_Block_Casings2(); - GregTech_API.sBlockCasings3 = new GT_Block_Casings3(); - GregTech_API.sBlockCasings4 = new GT_Block_Casings4(); - GregTech_API.sBlockCasings5 = new GT_Block_Casings5(); - GregTech_API.sBlockCasings6 = new GT_Block_Casings6(); - GregTech_API.sBlockCasings8 = new GT_Block_Casings8(); - GregTech_API.sBlockCasings9 = new GT_Block_Casings9(); - GregTech_API.sBlockCasings10 = new GT_Block_Casings10(); - GregTech_API.sBlockCasings11 = new GT_Block_Casings11(); - GregTech_API.sBlockGranites = new GT_Block_Granites(); - GregTech_API.sBlockLongDistancePipes = new GT_Block_LongDistancePipe(); - GregTech_API.sBlockConcretes = new GT_Block_Concretes(); - GregTech_API.sBlockStones = new GT_Block_Stones(); - GregTech_API.sBlockOres1 = new GT_Block_Ores(); - GregTech_API.sBlockFrames = new GT_Block_FrameBox(); - GregTech_API.sDroneRender = new GT_Block_Drone(); - GregTech_API.sBlockGlass1 = new GT_Block_Glass1(); - GregTech_API.sBlockTintedGlass = new GT_Block_TintedIndustrialGlass(); - GregTech_API.sLaserRender = new GT_Block_Laser(); - GregTech_API.sWormholeRender = new GT_WormholeRenderBlock(); + GTLog.out.println("GTMod: Adding Blocks."); + GregTechAPI.sBlockMachines = new BlockMachines(); + GregTechAPI.sBlockCasings1 = new BlockCasings1(); + GregTechAPI.sBlockCasings2 = new BlockCasings2(); + GregTechAPI.sBlockCasings3 = new BlockCasings3(); + GregTechAPI.sBlockCasings4 = new BlockCasings4(); + GregTechAPI.sBlockCasings5 = new BlockCasings5(); + GregTechAPI.sBlockCasings6 = new BlockCasings6(); + GregTechAPI.sBlockCasings8 = new BlockCasings8(); + GregTechAPI.sBlockCasings9 = new BlockCasings9(); + GregTechAPI.sBlockCasings10 = new BlockCasings10(); + GregTechAPI.sBlockCasings11 = new BlockCasings11(); + GregTechAPI.sBlockGranites = new BlockGranites(); + GregTechAPI.sBlockLongDistancePipes = new BlockLongDistancePipe(); + GregTechAPI.sBlockConcretes = new BlockConcretes(); + GregTechAPI.sBlockStones = new BlockStones(); + GregTechAPI.sBlockOres1 = new BlockOres(); + GregTechAPI.sBlockFrames = new BlockFrameBox(); + GregTechAPI.sDroneRender = new BlockDrone(); + GregTechAPI.sBlockGlass1 = new BlockGlass1(); + GregTechAPI.sBlockTintedGlass = new BlockTintedIndustrialGlass(); + GregTechAPI.sLaserRender = new BlockLaser(); + GregTechAPI.sWormholeRender = new BlockWormholeRender(); // meta ID order, DO NOT CHANGE ORDER - GregTech_API.sBlockMetal1 = new GT_Block_Metal( + GregTechAPI.sBlockMetal1 = new BlockMetal( "gt.blockmetal1", new Materials[] { Materials.Adamantium, Materials.Aluminium, Materials.Americium, Materials.AnnealedCopper, Materials.Antimony, Materials.Arsenic, Materials.AstralSilver, Materials.BatteryAlloy, @@ -572,7 +570,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS1); - GregTech_API.sBlockMetal2 = new GT_Block_Metal( + GregTechAPI.sBlockMetal2 = new BlockMetal( "gt.blockmetal2", new Materials[] { Materials.Bronze, Materials.Caesium, Materials.Cerium, Materials.Chrome, Materials.ChromiumDioxide, Materials.Cobalt, Materials.CobaltBrass, Materials.Copper, @@ -581,7 +579,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS2); - GregTech_API.sBlockMetal3 = new GT_Block_Metal( + GregTechAPI.sBlockMetal3 = new BlockMetal( "gt.blockmetal3", new Materials[] { Materials.ElectrumFlux, Materials.Enderium, Materials.Erbium, Materials.Europium, Materials.FierySteel, Materials.Gadolinium, Materials.Gallium, Materials.Holmium, Materials.HSLA, @@ -590,7 +588,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS3); - GregTech_API.sBlockMetal4 = new GT_Block_Metal( + GregTechAPI.sBlockMetal4 = new BlockMetal( "gt.blockmetal4", new Materials[] { Materials.Knightmetal, Materials.Lanthanum, Materials.Lead, Materials.Lutetium, Materials.Magnalium, Materials.Magnesium, Materials.Manganese, Materials.MeteoricIron, @@ -599,7 +597,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS4); - GregTech_API.sBlockMetal5 = new GT_Block_Metal( + GregTechAPI.sBlockMetal5 = new BlockMetal( "gt.blockmetal5", new Materials[] { Materials.Neodymium, Materials.NeodymiumMagnetic, Materials.Neutronium, Materials.Nichrome, Materials.Nickel, Materials.Niobium, Materials.NiobiumNitride, @@ -609,7 +607,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS5); - GregTech_API.sBlockMetal6 = new GT_Block_Metal( + GregTechAPI.sBlockMetal6 = new BlockMetal( "gt.blockmetal6", new Materials[] { Materials.Promethium, Materials.RedAlloy, Materials.RedSteel, Materials.RoseGold, Materials.Rubidium, Materials.Samarium, Materials.Scandium, Materials.ShadowIron, Materials.ShadowSteel, @@ -618,7 +616,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS6); - GregTech_API.sBlockMetal7 = new GT_Block_Metal( + GregTechAPI.sBlockMetal7 = new BlockMetal( "gt.blockmetal7", new Materials[] { Materials.Sunnarium, Materials.Tantalum, Materials.Tellurium, Materials.Terbium, Materials.Thaumium, Materials.Thorium, Materials.Thulium, Materials.Tin, Materials.TinAlloy, @@ -627,7 +625,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS7); - GregTech_API.sBlockMetal8 = new GT_Block_Metal( + GregTechAPI.sBlockMetal8 = new BlockMetal( "gt.blockmetal8", new Materials[] { Materials.Vanadium, Materials.VanadiumGallium, Materials.WroughtIron, Materials.Ytterbium, Materials.Yttrium, Materials.YttriumBariumCuprate, Materials.Zinc, Materials.TungstenCarbide, @@ -636,7 +634,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS8); - GregTech_API.sBlockGem1 = new GT_Block_Metal( + GregTechAPI.sBlockGem1 = new BlockMetal( "gt.blockgem1", new Materials[] { Materials.InfusedAir, Materials.Amber, Materials.Amethyst, Materials.InfusedWater, Materials.BlueTopaz, Materials.CertusQuartz, Materials.Dilithium, Materials.EnderEye, @@ -645,7 +643,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS9); - GregTech_API.sBlockGem2 = new GT_Block_Metal( + GregTechAPI.sBlockGem2 = new BlockMetal( "gt.blockgem2", new Materials[] { Materials.Lazurite, Materials.Lignite, Materials.Monazite, Materials.Niter, Materials.Olivine, Materials.Opal, Materials.InfusedOrder, Materials.InfusedEntropy, @@ -654,14 +652,14 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS10); - GregTech_API.sBlockGem3 = new GT_Block_Metal( + GregTechAPI.sBlockGem3 = new BlockMetal( "gt.blockgem3", new Materials[] { Materials.Topaz, Materials.Vinteum, Materials.GarnetYellow, Materials.NetherStar, Materials.Charcoal, Materials.Blaze }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS11); - GregTech_API.sBlockMetal9 = new GT_Block_Metal( + GregTechAPI.sBlockMetal9 = new BlockMetal( "gt.blockmetal9", new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide, MaterialsUEVplus.SpaceTime, MaterialsUEVplus.TranscendentMetal, Materials.Oriharukon, @@ -670,13 +668,13 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); - GregTech_API.sBlockReinforced = new GT_Block_Reinforced("gt.blockreinforced"); + GregTechAPI.sBlockReinforced = new BlockReinforced("gt.blockreinforced"); - GT_Log.out.println("GT_Mod: Register TileEntities."); + GTLog.out.println("GTMod: Register TileEntities."); - BaseMetaTileEntity tBaseMetaTileEntity = GregTech_API.constructBaseMetaTileEntity(); + BaseMetaTileEntity tBaseMetaTileEntity = GregTechAPI.constructBaseMetaTileEntity(); - GT_Log.out.println("GT_Mod: Registering the BaseMetaTileEntity."); + GTLog.out.println("GTMod: Registering the BaseMetaTileEntity."); GameRegistry.registerTileEntity(tBaseMetaTileEntity.getClass(), "BaseMetaTileEntity"); FMLInterModComms.sendMessage( AppliedEnergistics2.ID, @@ -684,176 +682,175 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { tBaseMetaTileEntity.getClass() .getName()); - GT_Log.out.println("GT_Mod: Registering the DroneRender."); - GameRegistry.registerTileEntity(TileDrone.class, "DroneRender"); + GTLog.out.println("GTMod: Registering the DroneRender."); + GameRegistry.registerTileEntity(TileEntityDrone.class, "DroneRender"); - GT_Log.out.println("GT_Mod: Registering the LaserRender."); - GameRegistry.registerTileEntity(TileLaser.class, "LaserRenderer"); + GTLog.out.println("GTMod: Registering the LaserRender."); + GameRegistry.registerTileEntity(TileEntityLaser.class, "LaserRenderer"); - GT_Log.out.println("GT_Mod: Registering the WormholeRender."); - GameRegistry.registerTileEntity(TileWormhole.class, "WormholeRender"); + GTLog.out.println("GTMod: Registering the WormholeRender."); + GameRegistry.registerTileEntity(TileEntityWormhole.class, "WormholeRender"); - GT_Log.out.println("GT_Mod: Registering the BaseMetaPipeEntity."); + GTLog.out.println("GTMod: Registering the BaseMetaPipeEntity."); GameRegistry.registerTileEntity(BaseMetaPipeEntity.class, "BaseMetaPipeEntity"); FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", BaseMetaPipeEntity.class.getName()); - GT_Log.out.println("GT_Mod: Registering the Ore TileEntity."); - GameRegistry.registerTileEntity(GT_TileEntity_Ores.class, "GT_TileEntity_Ores"); - FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", GT_TileEntity_Ores.class.getName()); + GTLog.out.println("GTMod: Registering the Ore TileEntity."); + GameRegistry.registerTileEntity(TileEntityOres.class, "GT_TileEntity_Ores"); + FMLInterModComms.sendMessage(AppliedEnergistics2.ID, "whitelist-spatial", TileEntityOres.class.getName()); - GT_Log.out.println("GT_Mod: Registering Fluids."); - Materials.ConstructionFoam.mFluid = GT_Utility - .getFluidForFilledItem(GT_ModHandler.getIC2Item("CFCell", 1L), true) + GTLog.out.println("GTMod: Registering Fluids."); + Materials.ConstructionFoam.mFluid = GTUtility.getFluidForFilledItem(GTModHandler.getIC2Item("CFCell", 1L), true) .getFluid(); - Materials.UUMatter.mFluid = GT_Utility.getFluidForFilledItem(GT_ModHandler.getIC2Item("uuMatterCell", 1L), true) + Materials.UUMatter.mFluid = GTUtility.getFluidForFilledItem(GTModHandler.getIC2Item("uuMatterCell", 1L), true) .getFluid(); - GT_FluidFactory.builder("Air") + GTFluidFactory.builder("Air") .withLocalizedName("Air") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Air) .registerContainers(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L), 2000); - GT_FluidFactory.builder("LiquidOxygen") + GTFluidFactory.builder("LiquidOxygen") .withLocalizedName("Liquid Oxygen") .withStateAndTemperature(GAS, 60) .buildAndRegister() .configureMaterials(Materials.LiquidOxygen) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidOxygen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("LiquidNitrogen") + GTFluidFactory.builder("LiquidNitrogen") .withLocalizedName("Liquid Nitrogen") .withStateAndTemperature(GAS, 77) .buildAndRegister() .configureMaterials(Materials.LiquidNitrogen) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidNitrogen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("LiquidAir") + GTFluidFactory.builder("LiquidAir") .withLocalizedName("Liquid Air") .withStateAndTemperature(LIQUID, 77) .buildAndRegister() .configureMaterials(Materials.LiquidAir) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.LiquidAir, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Oxygen") + GTFluidFactory.builder("Oxygen") .withLocalizedName("Oxygen") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Oxygen) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Hydrogen") + GTFluidFactory.builder("Hydrogen") .withLocalizedName("Hydrogen") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Hydrogen) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Deuterium") + GTFluidFactory.builder("Deuterium") .withLocalizedName("Deuterium") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Deuterium) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Deuterium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Tritium") + GTFluidFactory.builder("Tritium") .withLocalizedName("Tritium") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Tritium) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Tritium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Helium") + GTFluidFactory.builder("Helium") .withLocalizedName("Helium") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Helium) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Argon") + GTFluidFactory.builder("Argon") .withLocalizedName("Argon") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Argon) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Radon") + GTFluidFactory.builder("Radon") .withLocalizedName("Radon") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Radon) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Fluorine") + GTFluidFactory.builder("Fluorine") .withLocalizedName("Fluorine") .withStateAndTemperature(GAS, 53) .buildAndRegister() .configureMaterials(Materials.Fluorine) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Titaniumtetrachloride") + GTFluidFactory.builder("Titaniumtetrachloride") .withLocalizedName("Titaniumtetrachloride") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Titaniumtetrachloride) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Titaniumtetrachloride, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Helium-3") + GTFluidFactory.builder("Helium-3") .withLocalizedName("Helium-3") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Helium_3) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium_3, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Methane") + GTFluidFactory.builder("Methane") .withLocalizedName("Methane") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Methane) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Methane, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Nitrogen") + GTFluidFactory.builder("Nitrogen") .withLocalizedName("Nitrogen") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Nitrogen) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("NitrogenDioxide") + GTFluidFactory.builder("NitrogenDioxide") .withLocalizedName("Nitrogen Dioxide") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.NitrogenDioxide) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.NitrogenDioxide, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Steam") + GTFluidFactory.builder("Steam") .withLocalizedName("Steam") .withStateAndTemperature(GAS, 375) .buildAndRegister() .configureMaterials(Materials.Water) - .registerBContainers(GT_ModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1)); + .registerBContainers(GTModHandler.getIC2Item("steamCell", 1), Materials.Empty.getCells(1)); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(Materials.Empty.getCells(1)) - .itemOutputs(GT_ModHandler.getIC2Item("steamCell", 1)) - .fluidInputs(GT_ModHandler.getSteam(1000)) + .itemOutputs(GTModHandler.getIC2Item("steamCell", 1)) + .fluidInputs(GTModHandler.getSteam(1000)) .duration(16 * TICKS) .eut(1) .addTo(fluidCannerRecipes); @@ -862,23 +859,23 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { Materials.Water.mGas.setTemperature(375) .setGaseous(true); - ItemList.sOilExtraHeavy = GT_FluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295); - ItemList.sEpichlorhydrin = GT_FluidFactory.builder("liquid_epichlorhydrin") + ItemList.sOilExtraHeavy = GTFluidFactory.of("liquid_extra_heavy_oil", "Very Heavy Oil", LIQUID, 295); + ItemList.sEpichlorhydrin = GTFluidFactory.builder("liquid_epichlorhydrin") .withLocalizedName("Epichlorohydrin") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Epichlorohydrin) .registerBContainers(Materials.Epichlorohydrin.getCells(1), Materials.Empty.getCells(1)) .asFluid(); - ItemList.sDrillingFluid = GT_FluidFactory.of("liquid_drillingfluid", "Drilling Fluid", LIQUID, 295); - ItemList.sToluene = GT_FluidFactory.builder("liquid_toluene") + ItemList.sDrillingFluid = GTFluidFactory.of("liquid_drillingfluid", "Drilling Fluid", LIQUID, 295); + ItemList.sToluene = GTFluidFactory.builder("liquid_toluene") .withLocalizedName("Toluene") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Toluene) .registerBContainers(Materials.Toluene.getCells(1), Materials.Empty.getCells(1)) .asFluid(); - ItemList.sNitrationMixture = GT_FluidFactory.builder("liquid_nitrationmixture") + ItemList.sNitrationMixture = GTFluidFactory.builder("liquid_nitrationmixture") .withLocalizedName("Nitration Mixture") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() @@ -886,120 +883,120 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .registerBContainers(Materials.NitrationMixture.getCells(1), Materials.Empty.getCells(1)) .asFluid(); - GT_FluidFactory.builder("liquid_heavy_oil") + GTFluidFactory.builder("liquid_heavy_oil") .withLocalizedName("Heavy Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.OilHeavy) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.OilHeavy, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_medium_oil") + GTFluidFactory.builder("liquid_medium_oil") .withLocalizedName("Raw Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.OilMedium) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.OilMedium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_light_oil") + GTFluidFactory.builder("liquid_light_oil") .withLocalizedName("Light Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.OilLight) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.OilLight, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("gas_natural_gas") + GTFluidFactory.builder("gas_natural_gas") .withLocalizedName("Natural Gas") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.NatruralGas) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.NatruralGas, 1L), ItemList.Cell_Empty.get(1L)); - ItemList.sHydricSulfur = GT_FluidFactory.builder("liquid_hydricsulfur") + ItemList.sHydricSulfur = GTFluidFactory.builder("liquid_hydricsulfur") .withLocalizedName("Hydrogen Sulfide") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.HydricSulfide) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.HydricSulfide, 1L), ItemList.Cell_Empty.get(1L)) .asFluid(); - GT_FluidFactory.builder("gas_sulfuricgas") + GTFluidFactory.builder("gas_sulfuricgas") .withLocalizedName("Sulfuric Gas") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.SulfuricGas) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricGas, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("gas_gas") + GTFluidFactory.builder("gas_gas") .withLocalizedName("Refinery Gas") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Gas) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Gas, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sulfuricnaphtha") + GTFluidFactory.builder("liquid_sulfuricnaphtha") .withLocalizedName("Sulfuric Naphtha") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.SulfuricNaphtha) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricNaphtha, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sufluriclight_fuel") + GTFluidFactory.builder("liquid_sufluriclight_fuel") .withLocalizedName("Sulfuric Light Fuel") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.SulfuricLightFuel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricLightFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sulfuricheavy_fuel") + GTFluidFactory.builder("liquid_sulfuricheavy_fuel") .withLocalizedName("Sulfuric Heavy Fuel") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.SulfuricHeavyFuel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricHeavyFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_naphtha") + GTFluidFactory.builder("liquid_naphtha") .withLocalizedName("Naphtha") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Naphtha) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Naphtha, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_light_fuel") + GTFluidFactory.builder("liquid_light_fuel") .withLocalizedName("Light Fuel") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.LightFuel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.LightFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_heavy_fuel") + GTFluidFactory.builder("liquid_heavy_fuel") .withLocalizedName("Heavy Fuel") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.HeavyFuel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.HeavyFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("liquid_lpg") + GTFluidFactory.builder("liquid_lpg") .withLocalizedName("LPG") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.LPG) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.LPG, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("charcoal_byproducts") + GTFluidFactory.builder("charcoal_byproducts") .withTextureName("molten.autogenerated") .withLocalizedName("Charcoal Byproducts") .withColorRGBA(Materials.CharcoalByproducts.mRGBa) @@ -1007,9 +1004,9 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .buildAndRegister() .configureMaterials(Materials.CharcoalByproducts) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.CharcoalByproducts, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("molten.bisphenol_a") + GTFluidFactory.builder("molten.bisphenol_a") .withTextureName("molten.autogenerated") .withLocalizedName("Molten Bisphenol A") .withColorRGBA(Materials.BisphenolA.mRGBa) @@ -1017,299 +1014,299 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .buildAndRegister() .configureMaterials(Materials.BisphenolA) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.BisphenolA, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("UUAmplifier") + GTFluidFactory.builder("UUAmplifier") .withLocalizedName("UU Amplifier") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.UUAmplifier) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.UUAmplifier, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Chlorine") + GTFluidFactory.builder("Chlorine") .withLocalizedName("Chlorine") .withStateAndTemperature(GAS, 295) .buildAndRegister() .configureMaterials(Materials.Chlorine) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Chlorine, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Mercury") + GTFluidFactory.builder("Mercury") .withLocalizedName("Mercury") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Mercury) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Mercury, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("NitroFuel") + GTFluidFactory.builder("NitroFuel") .withLocalizedName("Cetane-Boosted Diesel") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.NitroFuel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.NitroFuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("SodiumPersulfate") + GTFluidFactory.builder("SodiumPersulfate") .withLocalizedName("Sodium Persulfate") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.SodiumPersulfate) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SodiumPersulfate, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("Glyceryl") + GTFluidFactory.builder("Glyceryl") .withLocalizedName("Glyceryl Trinitrate") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Glyceryl) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Glyceryl, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("lubricant") + GTFluidFactory.builder("lubricant") .withLocalizedName("Lubricant") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Lubricant) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Lubricant, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("creosote") + GTFluidFactory.builder("creosote") .withLocalizedName("Creosote Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Creosote) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Creosote, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("seedoil") + GTFluidFactory.builder("seedoil") .withLocalizedName("Seed Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.SeedOil) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SeedOil, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fishoil") + GTFluidFactory.builder("fishoil") .withLocalizedName("Fish Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.FishOil) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.FishOil, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("oil") + GTFluidFactory.builder("oil") .withLocalizedName("Oil") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Oil) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oil, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fuel") + GTFluidFactory.builder("fuel") .withLocalizedName("Diesel") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Fuel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Fuel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("for.honey") + GTFluidFactory.builder("for.honey") .withLocalizedName("Honey") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Honey) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Honey, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("biomass") + GTFluidFactory.builder("biomass") .withLocalizedName("Biomass") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Biomass) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Biomass, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("bioethanol") + GTFluidFactory.builder("bioethanol") .withLocalizedName("Bio Ethanol") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Ethanol) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Ethanol, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("sulfuricacid") + GTFluidFactory.builder("sulfuricacid") .withLocalizedName("Sulfuric Acid") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.SulfuricAcid) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.SulfuricAcid, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("milk") + GTFluidFactory.builder("milk") .withLocalizedName("Milk") .withStateAndTemperature(LIQUID, 290) .buildAndRegister() .configureMaterials(Materials.Milk) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Milk, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("mcguffium") + GTFluidFactory.builder("mcguffium") .withLocalizedName("Mc Guffium 239") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.McGuffium239) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.McGuffium239, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("refinedGlue") + GTFluidFactory.builder("refinedGlue") .withLocalizedName("Refined Glue") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Glue) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Glue, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("hotfryingoil") + GTFluidFactory.builder("hotfryingoil") .withLocalizedName("Hot Frying Oil") .withStateAndTemperature(LIQUID, 400) .buildAndRegister() .configureMaterials(Materials.FryingOilHot) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.FryingOilHot, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("DimensionallyTranscendentResidue") + GTFluidFactory.builder("DimensionallyTranscendentResidue") .withLocalizedName("Dimensionally Transcendent Residue") .withStateAndTemperature(LIQUID, 2000000000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.DimensionallyTranscendentResidue) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.DimensionallyTranscendentResidue, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.DimensionallyTranscendentResidue, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTCC") + GTFluidFactory.builder("ExcitedDTCC") .withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.ExcitedDTCC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTCC, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTCC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTPC") + GTFluidFactory.builder("ExcitedDTPC") .withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.ExcitedDTPC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTPC, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTPC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTRC") + GTFluidFactory.builder("ExcitedDTRC") .withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.ExcitedDTRC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTRC, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTRC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTEC") + GTFluidFactory.builder("ExcitedDTEC") .withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.ExcitedDTEC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTEC, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTEC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("ExcitedDTSC") + GTFluidFactory.builder("ExcitedDTSC") .withLocalizedName("Excited Dimensionally Transcendent Stellar Catalyst") .withStateAndTemperature(LIQUID, 500000000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.ExcitedDTSC) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTSC, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTSC, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(MaterialsUEVplus.RawStarMatter.mName) + GTFluidFactory.builder(MaterialsUEVplus.RawStarMatter.mName) .withLocalizedName(MaterialsUEVplus.RawStarMatter.mLocalizedName) .withStateAndTemperature(LIQUID, 10_000_000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.RawStarMatter) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.RawStarMatter, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.RawStarMatter, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(MaterialsUEVplus.Space.mName) + GTFluidFactory.builder(MaterialsUEVplus.Space.mName) .withLocalizedName(MaterialsUEVplus.Space.mLocalizedName) .withStateAndTemperature(MOLTEN, 0) .buildAndRegister() .configureMaterials(MaterialsUEVplus.Space) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Space, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Space, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder(MaterialsUEVplus.Time.mName) + GTFluidFactory.builder(MaterialsUEVplus.Time.mName) .withLocalizedName(MaterialsUEVplus.Time.mLocalizedName) .withStateAndTemperature(MOLTEN, 0) .buildAndRegister() .configureMaterials(MaterialsUEVplus.Time) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("PrimordialMatter") + GTFluidFactory.builder("PrimordialMatter") .withLocalizedName(MaterialsUEVplus.PrimordialMatter.mLocalizedName) .withStateAndTemperature(LIQUID, 2_000_000_000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.PrimordialMatter) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PrimordialMatter, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PrimordialMatter, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("QuarkGluonPlasma") + GTFluidFactory.builder("QuarkGluonPlasma") .withLocalizedName(MaterialsUEVplus.QuarkGluonPlasma.mLocalizedName) .withStateAndTemperature(LIQUID, 2_000_000_000) .buildAndRegister() .configureMaterials(MaterialsUEVplus.QuarkGluonPlasma) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.QuarkGluonPlasma, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.QuarkGluonPlasma, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("PhononMedium") + GTFluidFactory.builder("PhononMedium") .withLocalizedName(MaterialsUEVplus.PhononMedium.mLocalizedName) .withStateAndTemperature(LIQUID, 500) .buildAndRegister() .configureMaterials(MaterialsUEVplus.PhononMedium) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononMedium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononMedium, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("PhononCrystalSolution") + GTFluidFactory.builder("PhononCrystalSolution") .withLocalizedName(MaterialsUEVplus.PhononCrystalSolution.mLocalizedName) .withStateAndTemperature(LIQUID, 500) .buildAndRegister() .configureMaterials(MaterialsUEVplus.PhononCrystalSolution) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononCrystalSolution, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.PhononCrystalSolution, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("fieryblood") + GTFluidFactory.builder("fieryblood") .withLocalizedName("Fiery Blood") .withStateAndTemperature(LIQUID, 6400) .buildAndRegister() .configureMaterials(Materials.FierySteel) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.FierySteel, 1L), ItemList.Cell_Empty.get(1L)); - GT_FluidFactory.builder("holywater") + GTFluidFactory.builder("holywater") .withLocalizedName("Holy Water") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.HolyWater) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.HolyWater, 1L), ItemList.Cell_Empty.get(1L)); if (ItemList.TF_Vial_FieryBlood.get(1L) != null) { FluidContainerRegistry.registerFluidContainer( @@ -1322,8 +1319,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { FluidContainerRegistry.registerFluidContainer( new FluidContainerRegistry.FluidContainerData( Materials.Milk.getFluid(1000L), - GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Milk, 1L), - GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L))); + GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Milk, 1L), + GTOreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L))); FluidContainerRegistry.registerFluidContainer( new FluidContainerRegistry.FluidContainerData( Materials.Milk.getFluid(250L), @@ -1350,12 +1347,12 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.Tool_Lighter_Platinum_Full.get(1L), ItemList.Tool_Lighter_Platinum_Empty.get(1L))); - Dyes.dyeBlack.addFluidDye(GT_FluidFactory.of("squidink", "Squid Ink", LIQUID, 295)); - Dyes.dyeBlue.addFluidDye(GT_FluidFactory.of("indigo", "Indigo Dye", LIQUID, 295)); + Dyes.dyeBlack.addFluidDye(GTFluidFactory.of("squidink", "Squid Ink", LIQUID, 295)); + Dyes.dyeBlue.addFluidDye(GTFluidFactory.of("indigo", "Indigo Dye", LIQUID, 295)); for (byte i = 0; i < Dyes.VALUES.length; i = (byte) (i + 1)) { Dyes tDye = Dyes.VALUES[i]; tDye.addFluidDye( - GT_FluidFactory.builder( + GTFluidFactory.builder( "dye.watermixed." + tDye.name() .toLowerCase(Locale.ENGLISH)) .withTextureName("dyes") @@ -1365,7 +1362,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .buildAndRegister() .asFluid()); tDye.addFluidDye( - GT_FluidFactory.builder( + GTFluidFactory.builder( "dye.chemical." + tDye.name() .toLowerCase(Locale.ENGLISH)) .withTextureName("dyes") @@ -1376,611 +1373,611 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { .registerContainers(ItemList.SPRAY_CAN_DYES[i].get(1L), ItemList.Spray_Empty.get(1L), 2304) .asFluid()); } - GT_FluidFactory.builder("ice") + GTFluidFactory.builder("ice") .withLocalizedName("Crushed Ice") .withStateAndTemperature(SLURRY, 270) .buildAndRegister() .configureMaterials(Materials.Ice) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Ice, 1L), ItemList.Cell_Empty.get(1L)); Materials.Water.mSolid = Materials.Ice.mSolid; - GT_FluidFactory.builder("molten.glass") + GTFluidFactory.builder("molten.glass") .withLocalizedName("Molten Glass") .withStateAndTemperature(MOLTEN, 1500) .buildAndRegister() .configureMaterials(Materials.Glass) .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L), + GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Glass, 1L), ItemList.Cell_Empty.get(1L), 144); - GT_FluidFactory.builder("molten.redstone") + GTFluidFactory.builder("molten.redstone") .withLocalizedName("Molten Redstone") .withStateAndTemperature(MOLTEN, 500) .buildAndRegister() .configureMaterials(Materials.Redstone) .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L), + GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Redstone, 1L), ItemList.Cell_Empty.get(1L), 144); - GT_FluidFactory.builder("molten.blaze") + GTFluidFactory.builder("molten.blaze") .withLocalizedName("Molten Blaze") .withStateAndTemperature(MOLTEN, 6400) .buildAndRegister() .configureMaterials(Materials.Blaze) .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L), + GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Blaze, 1L), ItemList.Cell_Empty.get(1L), 144); - GT_FluidFactory.builder("wet.concrete") + GTFluidFactory.builder("wet.concrete") .withLocalizedName("Wet Concrete") .withStateAndTemperature(MOLTEN, 300) .buildAndRegister() .configureMaterials(Materials.Concrete) .registerContainers( - GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L), + GTOreDictUnificator.get(OrePrefixes.cellMolten, Materials.Concrete, 1L), ItemList.Cell_Empty.get(1L), 144); for (Materials tMaterial : Materials.values()) { if ((tMaterial.mStandardMoltenFluid == null) && (tMaterial.contains(SubTag.SMELTING_TO_FLUID)) && (!tMaterial.contains(SubTag.NO_SMELTING))) { - GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial); + GTMod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial); if ((tMaterial.mSmeltInto != tMaterial) && (tMaterial.mSmeltInto.mStandardMoltenFluid == null)) { - GT_Mod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto); + GTMod.gregtechproxy.addAutogeneratedMoltenFluid(tMaterial.mSmeltInto); } } if (tMaterial.mElement != null) { - GT_Mod.gregtechproxy.addAutogeneratedPlasmaFluid(tMaterial); + GTMod.gregtechproxy.addAutogeneratedPlasmaFluid(tMaterial); } if (tMaterial.hasCorrespondingFluid()) { - GT_Mod.gregtechproxy.addAutoGeneratedCorrespondingFluid(tMaterial); + GTMod.gregtechproxy.addAutoGeneratedCorrespondingFluid(tMaterial); } if (tMaterial.hasCorrespondingGas()) { - GT_Mod.gregtechproxy.addAutoGeneratedCorrespondingGas(tMaterial); + GTMod.gregtechproxy.addAutoGeneratedCorrespondingGas(tMaterial); } if (tMaterial.canBeCracked()) { - GT_Mod.gregtechproxy.addAutoGeneratedHydroCrackedFluids(tMaterial); - GT_Mod.gregtechproxy.addAutoGeneratedSteamCrackedFluids(tMaterial); + GTMod.gregtechproxy.addAutoGeneratedHydroCrackedFluids(tMaterial); + GTMod.gregtechproxy.addAutoGeneratedSteamCrackedFluids(tMaterial); } } - GT_FluidFactory.builder("potion.awkward") + GTFluidFactory.builder("potion.awkward") .withLocalizedName("Awkward Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.thick") + GTFluidFactory.builder("potion.thick") .withLocalizedName("Thick Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 32), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.mundane") + GTFluidFactory.builder("potion.mundane") .withLocalizedName("Mundane Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 64), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage") + GTFluidFactory.builder("potion.damage") .withLocalizedName("Harming Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8204), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.strong") + GTFluidFactory.builder("potion.damage.strong") .withLocalizedName("Strong Harming Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8236), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.splash") + GTFluidFactory.builder("potion.damage.splash") .withLocalizedName("Splash Harming Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16396), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.damage.strong.splash") + GTFluidFactory.builder("potion.damage.strong.splash") .withLocalizedName("Strong Splash Harming Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16428), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health") + GTFluidFactory.builder("potion.health") .withLocalizedName("Healing Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8197), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.strong") + GTFluidFactory.builder("potion.health.strong") .withLocalizedName("Strong Healing Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8229), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.splash") + GTFluidFactory.builder("potion.health.splash") .withLocalizedName("Splash Healing Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16389), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.health.strong.splash") + GTFluidFactory.builder("potion.health.strong.splash") .withLocalizedName("Strong Splash Healing Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16421), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed") + GTFluidFactory.builder("potion.speed") .withLocalizedName("Swiftness Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8194), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.strong") + GTFluidFactory.builder("potion.speed.strong") .withLocalizedName("Strong Swiftness Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8226), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.long") + GTFluidFactory.builder("potion.speed.long") .withLocalizedName("Stretched Swiftness Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8258), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.splash") + GTFluidFactory.builder("potion.speed.splash") .withLocalizedName("Splash Swiftness Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16386), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.strong.splash") + GTFluidFactory.builder("potion.speed.strong.splash") .withLocalizedName("Strong Splash Swiftness Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16418), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.speed.long.splash") + GTFluidFactory.builder("potion.speed.long.splash") .withLocalizedName("Stretched Splash Swiftness Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16450), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength") + GTFluidFactory.builder("potion.strength") .withLocalizedName("Strength Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8201), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.strong") + GTFluidFactory.builder("potion.strength.strong") .withLocalizedName("Strong Strength Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8233), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.long") + GTFluidFactory.builder("potion.strength.long") .withLocalizedName("Stretched Strength Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8265), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.splash") + GTFluidFactory.builder("potion.strength.splash") .withLocalizedName("Splash Strength Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16393), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.strong.splash") + GTFluidFactory.builder("potion.strength.strong.splash") .withLocalizedName("Strong Splash Strength Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16425), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.strength.long.splash") + GTFluidFactory.builder("potion.strength.long.splash") .withLocalizedName("Stretched Splash Strength Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16457), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen") + GTFluidFactory.builder("potion.regen") .withLocalizedName("Regenerating Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8193), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.strong") + GTFluidFactory.builder("potion.regen.strong") .withLocalizedName("Strong Regenerating Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8225), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.long") + GTFluidFactory.builder("potion.regen.long") .withLocalizedName("Stretched Regenerating Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8257), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.splash") + GTFluidFactory.builder("potion.regen.splash") .withLocalizedName("Splash Regenerating Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16385), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.strong.splash") + GTFluidFactory.builder("potion.regen.strong.splash") .withLocalizedName("Strong Splash Regenerating Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16417), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.regen.long.splash") + GTFluidFactory.builder("potion.regen.long.splash") .withLocalizedName("Stretched Splash Regenerating Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16449), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison") + GTFluidFactory.builder("potion.poison") .withLocalizedName("Poisonous Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8196), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.strong") + GTFluidFactory.builder("potion.poison.strong") .withLocalizedName("Strong Poisonous Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8228), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.long") + GTFluidFactory.builder("potion.poison.long") .withLocalizedName("Stretched Poisonous Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8260), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.splash") + GTFluidFactory.builder("potion.poison.splash") .withLocalizedName("Splash Poisonous Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16388), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.strong.splash") + GTFluidFactory.builder("potion.poison.strong.splash") .withLocalizedName("Strong Splash Poisonous Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16420), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.poison.long.splash") + GTFluidFactory.builder("potion.poison.long.splash") .withLocalizedName("Stretched Splash Poisonous Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16452), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance") + GTFluidFactory.builder("potion.fireresistance") .withLocalizedName("Fire Resistant Brew") .withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8195), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.long") + GTFluidFactory.builder("potion.fireresistance.long") .withLocalizedName("Stretched Fire Resistant Brew") .withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8259), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.splash") + GTFluidFactory.builder("potion.fireresistance.splash") .withLocalizedName("Splash Fire Resistant Brew") .withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16387), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.fireresistance.long.splash") + GTFluidFactory.builder("potion.fireresistance.long.splash") .withLocalizedName("Stretched Splash Fire Resistant Brew") .withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16451), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision") + GTFluidFactory.builder("potion.nightvision") .withLocalizedName("Night Vision Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8198), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.long") + GTFluidFactory.builder("potion.nightvision.long") .withLocalizedName("Stretched Night Vision Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8262), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.splash") + GTFluidFactory.builder("potion.nightvision.splash") .withLocalizedName("Splash Night Vision Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16390), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.nightvision.long.splash") + GTFluidFactory.builder("potion.nightvision.long.splash") .withLocalizedName("Stretched Splash Night Vision Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16454), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness") + GTFluidFactory.builder("potion.weakness") .withLocalizedName("Weakening Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8200), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.long") + GTFluidFactory.builder("potion.weakness.long") .withLocalizedName("Stretched Weakening Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8264), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.splash") + GTFluidFactory.builder("potion.weakness.splash") .withLocalizedName("Splash Weakening Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16392), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.weakness.long.splash") + GTFluidFactory.builder("potion.weakness.long.splash") .withLocalizedName("Stretched Splash Weakening Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16456), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness") + GTFluidFactory.builder("potion.slowness") .withLocalizedName("Lame Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8202), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.long") + GTFluidFactory.builder("potion.slowness.long") .withLocalizedName("Stretched Lame Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8266), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.splash") + GTFluidFactory.builder("potion.slowness.splash") .withLocalizedName("Splash Lame Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16394), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.slowness.long.splash") + GTFluidFactory.builder("potion.slowness.long.splash") .withLocalizedName("Stretched Splash Lame Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16458), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing") + GTFluidFactory.builder("potion.waterbreathing") .withLocalizedName("Fishy Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8205), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.long") + GTFluidFactory.builder("potion.waterbreathing.long") .withLocalizedName("Stretched Fishy Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8269), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.splash") + GTFluidFactory.builder("potion.waterbreathing.splash") .withLocalizedName("Splash Fishy Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16397), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.waterbreathing.long.splash") + GTFluidFactory.builder("potion.waterbreathing.long.splash") .withLocalizedName("Stretched Splash Fishy Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16461), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility") + GTFluidFactory.builder("potion.invisibility") .withLocalizedName("Invisible Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8206), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.long") + GTFluidFactory.builder("potion.invisibility.long") .withLocalizedName("Stretched Invisible Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 8270), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.splash") + GTFluidFactory.builder("potion.invisibility.splash") .withLocalizedName("Splash Invisible Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16398), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.invisibility.long.splash") + GTFluidFactory.builder("potion.invisibility.long.splash") .withLocalizedName("Stretched Splash Invisible Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(new ItemStack(Items.potionitem, 1, 16462), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.purpledrink") + GTFluidFactory.builder("potion.purpledrink") .withLocalizedName("Purple Drink") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Purple_Drink.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.grapejuice") + GTFluidFactory.builder("potion.grapejuice") .withLocalizedName("Grape Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Grape_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wine") + GTFluidFactory.builder("potion.wine") .withLocalizedName("Wine") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Wine.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.vinegar") + GTFluidFactory.builder("potion.vinegar") .withLocalizedName("Vinegar") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .configureMaterials(Materials.Vinegar) .registerPContainers(ItemList.Bottle_Vinegar.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.potatojuice") + GTFluidFactory.builder("potion.potatojuice") .withLocalizedName("Potato Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Potato_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.vodka") + GTFluidFactory.builder("potion.vodka") .withLocalizedName("Vodka") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Vodka.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.leninade") + GTFluidFactory.builder("potion.leninade") .withLocalizedName("Leninade") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Leninade.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.mineralwater") + GTFluidFactory.builder("potion.mineralwater") .withLocalizedName("Mineral Water") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Mineral_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.saltywater") + GTFluidFactory.builder("potion.saltywater") .withLocalizedName("Salty Water") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Salty_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.reedwater") + GTFluidFactory.builder("potion.reedwater") .withLocalizedName("Reed Water") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Reed_Water.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.rum") + GTFluidFactory.builder("potion.rum") .withLocalizedName("Rum") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Rum.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.piratebrew") + GTFluidFactory.builder("potion.piratebrew") .withLocalizedName("Pirate Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Pirate_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.hopsjuice") + GTFluidFactory.builder("potion.hopsjuice") .withLocalizedName("Hops Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkbeer") + GTFluidFactory.builder("potion.darkbeer") .withLocalizedName("Dark Beer") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Dark_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.dragonblood") + GTFluidFactory.builder("potion.dragonblood") .withLocalizedName("Dragon Blood") .withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(ItemList.Bottle_Dragon_Blood.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wheatyjuice") + GTFluidFactory.builder("potion.wheatyjuice") .withLocalizedName("Wheaty Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Wheaty_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.scotch") + GTFluidFactory.builder("potion.scotch") .withLocalizedName("Scotch") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Scotch.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.glenmckenner") + GTFluidFactory.builder("potion.glenmckenner") .withLocalizedName("Glen McKenner") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Glen_McKenner.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.wheatyhopsjuice") + GTFluidFactory.builder("potion.wheatyhopsjuice") .withLocalizedName("Wheaty Hops Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Wheaty_Hops_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.beer") + GTFluidFactory.builder("potion.beer") .withLocalizedName("Beer") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Beer.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.chillysauce") + GTFluidFactory.builder("potion.chillysauce") .withLocalizedName("Chilly Sauce") .withStateAndTemperature(LIQUID, 375) .buildAndRegister() .registerPContainers(ItemList.Bottle_Chilly_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.hotsauce") + GTFluidFactory.builder("potion.hotsauce") .withLocalizedName("Hot Sauce") .withStateAndTemperature(LIQUID, 380) .buildAndRegister() .registerPContainers(ItemList.Bottle_Hot_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diabolosauce") + GTFluidFactory.builder("potion.diabolosauce") .withLocalizedName("Diabolo Sauce") .withStateAndTemperature(LIQUID, 385) .buildAndRegister() .registerPContainers(ItemList.Bottle_Diabolo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diablosauce") + GTFluidFactory.builder("potion.diablosauce") .withLocalizedName("Diablo Sauce") .withStateAndTemperature(LIQUID, 390) .buildAndRegister() .registerPContainers(ItemList.Bottle_Diablo_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.diablosauce.strong") + GTFluidFactory.builder("potion.diablosauce.strong") .withLocalizedName("Old Man Snitches glitched Diablo Sauce") .withStateAndTemperature(LIQUID, 999) .buildAndRegister() .registerPContainers(ItemList.Bottle_Snitches_Glitch_Sauce.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.applejuice") + GTFluidFactory.builder("potion.applejuice") .withLocalizedName("Apple Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.cider") + GTFluidFactory.builder("potion.cider") .withLocalizedName("Cider") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.goldenapplejuice") + GTFluidFactory.builder("potion.goldenapplejuice") .withLocalizedName("Golden Apple Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Golden_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.goldencider") + GTFluidFactory.builder("potion.goldencider") .withLocalizedName("Golden Cider") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Golden_Cider.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.idunsapplejuice") + GTFluidFactory.builder("potion.idunsapplejuice") .withLocalizedName("Idun's Apple Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Iduns_Apple_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.notchesbrew") + GTFluidFactory.builder("potion.notchesbrew") .withLocalizedName("Notches Brew") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Notches_Brew.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.lemonjuice") + GTFluidFactory.builder("potion.lemonjuice") .withLocalizedName("Lemon Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Lemon_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.limoncello") + GTFluidFactory.builder("potion.limoncello") .withLocalizedName("Limoncello") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Limoncello.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.lemonade") + GTFluidFactory.builder("potion.lemonade") .withLocalizedName("Lemonade") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Lemonade.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.alcopops") + GTFluidFactory.builder("potion.alcopops") .withLocalizedName("Alcopops") .withStateAndTemperature(LIQUID, 275) .buildAndRegister() .registerPContainers(ItemList.Bottle_Alcopops.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.cavejohnsonsgrenadejuice") + GTFluidFactory.builder("potion.cavejohnsonsgrenadejuice") .withLocalizedName("Cave Johnsons Grenade Juice") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.Bottle_Cave_Johnsons_Grenade_Juice.get(1L), ItemList.Bottle_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkcoffee") + GTFluidFactory.builder("potion.darkcoffee") .withLocalizedName("Dark Coffee") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Dark_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkcafeaulait") + GTFluidFactory.builder("potion.darkcafeaulait") .withLocalizedName("Dark Cafe au lait") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Dark_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.coffee") + GTFluidFactory.builder("potion.coffee") .withLocalizedName("Coffee") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Coffee.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.cafeaulait") + GTFluidFactory.builder("potion.cafeaulait") .withLocalizedName("Cafe au lait") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Cafe_au_lait.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.laitaucafe") + GTFluidFactory.builder("potion.laitaucafe") .withLocalizedName("Lait au cafe") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Lait_au_cafe.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.darkchocolatemilk") + GTFluidFactory.builder("potion.darkchocolatemilk") .withLocalizedName("Bitter Chocolate Milk") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Dark_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.chocolatemilk") + GTFluidFactory.builder("potion.chocolatemilk") .withLocalizedName("Chocolate Milk") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Chocolate_Milk.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.tea") + GTFluidFactory.builder("potion.tea") .withLocalizedName("Tea") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.sweettea") + GTFluidFactory.builder("potion.sweettea") .withLocalizedName("Sweet Tea") .withStateAndTemperature(LIQUID, 295) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Sweet_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("potion.icetea") + GTFluidFactory.builder("potion.icetea") .withLocalizedName("Ice Tea") .withStateAndTemperature(LIQUID, 255) .buildAndRegister() .registerPContainers(ItemList.ThermosCan_Ice_Tea.get(1L), ItemList.ThermosCan_Empty.get(1L)); - GT_FluidFactory.builder("liquid_sodium") + GTFluidFactory.builder("liquid_sodium") .withLocalizedName("Liquid Sodium") .withStateAndTemperature(LIQUID, 495) .buildAndRegister() .configureMaterials(Materials.Sodium) .registerBContainers( - GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L), + GTOreDictUnificator.get(OrePrefixes.cell, Materials.Sodium, 1L), ItemList.Cell_Empty.get(1L)); FluidContainerRegistry.registerFluidContainer( @@ -1989,139 +1986,136 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { ItemList.IC2_Spray_WeedEx.get(1L), ItemList.Spray_Empty.get(1L))); - if (!GT_Values.D1) { + if (!GTValues.D1) { try { Class.forName("codechicken.nei.api.API"); - GT_Log.out.println("GT_Mod: Hiding certain Items from NEI."); + GTLog.out.println("GTMod: Hiding certain Items from NEI."); API.hideItem(ItemList.Display_Fluid.getWildcard(1L)); } catch (Throwable e) { - if (GT_Values.D1) { - e.printStackTrace(GT_Log.err); + if (GTValues.D1) { + e.printStackTrace(GTLog.err); } } } - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.cobblestone, 1, WILDCARD)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.gravel, 1, WILDCARD)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new ItemStack(Items.flint, 1)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new ItemStack(Items.flint, 1)) .outputChances(10000, 1000) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.furnace, 1, WILDCARD)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.lit_furnace, 1, WILDCARD)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) + .itemOutputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L)) .duration(20 * SECONDS) .eut(2) .addTo(maceratorRecipes); - GT_OreDictUnificator.set( + GTOreDictUnificator.set( OrePrefixes.ingot, Materials.FierySteel, - GT_ModHandler.getModItem(TwilightForest.ID, "item.fieryIngot", 1L, 0)); - GT_OreDictUnificator.set( + GTModHandler.getModItem(TwilightForest.ID, "item.fieryIngot", 1L, 0)); + GTOreDictUnificator.set( OrePrefixes.ingot, Materials.Knightmetal, - GT_ModHandler.getModItem(TwilightForest.ID, "item.knightMetal", 1L, 0)); - GT_OreDictUnificator.set( + GTModHandler.getModItem(TwilightForest.ID, "item.knightMetal", 1L, 0)); + GTOreDictUnificator.set( OrePrefixes.ingot, Materials.Steeleaf, - GT_ModHandler.getModItem(TwilightForest.ID, "item.steeleafIngot", 1L, 0)); - GT_OreDictUnificator.set( + GTModHandler.getModItem(TwilightForest.ID, "item.steeleafIngot", 1L, 0)); + GTOreDictUnificator.set( OrePrefixes.ingot, Materials.IronWood, - GT_ModHandler.getModItem(TwilightForest.ID, "item.ironwoodIngot", 1L, 0)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.InfusedAir, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 0)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.InfusedFire, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 1)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.InfusedWater, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 2)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.InfusedEarth, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 3)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.InfusedOrder, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 4)); - GT_OreDictUnificator.set( - OrePrefixes.gem, - Materials.InfusedEntropy, - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 5)); - GT_OreDictUnificator - .set(OrePrefixes.nugget, Materials.Mercury, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 5)); - GT_OreDictUnificator - .set(OrePrefixes.nugget, Materials.Thaumium, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 6)); - GT_OreDictUnificator - .set(OrePrefixes.ingot, Materials.Thaumium, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 2)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.Mercury, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 3)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.Amber, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 6)); - GT_OreDictUnificator - .set(OrePrefixes.gem, Materials.Firestone, GT_ModHandler.getModItem(Railcraft.ID, "firestone.raw", 1L)); - - GT_OreDictUnificator - .set(OrePrefixes.nugget, Materials.Void, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 7)); - GT_OreDictUnificator - .set(OrePrefixes.ingot, Materials.Void, GT_ModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16)); - - GT_OreDictUnificator.set( + GTModHandler.getModItem(TwilightForest.ID, "item.ironwoodIngot", 1L, 0)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedAir, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 0)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedFire, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 1)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedWater, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 2)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedEarth, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 3)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedOrder, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 4)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.InfusedEntropy, GTModHandler.getModItem(Thaumcraft.ID, "ItemShard", 1L, 5)); + GTOreDictUnificator + .set(OrePrefixes.nugget, Materials.Mercury, GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 5)); + GTOreDictUnificator + .set(OrePrefixes.nugget, Materials.Thaumium, GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 6)); + GTOreDictUnificator + .set(OrePrefixes.ingot, Materials.Thaumium, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 2)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.Mercury, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 3)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.Amber, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 6)); + GTOreDictUnificator + .set(OrePrefixes.gem, Materials.Firestone, GTModHandler.getModItem(Railcraft.ID, "firestone.raw", 1L)); + + GTOreDictUnificator + .set(OrePrefixes.nugget, Materials.Void, GTModHandler.getModItem(Thaumcraft.ID, "ItemNugget", 1L, 7)); + GTOreDictUnificator + .set(OrePrefixes.ingot, Materials.Void, GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 16)); + + GTOreDictUnificator.set( OrePrefixes.plate, Materials.Iron, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0), + GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 0), false, false); - GT_OreDictUnificator.set( + GTOreDictUnificator.set( OrePrefixes.plate, Materials.Steel, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1), + GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 1), false, false); - GT_OreDictUnificator.set( + GTOreDictUnificator.set( OrePrefixes.plate, Materials.TinAlloy, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2), + GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 2), false, false); - GT_OreDictUnificator.set( + GTOreDictUnificator.set( OrePrefixes.plate, Materials.Copper, - GT_ModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3), + GTModHandler.getModItem(Railcraft.ID, "part.plate", 1L, 3), false, false); - GT_OreDictUnificator.set( + GTOreDictUnificator.set( OrePrefixes.dust, Materials.Cocoa, - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "cocoapowderItem", 1L, 0)); - GT_OreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L)); + GTModHandler.getModItem(PamsHarvestCraft.ID, "cocoapowderItem", 1L, 0)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Coffee, ItemList.IC2_CoffeePowder.get(1L)); - GregTech_API - .registerMachineBlock(GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("reinforcedGlass", 0)), 0); + GregTechAPI.registerMachineBlock(GTUtility.getBlockFromStack(GTModHandler.getIC2Item("reinforcedGlass", 0)), 0); - GregTech_API.sSolenoidCoilCasings = new GT_Cyclotron_Coils(); + GregTechAPI.sSolenoidCoilCasings = new BlockCyclotronCoils(); ItemList.TierdDrone0 - .set(new GT_TierDrone("tierdDrone0", "Drone (Level 1)", "Quadcopter Stable Small Aircraft", 1)); + .set(new ItemTierDrone("tierdDrone0", "Drone (Level 1)", "Quadcopter Stable Small Aircraft", 1)); ItemList.TierdDrone1 - .set(new GT_TierDrone("tierdDrone1", "Drone (Level 2)", "Dual Turbo High-Ejection Medium Aircraft", 2)); + .set(new ItemTierDrone("tierdDrone1", "Drone (Level 2)", "Dual Turbo High-Ejection Medium Aircraft", 2)); ItemList.TierdDrone2 - .set(new GT_TierDrone("tierdDrone2", "Drone (Level 3)", "Single Engine Anti-Gravity Large Aircraft", 3)); + .set(new ItemTierDrone("tierdDrone2", "Drone (Level 3)", "Single Engine Anti-Gravity Large Aircraft", 3)); } } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java index a4d1644b6b..778916fe38 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/LoaderGTItemData.java @@ -17,375 +17,366 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.objects.ItemData; import gregtech.api.objects.MaterialStack; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; -public class GT_Loader_ItemData implements Runnable { +public class LoaderGTItemData implements Runnable { @Override public void run() { - GT_Log.out.println("GT_Mod: Loading Item Data Tags"); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0), + GTLog.out.println("GTMod: Loading Item Data Tags"); + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "item.giantPick", 1L, 0), new ItemData(Materials.Stone, 696729600L, new MaterialStack(Materials.Wood, 464486400L))); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "item.giantSword", 1L, 0), new ItemData(Materials.Stone, 464486400L, new MaterialStack(Materials.Wood, 232243200L))); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "tile.GiantLog", 1L, 32767), new ItemData(Materials.Wood, 232243200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "tile.GiantCobble", 1L, 32767), new ItemData(Materials.Stone, 232243200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "tile.GiantObsidian", 1L, 32767), new ItemData(Materials.Obsidian, 232243200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "item.minotaurAxe", 1L, 0), new ItemData( Materials.Diamond, 14515200L, new MaterialStack(Materials.Wood, OrePrefixes.stick.mMaterialAmount * 2L))); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "item.armorShards", 1L, 0), new ItemData(Materials.Knightmetal, 403200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(TwilightForest.ID, "item.shardCluster", 1L, 0), new ItemData(Materials.Knightmetal, 3628800L)); - GT_OreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), + GTOreDictUnificator.addItemData(ItemList.TF_LiveRoot.get(1L), new ItemData(Materials.LiveRoot, 3628800L)); + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10), new ItemData(Materials.CertusQuartz, 1814400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11), new ItemData(Materials.NetherQuartz, 1814400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 12), new ItemData(Materials.Fluix, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.quartz_block, 1, 32767), new ItemData(Materials.NetherQuartz, 14515200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartz", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzPillar", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(AppliedEnergistics2.ID, "tile.BlockQuartzChiseled", 1L, 32767), new ItemData(Materials.CertusQuartz, 14515200L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Items.wheat, 1, 32767), new ItemData(Materials.Wheat, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.hay_block, 1, 32767), new ItemData(Materials.Wheat, 32659200L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.glowstone, 1, 32767), new ItemData(Materials.Glowstone, 14515200L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.redstone_lamp, 1, 32767), new ItemData( Materials.Glowstone, 14515200L, new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.lit_redstone_lamp, 1, 32767), new ItemData( Materials.Glowstone, 14515200L, new MaterialStack(Materials.Redstone, OrePrefixes.dust.mMaterialAmount * 4L))); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Forestry.ID, "craftingMaterial", 1L, 5), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L)); - GT_OreDictUnificator.removeItemData(new ItemStack(Blocks.clay, 1, 0)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L)); - GT_OreDictUnificator + GTOreDictUnificator.removeItemData(new ItemStack(Blocks.clay, 1, 0)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stained_hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.brick_block, 1, 32767), new ItemData(Materials.Brick, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator + .addItemData(GTModHandler.getIC2Item("Uran238", 1L), new ItemData(Materials.Uranium, 3628800L)); + GTOreDictUnificator + .addItemData(GTModHandler.getIC2Item("Uran235", 1L), new ItemData(Materials.Uranium235, 3628800L)); + GTOreDictUnificator + .addItemData(GTModHandler.getIC2Item("Plutonium", 1L), new ItemData(Materials.Plutonium, 3628800L)); + GTOreDictUnificator + .addItemData(GTModHandler.getIC2Item("smallUran235", 1L), new ItemData(Materials.Uranium235, 403200L)); + GTOreDictUnificator + .addItemData(GTModHandler.getIC2Item("smallPlutonium", 1L), new ItemData(Materials.Plutonium, 403200L)); + GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Iron.get(1L), new ItemData(Materials.Iron, 1814400L)); + GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Gold.get(1L), new ItemData(Materials.Gold, 1814400L)); + GTOreDictUnificator .addItemData(ItemList.IC2_Item_Casing_Bronze.get(1L), new ItemData(Materials.Bronze, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(ItemList.IC2_Item_Casing_Copper.get(1L), new ItemData(Materials.Copper, 1814400L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Tin.get(1L), new ItemData(Materials.Tin, 1814400L)); + GTOreDictUnificator.addItemData(ItemList.IC2_Item_Casing_Lead.get(1L), new ItemData(Materials.Lead, 1814400L)); + GTOreDictUnificator .addItemData(ItemList.IC2_Item_Casing_Steel.get(1L), new ItemData(Materials.Steel, 1814400L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Items.book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); + GTOreDictUnificator .addItemData(new ItemStack(Items.written_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Items.writable_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Items.enchanted_book, 1, 32767), new ItemData(Materials.Paper, 10886400L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.golden_apple, 1, 1), new ItemData(Materials.Gold, OrePrefixes.block.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.golden_apple, 1, 0), new ItemData(Materials.Gold, OrePrefixes.ingot.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.golden_carrot, 1, 0), new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.speckled_melon, 1, 0), new ItemData(Materials.Gold, OrePrefixes.nugget.mMaterialAmount * 8L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Items.minecart, 1), new ItemData(Materials.Iron, 18144000L)); + GTOreDictUnificator.addItemData(new ItemStack(Items.iron_door, 1), new ItemData(Materials.Iron, 21772800L)); + GTOreDictUnificator.addItemData(new ItemStack(Items.cauldron, 1), new ItemData(Materials.Iron, 25401600L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.iron_bars, 8, 32767), new ItemData(Materials.Iron, 10886400L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.SteelBars", 8L, 0), new ItemData(Materials.Steel, 10886400L)); - GT_OreDictUnificator - .addItemData(GT_ModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L)); - GT_OreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator + .addItemData(GTModHandler.getIC2Item("ironFurnace", 1L), new ItemData(Materials.Iron, 18144000L)); + GTOreDictUnificator.addItemData(ItemList.IC2_Food_Can_Empty.get(1L), new ItemData(Materials.Tin, 1814400L)); + GTOreDictUnificator.addItemData(ItemList.IC2_Fuel_Rod_Empty.get(1L), new ItemData(Materials.Iron, 3628800L)); + GTOreDictUnificator.addItemData( new ItemStack(Blocks.light_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Gold, 7257600L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.heavy_weighted_pressure_plate, 1, 32767), new ItemData(Materials.Iron, 7257600L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0), new ItemData(Materials.Steel, 108864000L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 1), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 1), new ItemData(Materials.Steel, 72576000L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Railcraft.ID, "anvil", 1L, 2), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 2), new ItemData(Materials.Steel, 36288000L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 2), new ItemData(Materials.Iron, 36288000L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 0), new ItemData(Materials.Iron, 108864000L)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 1), new ItemData(Materials.Iron, 72576000L)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.anvil, 1, 2), new ItemData(Materials.Iron, 36288000L)); + GTOreDictUnificator.addItemData( new ItemStack(Blocks.hopper, 1, 32767), new ItemData(Materials.Iron, 18144000L, new MaterialStack(Materials.Wood, 29030400L))); - GT_OreDictUnificator.addItemData(ItemList.Cell_Universal_Fluid.get(1L), new ItemData(Materials.Tin, 7257600L)); - GT_OreDictUnificator.addItemData(ItemList.Cell_Empty.get(1L), new ItemData(Materials.Tin, 7257600L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData(ItemList.Cell_Universal_Fluid.get(1L), new ItemData(Materials.Tin, 7257600L)); + GTOreDictUnificator.addItemData(ItemList.Cell_Empty.get(1L), new ItemData(Materials.Tin, 7257600L)); + GTOreDictUnificator.addItemData( new ItemStack(Blocks.tripwire_hook, 1, 32767), new ItemData( Materials.Iron, OrePrefixes.ring.mMaterialAmount * 2L, new MaterialStack(Materials.Wood, 3628800L))); - GT_OreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(ItemList.Bottle_Empty.get(1L), new ItemData(Materials.Glass, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Items.potionitem, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stained_glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.glass, 1, 32767), new ItemData(Materials.Glass, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stained_glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.glass_pane, 1, 32767), new ItemData(Materials.Glass, 1360800L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.clock, 1, 32767), new ItemData(Materials.Gold, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.compass, 1, 32767), new ItemData(Materials.Iron, 14515200L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.iron_horse_armor, 1, 32767), new ItemData(Materials.Iron, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.golden_horse_armor, 1, 32767), new ItemData(Materials.Gold, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Items.diamond_horse_armor, 1, 32767), new ItemData(Materials.Diamond, 29030400L, new MaterialStack(Materials.Leather, 21772800L))); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Items.leather, 1, 32767), new ItemData(Materials.Leather, 3628800L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.beacon, 1, 32767), new ItemData( Materials.NetherStar, 3628800L, new MaterialStack(Materials.Obsidian, 10886400L), new MaterialStack(Materials.Glass, 18144000L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.enchanting_table, 1, 32767), new ItemData( Materials.Diamond, 7257600L, new MaterialStack(Materials.Obsidian, 14515200L), new MaterialStack(Materials.Paper, 10886400L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.ender_chest, 1, 32767), new ItemData(Materials.EnderEye, 3628800L, new MaterialStack(Materials.Obsidian, 29030400L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.bookshelf, 1, 32767), new ItemData(Materials.Paper, 32659200L, new MaterialStack(Materials.Wood, 21772800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.lever, 1, 32767), new ItemData(Materials.Stone, 3628800L, new MaterialStack(Materials.Wood, 1814400L))); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.ice, 1, 32767), new ItemData(Materials.Ice, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow, 1, 32767), new ItemData(Materials.Snow, 3628800L)); + GTOreDictUnificator.addItemData(new ItemStack(Items.snowball, 1, 32767), new ItemData(Materials.Snow, 907200L)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.snow_layer, 1, 32767), new ItemData(Materials.Snow, -1L)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.sand, 1, 32767), new ItemData(Materials.Sand, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.sandstone, 1, 32767), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 0), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 8), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 0), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 8), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone_slab, 1, 1), new ItemData(Materials.Sand, 1814400L)); + GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone_slab, 1, 9), new ItemData(Materials.Sand, 1814400L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 1), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 9), new ItemData(Materials.Sand, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone_slab, 1, 2), new ItemData(Materials.Wood, 1814400L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 10), new ItemData(Materials.Wood, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 2), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 10), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 3), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 11), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 3), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 11), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 5), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_slab, 1, 13), new ItemData(Materials.Stone, 1814400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 5), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.double_stone_slab, 1, 13), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.stone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.lit_furnace, 1, 32767), new ItemData(Materials.Stone, 29030400L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stonebrick, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.mossy_cobblestone, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_button, 1, 32767), new ItemData(Materials.Stone, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.stone_pressure_plate, 1, 32767), new ItemData(Materials.Stone, 7257600L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.ladder, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.wooden_button, 1, 32767), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.wooden_pressure_plate, 1, 32767), new ItemData(Materials.Wood, 7257600L)); - GT_OreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L)); - GT_OreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.fence, 1, 32767), new ItemData(Materials.Wood, 5443200L)); + GTOreDictUnificator.addItemData(new ItemStack(Items.bowl, 1, 32767), new ItemData(Materials.Wood, 3628800L)); + GTOreDictUnificator.addItemData(new ItemStack(Items.sign, 1, 32767), new ItemData(Materials.Wood, 7257600L)); + GTOreDictUnificator .addItemData(new ItemStack(Items.wooden_door, 1, 32767), new ItemData(Materials.Wood, 21772800L)); - GT_OreDictUnificator - .addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); - GT_OreDictUnificator + GTOreDictUnificator.addItemData(new ItemStack(Blocks.chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); + GTOreDictUnificator .addItemData(new ItemStack(Blocks.trapped_chest, 1, 32767), new ItemData(Materials.Wood, 29030400L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.unlit_redstone_torch, 1, 32767), new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.redstone_torch, 1, 32767), new ItemData(Materials.Wood, 1814400L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.noteblock, 1, 32767), new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.jukebox, 1, 32767), new ItemData(Materials.Wood, 29030400L, new MaterialStack(Materials.Diamond, 3628800L))); - GT_OreDictUnificator + GTOreDictUnificator .addItemData(new ItemStack(Blocks.crafting_table, 1, 32767), new ItemData(Materials.Wood, 14515200L)); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.piston, 1, 32767), new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.sticky_piston, 1, 32767), new ItemData(Materials.Stone, 14515200L, new MaterialStack(Materials.Wood, 10886400L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.dispenser, 1, 32767), new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( + GTOreDictUnificator.addItemData( new ItemStack(Blocks.dropper, 1, 32767), new ItemData(Materials.Stone, 25401600L, new MaterialStack(Materials.Redstone, 3628800L))); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetChicken", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetBeef", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetPork", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - GT_OreDictUnificator.addItemData( - GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), + GTOreDictUnificator.addItemData( + GTModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); - for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0), - GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turkeyrawItem", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "rabbitrawItem", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "venisonrawItem", 1L, 0), new ItemStack(Items.porkchop), + for (ItemStack tItem : new ItemStack[] { GTModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0), + GTModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "turkeyrawItem", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "rabbitrawItem", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "venisonrawItem", 1L, 0), new ItemStack(Items.porkchop), new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { if (tItem != null) { - GT_OreDictUnificator.addItemData( - GT_Utility.copyMetaData(32767, tItem), + GTOreDictUnificator.addItemData( + GTUtility.copyMetaData(32767, tItem), new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } - for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0), - GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "muttoncookedItem", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1L, 0), - GT_ModHandler.getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1L, 0), + for (ItemStack tItem : new ItemStack[] { GTModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0), + GTModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "muttoncookedItem", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1L, 0), + GTModHandler.getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1L, 0), new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), new ItemStack(Items.cooked_chicken), new ItemStack(Items.cooked_fished) }) { if (tItem != null) { - GT_OreDictUnificator.addItemData( - GT_Utility.copyMetaData(32767, tItem), + GTOreDictUnificator.addItemData( + GTUtility.copyMetaData(32767, tItem), new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L))); } } diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java new file mode 100644 index 0000000000..0d2bd3ad55 --- /dev/null +++ b/src/main/java/gregtech/loaders/preload/LoaderGTOreDictionary.java @@ -0,0 +1,456 @@ +package gregtech.loaders.preload; + +import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.TwilightForest; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +import gregtech.api.GregTechAPI; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; + +public class LoaderGTOreDictionary implements Runnable { + + @Override + public void run() { + GTLog.out.println("GTMod: Register OreDict Entries of Non-GT-Items."); + GTOreDictUnificator.set(OrePrefixes.cell, Materials.Empty, ItemList.Cell_Empty.get(1L)); + GTOreDictUnificator.set(OrePrefixes.cell, Materials.Lava, ItemList.Cell_Lava.get(1L)); + GTOreDictUnificator.set(OrePrefixes.cell, Materials.Lava, GTModHandler.getIC2Item("lavaCell", 1L)); + GTOreDictUnificator.set(OrePrefixes.cell, Materials.Water, ItemList.Cell_Water.get(1L)); + GTOreDictUnificator.set(OrePrefixes.cell, Materials.Water, GTModHandler.getIC2Item("waterCell", 1L)); + GTOreDictUnificator.set( + OrePrefixes.cell, + Materials.Creosote, + GTModHandler.getModItem(Railcraft.ID, "fluid.creosote.cell", 1L)); + + GTOreDictUnificator.set(OrePrefixes.cell, Materials.UUMatter, GTModHandler.getIC2Item("uuMatterCell", 1L)); + GTOreDictUnificator.set(OrePrefixes.cell, Materials.ConstructionFoam, GTModHandler.getIC2Item("CFCell", 1L)); + + GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Empty, new ItemStack(Items.bucket, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Water, new ItemStack(Items.water_bucket, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Lava, new ItemStack(Items.lava_bucket, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.bucket, Materials.Milk, new ItemStack(Items.milk_bucket, 1, 0)); + // Clay buckets handled in gregtech.common.GTProxy.onLoad() as they aren't registered until Iguana Tweaks + // pre-init. + + GTOreDictUnificator.set(OrePrefixes.bottle, Materials.Empty, new ItemStack(Items.glass_bottle, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.bottle, Materials.Water, new ItemStack(Items.potionitem, 1, 0)); + + GTOreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Iridium, GTModHandler.getIC2Item("iridiumPlate", 1L)); + GTOreDictUnificator + .set(OrePrefixes.plateAlloy, Materials.Advanced, GTModHandler.getIC2Item("advancedAlloy", 1L)); + GTOreDictUnificator.set(OrePrefixes.plateAlloy, Materials.Carbon, GTModHandler.getIC2Item("carbonPlate", 1L)); + + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Coal, new ItemStack(Blocks.coal_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Iron, new ItemStack(Blocks.iron_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Lapis, new ItemStack(Blocks.lapis_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.redstone_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Redstone, new ItemStack(Blocks.lit_redstone_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Gold, new ItemStack(Blocks.gold_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Diamond, new ItemStack(Blocks.diamond_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.Emerald, new ItemStack(Blocks.emerald_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ore, Materials.NetherQuartz, new ItemStack(Blocks.quartz_ore, 1)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Copper, GTModHandler.getIC2Item("copperIngot", 1L)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Tin, GTModHandler.getIC2Item("tinIngot", 1L)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Lead, GTModHandler.getIC2Item("leadIngot", 1L)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Bronze, GTModHandler.getIC2Item("bronzeIngot", 1L)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Silver, GTModHandler.getIC2Item("silverIngot", 1L)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.Iridium, GTModHandler.getIC2Item("iridiumOre", 1L)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.Lapis, new ItemStack(Items.dye, 1, 4)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.EnderEye, new ItemStack(Items.ender_eye, 1)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.EnderPearl, new ItemStack(Items.ender_pearl, 1)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.Diamond, new ItemStack(Items.diamond, 1)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.Emerald, new ItemStack(Items.emerald, 1)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.Coal, new ItemStack(Items.coal, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.Charcoal, new ItemStack(Items.coal, 1, 1)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.NetherQuartz, new ItemStack(Items.quartz, 1)); + GTOreDictUnificator.set(OrePrefixes.gem, Materials.NetherStar, new ItemStack(Items.nether_star, 1)); + GTOreDictUnificator.set(OrePrefixes.nugget, Materials.Gold, new ItemStack(Items.gold_nugget, 1)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Gold, new ItemStack(Items.gold_ingot, 1)); + GTOreDictUnificator.set(OrePrefixes.ingot, Materials.Iron, new ItemStack(Items.iron_ingot, 1)); + GTOreDictUnificator.set(OrePrefixes.plate, Materials.Paper, new ItemStack(Items.paper, 1)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Sugar, new ItemStack(Items.sugar, 1)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Bone, ItemList.Dye_Bonemeal.get(1L)); + GTOreDictUnificator.set(OrePrefixes.stick, Materials.Wood, new ItemStack(Items.stick, 1)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Redstone, new ItemStack(Items.redstone, 1)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Gunpowder, new ItemStack(Items.gunpowder, 1)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Glowstone, new ItemStack(Items.glowstone_dust, 1)); + GTOreDictUnificator.set(OrePrefixes.dust, Materials.Blaze, new ItemStack(Items.blaze_powder, 1)); + GTOreDictUnificator.set(OrePrefixes.stick, Materials.Blaze, new ItemStack(Items.blaze_rod, 1)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Iron, new ItemStack(Blocks.iron_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Gold, new ItemStack(Blocks.gold_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Diamond, new ItemStack(Blocks.diamond_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Emerald, new ItemStack(Blocks.emerald_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Lapis, new ItemStack(Blocks.lapis_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Coal, new ItemStack(Blocks.coal_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Redstone, new ItemStack(Blocks.redstone_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.NetherQuartz, new ItemStack(Blocks.quartz_block, 1, 0)); + GTOreDictUnificator.set(OrePrefixes.block, Materials.Clay, new ItemStack(Blocks.clay, 1, 0)); + if (Blocks.ender_chest != null) { + GTOreDictUnificator.registerOre(OreDictNames.enderChest, new ItemStack(Blocks.ender_chest, 1)); + } + GTOreDictUnificator.registerOre(OreDictNames.craftingAnvil, new ItemStack(Blocks.anvil, 1)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingAnvil, GTModHandler.getModItem(Railcraft.ID, "anvil", 1L, 0)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingIndustrialDiamond, ItemList.IC2_Industrial_Diamond.get(1L)); + GTOreDictUnificator + .registerOre(OrePrefixes.glass, Materials.Reinforced, GTModHandler.getIC2Item("reinforcedGlass", 1L)); + + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Basalt, GTModHandler.getModItem(Railcraft.ID, "cube", 1L, 6)); + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Marble, GTModHandler.getModItem(Railcraft.ID, "cube", 1L, 7)); + GTOreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Basalt, + GTModHandler.getModItem(Railcraft.ID, "brick.abyssal", 1L, 32767)); + GTOreDictUnificator.registerOre( + OrePrefixes.stone, + Materials.Marble, + GTModHandler.getModItem(Railcraft.ID, "brick.quarried", 1L, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Obsidian, new ItemStack(Blocks.obsidian, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Stone, new ItemStack(Blocks.stone, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.mossy_cobblestone, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneCobble, new ItemStack(Blocks.cobblestone, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneSmooth, new ItemStack(Blocks.stone, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneBricks, new ItemStack(Blocks.stonebrick, 1, 32767)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneMossy, new ItemStack(Blocks.stonebrick, 1, 1)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneCracked, new ItemStack(Blocks.stonebrick, 1, 2)); + GTOreDictUnificator.registerOre(OrePrefixes.stoneChiseled, new ItemStack(Blocks.stonebrick, 1, 3)); + GTOreDictUnificator.registerOre(OrePrefixes.stone, Materials.Sand, new ItemStack(Blocks.sandstone, 1, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Netherrack, new ItemStack(Blocks.netherrack, 1, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.NetherBrick, new ItemStack(Blocks.nether_brick, 1, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Endstone, new ItemStack(Blocks.end_stone, 1, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.stone, Materials.Glowstone, new ItemStack(Blocks.glowstone, 1, 32767)); + + GTOreDictUnificator + .registerOre("paperResearchFragment", GTModHandler.getModItem(Thaumcraft.ID, "ItemResource", 1L, 9)); + GTOreDictUnificator.registerOre( + "itemCertusQuartz", + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); + GTOreDictUnificator.registerOre( + "itemCertusQuartz", + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); + GTOreDictUnificator.registerOre( + "itemNetherQuartz", + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); + GTOreDictUnificator.registerOre( + OreDictNames.craftingQuartz, + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 1)); + GTOreDictUnificator.registerOre( + OreDictNames.craftingQuartz, + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 10)); + GTOreDictUnificator.registerOre( + OreDictNames.craftingQuartz, + GTModHandler.getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1L, 11)); + GTOreDictUnificator.registerOre("cropLemon", ItemList.FR_Lemon.get(1L)); + GTOreDictUnificator.registerOre("cropCoffee", ItemList.IC2_CoffeeBeans.get(1L)); + GTOreDictUnificator.registerOre("cropPotato", ItemList.Food_Raw_Potato.get(1L)); + GTOreDictUnificator.registerOre(OrePrefixes.battery, Materials.LV, GTModHandler.getIC2Item("reBattery", 1L)); + GTOreDictUnificator + .registerOre(OrePrefixes.battery, Materials.LV, GTModHandler.getIC2Item("chargedReBattery", 1L, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.battery, Materials.MV, GTModHandler.getIC2Item("advBattery", 1L, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.battery, Materials.HV, GTModHandler.getIC2Item("energyCrystal", 1L, 32767)); + GTOreDictUnificator + .registerOre(OrePrefixes.battery, Materials.EV, GTModHandler.getIC2Item("lapotronCrystal", 1L, 32767)); + + GTOreDictUnificator + .registerOre(OreDictNames.craftingWireCopper, GTModHandler.getIC2Item("insulatedCopperCableItem", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingWireGold, GTModHandler.getIC2Item("insulatedGoldCableItem", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingWireIron, GTModHandler.getIC2Item("insulatedIronCableItem", 1L)); + GTOreDictUnificator.registerOre( + OreDictNames.craftingWireTin, + GTModHandler + .getIC2Item("insulatedTinCableItem", 1L, GTModHandler.getIC2Item("insulatedCopperCableItem", 1L))); + + GTOreDictUnificator + .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.redstone_torch, 1, 32767)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingRedstoneTorch, new ItemStack(Blocks.unlit_redstone_torch, 1, 32767)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingWorkBench, new ItemStack(Blocks.crafting_table, 1)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingWorkBench, new ItemStack(GregTechAPI.sBlockMachines, 1, 16)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.piston, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingPiston, new ItemStack(Blocks.sticky_piston, 1, 32767)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingSafe, new ItemStack(GregTechAPI.sBlockMachines, 1, 45)); + GTOreDictUnificator.registerOre(OreDictNames.craftingSafe, GTModHandler.getIC2Item("personalSafe", 1L)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.chest, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingChest, new ItemStack(Blocks.trapped_chest, 1, 32767)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.furnace, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingFurnace, new ItemStack(Blocks.lit_furnace, 1, 32767)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingPump, GTModHandler.getIC2Item("pump", 1L)); + GTOreDictUnificator.registerOre(OreDictNames.craftingElectromagnet, GTModHandler.getIC2Item("magnetizer", 1L)); + GTOreDictUnificator.registerOre(OreDictNames.craftingTeleporter, GTModHandler.getIC2Item("teleporter", 1L)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingMacerator, GTModHandler.getIC2Item("macerator", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingMacerator, new ItemStack(GregTechAPI.sBlockMachines, 1, 50)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingExtractor, GTModHandler.getIC2Item("extractor", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingExtractor, new ItemStack(GregTechAPI.sBlockMachines, 1, 51)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingCompressor, GTModHandler.getIC2Item("compressor", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingCompressor, new ItemStack(GregTechAPI.sBlockMachines, 1, 52)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingRecycler, GTModHandler.getIC2Item("recycler", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingRecycler, new ItemStack(GregTechAPI.sBlockMachines, 1, 53)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingIronFurnace, GTModHandler.getIC2Item("ironFurnace", 1L)); + + GTOreDictUnificator + .registerOre(OreDictNames.craftingCentrifuge, new ItemStack(GregTechAPI.sBlockMachines, 1, 62)); + + GTOreDictUnificator + .registerOre(OreDictNames.craftingInductionFurnace, GTModHandler.getIC2Item("inductionFurnace", 1L)); + + GTOreDictUnificator + .registerOre(OreDictNames.craftingElectricFurnace, GTModHandler.getIC2Item("electroFurnace", 1L)); + GTOreDictUnificator + .registerOre(OreDictNames.craftingElectricFurnace, new ItemStack(GregTechAPI.sBlockMachines, 1, 54)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingGenerator, GTModHandler.getIC2Item("generator", 1L)); + + GTOreDictUnificator + .registerOre(OreDictNames.craftingGeothermalGenerator, GTModHandler.getIC2Item("geothermalGenerator", 1L)); + + GTOreDictUnificator.registerOre(OreDictNames.craftingFeather, new ItemStack(Items.feather, 1, 32767)); + GTOreDictUnificator.registerOre( + OreDictNames.craftingFeather, + GTModHandler.getModItem(TwilightForest.ID, "item.tfFeather", 1L, 32767)); + + GTOreDictUnificator.registerOre("itemWheat", new ItemStack(Items.wheat, 1, 32767)); + GTOreDictUnificator.registerOre("paperEmpty", new ItemStack(Items.paper, 1, 32767)); + GTOreDictUnificator.registerOre("paperMap", new ItemStack(Items.map, 1, 32767)); + GTOreDictUnificator.registerOre("paperMap", new ItemStack(Items.filled_map, 1, 32767)); + GTOreDictUnificator.registerOre("bookEmpty", new ItemStack(Items.book, 1, 32767)); + GTOreDictUnificator.registerOre("bookWritable", new ItemStack(Items.writable_book, 1, 32767)); + GTOreDictUnificator.registerOre("bookWritten", new ItemStack(Items.written_book, 1, 32767)); + GTOreDictUnificator.registerOre("bookEnchanted", new ItemStack(Items.enchanted_book, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.book, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.writable_book, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.written_book, 1, 32767)); + GTOreDictUnificator.registerOre(OreDictNames.craftingBook, new ItemStack(Items.enchanted_book, 1, 32767)); + + GTOreDictUnificator.addToBlacklist(GTModHandler.getIC2Item("electronicCircuit", 1L)); + GTOreDictUnificator.addToBlacklist(GTModHandler.getIC2Item("advancedCircuit", 1L)); + GTOreDictUnificator + .registerOre(OrePrefixes.circuit, Materials.LV, GTModHandler.getIC2Item("electronicCircuit", 1L)); + GTOreDictUnificator + .registerOre(OrePrefixes.circuit, Materials.HV, GTModHandler.getIC2Item("advancedCircuit", 1L)); + + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Copper, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Tin, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 1)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Bronze, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 2)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Gold, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 3)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Iron, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 4)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Steel, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 5)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Lead, + GTModHandler.getModItem(IndustrialCraft2.ID, "itemCasing", 1L, 6)); + + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Osmium, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.OsmiumItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Aluminium, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.AluminiumItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.StainlessSteel, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.StainlessSteelItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Tungsten, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Neutronium, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.NeutroniumItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.TungstenSteel, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TungstenSteelItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Iridium, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.IridiumItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Titanium, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.TitaniumItemCasing", 1L, 0)); + GTOreDictUnificator.registerOre( + OrePrefixes.itemCasing, + Materials.Chrome, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.ChromeItemCasing", 1L, 0)); + + // Fake Circuits + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.ULV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitULV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.LV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.MV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.HV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitHV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.EV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitEV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.IV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitIV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.LuV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitLuV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.ZPM, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitZPM", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.UV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.UHV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUHV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.UEV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUEV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.UIV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUIV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.UMV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUMV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.UXV, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitUXV", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.circuit, + Materials.MAX, + GTModHandler.getModItem(NewHorizonsCoreMod.ID, "item.CircuitMAX", 1L)); + + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.Manasteel, + GTModHandler.getModItem(Botania.ID, "storage", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.Terrasteel, + GTModHandler.getModItem(Botania.ID, "storage", 1L, 1)); + GTOreDictUnificator.registerOre( + OrePrefixes.ingot, + MaterialsBotania.ElvenElementium, + GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 7)); + GTOreDictUnificator.registerOre( + OrePrefixes.nugget, + MaterialsBotania.ElvenElementium, + GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 19)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.ElvenElementium, + GTModHandler.getModItem(Botania.ID, "storage", 1L, 2)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.Livingrock, + GTModHandler.getModItem(Botania.ID, "livingrock", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.ingot, + MaterialsBotania.GaiaSpirit, + GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 14)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.Livingwood, + GTModHandler.getModItem(Botania.ID, "livingwood", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.Dreamwood, + GTModHandler.getModItem(Botania.ID, "dreamwood", 1L)); + GTOreDictUnificator.registerOre( + OrePrefixes.gem, + MaterialsBotania.ManaDiamond, + GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 2)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.ManaDiamond, + GTModHandler.getModItem(Botania.ID, "storage", 1L, 3)); + GTOreDictUnificator.registerOre( + OrePrefixes.gem, + MaterialsBotania.BotaniaDragonstone, + GTModHandler.getModItem(Botania.ID, "manaResource", 1L, 9)); + GTOreDictUnificator.registerOre( + OrePrefixes.block, + MaterialsBotania.BotaniaDragonstone, + GTModHandler.getModItem(Botania.ID, "storage", 1L, 4)); + } +} diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java index e7ad9e9337..b462e065cd 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/LoaderMetaTileEntities.java @@ -928,14 +928,14 @@ import static gregtech.api.recipe.RecipeMaps.sifterRecipes; import static gregtech.api.recipe.RecipeMaps.slicerRecipes; import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes; import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; -import static gregtech.api.util.GT_Utility.calculateRecipeEU; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; +import static gregtech.api.util.GTUtility.calculateRecipeEU; import net.minecraft.util.EnumChatFormatting; -import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; +import gregtech.api.GregTechAPI; +import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; import gregtech.api.enums.MachineType; import gregtech.api.enums.Materials; @@ -944,176 +944,176 @@ import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; import gregtech.api.enums.SubTag; import gregtech.api.enums.TierEU; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_QuadrupleHumongous; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MagHatch; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_WetTransformer; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Dynamo; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Hatch; +import gregtech.api.metatileentity.implementations.MTEBasicBatteryBuffer; +import gregtech.api.metatileentity.implementations.MTEBasicHull; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTECable; +import gregtech.api.metatileentity.implementations.MTEFluid; +import gregtech.api.metatileentity.implementations.MTEFrame; +import gregtech.api.metatileentity.implementations.MTEHatchDataAccess; +import gregtech.api.metatileentity.implementations.MTEHatchDynamo; +import gregtech.api.metatileentity.implementations.MTEHatchEnergy; +import gregtech.api.metatileentity.implementations.MTEHatchInput; +import gregtech.api.metatileentity.implementations.MTEHatchInputBus; +import gregtech.api.metatileentity.implementations.MTEHatchMagnet; +import gregtech.api.metatileentity.implementations.MTEHatchMaintenance; +import gregtech.api.metatileentity.implementations.MTEHatchMuffler; +import gregtech.api.metatileentity.implementations.MTEHatchMultiInput; +import gregtech.api.metatileentity.implementations.MTEHatchOutput; +import gregtech.api.metatileentity.implementations.MTEHatchOutputBus; +import gregtech.api.metatileentity.implementations.MTEHatchQuadrupleHumongous; +import gregtech.api.metatileentity.implementations.MTEItem; +import gregtech.api.metatileentity.implementations.MTETransformer; +import gregtech.api.metatileentity.implementations.MTEWetTransformer; +import gregtech.api.metatileentity.implementations.MTEWirelessDynamo; +import gregtech.api.metatileentity.implementations.MTEWirelessEnergy; import gregtech.api.recipe.RecipeMaps; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Log; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gregtech.common.blocks.GT_Block_FrameBox; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_ChestBuffer; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_Filter; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_ItemDistributor; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_RecipeFilter; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_Regulator; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_SuperBuffer; -import gregtech.common.tileentities.automation.GT_MetaTileEntity_TypeFilter; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Bronze; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Lava; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Solar; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Solar_Steel; -import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler_Steel; -import gregtech.common.tileentities.debug.GT_MetaTileEntity_AdvDebugStructureWriter; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_DieselGenerator; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_LightningRod; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_MagicEnergyConverter; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_MagicalEnergyAbsorber; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_NaquadahReactor; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_PlasmaGenerator; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_SteamTurbine; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_Bronze; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_BronzeBricks; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_Steel; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_BasicHull_SteelBricks; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_ME; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_CraftingInput_Slave; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Input_ME; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME; -import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_AdvSeismicProspector; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_BetterJukebox; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Boxinator; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Charger; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_IndustrialApiary; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabricator; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_MicrowaveEnergyTransmitter; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Miner; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_MonsterRepellent; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_PotionBrewer; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Pump; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Replicator; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_RockBreaker; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Scanner; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Teleporter; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_TurboCharger; -import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_WorldAccelerator; -import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineFluid; -import gregtech.common.tileentities.machines.long_distance.GT_MetaTileEntity_LongDistancePipelineItem; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_AssemblyLine; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_BrickedBlastFurnace; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Cleanroom; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ConcreteBackfiller1; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ConcreteBackfiller2; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DieselEngine; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_DistillationTower; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ElectricBlastFurnace; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ExtremeDieselEngine; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer1; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer2; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_FusionComputer3; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_HeatExchanger; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ImplosionCompressor; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialElectromagneticSeparator; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialExtractor; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IndustrialLaserEngraver; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_IntegratedOreFactory; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Bronze; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Steel; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_Titanium; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeBoiler_TungstenSteel; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeChemicalReactor; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeFluidExtractor; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Gas; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_GasAdvanced; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_HPSteam; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Steam; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiAutoclave; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiCanner; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiFurnace; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_MultiLathe; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_NanoForge; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilCracker; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill1; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill2; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill3; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrill4; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OilDrillInfinite; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant1; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant2; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant3; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_OreDrillingPlant4; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PCBFactory; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PlasmaForge; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_ProcessingArray; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_PyrolyseOven; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_TranscendentPlasmaMixer; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_VacuumFreezer; -import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_WormholeGenerator; -import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_BlackHoleCompressor; -import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_HIPCompressor; -import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_HeatSensor; -import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_IndustrialCompressor; -import gregtech.common.tileentities.machines.multi.compressor.GT_MetaTileEntity_NeutroniumCompressor; -import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_DroneCentre; -import gregtech.common.tileentities.machines.multi.drone.GT_MetaTileEntity_Hatch_DroneDownLink; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_Hatch_DegasifierControlHatch; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_LensHousing; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_LensIndicator; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationPlant; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitClarifier; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitDegasifier; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitFlocculation; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitOzonation; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitParticleExtractor; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitPhAdjustment; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitPlasmaHeater; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_PurificationUnitUVTreatment; -import gregtech.common.tileentities.machines.multi.purification.GT_MetaTileEntity_pHSensor; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_AlloySmelter_Bronze; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_AlloySmelter_Steel; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Compressor_Bronze; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Compressor_Steel; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Extractor_Bronze; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Extractor_Steel; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_ForgeHammer_Bronze; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_ForgeHammer_Steel; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Furnace_Bronze; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Furnace_Steel; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Macerator_Bronze; -import gregtech.common.tileentities.machines.steam.GT_MetaTileEntity_Macerator_Steel; -import gregtech.common.tileentities.storage.GT_MetaTileEntity_Locker; -import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest; -import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumTank; -import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperChest; -import gregtech.common.tileentities.storage.GT_MetaTileEntity_SuperTank; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTLog; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; +import gregtech.common.blocks.BlockFrameBox; +import gregtech.common.tileentities.automation.MTEChestBuffer; +import gregtech.common.tileentities.automation.MTEFilter; +import gregtech.common.tileentities.automation.MTEItemDistributor; +import gregtech.common.tileentities.automation.MTERecipeFilter; +import gregtech.common.tileentities.automation.MTERegulator; +import gregtech.common.tileentities.automation.MTESuperBuffer; +import gregtech.common.tileentities.automation.MTETypeFilter; +import gregtech.common.tileentities.boilers.MTEBoilerBronze; +import gregtech.common.tileentities.boilers.MTEBoilerLava; +import gregtech.common.tileentities.boilers.MTEBoilerSolar; +import gregtech.common.tileentities.boilers.MTEBoilerSolarSteel; +import gregtech.common.tileentities.boilers.MTEBoilerSteel; +import gregtech.common.tileentities.debug.MTEAdvDebugStructureWriter; +import gregtech.common.tileentities.generators.MTEDieselGenerator; +import gregtech.common.tileentities.generators.MTEGasTurbine; +import gregtech.common.tileentities.generators.MTELightningRod; +import gregtech.common.tileentities.generators.MTEMagicEnergyConverter; +import gregtech.common.tileentities.generators.MTEMagicalEnergyAbsorber; +import gregtech.common.tileentities.generators.MTENaquadahReactor; +import gregtech.common.tileentities.generators.MTEPlasmaGenerator; +import gregtech.common.tileentities.generators.MTESteamTurbine; +import gregtech.common.tileentities.machines.MTEBasicHullBronze; +import gregtech.common.tileentities.machines.MTEBasicHullBronzeBricks; +import gregtech.common.tileentities.machines.MTEBasicHullSteel; +import gregtech.common.tileentities.machines.MTEBasicHullSteelBricks; +import gregtech.common.tileentities.machines.MTEHatchCraftingInputME; +import gregtech.common.tileentities.machines.MTEHatchCraftingInputSlave; +import gregtech.common.tileentities.machines.MTEHatchInputBusME; +import gregtech.common.tileentities.machines.MTEHatchInputME; +import gregtech.common.tileentities.machines.MTEHatchOutputBusME; +import gregtech.common.tileentities.machines.MTEHatchOutputME; +import gregtech.common.tileentities.machines.basic.MTEAdvSeismicProspector; +import gregtech.common.tileentities.machines.basic.MTEBetterJukebox; +import gregtech.common.tileentities.machines.basic.MTEBoxinator; +import gregtech.common.tileentities.machines.basic.MTECharger; +import gregtech.common.tileentities.machines.basic.MTEIndustrialApiary; +import gregtech.common.tileentities.machines.basic.MTEMassfabricator; +import gregtech.common.tileentities.machines.basic.MTEMicrowaveEnergyTransmitter; +import gregtech.common.tileentities.machines.basic.MTEMiner; +import gregtech.common.tileentities.machines.basic.MTEMonsterRepellent; +import gregtech.common.tileentities.machines.basic.MTEPotionBrewer; +import gregtech.common.tileentities.machines.basic.MTEPump; +import gregtech.common.tileentities.machines.basic.MTEReplicator; +import gregtech.common.tileentities.machines.basic.MTERockBreaker; +import gregtech.common.tileentities.machines.basic.MTEScanner; +import gregtech.common.tileentities.machines.basic.MTETeleporter; +import gregtech.common.tileentities.machines.basic.MTETurboCharger; +import gregtech.common.tileentities.machines.basic.MTEWorldAccelerator; +import gregtech.common.tileentities.machines.long_distance.MTELongDistancePipelineFluid; +import gregtech.common.tileentities.machines.long_distance.MTELongDistancePipelineItem; +import gregtech.common.tileentities.machines.multi.MTEAssemblyLine; +import gregtech.common.tileentities.machines.multi.MTEBrickedBlastFurnace; +import gregtech.common.tileentities.machines.multi.MTECharcoalPit; +import gregtech.common.tileentities.machines.multi.MTECleanroom; +import gregtech.common.tileentities.machines.multi.MTEConcreteBackfiller1; +import gregtech.common.tileentities.machines.multi.MTEConcreteBackfiller2; +import gregtech.common.tileentities.machines.multi.MTEDieselEngine; +import gregtech.common.tileentities.machines.multi.MTEDistillationTower; +import gregtech.common.tileentities.machines.multi.MTEElectricBlastFurnace; +import gregtech.common.tileentities.machines.multi.MTEExtremeDieselEngine; +import gregtech.common.tileentities.machines.multi.MTEFusionComputer1; +import gregtech.common.tileentities.machines.multi.MTEFusionComputer2; +import gregtech.common.tileentities.machines.multi.MTEFusionComputer3; +import gregtech.common.tileentities.machines.multi.MTEHeatExchanger; +import gregtech.common.tileentities.machines.multi.MTEImplosionCompressor; +import gregtech.common.tileentities.machines.multi.MTEIndustrialElectromagneticSeparator; +import gregtech.common.tileentities.machines.multi.MTEIndustrialExtractor; +import gregtech.common.tileentities.machines.multi.MTEIndustrialLaserEngraver; +import gregtech.common.tileentities.machines.multi.MTEIntegratedOreFactory; +import gregtech.common.tileentities.machines.multi.MTELargeBoilerBronze; +import gregtech.common.tileentities.machines.multi.MTELargeBoilerSteel; +import gregtech.common.tileentities.machines.multi.MTELargeBoilerTitanium; +import gregtech.common.tileentities.machines.multi.MTELargeBoilerTungstenSteel; +import gregtech.common.tileentities.machines.multi.MTELargeChemicalReactor; +import gregtech.common.tileentities.machines.multi.MTELargeFluidExtractor; +import gregtech.common.tileentities.machines.multi.MTELargeTurbineGas; +import gregtech.common.tileentities.machines.multi.MTELargeTurbineGasAdvanced; +import gregtech.common.tileentities.machines.multi.MTELargeTurbineHPSteam; +import gregtech.common.tileentities.machines.multi.MTELargeTurbinePlasma; +import gregtech.common.tileentities.machines.multi.MTELargeTurbineSteam; +import gregtech.common.tileentities.machines.multi.MTEMultiAutoclave; +import gregtech.common.tileentities.machines.multi.MTEMultiCanner; +import gregtech.common.tileentities.machines.multi.MTEMultiFurnace; +import gregtech.common.tileentities.machines.multi.MTEMultiLathe; +import gregtech.common.tileentities.machines.multi.MTENanoForge; +import gregtech.common.tileentities.machines.multi.MTEOilCracker; +import gregtech.common.tileentities.machines.multi.MTEOilDrill1; +import gregtech.common.tileentities.machines.multi.MTEOilDrill2; +import gregtech.common.tileentities.machines.multi.MTEOilDrill3; +import gregtech.common.tileentities.machines.multi.MTEOilDrill4; +import gregtech.common.tileentities.machines.multi.MTEOilDrillInfinite; +import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant1; +import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant2; +import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant3; +import gregtech.common.tileentities.machines.multi.MTEOreDrillingPlant4; +import gregtech.common.tileentities.machines.multi.MTEPCBFactory; +import gregtech.common.tileentities.machines.multi.MTEPlasmaForge; +import gregtech.common.tileentities.machines.multi.MTEProcessingArray; +import gregtech.common.tileentities.machines.multi.MTEPyrolyseOven; +import gregtech.common.tileentities.machines.multi.MTETranscendentPlasmaMixer; +import gregtech.common.tileentities.machines.multi.MTEVacuumFreezer; +import gregtech.common.tileentities.machines.multi.MTEWormholeGenerator; +import gregtech.common.tileentities.machines.multi.compressor.MTEBlackHoleCompressor; +import gregtech.common.tileentities.machines.multi.compressor.MTEHIPCompressor; +import gregtech.common.tileentities.machines.multi.compressor.MTEHeatSensor; +import gregtech.common.tileentities.machines.multi.compressor.MTEIndustrialCompressor; +import gregtech.common.tileentities.machines.multi.compressor.MTENeutroniumCompressor; +import gregtech.common.tileentities.machines.multi.drone.MTEDroneCentre; +import gregtech.common.tileentities.machines.multi.drone.MTEHatchDroneDownLink; +import gregtech.common.tileentities.machines.multi.purification.MTEHatchDegasifierControl; +import gregtech.common.tileentities.machines.multi.purification.MTEHatchLensHousing; +import gregtech.common.tileentities.machines.multi.purification.MTEHatchLensIndicator; +import gregtech.common.tileentities.machines.multi.purification.MTEHatchPHSensor; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationPlant; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitBaryonicPerfection; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitClarifier; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitDegasser; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitFlocculation; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitOzonation; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitPhAdjustment; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitPlasmaHeater; +import gregtech.common.tileentities.machines.multi.purification.MTEPurificationUnitUVTreatment; +import gregtech.common.tileentities.machines.steam.MTESteamAlloySmelterBronze; +import gregtech.common.tileentities.machines.steam.MTESteamAlloySmelterSteel; +import gregtech.common.tileentities.machines.steam.MTESteamCompressorBronze; +import gregtech.common.tileentities.machines.steam.MTESteamCompressorSteel; +import gregtech.common.tileentities.machines.steam.MTESteamExtractorBronze; +import gregtech.common.tileentities.machines.steam.MTESteamExtractorSteel; +import gregtech.common.tileentities.machines.steam.MTESteamForgeHammerBronze; +import gregtech.common.tileentities.machines.steam.MTESteamForgeHammerSteel; +import gregtech.common.tileentities.machines.steam.MTESteamFurnaceBronze; +import gregtech.common.tileentities.machines.steam.MTESteamFurnaceSteel; +import gregtech.common.tileentities.machines.steam.MTESteamMaceratorBronze; +import gregtech.common.tileentities.machines.steam.MTESteamMaceratorSteel; +import gregtech.common.tileentities.storage.MTELocker; +import gregtech.common.tileentities.storage.MTEQuantumChest; +import gregtech.common.tileentities.storage.MTEQuantumTank; +import gregtech.common.tileentities.storage.MTESuperChest; +import gregtech.common.tileentities.storage.MTESuperTank; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTETransformerHiAmp; // Free IDs left for machines in GT as of 29th of July 2022 - Colen. Please try use them up in order. // 366 @@ -1292,7 +1292,7 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.Gregtech // TODO Some GT MetaTileEntity registrations are done in load/GT_Loader_MetaTileEntities_Recipes.java due to joint // registration+recipe methods, they should be split and brought here to register all in preload. -public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRCUIT RECIPES AND USAGES +public class LoaderMetaTileEntities implements Runnable { // TODO CHECK CIRCUIT RECIPES AND USAGES private static final String aTextWire1 = "wire."; private static final String aTextCable1 = "cable."; @@ -1326,376 +1326,329 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerMultiblockControllers() { ItemList.Machine_Bricked_BlastFurnace.set( - new GT_MetaTileEntity_BrickedBlastFurnace( + new MTEBrickedBlastFurnace( BRICKED_BLAST_FURNACE_CONTROLLER.ID, "multimachine.brickedblastfurnace", "Bricked Blast Furnace").getStackForm(1L)); ItemList.Machine_Multi_BlastFurnace.set( - new GT_MetaTileEntity_ElectricBlastFurnace( - EBF_CONTROLLER.ID, - "multimachine.blastfurnace", - "Electric Blast Furnace").getStackForm(1L)); + new MTEElectricBlastFurnace(EBF_CONTROLLER.ID, "multimachine.blastfurnace", "Electric Blast Furnace") + .getStackForm(1L)); ItemList.Machine_Multi_ImplosionCompressor.set( - new GT_MetaTileEntity_ImplosionCompressor( + new MTEImplosionCompressor( IMPLOSION_COMPRESSOR_CONTROLLER.ID, "multimachine.implosioncompressor", "Implosion Compressor").getStackForm(1L)); ItemList.Machine_Multi_VacuumFreezer.set( - new GT_MetaTileEntity_VacuumFreezer( - VACUUM_FREEZER_CONTROLLER.ID, - "multimachine.vacuumfreezer", - "Vacuum Freezer").getStackForm(1L)); + new MTEVacuumFreezer(VACUUM_FREEZER_CONTROLLER.ID, "multimachine.vacuumfreezer", "Vacuum Freezer") + .getStackForm(1L)); ItemList.Machine_Multi_Furnace.set( - new GT_MetaTileEntity_MultiFurnace( - MULTI_SMELTER_CONTROLLER.ID, - "multimachine.multifurnace", - "Multi Smelter").getStackForm(1L)); + new MTEMultiFurnace(MULTI_SMELTER_CONTROLLER.ID, "multimachine.multifurnace", "Multi Smelter") + .getStackForm(1L)); ItemList.Machine_Multi_PlasmaForge.set( - new GT_MetaTileEntity_PlasmaForge( + new MTEPlasmaForge( DTPF_CONTROLLER.ID, "multimachine.plasmaforge", "Dimensionally Transcendent Plasma Forge").getStackForm(1L)); ItemList.Machine_Multi_PurificationPlant.set( - new GT_MetaTileEntity_PurificationPlant( + new MTEPurificationPlant( PURIFICATION_PLANT_CONTROLLER.ID, "multimachine.purificationplant", "Water Purification Plant").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitClarifier.set( - new GT_MetaTileEntity_PurificationUnitClarifier( + new MTEPurificationUnitClarifier( PURIFICATION_UNIT_CLARIFIER.ID, "multimachine.purificationunitclarifier", "Clarifier Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitFlocculator.set( - new GT_MetaTileEntity_PurificationUnitFlocculation( + new MTEPurificationUnitFlocculation( PURIFICATION_UNIT_FLOCCULATOR.ID, "multimachine.purificationunitflocculator", "Flocculation Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitPhAdjustment.set( - new GT_MetaTileEntity_PurificationUnitPhAdjustment( + new MTEPurificationUnitPhAdjustment( PURIFICATION_UNIT_PH_ADJUSTMENT.ID, "multimachine.purificationunitphadjustment", "pH Neutralization Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitOzonation.set( - new GT_MetaTileEntity_PurificationUnitOzonation( + new MTEPurificationUnitOzonation( PURIFICATION_UNIT_OZONATION.ID, "multimachine.purificationunitozonation", "Ozonation Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitPlasmaHeater.set( - new GT_MetaTileEntity_PurificationUnitPlasmaHeater( + new MTEPurificationUnitPlasmaHeater( PURIFICATION_UNIT_PLASMA_HEATER.ID, "multimachine.purificationunitplasmaheater", "Extreme Temperature Fluctuation Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitUVTreatment.set( - new GT_MetaTileEntity_PurificationUnitUVTreatment( + new MTEPurificationUnitUVTreatment( PURIFICATION_UNIT_UV_TREATMENT.ID, "multimachine.purificationunituvtreatment", "High Energy Laser Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitDegasifier.set( - new GT_MetaTileEntity_PurificationUnitDegasifier( + new MTEPurificationUnitDegasser( PURIFICATION_UNIT_DEGASIFIER.ID, "multimachine.purificationunitdegasifier", "Residual Decontaminant Degasser Purification Unit").getStackForm(1L)); ItemList.Machine_Multi_PurificationUnitParticleExtractor.set( - new GT_MetaTileEntity_PurificationUnitParticleExtractor( + new MTEPurificationUnitBaryonicPerfection( PURIFICATION_UNIT_PARTICLE_EXTRACTOR.ID, "multimachine.purificationunitextractor", "Absolute Baryonic Perfection Purification Unit").getStackForm(1L)); ItemList.Hatch_DegasifierControl.set( - new GT_MetaTileEntity_Hatch_DegasifierControlHatch( + new MTEHatchDegasifierControl( HATCH_DEGASIFIER_CONTROL.ID, "hatch.degasifiercontrol", "Degasser Control Hatch", 8).getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Bronze.set( - new GT_MetaTileEntity_LargeBoiler_Bronze( + new MTELargeBoilerBronze( LARGE_BRONZE_BOILER_CONTROLLER.ID, "multimachine.boiler.bronze", "Large Bronze Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Steel.set( - new GT_MetaTileEntity_LargeBoiler_Steel( - LARGE_STEEL_BOILER_CONTROLLER.ID, - "multimachine.boiler.steel", - "Large Steel Boiler").getStackForm(1L)); + new MTELargeBoilerSteel(LARGE_STEEL_BOILER_CONTROLLER.ID, "multimachine.boiler.steel", "Large Steel Boiler") + .getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_Titanium.set( - new GT_MetaTileEntity_LargeBoiler_Titanium( + new MTELargeBoilerTitanium( LARGE_TITANIUM_BOILER_CONTROLLER.ID, "multimachine.boiler.titanium", "Large Titanium Boiler").getStackForm(1L)); ItemList.Machine_Multi_LargeBoiler_TungstenSteel.set( - new GT_MetaTileEntity_LargeBoiler_TungstenSteel( + new MTELargeBoilerTungstenSteel( LARGE_TUNGSTENSTEEL_BOILER_CONTROLLER.ID, "multimachine.boiler.tungstensteel", "Large Tungstensteel Boiler").getStackForm(1L)); ItemList.FusionComputer_LuV.set( - new GT_MetaTileEntity_FusionComputer1( - FUSION_CONTROLLER_MKI.ID, - "fusioncomputer.tier.06", - "Fusion Control Computer Mark I").getStackForm(1L)); + new MTEFusionComputer1(FUSION_CONTROLLER_MKI.ID, "fusioncomputer.tier.06", "Fusion Control Computer Mark I") + .getStackForm(1L)); ItemList.FusionComputer_ZPMV.set( - new GT_MetaTileEntity_FusionComputer2( + new MTEFusionComputer2( FUSION_CONTROLLER_MKII.ID, "fusioncomputer.tier.07", "Fusion Control Computer Mark II").getStackForm(1L)); ItemList.FusionComputer_UV.set( - new GT_MetaTileEntity_FusionComputer3( + new MTEFusionComputer3( FUSION_CONTROLLER_MKIII.ID, "fusioncomputer.tier.08", "Fusion Control Computer Mark III").getStackForm(1L)); ItemList.Processing_Array.set( - new GT_MetaTileEntity_ProcessingArray( - PROCESSING_ARRAY_CONTROLLER.ID, - "multimachine.processingarray", - "Processing Array").getStackForm(1L)); + new MTEProcessingArray(PROCESSING_ARRAY_CONTROLLER.ID, "multimachine.processingarray", "Processing Array") + .getStackForm(1L)); ItemList.Distillation_Tower.set( - new GT_MetaTileEntity_DistillationTower( + new MTEDistillationTower( DISTILLATION_TOWER_CONTROLLER.ID, "multimachine.distillationtower", "Distillation Tower").getStackForm(1L)); ItemList.Ore_Processor.set( - new GT_MetaTileEntity_IntegratedOreFactory( + new MTEIntegratedOreFactory( INTEGRATED_ORE_FACTORY_CONTROLLER.ID, "multimachine.oreprocessor", "Integrated Ore Factory").getStackForm(1L)); ItemList.LargeSteamTurbine.set( - new GT_MetaTileEntity_LargeTurbine_Steam( + new MTELargeTurbineSteam( LARGE_STEAM_TURBINE_CONTROLLER.ID, "multimachine.largeturbine", "Large Steam Turbine").getStackForm(1L)); ItemList.LargeGasTurbine.set( - new GT_MetaTileEntity_LargeTurbine_Gas( - LARGE_GAS_TURBINE_CONTROLLER.ID, - "multimachine.largegasturbine", - "Large Gas Turbine").getStackForm(1L)); + new MTELargeTurbineGas(LARGE_GAS_TURBINE_CONTROLLER.ID, "multimachine.largegasturbine", "Large Gas Turbine") + .getStackForm(1L)); ItemList.LargeHPSteamTurbine.set( - new GT_MetaTileEntity_LargeTurbine_HPSteam( + new MTELargeTurbineHPSteam( LARGE_HP_STEAM_TURBINE_CONTROLLER.ID, "multimachine.largehpturbine", "Large HP Steam Turbine").getStackForm(1L)); ItemList.LargeAdvancedGasTurbine.set( - new GT_MetaTileEntity_LargeTurbine_GasAdvanced( + new MTELargeTurbineGasAdvanced( LARGE_ADVANCED_GAS_TURBINE_CONTROLLER.ID, "multimachine.largeadvancedgasturbine", "Large Advanced Gas Turbine").getStackForm(1L)); ItemList.Machine_Multi_TranscendentPlasmaMixer.set( - new GT_MetaTileEntity_TranscendentPlasmaMixer( + new MTETranscendentPlasmaMixer( TRANSCENDENT_PLASMA_MIXER_CONTROLLER.ID, "multimachine.transcendentplasmamixer", "Transcendent Plasma Mixer").getStackForm(1)); ItemList.LargePlasmaTurbine.set( - new GT_MetaTileEntity_LargeTurbine_Plasma( + new MTELargeTurbinePlasma( LARGE_PLASMA_TURBINE_CONTROLLER.ID, "multimachine.largeplasmaturbine", "Large Plasma Generator").getStackForm(1L)); ItemList.Machine_Multi_HeatExchanger.set( - new GT_MetaTileEntity_HeatExchanger( + new MTEHeatExchanger( LARGE_HEAT_EXCHANGER_CONTROLLER.ID, "multimachine.heatexchanger", "Large Heat Exchanger").getStackForm(1L)); ItemList.Charcoal_Pile.set( - new GT_MetaTileEntity_Charcoal_Pit( + new MTECharcoalPit( CHARCOAL_PILE_IGNITER_CONTROLLER.ID, "multimachine.charcoalpile", "Charcoal Pile Igniter").getStackForm(1)); // Converter recipes in case you had old one lying around ItemList.OilDrill1.set( - new GT_MetaTileEntity_OilDrill1( - MULTIBLOCK_PUMP_MKI_CONTROLLER.ID, - "multimachine.oildrill1", - "Oil/Gas/Fluid Drilling Rig").getStackForm(1)); + new MTEOilDrill1(MULTIBLOCK_PUMP_MKI_CONTROLLER.ID, "multimachine.oildrill1", "Oil/Gas/Fluid Drilling Rig") + .getStackForm(1)); ItemList.OilDrill2.set( - new GT_MetaTileEntity_OilDrill2( + new MTEOilDrill2( MULTILOCK_PUMP_MKII_CONTROLLER.ID, "multimachine.oildrill2", "Oil/Gas/Fluid Drilling Rig II").getStackForm(1)); ItemList.OilDrill3.set( - new GT_MetaTileEntity_OilDrill3( + new MTEOilDrill3( MULTILOCK_PUMP_MKIII_CONTROLLER.ID, "multimachine.oildrill3", "Oil/Gas/Fluid Drilling Rig III").getStackForm(1)); ItemList.OilDrill4.set( - new GT_MetaTileEntity_OilDrill4( + new MTEOilDrill4( MULTILOCK_PUMP_MKIV_CONTROLLER.ID, "multimachine.oildrill4", "Oil/Gas/Fluid Drilling Rig IV").getStackForm(1)); ItemList.OilDrillInfinite.set( - new GT_MetaTileEntity_OilDrillInfinite( + new MTEOilDrillInfinite( MULTIBLOCK_PUMP_INFINITE_CONTROLLER.ID, "multimachine.oildrillinfinite", "Infinite Oil/Gas/Fluid Drilling Rig").getStackForm(1)); ItemList.ConcreteBackfiller1.set( - new GT_MetaTileEntity_ConcreteBackfiller1( + new MTEConcreteBackfiller1( CONCRETE_BACKFILLER_I_CONTROLLER.ID, "multimachine.concretebackfiller1", "Concrete Backfiller").getStackForm(1)); ItemList.ConcreteBackfiller2.set( - new GT_MetaTileEntity_ConcreteBackfiller2( + new MTEConcreteBackfiller2( CONCRETE_BACKFILLER_II_CONTROLLER.ID, "multimachine.concretebackfiller3", "Advanced Concrete Backfiller").getStackForm(1)); ItemList.OreDrill1.set( - new GT_MetaTileEntity_OreDrillingPlant1( - ORE_DRILL_MKI_CONTROLLER.ID, - "multimachine.oredrill1", - "Ore Drilling Plant").getStackForm(1)); + new MTEOreDrillingPlant1(ORE_DRILL_MKI_CONTROLLER.ID, "multimachine.oredrill1", "Ore Drilling Plant") + .getStackForm(1)); ItemList.OreDrill2.set( - new GT_MetaTileEntity_OreDrillingPlant2( - ORE_DRILL_MKII_CONTROLLER.ID, - "multimachine.oredrill2", - "Ore Drilling Plant II").getStackForm(1)); + new MTEOreDrillingPlant2(ORE_DRILL_MKII_CONTROLLER.ID, "multimachine.oredrill2", "Ore Drilling Plant II") + .getStackForm(1)); ItemList.OreDrill3.set( - new GT_MetaTileEntity_OreDrillingPlant3( - ORE_DRILL_MKIII_CONTROLLER.ID, - "multimachine.oredrill3", - "Ore Drilling Plant III").getStackForm(1)); + new MTEOreDrillingPlant3(ORE_DRILL_MKIII_CONTROLLER.ID, "multimachine.oredrill3", "Ore Drilling Plant III") + .getStackForm(1)); ItemList.OreDrill4.set( - new GT_MetaTileEntity_OreDrillingPlant4( - ORE_DRILL_MKIV_CONTROLLER.ID, - "multimachine.oredrill4", - "Ore Drilling Plant IV").getStackForm(1)); + new MTEOreDrillingPlant4(ORE_DRILL_MKIV_CONTROLLER.ID, "multimachine.oredrill4", "Ore Drilling Plant IV") + .getStackForm(1)); ItemList.PyrolyseOven.set( - new GT_MetaTileEntity_PyrolyseOven(PYROLYSE_OVEN_CONTROLLER.ID, "multimachine.pyro", "Pyrolyse Oven") - .getStackForm(1)); + new MTEPyrolyseOven(PYROLYSE_OVEN_CONTROLLER.ID, "multimachine.pyro", "Pyrolyse Oven").getStackForm(1)); ItemList.OilCracker.set( - new GT_MetaTileEntity_OilCracker(OIL_CRACKER_CONTROLLER.ID, "multimachine.cracker", "Oil Cracking Unit") - .getStackForm(1)); + new MTEOilCracker(OIL_CRACKER_CONTROLLER.ID, "multimachine.cracker", "Oil Cracking Unit").getStackForm(1)); ItemList.Machine_Multi_Assemblyline.set( - new GT_MetaTileEntity_AssemblyLine( - ASSEMBLING_LINE_CONTROLLER.ID, - "multimachine.assemblyline", - "Assembling Line").getStackForm(1L)); + new MTEAssemblyLine(ASSEMBLING_LINE_CONTROLLER.ID, "multimachine.assemblyline", "Assembling Line") + .getStackForm(1L)); ItemList.Machine_Multi_DieselEngine.set( - new GT_MetaTileEntity_DieselEngine( - COMBUSTION_ENGINE_CONTROLLER.ID, - "multimachine.dieselengine", - "Combustion Engine").getStackForm(1L)); + new MTEDieselEngine(COMBUSTION_ENGINE_CONTROLLER.ID, "multimachine.dieselengine", "Combustion Engine") + .getStackForm(1L)); ItemList.Machine_Multi_ExtremeDieselEngine.set( - new GT_MetaTileEntity_ExtremeDieselEngine( + new MTEExtremeDieselEngine( EXTREME_COMBUSTION_ENGINE_CONTROLLER.ID, "multimachine.extremedieselengine", "Extreme Combustion Engine").getStackForm(1L)); ItemList.Machine_Multi_Cleanroom.set( - new GT_MetaTileEntity_Cleanroom(CLEANROOM_CONTROLLER.ID, "multimachine.cleanroom", "Cleanroom Controller") + new MTECleanroom(CLEANROOM_CONTROLLER.ID, "multimachine.cleanroom", "Cleanroom Controller") .getStackForm(1)); ItemList.Machine_Multi_LargeChemicalReactor.set( - new GT_MetaTileEntity_LargeChemicalReactor( - LCR_CONTROLLER.ID, - "multimachine.chemicalreactor", - "Large Chemical Reactor").getStackForm(1)); - ItemList.PCBFactory.set( - new GT_MetaTileEntity_PCBFactory(PCB_FACTORY_CONTROLLER.ID, "multimachine.pcbfactory", "PCB Factory") - .getStackForm(1)); - ItemList.NanoForge.set( - new GT_MetaTileEntity_NanoForge(NANO_FORGE_CONTROLLER.ID, "multimachine.nanoforge", "Nano Forge") - .getStackForm(1)); - ItemList.Machine_Multi_DroneCentre.set( - new GT_MetaTileEntity_DroneCentre(Drone_Centre.ID, "multimachine_DroneCentre", "Drone Centre") + new MTELargeChemicalReactor(LCR_CONTROLLER.ID, "multimachine.chemicalreactor", "Large Chemical Reactor") .getStackForm(1)); + ItemList.PCBFactory.set( + new MTEPCBFactory(PCB_FACTORY_CONTROLLER.ID, "multimachine.pcbfactory", "PCB Factory").getStackForm(1)); + ItemList.NanoForge + .set(new MTENanoForge(NANO_FORGE_CONTROLLER.ID, "multimachine.nanoforge", "Nano Forge").getStackForm(1)); + ItemList.Machine_Multi_DroneCentre + .set(new MTEDroneCentre(Drone_Centre.ID, "multimachine_DroneCentre", "Drone Centre").getStackForm(1)); ItemList.Machine_Multi_IndustrialElectromagneticSeparator.set( - new GT_MetaTileEntity_IndustrialElectromagneticSeparator( + new MTEIndustrialElectromagneticSeparator( INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR_CONTROLLER.ID, "multimachine.electromagneticseparator", "Magnetic Flux Exhibitor").getStackForm(1)); - ItemList.Machine_Multi_Canner.set( - new GT_MetaTileEntity_MultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro") - .getStackForm(1)); + ItemList.Machine_Multi_Canner + .set(new MTEMultiCanner(MULTI_CANNER_CONTROLLER.ID, "multimachine.canner", "TurboCan Pro").getStackForm(1)); ItemList.WormholeGenerator.set( - new GT_MetaTileEntity_WormholeGenerator( + new MTEWormholeGenerator( WORMHOLE_GENERATOR_CONTROLLER.ID, "multimachine.wormhole", "Miniature Wormhole Generator").getStackForm(1)); ItemList.Machine_Multi_IndustrialLaserEngraver.set( - new GT_MetaTileEntity_IndustrialLaserEngraver( + new MTEIndustrialLaserEngraver( INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID, "multimachine.engraver", "Hyper-Intensity Laser Engraver").getStackForm(1)); ItemList.Machine_Multi_IndustrialExtractor.set( - new GT_MetaTileEntity_IndustrialExtractor( + new MTEIndustrialExtractor( INDUSTRIAL_EXTRACTOR_CONTROLLER.ID, "multimachine.extractor", "Dissection Apparatus").getStackForm(1)); ItemList.Machine_Multi_Lathe.set( - new GT_MetaTileEntity_MultiLathe( - MULTI_LATHE_CONTROLLER.ID, - "multimachine.lathe", - "Industrial Precision Lathe").getStackForm(1)); + new MTEMultiLathe(MULTI_LATHE_CONTROLLER.ID, "multimachine.lathe", "Industrial Precision Lathe") + .getStackForm(1)); ItemList.Machine_Multi_IndustrialCompressor.set( - new GT_MetaTileEntity_IndustrialCompressor( + new MTEIndustrialCompressor( INDUSTRIAL_COMPRESSOR_CONTROLLER.ID, "multimachine.basiccompressor", "Large Electric Compressor").getStackForm(1)); ItemList.Machine_Multi_HIPCompressor.set( - new GT_MetaTileEntity_HIPCompressor( + new MTEHIPCompressor( HIP_COMPRESSOR_CONTROLLER.ID, "multimachine.hipcompressor", "Hot Isostatic Pressurization Unit").getStackForm(1)); ItemList.Machine_Multi_NeutroniumCompressor.set( - new GT_MetaTileEntity_NeutroniumCompressor( + new MTENeutroniumCompressor( NEUTRONIUM_COMPRESSOR_CONTROLLER.ID, "multimachine.neutroniumcompressor", "Neutronium Compressor").getStackForm(1)); ItemList.Machine_Multi_BlackHoleCompressor.set( - new GT_MetaTileEntity_BlackHoleCompressor( + new MTEBlackHoleCompressor( BLACKHOLE_COMPRESSOR_CONTROLLER.ID, "multimachine.blackholecompressor", "Semi-Stable Black Hole Containment Field").getStackForm(1)); ItemList.Machine_Multi_Autoclave.set( - new GT_MetaTileEntity_MultiAutoclave( - MULTI_AUTOCLAVE_CONTROLLER.ID, - "multimachine.autoclave", - "Industrial Autoclave").getStackForm(1)); + new MTEMultiAutoclave(MULTI_AUTOCLAVE_CONTROLLER.ID, "multimachine.autoclave", "Industrial Autoclave") + .getStackForm(1)); ItemList.LargeFluidExtractor.set( - new GT_MetaTileEntity_LargeFluidExtractor( - LARGE_FLUID_EXTRACTOR.ID, - "multimachine.fluidextractor", - "Large Fluid Extractor").getStackForm(1)); + new MTELargeFluidExtractor(LARGE_FLUID_EXTRACTOR.ID, "multimachine.fluidextractor", "Large Fluid Extractor") + .getStackForm(1)); } private static void registerSteamMachines() { ItemList.Machine_Bronze_Furnace.set( - new GT_MetaTileEntity_Furnace_Bronze(STEAM_FURNACE.ID, "bronzemachine.furnace", "Steam Furnace") - .getStackForm(1L)); + new MTESteamFurnaceBronze(STEAM_FURNACE.ID, "bronzemachine.furnace", "Steam Furnace").getStackForm(1L)); ItemList.Machine_Bronze_Macerator.set( - new GT_MetaTileEntity_Macerator_Bronze(STEAM_MACERATOR.ID, "bronzemachine.macerator", "Steam Macerator") + new MTESteamMaceratorBronze(STEAM_MACERATOR.ID, "bronzemachine.macerator", "Steam Macerator") .getStackForm(1L)); ItemList.Machine_Bronze_Extractor.set( - new GT_MetaTileEntity_Extractor_Bronze(STEAM_EXTRACTOR.ID, "bronzemachine.extractor", "Steam Extractor") + new MTESteamExtractorBronze(STEAM_EXTRACTOR.ID, "bronzemachine.extractor", "Steam Extractor") .getStackForm(1L)); ItemList.Machine_Bronze_Hammer.set( - new GT_MetaTileEntity_ForgeHammer_Bronze( - STEAM_FORGE_HAMMER.ID, - "bronzemachine.hammer", - "Steam Forge Hammer").getStackForm(1L)); + new MTESteamForgeHammerBronze(STEAM_FORGE_HAMMER.ID, "bronzemachine.hammer", "Steam Forge Hammer") + .getStackForm(1L)); ItemList.Machine_Bronze_Compressor.set( - new GT_MetaTileEntity_Compressor_Bronze(STEAM_COMPRESSOR.ID, "bronzemachine.compressor", "Steam Compressor") + new MTESteamCompressorBronze(STEAM_COMPRESSOR.ID, "bronzemachine.compressor", "Steam Compressor") .getStackForm(1L)); ItemList.Machine_Bronze_AlloySmelter.set( - new GT_MetaTileEntity_AlloySmelter_Bronze( - STEAM_ALLOY_SMELTER.ID, - "bronzemachine.alloysmelter", - "Steam Alloy Smelter").getStackForm(1L)); + new MTESteamAlloySmelterBronze(STEAM_ALLOY_SMELTER.ID, "bronzemachine.alloysmelter", "Steam Alloy Smelter") + .getStackForm(1L)); } private static void registerUnpackager() { ItemList.Machine_LV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_LV.ID, "basicmachine.unboxinator.tier.01", "Basic Unpackager", @@ -1706,12 +1659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_MV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_MV.ID, "basicmachine.unboxinator.tier.02", "Advanced Unpackager", @@ -1722,12 +1675,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_HV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_HV.ID, "basicmachine.unboxinator.tier.03", "Advanced Unpackager II", @@ -1738,12 +1691,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_EV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_EV.ID, "basicmachine.unboxinator.tier.04", "Advanced Unpackager III", @@ -1754,12 +1707,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_IV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_IV.ID, "basicmachine.unboxinator.tier.05", "Unboxinator", @@ -1770,12 +1723,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_LuV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_LuV.ID, "basicmachine.unboxinator.tier.06", "Unboxinator", @@ -1786,12 +1739,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_ZPM_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_ZPM.ID, "basicmachine.unboxinator.tier.07", "Unboxinator", @@ -1802,12 +1755,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); ItemList.Machine_UV_Unboxinator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( UNPACKAGER_UV.ID, "basicmachine.unboxinator.tier.08", "Unboxinator", @@ -1818,7 +1771,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "UNBOXINATOR", null).getStackForm(1L)); } @@ -1826,7 +1779,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerAssemblingMachine() { ItemList.Machine_LV_Assembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLER_LV.ID, "basicmachine.assembler.tier.01", "Basic Assembling Machine", @@ -1837,12 +1790,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.Machine_MV_Assembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLER_MV.ID, "basicmachine.assembler.tier.02", "Advanced Assembling Machine", @@ -1853,12 +1806,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.Machine_HV_Assembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLER_HV.ID, "basicmachine.assembler.tier.03", "Advanced Assembling Machine II", @@ -1869,12 +1822,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.Machine_EV_Assembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLER_EV.ID, "basicmachine.assembler.tier.04", "Advanced Assembling Machine III", @@ -1885,12 +1838,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.Machine_IV_Assembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLER_IV.ID, "basicmachine.assembler.tier.05", "Advanced Assembling Machine IV", @@ -1901,12 +1854,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_LuV.ID, "basicmachine.assembler.tier.06", "Elite Assembling Machine", @@ -1917,12 +1870,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_ZPM.ID, "basicmachine.assembler.tier.07", "Elite Assembling Machine II", @@ -1933,12 +1886,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_UV.ID, "basicmachine.assembler.tier.08", "Ultimate Assembly Constructor", @@ -1949,12 +1902,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_UHV.ID, "basicmachine.assembler.tier.09", "Epic Assembly Constructor", @@ -1965,12 +1918,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_UEV.ID, "basicmachine.assembler.tier.10", "Epic Assembly Constructor II", @@ -1981,12 +1934,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_UIV.ID, "basicmachine.assembler.tier.11", "Epic Assembly Constructor III", @@ -1997,12 +1950,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); ItemList.AssemblingMachineUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ASSEMBLING_MACHINE_UMV.ID, "basicmachine.assembler.tier.12", "Epic Assembly Constructor IV", @@ -2013,14 +1966,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ASSEMBLER", null).getStackForm(1L)); } private static void registerMatterAmplifier() { ItemList.Machine_LV_Amplifab.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_LV.ID, "basicmachine.amplifab.tier.01", "Basic Amplifabricator", @@ -2031,12 +1984,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.Machine_MV_Amplifab.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_MV.ID, "basicmachine.amplifab.tier.02", "Advanced Amplifabricator", @@ -2047,12 +2000,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.Machine_HV_Amplifab.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_HV.ID, "basicmachine.amplifab.tier.03", "Advanced Amplifabricator II", @@ -2063,12 +2016,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.Machine_EV_Amplifab.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_EV.ID, "basicmachine.amplifab.tier.04", "Advanced Amplifabricator III", @@ -2079,12 +2032,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.Machine_IV_Amplifab.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_IV.ID, "basicmachine.amplifab.tier.05", "Advanced Amplifabricator IV", @@ -2095,12 +2048,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_LuV.ID, "basicmachine.amplifab.tier.06", "Elite Amplifabricator", @@ -2111,12 +2064,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_ZPM.ID, "basicmachine.amplifab.tier.07", "Elite Amplifabricator II", @@ -2127,12 +2080,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_UV.ID, "basicmachine.amplifab.tier.08", "Ultimate Amplicreator", @@ -2143,12 +2096,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_UHV.ID, "basicmachine.amplifab.tier.09", "Epic Amplicreator", @@ -2159,12 +2112,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_UEV.ID, "basicmachine.amplifab.tier.10", "Epic Amplicreator II", @@ -2175,12 +2128,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_UIV.ID, "basicmachine.amplifab.tier.11", "Epic Amplicreator III", @@ -2191,12 +2144,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); ItemList.AmplifabricatorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MATTER_AMPLIFIER_UMV.ID, "basicmachine.amplifab.tier.12", "Epic Amplicreator IV", @@ -2207,14 +2160,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, 1000, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AMPLIFAB", null).getStackForm(1L)); } private static void registerAlloySmelter() { ItemList.Machine_LV_AlloySmelter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_LV.ID, "basicmachine.alloysmelter.tier.01", "Basic Alloy Smelter", @@ -2225,12 +2178,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.Machine_MV_AlloySmelter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_MV.ID, "basicmachine.alloysmelter.tier.02", "Advanced Alloy Smelter", @@ -2241,12 +2194,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.Machine_HV_AlloySmelter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_HV.ID, "basicmachine.alloysmelter.tier.03", "Advanced Alloy Smelter II", @@ -2257,12 +2210,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.Machine_EV_AlloySmelter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_EV.ID, "basicmachine.alloysmelter.tier.04", "Advanced Alloy Smelter III", @@ -2273,12 +2226,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.Machine_IV_AlloySmelter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_IV.ID, "basicmachine.alloysmelter.tier.05", "Advanced Alloy Smelter IV", @@ -2289,12 +2242,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_LuV.ID, "basicmachine.alloysmelter.tier.06", "Elite Alloy Smelter", @@ -2305,12 +2258,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_ZPM.ID, "basicmachine.alloysmelter.tier.07", "Elite Alloy Smelter II", @@ -2321,12 +2274,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_UV.ID, "basicmachine.alloysmelter.tier.08", "Ultimate Alloy Integrator", @@ -2337,12 +2290,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_UHV.ID, "basicmachine.alloysmelter.tier.09", "Epic Alloy Integrator", @@ -2353,12 +2306,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_UEV.ID, "basicmachine.alloysmelter.tier.10", "Epic Alloy Integrator II", @@ -2369,12 +2322,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_UIV.ID, "basicmachine.alloysmelter.tier.11", "Epic Alloy Integrator III", @@ -2385,12 +2338,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); ItemList.AlloySmelterUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ALLOY_SMELTER_UMV.ID, "basicmachine.alloysmelter.tier.12", "Epic Alloy Integrator IV", @@ -2401,269 +2354,187 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ALLOY_SMELTER", null).getStackForm(1L)); } private static void registerHPSteamMachines() { ItemList.Machine_HP_Extractor.set( - new GT_MetaTileEntity_Extractor_Steel( - HP_STEAM_EXTRACTOR.ID, - "hpmachine.extractor", - "High Pressure Extractor").getStackForm(1L)); + new MTESteamExtractorSteel(HP_STEAM_EXTRACTOR.ID, "hpmachine.extractor", "High Pressure Extractor") + .getStackForm(1L)); ItemList.Machine_HP_Furnace.set( - new GT_MetaTileEntity_Furnace_Steel(HP_STEAM_FURNACE.ID, "hpmachine.furnace", "High Pressure Furnace") + new MTESteamFurnaceSteel(HP_STEAM_FURNACE.ID, "hpmachine.furnace", "High Pressure Furnace") .getStackForm(1L)); ItemList.Machine_HP_Macerator.set( - new GT_MetaTileEntity_Macerator_Steel( - HP_STEAM_MACERATOR.ID, - "hpmachine.macerator", - "High Pressure Macerator").getStackForm(1L)); + new MTESteamMaceratorSteel(HP_STEAM_MACERATOR.ID, "hpmachine.macerator", "High Pressure Macerator") + .getStackForm(1L)); ItemList.Machine_HP_Hammer.set( - new GT_MetaTileEntity_ForgeHammer_Steel( - HP_STEAM_FORGE_HAMMER.ID, - "hpmachine.hammer", - "High Pressure Forge Hammer").getStackForm(1L)); + new MTESteamForgeHammerSteel(HP_STEAM_FORGE_HAMMER.ID, "hpmachine.hammer", "High Pressure Forge Hammer") + .getStackForm(1L)); ItemList.Machine_HP_Compressor.set( - new GT_MetaTileEntity_Compressor_Steel( - HP_STEAM_COMPRESSOR.ID, - "hpmachine.compressor", - "High Pressure Compressor").getStackForm(1L)); + new MTESteamCompressorSteel(HP_STEAM_COMPRESSOR.ID, "hpmachine.compressor", "High Pressure Compressor") + .getStackForm(1L)); ItemList.Machine_HP_AlloySmelter.set( - new GT_MetaTileEntity_AlloySmelter_Steel( + new MTESteamAlloySmelterSteel( HP_STEAM_ALLOY_SMELTER.ID, "hpmachine.alloysmelter", "High Pressure Alloy Smelter").getStackForm(1L)); } private static void registerLocker() { - ItemList.Locker_ULV.set( - new GT_MetaTileEntity_Locker(LOCKER_ULV.ID, "locker.tier.00", "Ultra Low Voltage Locker", 0) - .getStackForm(1L)); - ItemList.Locker_LV.set( - new GT_MetaTileEntity_Locker(LOCKER_LV.ID, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); - ItemList.Locker_MV.set( - new GT_MetaTileEntity_Locker(LOCKER_MV.ID, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L)); - ItemList.Locker_HV.set( - new GT_MetaTileEntity_Locker(LOCKER_HV.ID, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L)); - ItemList.Locker_EV.set( - new GT_MetaTileEntity_Locker(LOCKER_EV.ID, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L)); - ItemList.Locker_IV.set( - new GT_MetaTileEntity_Locker(LOCKER_IV.ID, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L)); - ItemList.Locker_LuV.set( - new GT_MetaTileEntity_Locker(LOCKER_LuV.ID, "locker.tier.06", "Ludicrous Voltage Locker", 6) - .getStackForm(1L)); - ItemList.Locker_ZPM.set( - new GT_MetaTileEntity_Locker(LOCKER_ZPM.ID, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L)); - ItemList.Locker_UV.set( - new GT_MetaTileEntity_Locker(LOCKER_UV.ID, "locker.tier.08", "Ultimate Voltage Locker", 8) - .getStackForm(1L)); - ItemList.Locker_MAX.set( - new GT_MetaTileEntity_Locker(LOCKER_UHV.ID, "locker.tier.09", "Highly Ultimate Voltage Locker", 9) - .getStackForm(1L)); + ItemList.Locker_ULV + .set(new MTELocker(LOCKER_ULV.ID, "locker.tier.00", "Ultra Low Voltage Locker", 0).getStackForm(1L)); + ItemList.Locker_LV.set(new MTELocker(LOCKER_LV.ID, "locker.tier.01", "Low Voltage Locker", 1).getStackForm(1L)); + ItemList.Locker_MV + .set(new MTELocker(LOCKER_MV.ID, "locker.tier.02", "Medium Voltage Locker", 2).getStackForm(1L)); + ItemList.Locker_HV + .set(new MTELocker(LOCKER_HV.ID, "locker.tier.03", "High Voltage Locker", 3).getStackForm(1L)); + ItemList.Locker_EV + .set(new MTELocker(LOCKER_EV.ID, "locker.tier.04", "Extreme Voltage Locker", 4).getStackForm(1L)); + ItemList.Locker_IV + .set(new MTELocker(LOCKER_IV.ID, "locker.tier.05", "Insane Voltage Locker", 5).getStackForm(1L)); + ItemList.Locker_LuV + .set(new MTELocker(LOCKER_LuV.ID, "locker.tier.06", "Ludicrous Voltage Locker", 6).getStackForm(1L)); + ItemList.Locker_ZPM + .set(new MTELocker(LOCKER_ZPM.ID, "locker.tier.07", "ZPM Voltage Locker", 7).getStackForm(1L)); + ItemList.Locker_UV + .set(new MTELocker(LOCKER_UV.ID, "locker.tier.08", "Ultimate Voltage Locker", 8).getStackForm(1L)); + ItemList.Locker_MAX + .set(new MTELocker(LOCKER_UHV.ID, "locker.tier.09", "Highly Ultimate Voltage Locker", 9).getStackForm(1L)); } private static void registerScanner() { - ItemList.Machine_LV_Scanner.set( - new GT_MetaTileEntity_Scanner(SCANNER_LV.ID, "basicmachine.scanner.tier.01", "Basic Scanner", 1) - .getStackForm(1L)); - ItemList.Machine_MV_Scanner.set( - new GT_MetaTileEntity_Scanner(SCANNER_MV.ID, "basicmachine.scanner.tier.02", "Advanced Scanner", 2) - .getStackForm(1L)); + ItemList.Machine_LV_Scanner + .set(new MTEScanner(SCANNER_LV.ID, "basicmachine.scanner.tier.01", "Basic Scanner", 1).getStackForm(1L)); + ItemList.Machine_MV_Scanner + .set(new MTEScanner(SCANNER_MV.ID, "basicmachine.scanner.tier.02", "Advanced Scanner", 2).getStackForm(1L)); ItemList.Machine_HV_Scanner.set( - new GT_MetaTileEntity_Scanner(SCANNER_HV.ID, "basicmachine.scanner.tier.03", "Advanced Scanner II", 3) - .getStackForm(1L)); + new MTEScanner(SCANNER_HV.ID, "basicmachine.scanner.tier.03", "Advanced Scanner II", 3).getStackForm(1L)); ItemList.Machine_EV_Scanner.set( - new GT_MetaTileEntity_Scanner(SCANNER_EV.ID, "basicmachine.scanner.tier.04", "Advanced Scanner III", 4) - .getStackForm(1L)); + new MTEScanner(SCANNER_EV.ID, "basicmachine.scanner.tier.04", "Advanced Scanner III", 4).getStackForm(1L)); ItemList.Machine_IV_Scanner.set( - new GT_MetaTileEntity_Scanner(SCANNER_IV.ID, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5) - .getStackForm(1L)); - ItemList.ScannerLuV.set( - new GT_MetaTileEntity_Scanner(SCANNER_LuV.ID, "basicmachine.scanner.tier.06", "Elite Scanner", 6) - .getStackForm(1L)); + new MTEScanner(SCANNER_IV.ID, "basicmachine.scanner.tier.05", "Advanced Scanner IV", 5).getStackForm(1L)); + ItemList.ScannerLuV + .set(new MTEScanner(SCANNER_LuV.ID, "basicmachine.scanner.tier.06", "Elite Scanner", 6).getStackForm(1L)); ItemList.ScannerZPM.set( - new GT_MetaTileEntity_Scanner(SCANNER_ZPM.ID, "basicmachine.scanner.tier.07", "Elite Scanner II", 7) - .getStackForm(1L)); + new MTEScanner(SCANNER_ZPM.ID, "basicmachine.scanner.tier.07", "Elite Scanner II", 7).getStackForm(1L)); ItemList.ScannerUV.set( - new GT_MetaTileEntity_Scanner( - SCANNER_UV.ID, - "basicmachine.scanner.tier.08", - "Ultimate Electron Microscope", - 8).getStackForm(1L)); + new MTEScanner(SCANNER_UV.ID, "basicmachine.scanner.tier.08", "Ultimate Electron Microscope", 8) + .getStackForm(1L)); ItemList.ScannerUHV.set( - new GT_MetaTileEntity_Scanner(SCANNER_UHV.ID, "basicmachine.scanner.tier.09", "Epic Electron Microscope", 9) + new MTEScanner(SCANNER_UHV.ID, "basicmachine.scanner.tier.09", "Epic Electron Microscope", 9) .getStackForm(1L)); ItemList.ScannerUEV.set( - new GT_MetaTileEntity_Scanner( - SCANNER_UEV.ID, - "basicmachine.scanner.tier.10", - "Epic Electron Microscope II", - 10).getStackForm(1L)); + new MTEScanner(SCANNER_UEV.ID, "basicmachine.scanner.tier.10", "Epic Electron Microscope II", 10) + .getStackForm(1L)); ItemList.ScannerUIV.set( - new GT_MetaTileEntity_Scanner( - SCANNER_UIV.ID, - "basicmachine.scanner.tier.11", - "Epic Electron Microscope III", - 11).getStackForm(1L)); + new MTEScanner(SCANNER_UIV.ID, "basicmachine.scanner.tier.11", "Epic Electron Microscope III", 11) + .getStackForm(1L)); ItemList.ScannerUMV.set( - new GT_MetaTileEntity_Scanner( - SCANNER_UMV.ID, - "basicmachine.scanner.tier.12", - "Epic Electron Microscope IV", - 12).getStackForm(1L)); + new MTEScanner(SCANNER_UMV.ID, "basicmachine.scanner.tier.12", "Epic Electron Microscope IV", 12) + .getStackForm(1L)); } private static void registerPackager() { ItemList.Machine_LV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_LV.ID, "basicmachine.boxinator.tier.01", "Basic Packager", 1) - .getStackForm(1L)); + new MTEBoxinator(PACKAGER_LV.ID, "basicmachine.boxinator.tier.01", "Basic Packager", 1).getStackForm(1L)); ItemList.Machine_MV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_MV.ID, "basicmachine.boxinator.tier.02", "Advanced Packager", 2) + new MTEBoxinator(PACKAGER_MV.ID, "basicmachine.boxinator.tier.02", "Advanced Packager", 2) .getStackForm(1L)); ItemList.Machine_HV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_HV.ID, "basicmachine.boxinator.tier.03", "Advanced Packager II", 3) + new MTEBoxinator(PACKAGER_HV.ID, "basicmachine.boxinator.tier.03", "Advanced Packager II", 3) .getStackForm(1L)); ItemList.Machine_EV_Boxinator.set( - new GT_MetaTileEntity_Boxinator( - PACKAGER_EV.ID, - "basicmachine.boxinator.tier.04", - "Advanced Packager III", - 4).getStackForm(1L)); - ItemList.Machine_IV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_IV.ID, "basicmachine.boxinator.tier.05", "Boxinator", 5) - .getStackForm(1L)); - ItemList.Machine_LuV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_LuV.ID, "basicmachine.boxinator.tier.06", "Boxinator", 6) - .getStackForm(1L)); - ItemList.Machine_ZPM_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_ZPM.ID, "basicmachine.boxinator.tier.07", "Boxinator", 7) - .getStackForm(1L)); - ItemList.Machine_UV_Boxinator.set( - new GT_MetaTileEntity_Boxinator(PACKAGER_UV.ID, "basicmachine.boxinator.tier.08", "Boxinator", 8) - .getStackForm(1L)); + new MTEBoxinator(PACKAGER_EV.ID, "basicmachine.boxinator.tier.04", "Advanced Packager III", 4) + .getStackForm(1L)); + ItemList.Machine_IV_Boxinator + .set(new MTEBoxinator(PACKAGER_IV.ID, "basicmachine.boxinator.tier.05", "Boxinator", 5).getStackForm(1L)); + ItemList.Machine_LuV_Boxinator + .set(new MTEBoxinator(PACKAGER_LuV.ID, "basicmachine.boxinator.tier.06", "Boxinator", 6).getStackForm(1L)); + ItemList.Machine_ZPM_Boxinator + .set(new MTEBoxinator(PACKAGER_ZPM.ID, "basicmachine.boxinator.tier.07", "Boxinator", 7).getStackForm(1L)); + ItemList.Machine_UV_Boxinator + .set(new MTEBoxinator(PACKAGER_UV.ID, "basicmachine.boxinator.tier.08", "Boxinator", 8).getStackForm(1L)); } private static void registerRockBreaker() { ItemList.Machine_LV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_LV.ID, - "basicmachine.rockbreaker.tier.01", - "Basic Rock Breaker", - 1).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_LV.ID, "basicmachine.rockbreaker.tier.01", "Basic Rock Breaker", 1) + .getStackForm(1L)); ItemList.Machine_MV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_MV.ID, - "basicmachine.rockbreaker.tier.02", - "Advanced Rock Breaker", - 2).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_MV.ID, "basicmachine.rockbreaker.tier.02", "Advanced Rock Breaker", 2) + .getStackForm(1L)); ItemList.Machine_HV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_HV.ID, - "basicmachine.rockbreaker.tier.03", - "Advanced Rock Breaker II", - 3).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_HV.ID, "basicmachine.rockbreaker.tier.03", "Advanced Rock Breaker II", 3) + .getStackForm(1L)); ItemList.Machine_EV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_EV.ID, - "basicmachine.rockbreaker.tier.04", - "Advanced Rock Breaker III", - 4).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_EV.ID, "basicmachine.rockbreaker.tier.04", "Advanced Rock Breaker III", 4) + .getStackForm(1L)); ItemList.Machine_IV_RockBreaker.set( - new GT_MetaTileEntity_RockBreaker( + new MTERockBreaker( ROCK_BREAKER_IV.ID, "basicmachine.rockbreaker.tier.05", "Cryogenic Magma Solidifier R-8200", 5).getStackForm(1L)); ItemList.RockBreakerLuV.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_LuV.ID, - "rockbreaker.tier.06", - "Cryogenic Magma Solidifier R-9200", - 6).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_LuV.ID, "rockbreaker.tier.06", "Cryogenic Magma Solidifier R-9200", 6) + .getStackForm(1L)); ItemList.RockBreakerZPM.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_ZPM.ID, - "rockbreaker.tier.07", - "Cryogenic Magma Solidifier R-10200", - 7).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_ZPM.ID, "rockbreaker.tier.07", "Cryogenic Magma Solidifier R-10200", 7) + .getStackForm(1L)); ItemList.RockBreakerUV.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_UV.ID, - "rockbreaker.tier.08", - "Cryogenic Magma Solidifier R-11200", - 8).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_UV.ID, "rockbreaker.tier.08", "Cryogenic Magma Solidifier R-11200", 8) + .getStackForm(1L)); ItemList.RockBreakerUHV.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_UHV.ID, - "rockbreaker.tier.09", - "Cryogenic Magma Solidifier R-12200", - 9).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_UHV.ID, "rockbreaker.tier.09", "Cryogenic Magma Solidifier R-12200", 9) + .getStackForm(1L)); ItemList.RockBreakerUEV.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_UEV.ID, - "rockbreaker.tier.10", - "Cryogenic Magma Solidifier R-13200", - 10).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_UEV.ID, "rockbreaker.tier.10", "Cryogenic Magma Solidifier R-13200", 10) + .getStackForm(1L)); ItemList.RockBreakerUIV.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_UIV.ID, - "rockbreaker.tier.11", - "Cryogenic Magma Solidifier R-14200", - 11).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_UIV.ID, "rockbreaker.tier.11", "Cryogenic Magma Solidifier R-14200", 11) + .getStackForm(1L)); ItemList.RockBreakerUMV.set( - new GT_MetaTileEntity_RockBreaker( - ROCK_BREAKER_UMV.ID, - "rockbreaker.tier.12", - "Cryogenic Magma Solidifier R-15200", - 12).getStackForm(1L)); + new MTERockBreaker(ROCK_BREAKER_UMV.ID, "rockbreaker.tier.12", "Cryogenic Magma Solidifier R-15200", 12) + .getStackForm(1L)); } private static void registerIndustrialApiary() { if (Forestry.isModLoaded()) { ItemList.Machine_IndustrialApiary.set( - new GT_MetaTileEntity_IndustrialApiary( - INDUSTRIAL_APIARY.ID, - "basicmachine.industrialapiary", - "Industrial Apiary", - 8).getStackForm(1L)); + new MTEIndustrialApiary(INDUSTRIAL_APIARY.ID, "basicmachine.industrialapiary", "Industrial Apiary", 8) + .getStackForm(1L)); } } private static void registerMassFab() { ItemList.Machine_LV_Massfab.set( - new GT_MetaTileEntity_Massfabricator( - MASS_FABRICATOR_LV.ID, - "basicmachine.massfab.tier.01", - "Basic Mass Fabricator", - 1).getStackForm(1L)); + new MTEMassfabricator(MASS_FABRICATOR_LV.ID, "basicmachine.massfab.tier.01", "Basic Mass Fabricator", 1) + .getStackForm(1L)); ItemList.Machine_MV_Massfab.set( - new GT_MetaTileEntity_Massfabricator( - MASS_FABRICATOR_MV.ID, - "basicmachine.massfab.tier.02", - "Advanced Mass Fabricator", - 2).getStackForm(1L)); + new MTEMassfabricator(MASS_FABRICATOR_MV.ID, "basicmachine.massfab.tier.02", "Advanced Mass Fabricator", 2) + .getStackForm(1L)); ItemList.Machine_HV_Massfab.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MASS_FABRICATOR_HV.ID, "basicmachine.massfab.tier.03", "Advanced Mass Fabricator II", 3).getStackForm(1L)); ItemList.Machine_EV_Massfab.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MASS_FABRICATOR_EV.ID, "basicmachine.massfab.tier.04", "Advanced Mass Fabricator III", 4).getStackForm(1L)); ItemList.Machine_IV_Massfab.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MASS_FABRICATOR_IV.ID, "basicmachine.massfab.tier.05", "Advanced Mass Fabricator IV", @@ -2672,71 +2543,50 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerReplicator() { ItemList.Machine_LV_Replicator.set( - new GT_MetaTileEntity_Replicator(REPLICATOR_LV.ID, "basicmachine.replicator.tier.01", "Basic Replicator", 1) + new MTEReplicator(REPLICATOR_LV.ID, "basicmachine.replicator.tier.01", "Basic Replicator", 1) .getStackForm(1L)); ItemList.Machine_MV_Replicator.set( - new GT_MetaTileEntity_Replicator( - REPLICATOR_MV.ID, - "basicmachine.replicator.tier.02", - "Advanced Replicator", - 2).getStackForm(1L)); + new MTEReplicator(REPLICATOR_MV.ID, "basicmachine.replicator.tier.02", "Advanced Replicator", 2) + .getStackForm(1L)); ItemList.Machine_HV_Replicator.set( - new GT_MetaTileEntity_Replicator( - REPLICATOR_HV.ID, - "basicmachine.replicator.tier.03", - "Advanced Replicator II", - 3).getStackForm(1L)); + new MTEReplicator(REPLICATOR_HV.ID, "basicmachine.replicator.tier.03", "Advanced Replicator II", 3) + .getStackForm(1L)); ItemList.Machine_EV_Replicator.set( - new GT_MetaTileEntity_Replicator( - REPLICATOR_EV.ID, - "basicmachine.replicator.tier.04", - "Advanced Replicator III", - 4).getStackForm(1L)); + new MTEReplicator(REPLICATOR_EV.ID, "basicmachine.replicator.tier.04", "Advanced Replicator III", 4) + .getStackForm(1L)); ItemList.Machine_IV_Replicator.set( - new GT_MetaTileEntity_Replicator( - REPLICATOR_IV.ID, - "basicmachine.replicator.tier.05", - "Advanced Replicator IV", - 5).getStackForm(1L)); + new MTEReplicator(REPLICATOR_IV.ID, "basicmachine.replicator.tier.05", "Advanced Replicator IV", 5) + .getStackForm(1L)); ItemList.ReplicatorLuV.set( - new GT_MetaTileEntity_Replicator( - MATTER_REPLICATOR_LuV.ID, - "basicmachine.replicator.tier.06", - "Elite Replicator", - 6).getStackForm(1L)); + new MTEReplicator(MATTER_REPLICATOR_LuV.ID, "basicmachine.replicator.tier.06", "Elite Replicator", 6) + .getStackForm(1L)); ItemList.ReplicatorZPM.set( - new GT_MetaTileEntity_Replicator( - MATTER_REPLICATOR_ZPM.ID, - "basicmachine.replicator.tier.07", - "Elite Replicator II", - 7).getStackForm(1L)); + new MTEReplicator(MATTER_REPLICATOR_ZPM.ID, "basicmachine.replicator.tier.07", "Elite Replicator II", 7) + .getStackForm(1L)); ItemList.ReplicatorUV.set( - new GT_MetaTileEntity_Replicator( + new MTEReplicator( MATTER_REPLICATOR_UV.ID, "basicmachine.replicator.tier.08", "Ultimate Elemental Composer", 8).getStackForm(1L)); ItemList.ReplicatorUHV.set( - new GT_MetaTileEntity_Replicator( - MATTER_REPLICATOR_UHV.ID, - "basicmachine.replicator.tier.09", - "Epic Elemental Composer", - 9).getStackForm(1L)); + new MTEReplicator(MATTER_REPLICATOR_UHV.ID, "basicmachine.replicator.tier.09", "Epic Elemental Composer", 9) + .getStackForm(1L)); ItemList.ReplicatorUEV.set( - new GT_MetaTileEntity_Replicator( + new MTEReplicator( MATTER_REPLICATOR_UEV.ID, "basicmachine.replicator.tier.10", "Epic Elemental Composer II", 10).getStackForm(1L)); ItemList.ReplicatorUIV.set( - new GT_MetaTileEntity_Replicator( + new MTEReplicator( MATTER_REPLICATOR_UIV.ID, "basicmachine.replicator.tier.11", "Epic Elemental Composer III", 11).getStackForm(1L)); ItemList.ReplicatorUMV.set( - new GT_MetaTileEntity_Replicator( + new MTEReplicator( MATTER_REPLICATOR_UMV.ID, "basicmachine.replicator.tier.12", "Epic Elemental Composer IV", @@ -2745,136 +2595,115 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerBrewery() { ItemList.Machine_LV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_LV.ID, "basicmachine.brewery.tier.01", "Basic Brewery", 1) - .getStackForm(1L)); + new MTEPotionBrewer(BREWERY_LV.ID, "basicmachine.brewery.tier.01", "Basic Brewery", 1).getStackForm(1L)); ItemList.Machine_MV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_MV.ID, "basicmachine.brewery.tier.02", "Advanced Brewery", 2) - .getStackForm(1L)); + new MTEPotionBrewer(BREWERY_MV.ID, "basicmachine.brewery.tier.02", "Advanced Brewery", 2).getStackForm(1L)); ItemList.Machine_HV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_HV.ID, "basicmachine.brewery.tier.03", "Advanced Brewery II", 3) + new MTEPotionBrewer(BREWERY_HV.ID, "basicmachine.brewery.tier.03", "Advanced Brewery II", 3) .getStackForm(1L)); ItemList.Machine_EV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_EV.ID, "basicmachine.brewery.tier.04", "Advanced Brewery III", 4) + new MTEPotionBrewer(BREWERY_EV.ID, "basicmachine.brewery.tier.04", "Advanced Brewery III", 4) .getStackForm(1L)); ItemList.Machine_IV_Brewery.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_IV.ID, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5) + new MTEPotionBrewer(BREWERY_IV.ID, "basicmachine.brewery.tier.05", "Advanced Brewery IV", 5) .getStackForm(1L)); ItemList.BreweryLuV.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_LuV.ID, "basicmachine.brewery.tier.06", "Elite Brewery", 6) - .getStackForm(1L)); + new MTEPotionBrewer(BREWERY_LuV.ID, "basicmachine.brewery.tier.06", "Elite Brewery", 6).getStackForm(1L)); ItemList.BreweryZPM.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_ZPM.ID, "basicmachine.brewery.tier.07", "Elite Brewery II", 7) + new MTEPotionBrewer(BREWERY_ZPM.ID, "basicmachine.brewery.tier.07", "Elite Brewery II", 7) .getStackForm(1L)); ItemList.BreweryUV.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_UV.ID, "basicmachine.brewery.tier.08", "Ultimate Brew Rusher", 8) + new MTEPotionBrewer(BREWERY_UV.ID, "basicmachine.brewery.tier.08", "Ultimate Brew Rusher", 8) .getStackForm(1L)); ItemList.BreweryUHV.set( - new GT_MetaTileEntity_PotionBrewer(BREWERY_UHV.ID, "basicmachine.brewery.tier.09", "Epic Brew Rusher", 9) + new MTEPotionBrewer(BREWERY_UHV.ID, "basicmachine.brewery.tier.09", "Epic Brew Rusher", 9) .getStackForm(1L)); ItemList.BreweryUEV.set( - new GT_MetaTileEntity_PotionBrewer( - BREWERY_UEV.ID, - "basicmachine.brewery.tier.10", - "Epic Brew Rusher II", - 10).getStackForm(1L)); + new MTEPotionBrewer(BREWERY_UEV.ID, "basicmachine.brewery.tier.10", "Epic Brew Rusher II", 10) + .getStackForm(1L)); ItemList.BreweryUIV.set( - new GT_MetaTileEntity_PotionBrewer( - BREWERY_UIV.ID, - "basicmachine.brewery.tier.11", - "Epic Brew Rusher III", - 11).getStackForm(1L)); + new MTEPotionBrewer(BREWERY_UIV.ID, "basicmachine.brewery.tier.11", "Epic Brew Rusher III", 11) + .getStackForm(1L)); ItemList.BreweryUMV.set( - new GT_MetaTileEntity_PotionBrewer( - BREWERY_UMV.ID, - "basicmachine.brewery.tier.12", - "Epic Brew Rusher IV", - 12).getStackForm(1L)); + new MTEPotionBrewer(BREWERY_UMV.ID, "basicmachine.brewery.tier.12", "Epic Brew Rusher IV", 12) + .getStackForm(1L)); } private static void registerMiner() { - ItemList.Machine_LV_Miner.set( - new GT_MetaTileEntity_Miner(MINER_LV.ID, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L)); - ItemList.Machine_MV_Miner.set( - new GT_MetaTileEntity_Miner(MINER_MV.ID, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L)); - ItemList.Machine_HV_Miner.set( - new GT_MetaTileEntity_Miner(MINER_HV.ID, "basicmachine.miner.tier.03", "Advanced Miner", 3) - .getStackForm(1L)); + ItemList.Machine_LV_Miner + .set(new MTEMiner(MINER_LV.ID, "basicmachine.miner.tier.01", "Basic Miner", 1).getStackForm(1L)); + ItemList.Machine_MV_Miner + .set(new MTEMiner(MINER_MV.ID, "basicmachine.miner.tier.02", "Good Miner", 2).getStackForm(1L)); + ItemList.Machine_HV_Miner + .set(new MTEMiner(MINER_HV.ID, "basicmachine.miner.tier.03", "Advanced Miner", 3).getStackForm(1L)); } private static void registerPump() { - ItemList.Pump_LV - .set(new GT_MetaTileEntity_Pump(PUMP_LV.ID, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); - ItemList.Pump_MV.set( - new GT_MetaTileEntity_Pump(PUMP_MV.ID, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L)); - ItemList.Pump_HV.set( - new GT_MetaTileEntity_Pump(PUMP_HV.ID, "basicmachine.pump.tier.03", "Advanced Pump II", 3) - .getStackForm(1L)); - ItemList.Pump_EV.set( - new GT_MetaTileEntity_Pump(PUMP_EV.ID, "basicmachine.pump.tier.04", "Advanced Pump III", 4) - .getStackForm(1L)); - ItemList.Pump_IV.set( - new GT_MetaTileEntity_Pump(PUMP_IV.ID, "basicmachine.pump.tier.05", "Advanced Pump IV", 5) - .getStackForm(1L)); - ItemList.PumpLuV.set( - new GT_MetaTileEntity_Pump(PUMP_LuV.ID, "basicmachine.pump.tier.06", "Lake Dislocator", 6) - .getStackForm(1L)); - ItemList.PumpZPM.set( - new GT_MetaTileEntity_Pump(PUMP_ZPM.ID, "basicmachine.pump.tier.07", "Ocean Transposer", 7) - .getStackForm(1L)); + ItemList.Pump_LV.set(new MTEPump(PUMP_LV.ID, "basicmachine.pump.tier.01", "Basic Pump", 1).getStackForm(1L)); + ItemList.Pump_MV.set(new MTEPump(PUMP_MV.ID, "basicmachine.pump.tier.02", "Advanced Pump", 2).getStackForm(1L)); + ItemList.Pump_HV + .set(new MTEPump(PUMP_HV.ID, "basicmachine.pump.tier.03", "Advanced Pump II", 3).getStackForm(1L)); + ItemList.Pump_EV + .set(new MTEPump(PUMP_EV.ID, "basicmachine.pump.tier.04", "Advanced Pump III", 4).getStackForm(1L)); + ItemList.Pump_IV + .set(new MTEPump(PUMP_IV.ID, "basicmachine.pump.tier.05", "Advanced Pump IV", 5).getStackForm(1L)); + ItemList.PumpLuV + .set(new MTEPump(PUMP_LuV.ID, "basicmachine.pump.tier.06", "Lake Dislocator", 6).getStackForm(1L)); + ItemList.PumpZPM + .set(new MTEPump(PUMP_ZPM.ID, "basicmachine.pump.tier.07", "Ocean Transposer", 7).getStackForm(1L)); } private static void registerTeleporter() { - ItemList.Teleporter.set( - new GT_MetaTileEntity_Teleporter(TELEPORTER.ID, "basicmachine.teleporter", "Teleporter", 9) - .getStackForm(1L)); + ItemList.Teleporter + .set(new MTETeleporter(TELEPORTER.ID, "basicmachine.teleporter", "Teleporter", 9).getStackForm(1L)); } private static void registerMonsterRepellator() { ItemList.MobRep_LV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_LV.ID, "basicmachine.mobrep.tier.01", "Basic Monster Repellator", 1).getStackForm(1L)); ItemList.MobRep_MV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_MV.ID, "basicmachine.mobrep.tier.02", "Advanced Monster Repellator", 2).getStackForm(1L)); ItemList.MobRep_HV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_HV.ID, "basicmachine.mobrep.tier.03", "Advanced Monster Repellator II", 3).getStackForm(1L)); ItemList.MobRep_EV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_EV.ID, "basicmachine.mobrep.tier.04", "Advanced Monster Repellator III", 4).getStackForm(1L)); ItemList.MobRep_IV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_IV.ID, "basicmachine.mobrep.tier.05", "Advanced Monster Repellator IV", 5).getStackForm(1L)); ItemList.MobRep_LuV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_LuV.ID, "basicmachine.mobrep.tier.06", "Advanced Monster Repellator V", 6).getStackForm(1L)); ItemList.MobRep_ZPM.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_ZPM.ID, "basicmachine.mobrep.tier.07", "Advanced Monster Repellator VI", 7).getStackForm(1L)); ItemList.MobRep_UV.set( - new GT_MetaTileEntity_MonsterRepellent( + new MTEMonsterRepellent( MONSTER_REPELLATOR_UV.ID, "basicmachine.mobrep.tier.08", "Advanced Monster Repellator VII", @@ -2883,49 +2712,49 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerWorldAccelerator() { ItemList.AcceleratorLV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_LV.ID, "basicmachine.accelerator.tier.01", "Basic World Accelerator", 1).getStackForm(1L)); ItemList.AcceleratorMV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_MV.ID, "basicmachine.accelerator.tier.02", "Advanced World Accelerator", 2).getStackForm(1L)); ItemList.AcceleratorHV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_HV.ID, "basicmachine.accelerator.tier.03", "Advanced World Accelerator II", 3).getStackForm(1L)); ItemList.AcceleratorEV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_EV.ID, "basicmachine.accelerator.tier.04", "Advanced World Accelerator III", 4).getStackForm(1L)); ItemList.AcceleratorIV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_IV.ID, "basicmachine.accelerator.tier.05", "Advanced World Accelerator IV", 5).getStackForm(1L)); ItemList.AcceleratorLuV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_LuV.ID, "basicmachine.accelerator.tier.06", "Elite World Accelerator", 6).getStackForm(1L)); ItemList.AcceleratorZPM.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_ZPM.ID, "basicmachine.accelerator.tier.07", "Elite World Accelerator II", 7).getStackForm(1L)); ItemList.AcceleratorUV.set( - new GT_MetaTileEntity_WorldAccelerator( + new MTEWorldAccelerator( WORLD_ACCELERATOR_UV.ID, "basicmachine.accelerator.tier.08", "Ultimate Time Anomaly", @@ -2935,7 +2764,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerAdvancedSeismicProspector() { ItemList.Seismic_Prospector_Adv_LV.set( - new GT_MetaTileEntity_AdvSeismicProspector( + new MTEAdvSeismicProspector( ADVANCED_SEISMIC_PROSPECTOR_LV.ID, "basicmachine.seismicprospector.07", "Advanced Seismic Prospector LV", @@ -2943,7 +2772,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 5 * 16 / 2, 2).getStackForm(1)); ItemList.Seismic_Prospector_Adv_MV.set( - new GT_MetaTileEntity_AdvSeismicProspector( + new MTEAdvSeismicProspector( ADVANCED_SEISMIC_PROSPECTOR_MV.ID, "basicmachine.seismicprospector.06", "Advanced Seismic Prospector MV", @@ -2951,7 +2780,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 7 * 16 / 2, 2).getStackForm(1)); ItemList.Seismic_Prospector_Adv_HV.set( - new GT_MetaTileEntity_AdvSeismicProspector( + new MTEAdvSeismicProspector( ADVANCED_SEISMIC_PROSPECTOR_HV.ID, "basicmachine.seismicprospector.05", "Advanced Seismic Prospector HV", @@ -2959,7 +2788,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9 * 16 / 2, 2).getStackForm(1)); ItemList.Seismic_Prospector_Adv_EV.set( - new GT_MetaTileEntity_AdvSeismicProspector( + new MTEAdvSeismicProspector( ADVANCED_SEISMIC_PROSPECTOR_EV.ID, "basicmachine.seismicprospector.04", "Advanced Seismic Prospector EV", @@ -2970,37 +2799,37 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerMicrowaveEnergyTransmitter() { ItemList.MicroTransmitter_HV.set( - new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + new MTEMicrowaveEnergyTransmitter( MICROWAVE_ENERGY_TRANSMITTER_HV.ID, "basicmachine.microtransmitter.03", "HV Microwave Energy Transmitter", 3).getStackForm(1L)); ItemList.MicroTransmitter_EV.set( - new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + new MTEMicrowaveEnergyTransmitter( MICROWAVE_ENERGY_TRANSMITTER_EV.ID, "basicmachine.microtransmitter.04", "EV Microwave Energy Transmitter", 4).getStackForm(1L)); ItemList.MicroTransmitter_IV.set( - new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + new MTEMicrowaveEnergyTransmitter( MICROWAVE_ENERGY_TRANSMITTER_IV.ID, "basicmachine.microtransmitter.05", "IV Microwave Energy Transmitter", 5).getStackForm(1L)); ItemList.MicroTransmitter_LUV.set( - new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + new MTEMicrowaveEnergyTransmitter( MICROWAVE_ENERGY_TRANSMITTER_LuV.ID, "basicmachine.microtransmitter.06", "LuV Microwave Energy Transmitter", 6).getStackForm(1L)); ItemList.MicroTransmitter_ZPM.set( - new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + new MTEMicrowaveEnergyTransmitter( MICROWAVE_ENERGY_TRANSMITTER_ZPM.ID, "basicmachine.microtransmitter.07", "ZPM Microwave Energy Transmitter", 7).getStackForm(1L)); ItemList.MicroTransmitter_UV.set( - new GT_MetaTileEntity_MicrowaveEnergyTransmitter( + new MTEMicrowaveEnergyTransmitter( MICROWAVE_ENERGY_TRANSMITTER_UV.ID, "basicmachine.microtransmitter.08", "UV Microwave Energy Transmitter", @@ -3009,232 +2838,151 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerBetterJukebox() { ItemList.BetterJukebox_LV.set( - new GT_MetaTileEntity_BetterJukebox( + new MTEBetterJukebox( BETTER_JUKEBOX_LV.ID, "basicmachine.betterjukebox.tier.01", "Basic Electric Jukebox", 1).getStackForm(1L)); ItemList.BetterJukebox_MV.set( - new GT_MetaTileEntity_BetterJukebox( + new MTEBetterJukebox( BETTER_JUKEBOX_MV.ID, "basicmachine.betterjukebox.tier.02", "Advanced Electric Jukebox", 2).getStackForm(1L)); ItemList.BetterJukebox_HV.set( - new GT_MetaTileEntity_BetterJukebox( + new MTEBetterJukebox( BETTER_JUKEBOX_HV.ID, "basicmachine.betterjukebox.tier.03", "Advanced Electric Jukebox II", 3).getStackForm(1L)); ItemList.BetterJukebox_EV.set( - new GT_MetaTileEntity_BetterJukebox( - BETTER_JUKEBOX_EV.ID, - "basicmachine.betterjukebox.tier.04", - "Extreme Music Mixer", - 4).getStackForm(1L)); + new MTEBetterJukebox(BETTER_JUKEBOX_EV.ID, "basicmachine.betterjukebox.tier.04", "Extreme Music Mixer", 4) + .getStackForm(1L)); ItemList.BetterJukebox_IV.set( - new GT_MetaTileEntity_BetterJukebox( - BETTER_JUKEBOX_IV.ID, - "basicmachine.betterjukebox.tier.05", - "Duke Mix'em 3D", - 5).getStackForm(1L)); + new MTEBetterJukebox(BETTER_JUKEBOX_IV.ID, "basicmachine.betterjukebox.tier.05", "Duke Mix'em 3D", 5) + .getStackForm(1L)); } private static void registerChestBuffer() { ItemList.Automation_ChestBuffer_ULV.set( - new GT_MetaTileEntity_ChestBuffer( + new MTEChestBuffer( CHEST_BUFFER_ULV.ID, "automation.chestbuffer.tier.00", "Ultra Low Voltage Chest Buffer", 0).getStackForm(1L)); ItemList.Automation_ChestBuffer_LV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_LV.ID, - "automation.chestbuffer.tier.01", - "Low Voltage Chest Buffer", - 1).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_LV.ID, "automation.chestbuffer.tier.01", "Low Voltage Chest Buffer", 1) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_MV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_MV.ID, - "automation.chestbuffer.tier.02", - "Medium Voltage Chest Buffer", - 2).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_MV.ID, "automation.chestbuffer.tier.02", "Medium Voltage Chest Buffer", 2) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_HV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_HV.ID, - "automation.chestbuffer.tier.03", - "High Voltage Chest Buffer", - 3).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_HV.ID, "automation.chestbuffer.tier.03", "High Voltage Chest Buffer", 3) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_EV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_EV.ID, - "automation.chestbuffer.tier.04", - "Extreme Voltage Chest Buffer", - 4).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_EV.ID, "automation.chestbuffer.tier.04", "Extreme Voltage Chest Buffer", 4) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_IV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_IV.ID, - "automation.chestbuffer.tier.05", - "Insane Voltage Chest Buffer", - 5).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_IV.ID, "automation.chestbuffer.tier.05", "Insane Voltage Chest Buffer", 5) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_LuV.set( - new GT_MetaTileEntity_ChestBuffer( + new MTEChestBuffer( CHEST_BUFFER_LuV.ID, "automation.chestbuffer.tier.06", "Ludicrous Voltage Chest Buffer", 6).getStackForm(1L)); ItemList.Automation_ChestBuffer_ZPM.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_ZPM.ID, - "automation.chestbuffer.tier.07", - "ZPM Voltage Chest Buffer", - 7).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_ZPM.ID, "automation.chestbuffer.tier.07", "ZPM Voltage Chest Buffer", 7) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_UV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_UV.ID, - "automation.chestbuffer.tier.08", - "Ultimate Voltage Chest Buffer", - 8).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_UV.ID, "automation.chestbuffer.tier.08", "Ultimate Voltage Chest Buffer", 8) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_UHV.set( - new GT_MetaTileEntity_ChestBuffer( + new MTEChestBuffer( CHEST_BUFFER_UHV.ID, "automation.chestbuffer.tier.09", "Highly Ultimate Voltage Chest Buffer", 9).getStackForm(1L)); ItemList.Automation_ChestBuffer_UEV.set( - new GT_MetaTileEntity_ChestBuffer( + new MTEChestBuffer( CHEST_BUFFER_UEV.ID, "automation.chestbuffer.tier.10", "Ultra High Voltage Chest Buffer", 10).getStackForm(1L)); ItemList.Automation_ChestBuffer_UIV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_UIV.ID, - "automation.chestbuffer.tier.11", - "UIV Voltage Chest Buffer", - 11).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_UIV.ID, "automation.chestbuffer.tier.11", "UIV Voltage Chest Buffer", 11) + .getStackForm(1L)); ItemList.Automation_ChestBuffer_UMV.set( - new GT_MetaTileEntity_ChestBuffer( - CHEST_BUFFER_UMV.ID, - "automation.chestbuffer.tier.12", - "UMV Voltage Chest Buffer", - 12).getStackForm(1L)); + new MTEChestBuffer(CHEST_BUFFER_UMV.ID, "automation.chestbuffer.tier.12", "UMV Voltage Chest Buffer", 12) + .getStackForm(1L)); } private static void registerItemFilter() { ItemList.Automation_Filter_ULV.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_ULV.ID, - "automation.filter.tier.00", - "Ultra Low Voltage Item Filter", - 0).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_ULV.ID, "automation.filter.tier.00", "Ultra Low Voltage Item Filter", 0) + .getStackForm(1L)); ItemList.Automation_Filter_LV.set( - new GT_MetaTileEntity_Filter(ITEM_FILTER_LV.ID, "automation.filter.tier.01", "Low Voltage Item Filter", 1) + new MTEFilter(ITEM_FILTER_LV.ID, "automation.filter.tier.01", "Low Voltage Item Filter", 1) .getStackForm(1L)); ItemList.Automation_Filter_MV.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_MV.ID, - "automation.filter.tier.02", - "Medium Voltage Item Filter", - 2).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_MV.ID, "automation.filter.tier.02", "Medium Voltage Item Filter", 2) + .getStackForm(1L)); ItemList.Automation_Filter_HV.set( - new GT_MetaTileEntity_Filter(ITEM_FILTER_HV.ID, "automation.filter.tier.03", "High Voltage Item Filter", 3) + new MTEFilter(ITEM_FILTER_HV.ID, "automation.filter.tier.03", "High Voltage Item Filter", 3) .getStackForm(1L)); ItemList.Automation_Filter_EV.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_EV.ID, - "automation.filter.tier.04", - "Extreme Voltage Item Filter", - 4).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_EV.ID, "automation.filter.tier.04", "Extreme Voltage Item Filter", 4) + .getStackForm(1L)); ItemList.Automation_Filter_IV.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_IV.ID, - "automation.filter.tier.05", - "Insane Voltage Item Filter", - 5).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_IV.ID, "automation.filter.tier.05", "Insane Voltage Item Filter", 5) + .getStackForm(1L)); ItemList.Automation_Filter_LuV.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_LuV.ID, - "automation.filter.tier.06", - "Ludicrous Voltage Item Filter", - 6).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_LuV.ID, "automation.filter.tier.06", "Ludicrous Voltage Item Filter", 6) + .getStackForm(1L)); ItemList.Automation_Filter_ZPM.set( - new GT_MetaTileEntity_Filter(ITEM_FILTER_ZPM.ID, "automation.filter.tier.07", "ZPM Voltage Item Filter", 7) + new MTEFilter(ITEM_FILTER_ZPM.ID, "automation.filter.tier.07", "ZPM Voltage Item Filter", 7) .getStackForm(1L)); ItemList.Automation_Filter_UV.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_UV.ID, - "automation.filter.tier.08", - "Ultimate Voltage Item Filter", - 8).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_UV.ID, "automation.filter.tier.08", "Ultimate Voltage Item Filter", 8) + .getStackForm(1L)); ItemList.Automation_Filter_MAX.set( - new GT_MetaTileEntity_Filter( - ITEM_FILTER_UHV.ID, - "automation.filter.tier.09", - "Highly Ultimate Voltage Item Filter", - 9).getStackForm(1L)); + new MTEFilter(ITEM_FILTER_UHV.ID, "automation.filter.tier.09", "Highly Ultimate Voltage Item Filter", 9) + .getStackForm(1L)); } private static void registerTypeFilter() { ItemList.Automation_TypeFilter_ULV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_ULV.ID, - "automation.typefilter.tier.00", - "Ultra Low Voltage Type Filter", - 0).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_ULV.ID, "automation.typefilter.tier.00", "Ultra Low Voltage Type Filter", 0) + .getStackForm(1L)); ItemList.Automation_TypeFilter_LV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_LV.ID, - "automation.typefilter.tier.01", - "Low Voltage Type Filter", - 1).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_LV.ID, "automation.typefilter.tier.01", "Low Voltage Type Filter", 1) + .getStackForm(1L)); ItemList.Automation_TypeFilter_MV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_MV.ID, - "automation.typefilter.tier.02", - "Medium Voltage Type Filter", - 2).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_MV.ID, "automation.typefilter.tier.02", "Medium Voltage Type Filter", 2) + .getStackForm(1L)); ItemList.Automation_TypeFilter_HV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_HV.ID, - "automation.typefilter.tier.03", - "High Voltage Type Filter", - 3).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_HV.ID, "automation.typefilter.tier.03", "High Voltage Type Filter", 3) + .getStackForm(1L)); ItemList.Automation_TypeFilter_EV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_EV.ID, - "automation.typefilter.tier.04", - "Extreme Voltage Type Filter", - 4).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_EV.ID, "automation.typefilter.tier.04", "Extreme Voltage Type Filter", 4) + .getStackForm(1L)); ItemList.Automation_TypeFilter_IV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_IV.ID, - "automation.typefilter.tier.05", - "Insane Voltage Type Filter", - 5).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_IV.ID, "automation.typefilter.tier.05", "Insane Voltage Type Filter", 5) + .getStackForm(1L)); ItemList.Automation_TypeFilter_LuV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_LuV.ID, - "automation.typefilter.tier.06", - "Ludicrous Voltage Type Filter", - 6).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_LuV.ID, "automation.typefilter.tier.06", "Ludicrous Voltage Type Filter", 6) + .getStackForm(1L)); ItemList.Automation_TypeFilter_ZPM.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_ZPM.ID, - "automation.typefilter.tier.07", - "ZPM Voltage Type Filter", - 7).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_ZPM.ID, "automation.typefilter.tier.07", "ZPM Voltage Type Filter", 7) + .getStackForm(1L)); ItemList.Automation_TypeFilter_UV.set( - new GT_MetaTileEntity_TypeFilter( - TYPE_FILTER_UV.ID, - "automation.typefilter.tier.08", - "Ultimate Voltage Type Filter", - 8).getStackForm(1L)); + new MTETypeFilter(TYPE_FILTER_UV.ID, "automation.typefilter.tier.08", "Ultimate Voltage Type Filter", 8) + .getStackForm(1L)); ItemList.Automation_TypeFilter_MAX.set( - new GT_MetaTileEntity_TypeFilter( + new MTETypeFilter( TYPE_FILTER_UHV.ID, "automation.typefilter.tier.09", "Highly Ultimate Voltage Type Filter", @@ -3243,61 +2991,34 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerRegulator() { ItemList.Automation_Regulator_ULV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_ULV.ID, - "automation.regulator.tier.00", - "Ultra Low Voltage Regulator", - 0).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_ULV.ID, "automation.regulator.tier.00", "Ultra Low Voltage Regulator", 0) + .getStackForm(1L)); ItemList.Automation_Regulator_LV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_LV.ID, - "automation.regulator.tier.01", - "Low Voltage Regulator", - 1).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_LV.ID, "automation.regulator.tier.01", "Low Voltage Regulator", 1) + .getStackForm(1L)); ItemList.Automation_Regulator_MV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_MV.ID, - "automation.regulator.tier.02", - "Medium Voltage Regulator", - 2).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_MV.ID, "automation.regulator.tier.02", "Medium Voltage Regulator", 2) + .getStackForm(1L)); ItemList.Automation_Regulator_HV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_HV.ID, - "automation.regulator.tier.03", - "High Voltage Regulator", - 3).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_HV.ID, "automation.regulator.tier.03", "High Voltage Regulator", 3) + .getStackForm(1L)); ItemList.Automation_Regulator_EV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_EV.ID, - "automation.regulator.tier.04", - "Extreme Voltage Regulator", - 4).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_EV.ID, "automation.regulator.tier.04", "Extreme Voltage Regulator", 4) + .getStackForm(1L)); ItemList.Automation_Regulator_IV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_IV.ID, - "automation.regulator.tier.05", - "Insane Voltage Regulator", - 5).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_IV.ID, "automation.regulator.tier.05", "Insane Voltage Regulator", 5) + .getStackForm(1L)); ItemList.Automation_Regulator_LuV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_LuV.ID, - "automation.regulator.tier.06", - "Ludicrous Voltage Regulator", - 6).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_LuV.ID, "automation.regulator.tier.06", "Ludicrous Voltage Regulator", 6) + .getStackForm(1L)); ItemList.Automation_Regulator_ZPM.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_ZPM.ID, - "automation.regulator.tier.07", - "ZPM Voltage Regulator", - 7).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_ZPM.ID, "automation.regulator.tier.07", "ZPM Voltage Regulator", 7) + .getStackForm(1L)); ItemList.Automation_Regulator_UV.set( - new GT_MetaTileEntity_Regulator( - VOLTAGE_REGULATOR_UV.ID, - "automation.regulator.tier.08", - "Ultimate Voltage Regulator", - 8).getStackForm(1L)); + new MTERegulator(VOLTAGE_REGULATOR_UV.ID, "automation.regulator.tier.08", "Ultimate Voltage Regulator", 8) + .getStackForm(1L)); ItemList.Automation_Regulator_MAX.set( - new GT_MetaTileEntity_Regulator( + new MTERegulator( VOLTAGE_REGULATOR_UHV.ID, "automation.regulator.tier.09", "Highly Ultimate Voltage Regulator", @@ -3306,61 +3027,40 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerSuperBuffer() { ItemList.Automation_SuperBuffer_ULV.set( - new GT_MetaTileEntity_SuperBuffer( + new MTESuperBuffer( SUPER_BUFFER_ULV.ID, "automation.superbuffer.tier.00", "Ultra Low Voltage Super Buffer", 0).getStackForm(1L)); ItemList.Automation_SuperBuffer_LV.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_LV.ID, - "automation.superbuffer.tier.01", - "Low Voltage Super Buffer", - 1).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_LV.ID, "automation.superbuffer.tier.01", "Low Voltage Super Buffer", 1) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_MV.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_MV.ID, - "automation.superbuffer.tier.02", - "Medium Voltage Super Buffer", - 2).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_MV.ID, "automation.superbuffer.tier.02", "Medium Voltage Super Buffer", 2) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_HV.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_HV.ID, - "automation.superbuffer.tier.03", - "High Voltage Super Buffer", - 3).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_HV.ID, "automation.superbuffer.tier.03", "High Voltage Super Buffer", 3) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_EV.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_EV.ID, - "automation.superbuffer.tier.04", - "Extreme Voltage Super Buffer", - 4).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_EV.ID, "automation.superbuffer.tier.04", "Extreme Voltage Super Buffer", 4) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_IV.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_IV.ID, - "automation.superbuffer.tier.05", - "Insane Voltage Super Buffer", - 5).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_IV.ID, "automation.superbuffer.tier.05", "Insane Voltage Super Buffer", 5) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_LuV.set( - new GT_MetaTileEntity_SuperBuffer( + new MTESuperBuffer( SUPER_BUFFER_LuV.ID, "automation.superbuffer.tier.06", "Ludicrous Voltage Super Buffer", 6).getStackForm(1L)); ItemList.Automation_SuperBuffer_ZPM.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_ZPM.ID, - "automation.superbuffer.tier.07", - "ZPM Voltage Super Buffer", - 7).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_ZPM.ID, "automation.superbuffer.tier.07", "ZPM Voltage Super Buffer", 7) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_UV.set( - new GT_MetaTileEntity_SuperBuffer( - SUPER_BUFFER_UV.ID, - "automation.superbuffer.tier.08", - "Ultimate Voltage Super Buffer", - 8).getStackForm(1L)); + new MTESuperBuffer(SUPER_BUFFER_UV.ID, "automation.superbuffer.tier.08", "Ultimate Voltage Super Buffer", 8) + .getStackForm(1L)); ItemList.Automation_SuperBuffer_MAX.set( - new GT_MetaTileEntity_SuperBuffer( + new MTESuperBuffer( SUPER_BUFFER_UHV.ID, "automation.superbuffer.tier.09", "Highly Ultimate Voltage Super Buffer", @@ -3369,61 +3069,61 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerItemDistributor() { ItemList.Automation_ItemDistributor_ULV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_ULV.ID, "automation.itemdistributor.tier.00", "Ultra Low Voltage Item Distributor", 0).getStackForm(1L)); ItemList.Automation_ItemDistributor_LV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_LV.ID, "automation.itemdistributor.tier.01", "Low Voltage Item Distributor", 1).getStackForm(1L)); ItemList.Automation_ItemDistributor_MV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_MV.ID, "automation.itemdistributor.tier.02", "Medium Voltage Item Distributor", 2).getStackForm(1L)); ItemList.Automation_ItemDistributor_HV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_HV.ID, "automation.itemdistributor.tier.03", "High Voltage Item Distributor", 3).getStackForm(1L)); ItemList.Automation_ItemDistributor_EV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_EV.ID, "automation.itemdistributor.tier.04", "Extreme Voltage Item Distributor", 4).getStackForm(1L)); ItemList.Automation_ItemDistributor_IV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_IV.ID, "automation.itemdistributor.tier.05", "Insane Voltage Item Distributor", 5).getStackForm(1L)); ItemList.Automation_ItemDistributor_LuV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_LuV.ID, "automation.itemdistributor.tier.06", "Ludicrous Voltage Item Distributor", 6).getStackForm(1L)); ItemList.Automation_ItemDistributor_ZPM.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_ZPM.ID, "automation.itemdistributor.tier.07", "ZPM Voltage Item Distributor", 7).getStackForm(1L)); ItemList.Automation_ItemDistributor_UV.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_UV.ID, "automation.itemdistributor.tier.08", "Ultimate Voltage Item Distributor", 8).getStackForm(1L)); ItemList.Automation_ItemDistributor_MAX.set( - new GT_MetaTileEntity_ItemDistributor( + new MTEItemDistributor( ITEM_DISTRIBUTOR_UHV.ID, "automation.itemdistributor.tier.09", "MAX Voltage Item Distributor", @@ -3432,61 +3132,52 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerRecipeFilter() { ItemList.Automation_RecipeFilter_ULV.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_ULV.ID, "automation.recipefilter.tier.00", "Ultra Low Voltage Recipe Filter", 0).getStackForm(1L)); ItemList.Automation_RecipeFilter_LV.set( - new GT_MetaTileEntity_RecipeFilter( - RECIPE_FILTER_LV.ID, - "automation.recipefilter.tier.01", - "Low Voltage Recipe Filter", - 1).getStackForm(1L)); + new MTERecipeFilter(RECIPE_FILTER_LV.ID, "automation.recipefilter.tier.01", "Low Voltage Recipe Filter", 1) + .getStackForm(1L)); ItemList.Automation_RecipeFilter_MV.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_MV.ID, "automation.recipefilter.tier.02", "Medium Voltage Recipe Filter", 2).getStackForm(1L)); ItemList.Automation_RecipeFilter_HV.set( - new GT_MetaTileEntity_RecipeFilter( - RECIPE_FILTER_HV.ID, - "automation.recipefilter.tier.03", - "High Voltage Recipe Filter", - 3).getStackForm(1L)); + new MTERecipeFilter(RECIPE_FILTER_HV.ID, "automation.recipefilter.tier.03", "High Voltage Recipe Filter", 3) + .getStackForm(1L)); ItemList.Automation_RecipeFilter_EV.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_EV.ID, "automation.recipefilter.tier.04", "Extreme Voltage Recipe Filter", 4).getStackForm(1L)); ItemList.Automation_RecipeFilter_IV.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_IV.ID, "automation.recipefilter.tier.05", "Insane Voltage Recipe Filter", 5).getStackForm(1L)); ItemList.Automation_RecipeFilter_LuV.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_LuV.ID, "automation.recipefilter.tier.06", "Ludicrous Voltage Recipe Filter", 6).getStackForm(1L)); ItemList.Automation_RecipeFilter_ZPM.set( - new GT_MetaTileEntity_RecipeFilter( - RECIPE_FILTER_ZPM.ID, - "automation.recipefilter.tier.07", - "ZPM Voltage Recipe Filter", - 7).getStackForm(1L)); + new MTERecipeFilter(RECIPE_FILTER_ZPM.ID, "automation.recipefilter.tier.07", "ZPM Voltage Recipe Filter", 7) + .getStackForm(1L)); ItemList.Automation_RecipeFilter_UV.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_UV.ID, "automation.recipefilter.tier.08", "Ultimate Voltage Recipe Filter", 8).getStackForm(1L)); ItemList.Automation_RecipeFilter_MAX.set( - new GT_MetaTileEntity_RecipeFilter( + new MTERecipeFilter( RECIPE_FILTER_UHV.ID, "automation.recipefilter.tier.09", "Highly Ultimate Voltage Recipe Filter", @@ -3495,172 +3186,134 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerMachineHull() { ItemList.Hull_Bronze.set( - new GT_MetaTileEntity_BasicHull_Bronze( - HULL_BRONZE.ID, - "hull.bronze", - "Bronze Hull", - 0, - "For your first Steam Machines").getStackForm(1L)); + new MTEBasicHullBronze(HULL_BRONZE.ID, "hull.bronze", "Bronze Hull", 0, "For your first Steam Machines") + .getStackForm(1L)); ItemList.Hull_Bronze_Bricks.set( - new GT_MetaTileEntity_BasicHull_BronzeBricks( + new MTEBasicHullBronzeBricks( HULL_BRICKED_BRONZE.ID, "hull.bronze_bricked", "Bricked Bronze Hull", 0, "For your first Steam Machines").getStackForm(1L)); ItemList.Hull_HP.set( - new GT_MetaTileEntity_BasicHull_Steel( - HULL_STEEL.ID, - "hull.steel", - "Steel Hull", - 0, - "For improved Steam Machines").getStackForm(1L)); + new MTEBasicHullSteel(HULL_STEEL.ID, "hull.steel", "Steel Hull", 0, "For improved Steam Machines") + .getStackForm(1L)); ItemList.Hull_HP_Bricks.set( - new GT_MetaTileEntity_BasicHull_SteelBricks( + new MTEBasicHullSteelBricks( HULL_WROUGHT_IRON.ID, "hull.steel_bricked", "Bricked Wrought Iron Hull", 0, "For improved Steam Machines").getStackForm(1L)); - ItemList.Hull_ULV.set( - new GT_MetaTileEntity_BasicHull(HULL_ULV.ID, "hull.tier.00", "ULV Machine Hull", 0, imagination) - .getStackForm(1L)); - ItemList.Hull_LV.set( - new GT_MetaTileEntity_BasicHull(HULL_LV.ID, "hull.tier.01", "LV Machine Hull", 1, imagination) - .getStackForm(1L)); - ItemList.Hull_MV.set( - new GT_MetaTileEntity_BasicHull(HULL_MV.ID, "hull.tier.02", "MV Machine Hull", 2, imagination) - .getStackForm(1L)); - ItemList.Hull_HV.set( - new GT_MetaTileEntity_BasicHull(HULL_HV.ID, "hull.tier.03", "HV Machine Hull", 3, imagination) - .getStackForm(1L)); - ItemList.Hull_EV.set( - new GT_MetaTileEntity_BasicHull(HULL_EV.ID, "hull.tier.04", "EV Machine Hull", 4, imagination) - .getStackForm(1L)); - ItemList.Hull_IV.set( - new GT_MetaTileEntity_BasicHull(HULL_IV.ID, "hull.tier.05", "IV Machine Hull", 5, imagination) - .getStackForm(1L)); - ItemList.Hull_LuV.set( - new GT_MetaTileEntity_BasicHull(HULL_LuV.ID, "hull.tier.06", "LuV Machine Hull", 6, imagination) - .getStackForm(1L)); - ItemList.Hull_ZPM.set( - new GT_MetaTileEntity_BasicHull(HULL_ZPM.ID, "hull.tier.07", "ZPM Machine Hull", 7, imagination) - .getStackForm(1L)); - ItemList.Hull_UV.set( - new GT_MetaTileEntity_BasicHull(HULL_UV.ID, "hull.tier.08", "UV Machine Hull", 8, imagination) - .getStackForm(1L)); - ItemList.Hull_MAX.set( - new GT_MetaTileEntity_BasicHull(HULL_UHV.ID, "hull.tier.09", "UHV Machine Hull", 9, imagination) - .getStackForm(1L)); + ItemList.Hull_ULV + .set(new MTEBasicHull(HULL_ULV.ID, "hull.tier.00", "ULV Machine Hull", 0, imagination).getStackForm(1L)); + ItemList.Hull_LV + .set(new MTEBasicHull(HULL_LV.ID, "hull.tier.01", "LV Machine Hull", 1, imagination).getStackForm(1L)); + ItemList.Hull_MV + .set(new MTEBasicHull(HULL_MV.ID, "hull.tier.02", "MV Machine Hull", 2, imagination).getStackForm(1L)); + ItemList.Hull_HV + .set(new MTEBasicHull(HULL_HV.ID, "hull.tier.03", "HV Machine Hull", 3, imagination).getStackForm(1L)); + ItemList.Hull_EV + .set(new MTEBasicHull(HULL_EV.ID, "hull.tier.04", "EV Machine Hull", 4, imagination).getStackForm(1L)); + ItemList.Hull_IV + .set(new MTEBasicHull(HULL_IV.ID, "hull.tier.05", "IV Machine Hull", 5, imagination).getStackForm(1L)); + ItemList.Hull_LuV + .set(new MTEBasicHull(HULL_LuV.ID, "hull.tier.06", "LuV Machine Hull", 6, imagination).getStackForm(1L)); + ItemList.Hull_ZPM + .set(new MTEBasicHull(HULL_ZPM.ID, "hull.tier.07", "ZPM Machine Hull", 7, imagination).getStackForm(1L)); + ItemList.Hull_UV + .set(new MTEBasicHull(HULL_UV.ID, "hull.tier.08", "UV Machine Hull", 8, imagination).getStackForm(1L)); + ItemList.Hull_MAX + .set(new MTEBasicHull(HULL_UHV.ID, "hull.tier.09", "UHV Machine Hull", 9, imagination).getStackForm(1L)); ItemList.Hull_UEV.set( - new GT_MetaTileEntity_BasicHull( - HULL_UEV.ID, - "hull.tier.10", - "UEV Machine Hull", - 10, - GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + new MTEBasicHull(HULL_UEV.ID, "hull.tier.10", "UEV Machine Hull", 10, LoaderMetaTileEntities.imagination) + .getStackForm(1L)); ItemList.Hull_UIV.set( - new GT_MetaTileEntity_BasicHull( - HULL_UIV.ID, - "hull.tier.11", - "UIV Machine Hull", - 11, - GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + new MTEBasicHull(HULL_UIV.ID, "hull.tier.11", "UIV Machine Hull", 11, LoaderMetaTileEntities.imagination) + .getStackForm(1L)); ItemList.Hull_UMV.set( - new GT_MetaTileEntity_BasicHull( - HULL_UMV.ID, - "hull.tier.12", - "UMV Machine Hull", - 12, - GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + new MTEBasicHull(HULL_UMV.ID, "hull.tier.12", "UMV Machine Hull", 12, LoaderMetaTileEntities.imagination) + .getStackForm(1L)); ItemList.Hull_UXV.set( - new GT_MetaTileEntity_BasicHull( - HULL_UXV.ID, - "hull.tier.13", - "UXV Machine Hull", - 13, - GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + new MTEBasicHull(HULL_UXV.ID, "hull.tier.13", "UXV Machine Hull", 13, LoaderMetaTileEntities.imagination) + .getStackForm(1L)); ItemList.Hull_MAXV.set( - new GT_MetaTileEntity_BasicHull( - HULL_MAX.ID, - "hull.tier.14", - "MAX Machine Hull", - 14, - GT_Loader_MetaTileEntities.imagination).getStackForm(1L)); + new MTEBasicHull(HULL_MAX.ID, "hull.tier.14", "MAX Machine Hull", 14, LoaderMetaTileEntities.imagination) + .getStackForm(1L)); } private static void registerTransformer() { ItemList.Transformer_LV_ULV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_LV_ULV.ID, "transformer.tier.00", "Ultra Low Voltage Transformer", 0, "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_MV_LV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_MV_LV.ID, "transformer.tier.01", "Low Voltage Transformer", 1, "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_HV_MV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_HV_MV.ID, "transformer.tier.02", "Medium Voltage Transformer", 2, "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_EV_HV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_EV_HV.ID, "transformer.tier.03", "High Voltage Transformer", 3, "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_IV_EV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_IV_EV.ID, "transformer.tier.04", "Extreme Transformer", 4, "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_LuV_IV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_LuV_IV.ID, "transformer.tier.05", "Insane Transformer", 5, "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_ZPM_LuV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_ZPM_LuV.ID, "transformer.tier.06", "Ludicrous Transformer", 6, "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_UV_ZPM.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_UV_ZPM.ID, "transformer.tier.07", "ZPM Voltage Transformer", 7, "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_MAX_UV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( transformer_UHV_UV.ID, "transformer.tier.08", "Ultimate Transformer", 8, "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_UEV_UHV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( TRANSFORMER_UEV_UHV.ID, "transformer.tier.09", "Highly Ultimate Transformer", @@ -3668,7 +3321,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_UIV_UEV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( TRANSFORMER_UIV_UEV.ID, "transformer.tier.10", "Extremely Ultimate Transformer", @@ -3676,7 +3329,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_UMV_UIV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( TRANSFORMER_UMV_UIV.ID, "transformer.tier.11", "Insanely Ultimate Transformer", @@ -3684,7 +3337,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_UXV_UMV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( TRANSFORMER_UXV_UMV.ID, "transformer.tier.12", "Mega Ultimate Transformer", @@ -3692,7 +3345,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_MAX_UXV.set( - new GT_MetaTileEntity_Transformer( + new MTETransformer( TRANSFORMER_MAX_UXV.ID, "transformer.tier.13", "Extended Mega Ultimate Transformer", @@ -3702,7 +3355,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerChemicalBath() { ItemList.Machine_LV_ChemicalBath.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_LV.ID, "basicmachine.chemicalbath.tier.01", "Basic Chemical Bath", @@ -3713,12 +3366,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.Machine_MV_ChemicalBath.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_MV.ID, "basicmachine.chemicalbath.tier.02", "Advanced Chemical Bath", @@ -3729,12 +3382,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.Machine_HV_ChemicalBath.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_HV.ID, "basicmachine.chemicalbath.tier.03", "Advanced Chemical Bath II", @@ -3745,12 +3398,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.Machine_EV_ChemicalBath.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_EV.ID, "basicmachine.chemicalbath.tier.04", "Advanced Chemical Bath III", @@ -3761,12 +3414,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.Machine_IV_ChemicalBath.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_IV.ID, "basicmachine.chemicalbath.tier.05", "Advanced Chemical Bath IV", @@ -3777,12 +3430,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_LuV.ID, "basicmachine.chemicalbath.tier.06", "Elite Chemical Bath", @@ -3793,12 +3446,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_ZPM.ID, "basicmachine.chemicalbath.tier.07", "Elite Chemical Bath II", @@ -3809,12 +3462,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_UV.ID, "basicmachine.chemicalbath.tier.08", "Ultimate Chemical Dunktron", @@ -3825,12 +3478,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_UHV.ID, "basicmachine.chemicalbath.tier.09", "Epic Chemical Dunktron", @@ -3841,12 +3494,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_UEV.ID, "basicmachine.chemicalbath.tier.10", "Epic Chemical Dunktron II", @@ -3857,12 +3510,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_UIV.ID, "basicmachine.chemicalbath.tier.11", "Epic Chemical Dunktron III", @@ -3873,12 +3526,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); ItemList.ChemicalBathUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_BATH_UMV.ID, "basicmachine.chemicalbath.tier.12", "Epic Chemical Dunktron IV", @@ -3889,14 +3542,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_BATH", null).getStackForm(1L)); } private void registerChemicalReactor() { ItemList.Machine_LV_ChemicalReactor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_LV.ID, "basicmachine.chemicalreactor.tier.01", "Basic Chemical Reactor", @@ -3907,12 +3560,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.Machine_MV_ChemicalReactor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_MV.ID, "basicmachine.chemicalreactor.tier.02", "Advanced Chemical Reactor", @@ -3923,12 +3576,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.Machine_HV_ChemicalReactor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_HV.ID, "basicmachine.chemicalreactor.tier.03", "Advanced Chemical Reactor II", @@ -3939,12 +3592,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.Machine_EV_ChemicalReactor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_EV.ID, "basicmachine.chemicalreactor.tier.04", "Advanced Chemical Reactor III", @@ -3955,12 +3608,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.Machine_IV_ChemicalReactor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_IV.ID, "basicmachine.chemicalreactor.tier.05", "Advanced Chemical Reactor IV", @@ -3971,12 +3624,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_LuV.ID, "basicmachine.chemicalreactor.tier.06", "Elite Chemical Reactor", @@ -3987,12 +3640,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_ZPM.ID, "basicmachine.chemicalreactor.tier.07", "Elite Chemical Reactor II", @@ -4003,12 +3656,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_UV.ID, "basicmachine.chemicalreactor.tier.08", "Ultimate Chemical Perforer", @@ -4019,12 +3672,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_UHV.ID, "basicmachine.chemicalreactor.tier.09", "Epic Chemical Performer", @@ -4035,12 +3688,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_UEV.ID, "basicmachine.chemicalreactor.tier.10", "Epic Chemical Performer II", @@ -4051,12 +3704,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_UIV.ID, "basicmachine.chemicalreactor.tier.11", "Epic Chemical Performer III", @@ -4067,12 +3720,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); ItemList.ChemicalReactorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CHEMICAL_REACTOR_UMV.ID, "basicmachine.chemicalreactor.tier.12", "Epic Chemical Performer IV", @@ -4083,7 +3736,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CHEMICAL_REACTOR", null).getStackForm(1L)); @@ -4091,7 +3744,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerFermenter() { ItemList.Machine_LV_Fermenter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_LV.ID, "basicmachine.fermenter.tier.01", "Basic Fermenter", @@ -4102,12 +3755,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.Machine_MV_Fermenter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_MV.ID, "basicmachine.fermenter.tier.02", "Advanced Fermenter", @@ -4118,12 +3771,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.Machine_HV_Fermenter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_HV.ID, "basicmachine.fermenter.tier.03", "Advanced Fermenter II", @@ -4134,12 +3787,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.Machine_EV_Fermenter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_EV.ID, "basicmachine.fermenter.tier.04", "Advanced Fermenter III", @@ -4150,12 +3803,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.Machine_IV_Fermenter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_IV.ID, "basicmachine.fermenter.tier.05", "Advanced Fermenter IV", @@ -4166,12 +3819,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_LuV.ID, "basicmachine.fermenter.tier.06", "Elite Fermenter", @@ -4182,12 +3835,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_ZPM.ID, "basicmachine.fermenter.tier.07", "Elite Fermenter II", @@ -4198,12 +3851,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_UV.ID, "basicmachine.fermenter.tier.08", "Ultimate Fermentation Hastener", @@ -4214,12 +3867,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_UHV.ID, "basicmachine.fermenter.tier.09", "Epic Fermentation Hastener", @@ -4230,12 +3883,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_UEV.ID, "basicmachine.fermenter.tier.10", "Epic Fermentation Hastener II", @@ -4246,12 +3899,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_UIV.ID, "basicmachine.fermenter.tier.11", "Epic Fermentation Hastener III", @@ -4262,12 +3915,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); ItemList.FermenterUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FERMENTER_UMV.ID, "basicmachine.fermenter.tier.12", "Epic Fermentation Hastener IV", @@ -4278,14 +3931,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FERMENTER", null).getStackForm(1L)); } private void registerFluidCanner() { ItemList.Machine_LV_FluidCanner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_LV.ID, "basicmachine.fluidcanner.tier.01", "Basic Fluid Canner", @@ -4296,12 +3949,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.Machine_MV_FluidCanner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_MV.ID, "basicmachine.fluidcanner.tier.02", "Advanced Fluid Canner", @@ -4312,12 +3965,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.Machine_HV_FluidCanner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_HV.ID, "basicmachine.fluidcanner.tier.03", "Quick Fluid Canner", @@ -4328,12 +3981,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.Machine_EV_FluidCanner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_EV.ID, "basicmachine.fluidcanner.tier.04", "Turbo Fluid Canner", @@ -4344,12 +3997,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.Machine_IV_FluidCanner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_IV.ID, "basicmachine.fluidcanner.tier.05", "Instant Fluid Canner", @@ -4360,12 +4013,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_LuV.ID, "basicmachine.fluidcanner.tier.06", "Elite Fluid Canner", @@ -4376,12 +4029,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_ZPM.ID, "basicmachine.fluidcanner.tier.07", "Elite Fluid Canner II", @@ -4392,12 +4045,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_UV.ID, "basicmachine.fluidcanner.tier.08", "Ultimate Liquid Can Actuator", @@ -4408,12 +4061,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_UHV.ID, "basicmachine.fluidcanner.tier.09", "Epic Liquid Can Actuator", @@ -4424,12 +4077,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_UEV.ID, "basicmachine.fluidcanner.tier.10", "Epic Liquid Can Actuator II", @@ -4440,12 +4093,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_UIV.ID, "basicmachine.fluidcanner.tier.11", "Epic Liquid Can Actuator III", @@ -4456,12 +4109,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); ItemList.FluidCannerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_CANNER_UMV.ID, "basicmachine.fluidcanner.tier.12", "Epic Liquid Can Actuator IV", @@ -4472,14 +4125,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_CANNER", null).getStackForm(1L)); } private void registerFluidExtractor() { ItemList.Machine_LV_FluidExtractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_LV.ID, "basicmachine.fluidextractor.tier.01", "Basic Fluid Extractor", @@ -4490,12 +4143,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_MV_FluidExtractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_MV.ID, "basicmachine.fluidextractor.tier.02", "Advanced Fluid Extractor", @@ -4506,12 +4159,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_HV_FluidExtractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_HV.ID, "basicmachine.fluidextractor.tier.03", "Advanced Fluid Extractor II", @@ -4522,12 +4175,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_EV_FluidExtractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_EV.ID, "basicmachine.fluidextractor.tier.04", "Advanced Fluid Extractor III", @@ -4538,12 +4191,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_IV_FluidExtractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_IV.ID, "basicmachine.fluidextractor.tier.05", "Advanced Fluid Extractor IV", @@ -4554,12 +4207,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_LuV.ID, "basicmachine.fluidextractor.tier.06", "Elite Fluid Extractor", @@ -4570,12 +4223,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_ZPM.ID, "basicmachine.fluidextractor.tier.07", "Elite Fluid Extractor II", @@ -4586,12 +4239,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_UV.ID, "basicmachine.fluidextractor.tier.08", "Ultimate Liquefying Sucker", @@ -4602,12 +4255,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_UHV.ID, "basicmachine.fluidextractor.tier.09", "Epic Liquefying Sucker", @@ -4618,12 +4271,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_UEV.ID, "basicmachine.fluidextractor.tier.10", "Epic Liquefying Sucker II", @@ -4634,12 +4287,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_UIV.ID, "basicmachine.fluidextractor.tier.11", "Epic Liquefying Sucker III", @@ -4650,12 +4303,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); ItemList.FluidExtractorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_EXTRACTOR_UMV.ID, "basicmachine.fluidextractor.tier.12", "Epic Liquefying Sucker IV", @@ -4666,14 +4319,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_EXTRACTOR", null).getStackForm(1L)); } private void registerFluidHeater() { ItemList.Machine_LV_FluidHeater.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_LV.ID, "basicmachine.fluidheater.tier.01", "Basic Fluid Heater", @@ -4684,12 +4337,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.Machine_MV_FluidHeater.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_MV.ID, "basicmachine.fluidheater.tier.02", "Advanced Fluid Heater", @@ -4700,12 +4353,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.Machine_HV_FluidHeater.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_HV.ID, "basicmachine.fluidheater.tier.03", "Advanced Fluid Heater II", @@ -4716,12 +4369,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.Machine_EV_FluidHeater.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_EV.ID, "basicmachine.fluidheater.tier.04", "Advanced Fluid Heater III", @@ -4732,12 +4385,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.Machine_IV_FluidHeater.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_IV.ID, "basicmachine.fluidheater.tier.05", "Advanced Fluid Heater IV", @@ -4748,12 +4401,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_LuV.ID, "basicmachine.fluidheater.tier.06", "Elite Fluid Heater", @@ -4764,12 +4417,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_ZPM.ID, "basicmachine.fluidheater.tier.07", "Elite Fluid Heater II", @@ -4780,12 +4433,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_UV.ID, "basicmachine.fluidheater.tier.08", "Ultimate Heat Infuser", @@ -4796,12 +4449,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_UHV.ID, "basicmachine.fluidheater.tier.09", "Epic Heat Infuser", @@ -4812,12 +4465,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_UEV.ID, "basicmachine.fluidheater.tier.10", "Epic Heat Infuser II", @@ -4828,12 +4481,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_UIV.ID, "basicmachine.fluidheater.tier.11", "Epic Heat Infuser III", @@ -4844,12 +4497,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); ItemList.FluidHeaterUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_HEATER_UMV.ID, "basicmachine.fluidheater.tier.12", "Epic Heat Infuser IV", @@ -4860,14 +4513,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 0, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_HEATER", null).getStackForm(1L)); } private void registerMixer() { ItemList.Machine_LV_Mixer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_LV.ID, "basicmachine.mixer.tier.01", "Basic Mixer", @@ -4878,12 +4531,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.Machine_MV_Mixer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_MV.ID, "basicmachine.mixer.tier.02", "Advanced Mixer", @@ -4894,12 +4547,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.Machine_HV_Mixer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_HV.ID, "basicmachine.mixer.tier.03", "Advanced Mixer II", @@ -4910,12 +4563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.Machine_EV_Mixer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_EV.ID, "basicmachine.mixer.tier.04", "Advanced Mixer III", @@ -4926,12 +4579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.Machine_IV_Mixer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_IV.ID, "basicmachine.mixer.tier.05", "Advanced Mixer IV", @@ -4942,12 +4595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_LuV.ID, "basicmachine.mixer.tier.06", "Elite Mixer", @@ -4958,12 +4611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_ZPM.ID, "basicmachine.mixer.tier.07", "Elite Mixer II", @@ -4974,12 +4627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_UV.ID, "basicmachine.mixer.tier.08", "Ultimate Matter Organizer", @@ -4990,12 +4643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_UHV.ID, "basicmachine.mixer.tier.09", "Epic Matter Organizer", @@ -5006,12 +4659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_UEV.ID, "basicmachine.mixer.tier.10", "Epic Matter Organizer II", @@ -5022,12 +4675,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_UIV.ID, "basicmachine.mixer.tier.11", "Epic Matter Organizer III", @@ -5038,12 +4691,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); ItemList.MixerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MIXER_UMV.ID, "basicmachine.mixer.tier.12", "Epic Matter Organizer IV", @@ -5054,14 +4707,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MIXER", null).getStackForm(1L)); } private void registerAutoclave() { ItemList.Machine_LV_Autoclave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_LV.ID, "basicmachine.autoclave.tier.01", "Basic Autoclave", @@ -5072,12 +4725,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.Machine_MV_Autoclave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_MV.ID, "basicmachine.autoclave.tier.02", "Advanced Autoclave", @@ -5088,12 +4741,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.Machine_HV_Autoclave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_HV.ID, "basicmachine.autoclave.tier.03", "Advanced Autoclave II", @@ -5104,12 +4757,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.Machine_EV_Autoclave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_EV.ID, "basicmachine.autoclave.tier.04", "Advanced Autoclave III", @@ -5120,12 +4773,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.Machine_IV_Autoclave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_IV.ID, "basicmachine.autoclave.tier.05", "Advanced Autoclave IV", @@ -5136,12 +4789,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_LuV.ID, "basicmachine.autoclave.tier.06", "Elite Autoclave", @@ -5152,12 +4805,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_ZPM.ID, "basicmachine.autoclave.tier.07", "Elite Autoclave II", @@ -5168,12 +4821,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_UV.ID, "basicmachine.autoclave.tier.08", "Ultimate Pressure Cooker", @@ -5184,12 +4837,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_UHV.ID, "basicmachine.autoclave.tier.09", "Epic Pressure Cooker", @@ -5200,12 +4853,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_UEV.ID, "basicmachine.autoclave.tier.10", "Epic Pressure Cooker II", @@ -5216,12 +4869,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_UIV.ID, "basicmachine.autoclave.tier.11", "Epic Pressure Cooker III", @@ -5232,12 +4885,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); ItemList.AutoclaveUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( AUTOCLAVE_UMV.ID, "basicmachine.autoclave.tier.12", "Epic Pressure Cooker IV", @@ -5248,7 +4901,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "AUTOCLAVE", null).getStackForm(1L)); @@ -5256,7 +4909,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerBendingMachine() { ItemList.Machine_LV_Bender.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_LV.ID, "basicmachine.bender.tier.01", "Basic Bending Machine", @@ -5267,12 +4920,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.Machine_MV_Bender.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_MV.ID, "basicmachine.bender.tier.02", "Advanced Bending Machine", @@ -5283,12 +4936,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.Machine_HV_Bender.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_HV.ID, "basicmachine.bender.tier.03", "Advanced Bending Machine II", @@ -5299,12 +4952,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.Machine_EV_Bender.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_EV.ID, "basicmachine.bender.tier.04", "Advanced Bending Machine III", @@ -5315,12 +4968,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.Machine_IV_Bender.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_IV.ID, "basicmachine.bender.tier.05", "Advanced Bending Machine IV", @@ -5331,12 +4984,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_LuV.ID, "basicmachine.bender.tier.06", "Elite Bending Machine", @@ -5347,12 +5000,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_ZPM.ID, "basicmachine.bender.tier.07", "Elite Bending Machine II", @@ -5363,12 +5016,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_UV.ID, "basicmachine.bender.tier.08", "Ultimate Bending Unit", @@ -5379,12 +5032,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_UHV.ID, "basicmachine.bender.tier.09", "Epic Bending Unit", @@ -5395,12 +5048,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_UEV.ID, "basicmachine.bender.tier.10", "Epic Bending Unit II", @@ -5411,12 +5064,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_UIV.ID, "basicmachine.bender.tier.11", "Epic Bending Unit III", @@ -5427,12 +5080,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); ItemList.BendingMachineUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( BENDING_MACHINE_UMV.ID, "basicmachine.bender.tier.12", "Epic Bending Unit IV", @@ -5443,14 +5096,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "BENDER", null).getStackForm(1L)); } private void registerCompressor() { ItemList.Machine_LV_Compressor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_LV.ID, "basicmachine.compressor.tier.01", "Basic Compressor", @@ -5461,12 +5114,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.Machine_MV_Compressor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_MV.ID, "basicmachine.compressor.tier.02", "Advanced Compressor", @@ -5477,12 +5130,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.Machine_HV_Compressor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_HV.ID, "basicmachine.compressor.tier.03", "Advanced Compressor II", @@ -5493,12 +5146,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.Machine_EV_Compressor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_EV.ID, "basicmachine.compressor.tier.04", "Advanced Compressor III", @@ -5509,12 +5162,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.Machine_IV_Compressor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_IV.ID, "basicmachine.compressor.tier.05", "Singularity Compressor", @@ -5525,12 +5178,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_LuV.ID, "basicmachine.compressor.tier.06", "Elite Compressor", @@ -5541,12 +5194,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_ZPM.ID, "basicmachine.compressor.tier.07", "Elite Compressor II", @@ -5557,12 +5210,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_UV.ID, "basicmachine.compressor.tier.08", "Ultimate Matter Constrictor", @@ -5573,12 +5226,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_UHV.ID, "basicmachine.compressor.tier.09", "Epic Matter Constrictor", @@ -5589,12 +5242,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_UEV.ID, "basicmachine.compressor.tier.10", "Epic Matter Constrictor II", @@ -5605,12 +5258,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_UIV.ID, "basicmachine.compressor.tier.11", "Epic Matter Constrictor III", @@ -5621,12 +5274,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); ItemList.CompressorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( COMPRESSOR_UMV.ID, "basicmachine.compressor.tier.12", "Epic Matter Constrictor IV", @@ -5637,7 +5290,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "COMPRESSOR", null).getStackForm(1L)); @@ -5645,7 +5298,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerCuttingMachine() { ItemList.Machine_LV_Cutter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_LV.ID, "basicmachine.cutter.tier.01", "Basic Cutting Machine", @@ -5656,12 +5309,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.Machine_MV_Cutter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_MV.ID, "basicmachine.cutter.tier.02", "Advanced Cutting Machine", @@ -5672,12 +5325,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.Machine_HV_Cutter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_HV.ID, "basicmachine.cutter.tier.03", "Advanced Cutting Machine II", @@ -5688,12 +5341,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.Machine_EV_Cutter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_EV.ID, "basicmachine.cutter.tier.04", "Advanced Cutting Machine III", @@ -5704,12 +5357,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.Machine_IV_Cutter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_IV.ID, "basicmachine.cutter.tier.05", "Advanced Cutting Machine IV", @@ -5720,12 +5373,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_LuV.ID, "basicmachine.cutter.tier.06", "Elite Cutting Machine", @@ -5736,12 +5389,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_ZPM.ID, "basicmachine.cutter.tier.07", "Elite Cutting Machine II", @@ -5752,12 +5405,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_UV.ID, "basicmachine.cutter.tier.08", "Ultimate Object Divider", @@ -5768,12 +5421,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_UHV.ID, "basicmachine.cutter.tier.09", "Epic Object Divider", @@ -5784,12 +5437,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_UEV.ID, "basicmachine.cutter.tier.10", "Epic Object Divider II", @@ -5800,12 +5453,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_UIV.ID, "basicmachine.cutter.tier.11", "Epic Object Divider III", @@ -5816,12 +5469,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); ItemList.CuttingMachineUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CUTTING_MACHINE_UMV.ID, "basicmachine.cutter.tier.12", "Epic Object Divider IV", @@ -5832,7 +5485,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CUTTER", null).getStackForm(1L)); @@ -5840,7 +5493,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerDistillery() { ItemList.Machine_LV_Distillery.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_LV.ID, "basicmachine.distillery.tier.01", "Basic Distillery", @@ -5851,12 +5504,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.GT_MACHINES_DISTILLERY_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.Machine_MV_Distillery.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_MV.ID, "basicmachine.distillery.tier.02", "Advanced Distillery", @@ -5867,12 +5520,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.GT_MACHINES_DISTILLERY_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.Machine_HV_Distillery.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_HV.ID, "basicmachine.distillery.tier.03", "Advanced Distillery II", @@ -5883,12 +5536,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.GT_MACHINES_DISTILLERY_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.Machine_EV_Distillery.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_EV.ID, "basicmachine.distillery.tier.04", "Advanced Distillery III", @@ -5899,12 +5552,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.GT_MACHINES_DISTILLERY_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.Machine_IV_Distillery.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_IV.ID, "basicmachine.distillery.tier.05", "Advanced Distillery IV", @@ -5915,12 +5568,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.GT_MACHINES_DISTILLERY_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_LuV.ID, "basicmachine.distillery.tier.06", "Elite Distillery", @@ -5931,12 +5584,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_ZPM.ID, "basicmachine.distillery.tier.07", "Elite Distillery II", @@ -5947,12 +5600,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_UV.ID, "basicmachine.distillery.tier.08", "Ultimate Fraction Splitter", @@ -5963,12 +5616,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_UHV.ID, "basicmachine.distillery.tier.09", "Epic Fraction Splitter", @@ -5979,12 +5632,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_UEV.ID, "basicmachine.distillery.tier.10", "Epic Fraction Splitter II", @@ -5995,12 +5648,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_UIV.ID, "basicmachine.distillery.tier.11", "Epic Fraction Splitter III", @@ -6011,12 +5664,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); ItemList.DistilleryUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( DISTILLERY_UMV.ID, "basicmachine.distillery.tier.12", "Epic Fraction Splitter IV", @@ -6027,7 +5680,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "DISTILLERY", null).getStackForm(1L)); @@ -6035,7 +5688,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerElectricFurnace() { ItemList.Machine_LV_E_Furnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_LV.ID, "basicmachine.e_furnace.tier.01", "Basic Electric Furnace", @@ -6046,13 +5699,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).setProgressBarTextureName("E_Furnace") .getStackForm(1L)); ItemList.Machine_MV_E_Furnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_MV.ID, "basicmachine.e_furnace.tier.02", "Advanced Electric Furnace", @@ -6063,13 +5716,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).setProgressBarTextureName("E_Furnace") .getStackForm(1L)); ItemList.Machine_HV_E_Furnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_HV.ID, "basicmachine.e_furnace.tier.03", "Advanced Electric Furnace II", @@ -6080,13 +5733,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).setProgressBarTextureName("E_Furnace") .getStackForm(1L)); ItemList.Machine_EV_E_Furnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_EV.ID, "basicmachine.e_furnace.tier.04", "Advanced Electric Furnace III", @@ -6097,13 +5750,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).setProgressBarTextureName("E_Furnace") .getStackForm(1L)); ItemList.Machine_IV_E_Furnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_IV.ID, "basicmachine.e_furnace.tier.05", "Electron Exitement Processor", @@ -6114,13 +5767,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).setProgressBarTextureName("E_Furnace") .getStackForm(1L)); ItemList.ElectricFurnaceLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_LuV.ID, "basicmachine.e_furnace.tier.06", "Elite Electric Furnace", @@ -6131,12 +5784,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); ItemList.ElectricFurnaceZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_ZPM.ID, "basicmachine.e_furnace.tier.07", "Elite Electric Furnace II", @@ -6147,12 +5800,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); ItemList.ElectricFurnaceUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_UV.ID, "basicmachine.e_furnace.tier.08", "Ultimate Atom Stimulator", @@ -6163,12 +5816,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); ItemList.ElectricFurnaceUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_UHV.ID, "basicmachine.e_furnace.tier.09", "Epic Atom Stimulator", @@ -6179,12 +5832,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); ItemList.ElectricFurnaceUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_UEV.ID, "basicmachine.e_furnace.tier.10", "Epic Atom Stimulator II", @@ -6195,12 +5848,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); ItemList.ElectricFurnaceUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_UIV.ID, "basicmachine.e_furnace.tier.11", "Epic Atom Stimulator III", @@ -6211,12 +5864,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); ItemList.ElectricFurnaceUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTRIC_FURNACE_UMV.ID, "basicmachine.e_furnace.tier.12", "Epic Atom Stimulator IV", @@ -6227,14 +5880,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_FURNACE", null).getStackForm(1L)); } private void registerElectrolyzer() { ItemList.Machine_LV_Electrolyzer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYSER_LV.ID, "basicmachine.electrolyzer.tier.01", "Basic Electrolyzer", @@ -6245,12 +5898,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.Machine_MV_Electrolyzer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYSER_MV.ID, "basicmachine.electrolyzer.tier.02", "Advanced Electrolyzer", @@ -6261,12 +5914,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.Machine_HV_Electrolyzer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYSER_HV.ID, "basicmachine.electrolyzer.tier.03", "Advanced Electrolyzer II", @@ -6277,12 +5930,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.Machine_EV_Electrolyzer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYSER_EV.ID, "basicmachine.electrolyzer.tier.04", "Advanced Electrolyzer III", @@ -6293,12 +5946,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.Machine_IV_Electrolyzer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYSER_IV.ID, "basicmachine.electrolyzer.tier.05", "Molecular Disintegrator E-4908", @@ -6309,12 +5962,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_LuV.ID, "basicmachine.electrolyzer.tier.06", "Elite Electrolyzer", @@ -6325,12 +5978,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_ZPM.ID, "basicmachine.electrolyzer.tier.07", "Elite Electrolyzer II", @@ -6341,12 +5994,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_UV.ID, "basicmachine.electrolyzer.tier.08", "Ultimate Ionizer", @@ -6357,12 +6010,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_UHV.ID, "basicmachine.electrolyzer.tier.09", "Epic Ionizer", @@ -6373,12 +6026,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_UEV.ID, "basicmachine.electrolyzer.tier.10", "Epic Ionizer II", @@ -6389,12 +6042,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_UIV.ID, "basicmachine.electrolyzer.tier.11", "Epic Ionizer III", @@ -6405,12 +6058,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); ItemList.ElectrolyzerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROLYZER_UMV.ID, "basicmachine.electrolyzer.tier.12", "Epic Ionizer IV", @@ -6421,7 +6074,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROLYZER", null).getStackForm(1L)); @@ -6429,7 +6082,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerElectromagneticSeparator() { ItemList.Machine_LV_ElectromagneticSeparator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_LV.ID, "basicmachine.electromagneticseparator.tier.01", "Basic Electromagnetic Separator", @@ -6440,12 +6093,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.Machine_MV_ElectromagneticSeparator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_MV.ID, "basicmachine.electromagneticseparator.tier.02", "Advanced Electromagnetic Separator", @@ -6456,12 +6109,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.Machine_HV_ElectromagneticSeparator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_HV.ID, "basicmachine.electromagneticseparator.tier.03", "Advanced Electromagnetic Separator II", @@ -6472,12 +6125,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.Machine_EV_ElectromagneticSeparator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_EV.ID, "basicmachine.electromagneticseparator.tier.04", "Advanced Electromagnetic Separator III", @@ -6488,12 +6141,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.Machine_IV_ElectromagneticSeparator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_IV.ID, "basicmachine.electromagneticseparator.tier.05", "Advanced Electromagnetic Separator IV", @@ -6504,12 +6157,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_LuV.ID, "basicmachine.electromagneticseparator.tier.06", "Elite Electromagnetic Separator", @@ -6520,12 +6173,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_ZPM.ID, "basicmachine.electromagneticseparator.tier.07", "Elite Electromagnetic Separator II", @@ -6536,12 +6189,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_UV.ID, "basicmachine.electromagneticseparator.tier.08", "Ultimate Magnetar Separator", @@ -6552,12 +6205,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_UHV.ID, "basicmachine.electromagneticseparator.tier.09", "Epic Magnetar Separator", @@ -6568,12 +6221,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_UEV.ID, "basicmachine.electromagneticseparator.tier.10", "Epic Magnetar Separator II", @@ -6584,12 +6237,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_UIV.ID, "basicmachine.electromagneticseparator.tier.11", "Epic Magnetar Separator III", @@ -6600,12 +6253,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); ItemList.ElectromagneticSeparatorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ELECTROMAGNETIC_SEPARATOR_UMV.ID, "basicmachine.electromagneticseparator.tier.12", "Epic Magnetar Separator IV", @@ -6616,7 +6269,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTROMAGNETIC_SEPARATOR", null).getStackForm(1L)); @@ -6624,7 +6277,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerExtractor() { ItemList.Machine_LV_Extractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_LV.ID, "basicmachine.extractor.tier.01", "Basic Extractor", @@ -6635,12 +6288,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_MV_Extractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_MV.ID, "basicmachine.extractor.tier.02", "Advanced Extractor", @@ -6651,12 +6304,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_HV_Extractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_HV.ID, "basicmachine.extractor.tier.03", "Advanced Extractor II", @@ -6667,12 +6320,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_EV_Extractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_EV.ID, "basicmachine.extractor.tier.04", "Advanced Extractor III", @@ -6683,12 +6336,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.Machine_IV_Extractor.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_IV.ID, "basicmachine.extractor.tier.05", "Vacuum Extractor", @@ -6699,12 +6352,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_LuV.ID, "basicmachine.extractor.tier.06", "Elite Extractor", @@ -6715,12 +6368,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_ZPM.ID, "basicmachine.extractor.tier.07", "Elite Extractor II", @@ -6731,12 +6384,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_UV.ID, "basicmachine.extractor.tier.08", "Ultimate Extractinator", @@ -6747,12 +6400,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_UHV.ID, "basicmachine.extractor.tier.09", "Epic Extractinator", @@ -6763,12 +6416,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_UEV.ID, "basicmachine.extractor.tier.10", "Epic Extractinator II", @@ -6779,12 +6432,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_UIV.ID, "basicmachine.extractor.tier.11", "Epic Extractinator III", @@ -6795,12 +6448,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); ItemList.ExtractorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRACTOR_UMV.ID, "basicmachine.extractor.tier.12", "Epic Extractinator IV", @@ -6811,7 +6464,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRACTOR", null).getStackForm(1L)); @@ -6819,7 +6472,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerExtruder() { ItemList.Machine_LV_Extruder.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_LV.ID, "basicmachine.extruder.tier.01", "Basic Extruder", @@ -6830,12 +6483,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.Machine_MV_Extruder.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_MV.ID, "basicmachine.extruder.tier.02", "Advanced Extruder", @@ -6846,12 +6499,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.Machine_HV_Extruder.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_HV.ID, "basicmachine.extruder.tier.03", "Advanced Extruder II", @@ -6862,12 +6515,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.Machine_EV_Extruder.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_EV.ID, "basicmachine.extruder.tier.04", "Advanced Extruder III", @@ -6878,12 +6531,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.Machine_IV_Extruder.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_IV.ID, "basicmachine.extruder.tier.05", "Advanced Extruder IV", @@ -6894,12 +6547,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_LuV.ID, "basicmachine.extruder.tier.06", "Elite Extruder", @@ -6910,12 +6563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_ZPM.ID, "basicmachine.extruder.tier.07", "Elite Extruder II", @@ -6926,12 +6579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_UV.ID, "basicmachine.extruder.tier.08", "Ultimate Shape Driver", @@ -6942,12 +6595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_UHV.ID, "basicmachine.extruder.tier.09", "Epic Shape Driver", @@ -6958,12 +6611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_UEV.ID, "basicmachine.extruder.tier.10", "Epic Shape Driver II", @@ -6974,12 +6627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_UIV.ID, "basicmachine.extruder.tier.11", "Epic Shape Driver III", @@ -6990,12 +6643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); ItemList.ExtruderUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( EXTRUDER_UMV.ID, "basicmachine.extruder.tier.12", "Epic Shape Driver IV", @@ -7006,7 +6659,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "EXTRUDER", null).getStackForm(1L)); @@ -7014,7 +6667,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerFluidSolidifier() { ItemList.Machine_LV_FluidSolidifier.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_LV.ID, "basicmachine.fluidsolidifier.tier.01", "Basic Fluid Solidifier", @@ -7025,12 +6678,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.Machine_MV_FluidSolidifier.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_MV.ID, "basicmachine.fluidsolidifier.tier.02", "Advanced Fluid Solidifier", @@ -7041,12 +6694,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.Machine_HV_FluidSolidifier.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_HV.ID, "basicmachine.fluidsolidifier.tier.03", "Advanced Fluid Solidifier II", @@ -7057,12 +6710,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.Machine_EV_FluidSolidifier.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_EV.ID, "basicmachine.fluidsolidifier.tier.04", "Advanced Fluid Solidifier III", @@ -7073,12 +6726,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.Machine_IV_FluidSolidifier.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_IV.ID, "basicmachine.fluidsolidifier.tier.05", "Advanced Fluid Solidifier IV", @@ -7089,12 +6742,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_LuV.ID, "basicmachine.fluidsolidifier.tier.06", "Elite Fluid Solidifier", @@ -7105,12 +6758,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_ZPM.ID, "basicmachine.fluidsolidifier.tier.07", "Elite Fluid Solidifier II", @@ -7121,12 +6774,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_UV.ID, "basicmachine.fluidsolidifier.tier.08", "Ultimate Fluid Petrificator", @@ -7137,12 +6790,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_UHV.ID, "basicmachine.fluidsolidifier.tier.09", "Epic Fluid Petrificator", @@ -7153,12 +6806,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_UEV.ID, "basicmachine.fluidsolidifier.tier.10", "Epic Fluid Petrificator II", @@ -7169,12 +6822,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_UIV.ID, "basicmachine.fluidsolidifier.tier.11", "Epic Fluid Petrificator III", @@ -7185,12 +6838,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); ItemList.FluidSolidifierUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FLUID_SOLIDIFIER_UMV.ID, "basicmachine.fluidsolidifier.tier.12", "Epic Fluid Petrificator IV", @@ -7201,7 +6854,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "FLUID_SOLIDIFIER", null).getStackForm(1L)); @@ -7209,7 +6862,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerFormingPress() { ItemList.Machine_LV_Press.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_LV.ID, "basicmachine.press.tier.01", "Basic Forming Press", @@ -7220,12 +6873,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.Machine_MV_Press.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_MV.ID, "basicmachine.press.tier.02", "Advanced Forming Press", @@ -7236,12 +6889,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.Machine_HV_Press.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_HV.ID, "basicmachine.press.tier.03", "Advanced Forming Press II", @@ -7252,12 +6905,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.Machine_EV_Press.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_EV.ID, "basicmachine.press.tier.04", "Advanced Forming Press III", @@ -7268,12 +6921,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.Machine_IV_Press.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_IV.ID, "basicmachine.press.tier.05", "Advanced Forming Press IV", @@ -7284,12 +6937,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_LuV.ID, "basicmachine.press.tier.06", "Elite Forming Press", @@ -7300,12 +6953,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_ZPM.ID, "basicmachine.press.tier.07", "Elite Forming Press II", @@ -7316,12 +6969,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_UV.ID, "basicmachine.press.tier.08", "Ultimate Surface Shifter", @@ -7332,12 +6985,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_UHV.ID, "basicmachine.press.tier.09", "Epic Surface Shifter", @@ -7348,12 +7001,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_UEV.ID, "basicmachine.press.tier.10", "Epic Surface Shifter II", @@ -7364,12 +7017,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_UIV.ID, "basicmachine.press.tier.11", "Epic Surface Shifter III", @@ -7380,12 +7033,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); ItemList.FormingPressUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORMING_PRESS_UMV.ID, "basicmachine.press.tier.12", "Epic Surface Shifter IV", @@ -7396,7 +7049,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PRESS", null).getStackForm(1L)); @@ -7404,7 +7057,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerForgeHammer() { ItemList.Machine_LV_Hammer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_LV.ID, "basicmachine.hammer.tier.01", "Basic Forge Hammer", @@ -7415,12 +7068,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS, + MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", null).getStackForm(1L)); ItemList.Machine_MV_Hammer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_MV.ID, "basicmachine.hammer.tier.02", "Advanced Forge Hammer", @@ -7431,12 +7084,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS, + MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", null).getStackForm(1L)); ItemList.Machine_HV_Hammer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_HV.ID, "basicmachine.hammer.tier.03", "Advanced Forge Hammer II", @@ -7447,12 +7100,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS, + MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", null).getStackForm(1L)); ItemList.Machine_EV_Hammer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_EV.ID, "basicmachine.hammer.tier.04", "Advanced Forge Hammer III", @@ -7463,12 +7116,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS, + MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", null).getStackForm(1L)); ItemList.Machine_IV_Hammer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_IV.ID, "basicmachine.hammer.tier.05", "Advanced Forge Hammer IV", @@ -7479,12 +7132,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.MAIN_RANDOM_SPARKS, + MTEBasicMachineWithRecipe.SpecialEffects.MAIN_RANDOM_SPARKS, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_LuV.ID, "basicmachine.hammer.tier.06", "Elite Forge Hammer", @@ -7495,12 +7148,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_ZPM.ID, "basicmachine.hammer.tier.07", "Elite Forge Hammer II", @@ -7511,12 +7164,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_UV.ID, "basicmachine.hammer.tier.08", "Ultimate Impact Modulator", @@ -7527,12 +7180,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_UHV.ID, "basicmachine.hammer.tier.09", "Epic Impact Modulator", @@ -7543,12 +7196,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_UEV.ID, "basicmachine.hammer.tier.10", "Epic Impact Modulator II", @@ -7559,12 +7212,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_UIV.ID, "basicmachine.hammer.tier.11", "Epic Impact Modulator III", @@ -7575,12 +7228,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); ItemList.ForgeHammerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( FORGE_HAMMER_UMV.ID, "basicmachine.hammer.tier.12", "Epic Impact Modulator IV", @@ -7591,7 +7244,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.RANDOM_ANVIL_USE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "HAMMER", null).getStackForm(1L)); @@ -7599,7 +7252,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerLathe() { ItemList.Machine_LV_Lathe.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_LV.ID, "basicmachine.lathe.tier.01", "Basic Lathe", @@ -7610,12 +7263,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.Machine_MV_Lathe.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_MV.ID, "basicmachine.lathe.tier.02", "Advanced Lathe", @@ -7626,12 +7279,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.Machine_HV_Lathe.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_HV.ID, "basicmachine.lathe.tier.03", "Advanced Lathe II", @@ -7642,12 +7295,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.Machine_EV_Lathe.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_EV.ID, "basicmachine.lathe.tier.04", "Advanced Lathe III", @@ -7658,12 +7311,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.Machine_IV_Lathe.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_IV.ID, "basicmachine.lathe.tier.05", "Advanced Lathe IV", @@ -7674,12 +7327,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_LuV.ID, "basicmachine.lathe.tier.06", "Elite Lathe", @@ -7690,12 +7343,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_ZPM.ID, "basicmachine.lathe.tier.07", "Elite Lathe II", @@ -7706,12 +7359,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_UV.ID, "basicmachine.lathe.tier.08", "Ultimate Turn-O-Matic", @@ -7722,12 +7375,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_UHV.ID, "basicmachine.lathe.tier.09", "Epic Turn-O-Matic", @@ -7738,12 +7391,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_UEV.ID, "basicmachine.lathe.tier.10", "Epic Turn-O-Matic II", @@ -7754,12 +7407,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_UIV.ID, "basicmachine.lathe.tier.11", "Epic Turn-O-Matic III", @@ -7770,12 +7423,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); ItemList.LatheUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LATHE_UMV.ID, "basicmachine.lathe.tier.12", "Epic Turn-O-Matic IV", @@ -7786,7 +7439,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LATHE", null).getStackForm(1L)); @@ -7794,7 +7447,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerPrecisionLaserEngraver() { ItemList.Machine_LV_LaserEngraver.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LASER_ENGRAVER_LV.ID, "basicmachine.laserengraver.tier.01", "Basic Precision Laser Engraver", @@ -7805,12 +7458,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.Machine_MV_LaserEngraver.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LASER_ENGRAVER_MV.ID, "basicmachine.laserengraver.tier.02", "Advanced Precision Laser Engraver", @@ -7821,12 +7474,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.Machine_HV_LaserEngraver.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LASER_ENGRAVER_HV.ID, "basicmachine.laserengraver.tier.03", "Advanced Precision Laser Engraver II", @@ -7837,12 +7490,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.Machine_EV_LaserEngraver.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LASER_ENGRAVER_EV.ID, "basicmachine.laserengraver.tier.04", "Advanced Precision Laser Engraver III", @@ -7853,12 +7506,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.Machine_IV_LaserEngraver.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( LASER_ENGRAVER_IV.ID, "basicmachine.laserengraver.tier.05", "Advanced Precision Laser Engraver IV", @@ -7869,12 +7522,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_LuV.ID, "basicmachine.laserengraver.tier.06", "Elite Precision Laser Engraver", @@ -7885,12 +7538,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_ZPM.ID, "basicmachine.laserengraver.tier.07", "Elite Precision Laser Engraver II", @@ -7901,12 +7554,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_UV.ID, "basicmachine.laserengraver.tier.08", "Ultimate Exact Photon Cannon", @@ -7917,12 +7570,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_UHV.ID, "basicmachine.laserengraver.tier.09", "Epic Exact Photon Cannon", @@ -7933,12 +7586,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_UEV.ID, "basicmachine.laserengraver.tier.10", "Epic Exact Photon Cannon II", @@ -7949,12 +7602,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_UIV.ID, "basicmachine.laserengraver.tier.11", "Epic Exact Photon Cannon III", @@ -7965,12 +7618,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); ItemList.PrecisionLaserEngraverUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRECISION_LASER_ENGRAVER_UMV.ID, "basicmachine.laserengraver.tier.12", "Epic Exact Photon Cannon IV", @@ -7981,7 +7634,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "LASER_ENGRAVER", null).getStackForm(1L)); @@ -7989,7 +7642,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerMacerator() { ItemList.Machine_LV_Macerator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_LV.ID, "basicmachine.macerator.tier.01", "Basic Macerator", @@ -8000,12 +7653,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "MACERATOR", null).getStackForm(1L)); ItemList.Machine_MV_Macerator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_MV.ID, "basicmachine.macerator.tier.02", "Advanced Macerator", @@ -8016,12 +7669,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "MACERATOR", null).getStackForm(1L)); ItemList.Machine_HV_Macerator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_HV.ID, "basicmachine.macerator.tier.03", "Universal Macerator", @@ -8032,12 +7685,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.Machine_EV_Macerator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_EV.ID, "basicmachine.macerator.tier.04", "Universal Pulverizer", @@ -8048,12 +7701,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.Machine_IV_Macerator.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_IV.ID, "basicmachine.macerator.tier.05", "Blend-O-Matic 9001", @@ -8064,12 +7717,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_LuV.ID, "basicmachine.macerator.tier.06", "Elite Pulverizer", @@ -8080,12 +7733,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_ZPM.ID, "basicmachine.macerator.tier.07", "Elite Pulverizer II", @@ -8096,12 +7749,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_UV.ID, "basicmachine.macerator.tier.08", "Ultimate Shape Eliminator", @@ -8112,12 +7765,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_UHV.ID, "basicmachine.macerator.tier.09", "Epic Shape Eliminator", @@ -8128,12 +7781,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_UEV.ID, "basicmachine.macerator.tier.10", "Epic Shape Eliminator II", @@ -8144,12 +7797,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_UIV.ID, "basicmachine.macerator.tier.11", "Epic Shape Eliminator III", @@ -8160,12 +7813,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); ItemList.MaceratorUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MACERATOR_UMV.ID, "basicmachine.macerator.tier.12", "Epic Shape Eliminator IV", @@ -8176,7 +7829,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, false, SoundResource.IC2_MACHINES_MACERATOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PULVERIZER", null).getStackForm(1L)); @@ -8185,43 +7838,40 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerMatterFabricator() { ItemList.MassFabricatorLuV.set( - new GT_MetaTileEntity_Massfabricator( - MATTER_FABRICATOR_LuV.ID, - "basicmachine.massfab.tier.06", - "Elite Mass Fabricator", - 6).getStackForm(1L)); + new MTEMassfabricator(MATTER_FABRICATOR_LuV.ID, "basicmachine.massfab.tier.06", "Elite Mass Fabricator", 6) + .getStackForm(1L)); ItemList.MassFabricatorZPM.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MATTER_FABRICATOR_ZPM.ID, "basicmachine.massfab.tier.07", "Elite Mass Fabricator II", 7).getStackForm(1L)); ItemList.MassFabricatorUV.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MATTER_FABRICATOR_UV.ID, "basicmachine.massfab.tier.08", "Ultimate Existence Initiator", 8).getStackForm(1L)); ItemList.MassFabricatorUHV.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MATTER_FABRICATOR_UHV.ID, "basicmachine.massfab.tier.09", "Epic Existence Initiator", 9).getStackForm(1L)); ItemList.MassFabricatorUEV.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MATTER_FABRICATOR_UEV.ID, "basicmachine.massfab.tier.10", "Epic Existence Initiator II", 10).getStackForm(1L)); ItemList.MassFabricatorUIV.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MATTER_FABRICATOR_UIV.ID, "basicmachine.massfab.tier.11", "Epic Existence Initiator III", 11).getStackForm(1L)); ItemList.MassFabricatorUMV.set( - new GT_MetaTileEntity_Massfabricator( + new MTEMassfabricator( MATTER_FABRICATOR_UMV.ID, "basicmachine.massfab.tier.12", "Epic Existence Initiator IV", @@ -8230,7 +7880,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerMicrowave() { ItemList.Machine_LV_Microwave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_OVEN_LV.ID, "basicmachine.microwave.tier.01", "Basic Microwave", @@ -8241,12 +7891,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.Machine_MV_Microwave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_OVEN_MV.ID, "basicmachine.microwave.tier.02", "Advanced Microwave", @@ -8257,12 +7907,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.Machine_HV_Microwave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_OVEN_HV.ID, "basicmachine.microwave.tier.03", "Advanced Microwave II", @@ -8273,12 +7923,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.Machine_EV_Microwave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_OVEN_EV.ID, "basicmachine.microwave.tier.04", "Advanced Microwave III", @@ -8289,12 +7939,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.Machine_IV_Microwave.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_OVEN_IV.ID, "basicmachine.microwave.tier.05", "Advanced Microwave IV", @@ -8305,12 +7955,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_LuV.ID, "basicmachine.microwave.tier.06", "Elite Microwave", @@ -8321,12 +7971,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_ZPM.ID, "basicmachine.microwave.tier.07", "Elite Microwave II", @@ -8337,12 +7987,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_UV.ID, "basicmachine.microwave.tier.08", "Ultimate UFO Engine", @@ -8353,12 +8003,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_UHV.ID, "basicmachine.microwave.tier.09", "Epic UFO Engine", @@ -8369,12 +8019,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_UEV.ID, "basicmachine.microwave.tier.10", "Epic UFO Engine II", @@ -8385,12 +8035,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_UIV.ID, "basicmachine.microwave.tier.11", "Epic UFO Engine III", @@ -8401,12 +8051,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); ItemList.MicrowaveUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( MICROWAVE_UMV.ID, "basicmachine.microwave.tier.12", "Epic UFO Engine IV", @@ -8417,7 +8067,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "MICROWAVE", null).getStackForm(1L)); @@ -8425,7 +8075,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerOven() { ItemList.Machine_LV_Oven.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( OVEN_LV.ID, "basicmachine.e_oven.tier.01", "Basic Electric Oven", @@ -8436,13 +8086,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_OVEN", null).setProgressBarTextureName("E_Oven") .getStackForm(1L)); ItemList.Machine_MV_Oven.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( OVEN_MV.ID, "basicmachine.e_oven.tier.02", "Advanced Electric Oven", @@ -8453,13 +8103,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_OVEN", null).setProgressBarTextureName("E_Oven") .getStackForm(1L)); ItemList.Machine_HV_Oven.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( OVEN_HV.ID, "basicmachine.e_oven.tier.03", "Advanced Electric Oven II", @@ -8470,13 +8120,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_OVEN", null).setProgressBarTextureName("E_Oven") .getStackForm(1L)); ItemList.Machine_EV_Oven.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( OVEN_EV.ID, "basicmachine.e_oven.tier.04", "Advanced Electric Oven III", @@ -8487,13 +8137,13 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_OVEN", null).setProgressBarTextureName("E_Oven") .getStackForm(1L)); ItemList.Machine_IV_Oven.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( OVEN_IV.ID, "basicmachine.e_oven.tier.05", "Advanced Electric Oven IV", @@ -8504,7 +8154,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ELECTRIC_OVEN", null).setProgressBarTextureName("E_Oven") .getStackForm(1L)); @@ -8512,7 +8162,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerOreWashingPlant() { ItemList.Machine_LV_OreWasher.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHER_LV.ID, "basicmachine.orewasher.tier.01", "Basic Ore Washing Plant", @@ -8523,12 +8173,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.Machine_MV_OreWasher.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHER_MV.ID, "basicmachine.orewasher.tier.02", "Advanced Ore Washing Plant", @@ -8539,12 +8189,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.Machine_HV_OreWasher.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHER_HV.ID, "basicmachine.orewasher.tier.03", "Advanced Ore Washing Plant II", @@ -8555,12 +8205,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.Machine_EV_OreWasher.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHER_EV.ID, "basicmachine.orewasher.tier.04", "Advanced Ore Washing Plant III", @@ -8571,12 +8221,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.Machine_IV_OreWasher.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHER_IV.ID, "basicmachine.orewasher.tier.05", "Repurposed Laundry-Washer I-360", @@ -8587,12 +8237,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_LuV.ID, "basicmachine.orewasher.tier.06", "Elite Ore Washing Plant", @@ -8603,12 +8253,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_ZPM.ID, "basicmachine.orewasher.tier.07", "Elite Ore Washing Plant II", @@ -8619,12 +8269,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_UV.ID, "basicmachine.orewasher.tier.08", "Ultimate Ore Washing Machine", @@ -8635,12 +8285,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_UHV.ID, "basicmachine.orewasher.tier.09", "Epic Ore Washing Machine", @@ -8651,12 +8301,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_UEV.ID, "basicmachine.orewasher.tier.10", "Epic Ore Washing Machine II", @@ -8667,12 +8317,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_UIV.ID, "basicmachine.orewasher.tier.11", "Epic Ore Washing Machine III", @@ -8683,12 +8333,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); ItemList.OreWashingPlantUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ORE_WASHING_PLANT_UMV.ID, "basicmachine.orewasher.tier.12", "Epic Ore Washing Machine IV", @@ -8699,7 +8349,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ORE_WASHER", null).getStackForm(1L)); @@ -8707,7 +8357,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerPolarizer() { ItemList.Machine_LV_Polarizer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_LV.ID, "basicmachine.polarizer.tier.01", "Basic Polarizer", @@ -8718,12 +8368,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.Machine_MV_Polarizer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_MV.ID, "basicmachine.polarizer.tier.02", "Advanced Polarizer", @@ -8734,12 +8384,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.Machine_HV_Polarizer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_HV.ID, "basicmachine.polarizer.tier.03", "Advanced Polarizer II", @@ -8750,12 +8400,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.Machine_EV_Polarizer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_EV.ID, "basicmachine.polarizer.tier.04", "Advanced Polarizer III", @@ -8766,12 +8416,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.Machine_IV_Polarizer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_IV.ID, "basicmachine.polarizer.tier.05", "Advanced Polarizer IV", @@ -8782,12 +8432,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_LuV.ID, "basicmachine.polarizer.tier.06", "Elite Polarizer", @@ -8798,12 +8448,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_ZPM.ID, "basicmachine.polarizer.tier.07", "Elite Polarizer II", @@ -8814,12 +8464,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_UV.ID, "basicmachine.polarizer.tier.08", "Ultimate Magnetism Inducer", @@ -8830,12 +8480,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_UHV.ID, "basicmachine.polarizer.tier.09", "Epic Magnetism Inducer", @@ -8846,12 +8496,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_UEV.ID, "basicmachine.polarizer.tier.10", "Epic Magnetism Inducer II", @@ -8862,12 +8512,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_UIV.ID, "basicmachine.polarizer.tier.11", "Epic Magnetism Inducer III", @@ -8878,12 +8528,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); ItemList.PolarizerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( POLARIZER_UMV.ID, "basicmachine.polarizer.tier.12", "Epic Magnetism Inducer IV", @@ -8894,7 +8544,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_MAGNETIZER_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "POLARIZER", null).getStackForm(1L)); @@ -8902,7 +8552,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerPrinter() { ItemList.Machine_LV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_LV.ID, "basicmachine.printer.tier.01", "Basic Printer", @@ -8913,12 +8563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_MV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_MV.ID, "basicmachine.printer.tier.02", "Advanced Printer", @@ -8929,12 +8579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_HV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_HV.ID, "basicmachine.printer.tier.03", "Advanced Printer II", @@ -8945,12 +8595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_EV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_EV.ID, "basicmachine.printer.tier.04", "Advanced Printer III", @@ -8961,12 +8611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_IV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_IV.ID, "basicmachine.printer.tier.05", "Advanced Printer IV", @@ -8977,12 +8627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_LuV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_LuV.ID, "basicmachine.printer.tier.06", "Advanced Printer V", @@ -8993,12 +8643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_ZPM_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_ZPM.ID, "basicmachine.printer.tier.07", "Advanced Printer VI", @@ -9009,12 +8659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); ItemList.Machine_UV_Printer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PRINTER_UV.ID, "basicmachine.printer.tier.08", "Advanced Printer VII", @@ -9025,14 +8675,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.IC2_MACHINES_COMPRESSOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.TOP_SMOKE, + MTEBasicMachineWithRecipe.SpecialEffects.TOP_SMOKE, "PRINTER", null).getStackForm(1L)); } private void registerRecycler() { ItemList.Machine_LV_Recycler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_LV.ID, "basicmachine.recycler.tier.01", "Basic Recycler", @@ -9043,12 +8693,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.Machine_MV_Recycler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_MV.ID, "basicmachine.recycler.tier.02", "Advanced Recycler", @@ -9059,12 +8709,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.Machine_HV_Recycler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_HV.ID, "basicmachine.recycler.tier.03", "Advanced Recycler II", @@ -9075,12 +8725,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.Machine_EV_Recycler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_EV.ID, "basicmachine.recycler.tier.04", "Advanced Recycler III", @@ -9091,12 +8741,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.Machine_IV_Recycler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_IV.ID, "basicmachine.recycler.tier.05", "The Oblitterator", @@ -9107,12 +8757,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_LuV.ID, "basicmachine.recycler.tier.06", "Elite Recycler", @@ -9123,12 +8773,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_ZPM.ID, "basicmachine.recycler.tier.07", "Elite Recycler II", @@ -9139,12 +8789,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_UV.ID, "basicmachine.recycler.tier.08", "Ultimate Scrap-O-Matic", @@ -9155,12 +8805,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_UHV.ID, "basicmachine.recycler.tier.09", "Epic Scrap-O-Matic", @@ -9171,12 +8821,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_UEV.ID, "basicmachine.recycler.tier.10", "Epic Scrap-O-Matic II", @@ -9187,12 +8837,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_UIV.ID, "basicmachine.recycler.tier.11", "Epic Scrap-O-Matic III", @@ -9203,12 +8853,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); ItemList.RecyclerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( RECYCLER_UMV.ID, "basicmachine.recycler.tier.12", "Epic Scrap-O-Matic IV", @@ -9219,7 +8869,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "RECYCLER", null).getStackForm(1L)); @@ -9227,7 +8877,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerSiftingMachine() { ItemList.Machine_LV_Sifter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTER_LV.ID, "basicmachine.sifter.tier.01", "Basic Sifting Machine", @@ -9238,12 +8888,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.Machine_MV_Sifter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTER_MV.ID, "basicmachine.sifter.tier.02", "Advanced Sifting Machine", @@ -9254,12 +8904,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.Machine_HV_Sifter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTER_HV.ID, "basicmachine.sifter.tier.03", "Advanced Sifting Machine II", @@ -9270,12 +8920,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.Machine_EV_Sifter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTER_EV.ID, "basicmachine.sifter.tier.04", "Advanced Sifting Machine III", @@ -9286,12 +8936,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.Machine_IV_Sifter.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTER_IV.ID, "basicmachine.sifter.tier.05", "Advanced Sifting Machine IV", @@ -9302,12 +8952,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_LuV.ID, "basicmachine.sifter.tier.06", "Elite Sifting Machine", @@ -9318,12 +8968,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_ZPM.ID, "basicmachine.sifter.tier.07", "Elite Sifting Machine II", @@ -9334,12 +8984,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_UV.ID, "basicmachine.sifter.tier.08", "Ultimate Pulsation Filter", @@ -9350,12 +9000,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_UHV.ID, "basicmachine.sifter.tier.09", "Epic Pulsation Filter", @@ -9366,12 +9016,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_UEV.ID, "basicmachine.sifter.tier.10", "Epic Pulsation Filter II", @@ -9382,12 +9032,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_UIV.ID, "basicmachine.sifter.tier.11", "Epic Pulsation Filter III", @@ -9398,12 +9048,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); ItemList.SiftingMachineUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SIFTING_MACHINE_UMV.ID, "basicmachine.sifter.tier.12", "Epic Pulsation Filter IV", @@ -9414,7 +9064,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SIFTER", null).getStackForm(1L)); @@ -9422,7 +9072,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerSlicingMachine() { ItemList.Machine_LV_Slicer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICER_LV.ID, "basicmachine.slicer.tier.01", "Basic Slicing Machine", @@ -9433,12 +9083,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.Machine_MV_Slicer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICER_MV.ID, "basicmachine.slicer.tier.02", "Advanced Slicing Machine", @@ -9449,12 +9099,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.Machine_HV_Slicer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICER_HV.ID, "basicmachine.slicer.tier.03", "Advanced Slicing Machine II", @@ -9465,12 +9115,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.Machine_EV_Slicer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICER_EV.ID, "basicmachine.slicer.tier.04", "Advanced Slicing Machine III", @@ -9481,12 +9131,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.Machine_IV_Slicer.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICER_IV.ID, "basicmachine.slicer.tier.05", "Advanced Slicing Machine IV", @@ -9497,12 +9147,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_LuV.ID, "basicmachine.slicer.tier.06", "Elite Slicing Machine", @@ -9513,12 +9163,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_ZPM.ID, "basicmachine.slicer.tier.07", "Elite Slicing Machine II", @@ -9529,12 +9179,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_UV.ID, "basicmachine.slicer.tier.08", "Ultimate Quantum Slicer", @@ -9545,12 +9195,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_UHV.ID, "basicmachine.slicer.tier.09", "Epic Quantum Slicer", @@ -9561,12 +9211,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_UEV.ID, "basicmachine.slicer.tier.10", "Epic Quantum Slicer II", @@ -9577,12 +9227,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_UIV.ID, "basicmachine.slicer.tier.11", "Epic Quantum Slicer III", @@ -9593,12 +9243,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); ItemList.SlicingMachineUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SLICING_MACHINE_UMV.ID, "basicmachine.slicer.tier.12", "Epic Quantum Slicer IV", @@ -9609,7 +9259,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "SLICER", null).getStackForm(1L)); @@ -9617,7 +9267,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerThermalCentrifuge() { ItemList.Machine_LV_ThermalCentrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_LV.ID, "basicmachine.thermalcentrifuge.tier.01", "Basic Thermal Centrifuge", @@ -9628,12 +9278,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_MV_ThermalCentrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_MV.ID, "basicmachine.thermalcentrifuge.tier.02", "Advanced Thermal Centrifuge", @@ -9644,12 +9294,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_HV_ThermalCentrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_HV.ID, "basicmachine.thermalcentrifuge.tier.03", "Advanced Thermal Centrifuge II", @@ -9660,12 +9310,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_EV_ThermalCentrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_EV.ID, "basicmachine.thermalcentrifuge.tier.04", "Advanced Thermal Centrifuge III", @@ -9676,12 +9326,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_IV_ThermalCentrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_IV.ID, "basicmachine.thermalcentrifuge.tier.05", "Blaze Sweatshop T-6350", @@ -9692,12 +9342,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_LuV.ID, "basicmachine.thermalcentrifuge.tier.06", "Elite Thermal Centrifuge", @@ -9708,12 +9358,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_ZPM.ID, "basicmachine.thermalcentrifuge.tier.07", "Elite Thermal Centrifuge II", @@ -9724,12 +9374,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_UV.ID, "basicmachine.thermalcentrifuge.tier.08", "Ultimate Fire Cyclone", @@ -9740,12 +9390,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_UHV.ID, "basicmachine.thermalcentrifuge.tier.09", "Epic Fire Cyclone", @@ -9756,12 +9406,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_UEV.ID, "basicmachine.thermalcentrifuge.tier.10", "Epic Fire Cyclone II", @@ -9772,12 +9422,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_UIV.ID, "basicmachine.thermalcentrifuge.tier.11", "Epic Fire Cyclone III", @@ -9788,12 +9438,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); ItemList.ThermalCentrifugeUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( THERMAL_CENTRIFUGE_UMV.ID, "basicmachine.thermalcentrifuge.tier.12", "Epic Fire Cyclone IV", @@ -9804,14 +9454,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, false, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "THERMAL_CENTRIFUGE", null).getStackForm(1L)); } private void registerWiremill() { ItemList.Machine_LV_Wiremill.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_LV.ID, "basicmachine.wiremill.tier.01", "Basic Wiremill", @@ -9822,12 +9472,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.Machine_MV_Wiremill.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_MV.ID, "basicmachine.wiremill.tier.02", "Advanced Wiremill", @@ -9838,12 +9488,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.Machine_HV_Wiremill.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_HV.ID, "basicmachine.wiremill.tier.03", "Advanced Wiremill II", @@ -9854,12 +9504,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.Machine_EV_Wiremill.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_EV.ID, "basicmachine.wiremill.tier.04", "Advanced Wiremill III", @@ -9870,12 +9520,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.Machine_IV_Wiremill.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_IV.ID, "basicmachine.wiremill.tier.05", "Advanced Wiremill IV", @@ -9886,12 +9536,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_LuV.ID, "basicmachine.wiremill.tier.06", "Elite Wiremill", @@ -9902,12 +9552,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_ZPM.ID, "basicmachine.wiremill.tier.07", "Elite Wiremill II", @@ -9918,12 +9568,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_UV.ID, "basicmachine.wiremill.tier.08", "Ultimate Wire Transfigurator", @@ -9934,12 +9584,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_UHV.ID, "basicmachine.wiremill.tier.09", "Epic Wire Transfigurator", @@ -9950,12 +9600,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_UEV.ID, "basicmachine.wiremill.tier.10", "Epic Wire Transfigurator II", @@ -9966,12 +9616,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_UIV.ID, "basicmachine.wiremill.tier.11", "Epic Wire Transfigurator III", @@ -9982,12 +9632,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); ItemList.WiremillUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( WIREMILL_UMV.ID, "basicmachine.wiremill.tier.12", "Epic Wire Transfigurator IV", @@ -9998,7 +9648,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, false, SoundResource.IC2_MACHINES_RECYCLER_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "WIREMILL", null).getStackForm(1L)); @@ -10006,7 +9656,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerArcFurnace() { ItemList.Machine_LV_ArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_LV.ID, "basicmachine.arcfurnace.tier.01", "Basic Arc Furnace", @@ -10017,12 +9667,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_MV_ArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_MV.ID, "basicmachine.arcfurnace.tier.02", "Advanced Arc Furnace", @@ -10033,12 +9683,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_HV_ArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_HV.ID, "basicmachine.arcfurnace.tier.03", "Advanced Arc Furnace II", @@ -10049,12 +9699,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_EV_ArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_EV.ID, "basicmachine.arcfurnace.tier.04", "Advanced Arc Furnace III", @@ -10065,12 +9715,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_IV_ArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_IV.ID, "basicmachine.arcfurnace.tier.05", "Advanced Arc Furnace IV", @@ -10081,12 +9731,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_LuV.ID, "basicmachine.arcfurnace.tier.06", "Elite Arc Furnace", @@ -10097,12 +9747,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_ZPM.ID, "basicmachine.arcfurnace.tier.07", "Elite Arc Furnace II", @@ -10113,12 +9763,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_UV.ID, "basicmachine.arcfurnace.tier.08", "Ultimate Short Circuit Heater", @@ -10129,12 +9779,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_UHV.ID, "basicmachine.arcfurnace.tier.09", "Epic Short Circuit Heater", @@ -10145,12 +9795,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_UEV.ID, "basicmachine.arcfurnace.tier.10", "Epic Short Circuit Heater II", @@ -10161,12 +9811,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_UIV.ID, "basicmachine.arcfurnace.tier.11", "Epic Short Circuit Heater III", @@ -10177,12 +9827,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); ItemList.ArcFurnaceUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ARC_FURNACE_UMV.ID, "basicmachine.arcfurnace.tier.12", "Epic Short Circuit Heater IV", @@ -10193,7 +9843,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "ARC_FURNACE", null).getStackForm(1L)); @@ -10201,7 +9851,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerCentrifuge() { ItemList.Machine_LV_Centrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_LV.ID, "basicmachine.centrifuge.tier.01", "Basic Centrifuge", @@ -10212,12 +9862,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_MV_Centrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_MV.ID, "basicmachine.centrifuge.tier.02", "Advanced Centrifuge", @@ -10228,12 +9878,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_HV_Centrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_HV.ID, "basicmachine.centrifuge.tier.03", "Turbo Centrifuge", @@ -10244,12 +9894,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_EV_Centrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_EV.ID, "basicmachine.centrifuge.tier.04", "Molecular Separator", @@ -10260,12 +9910,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.Machine_IV_Centrifuge.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_IV.ID, "basicmachine.centrifuge.tier.05", "Molecular Cyclone", @@ -10276,12 +9926,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_LuV.ID, "basicmachine.centrifuge.tier.06", "Elite Centrifuge", @@ -10292,12 +9942,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_ZPM.ID, "basicmachine.centrifuge.tier.07", "Elite Centrifuge II", @@ -10308,12 +9958,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_UV.ID, "basicmachine.centrifuge.tier.08", "Ultimate Molecular Tornado", @@ -10324,12 +9974,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_UHV.ID, "basicmachine.centrifuge.tier.09", "Epic Molecular Tornado", @@ -10340,12 +9990,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_UEV.ID, "basicmachine.centrifuge.tier.10", "Epic Molecular Tornado II", @@ -10356,12 +10006,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_UIV.ID, "basicmachine.centrifuge.tier.11", "Epic Molecular Tornado III", @@ -10372,12 +10022,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); ItemList.CentrifugeUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CENTRIFUGE_UMV.ID, "basicmachine.centrifuge.tier.12", "Epic Molecular Tornado IV", @@ -10388,7 +10038,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 6, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CENTRIFUGE", null).getStackForm(1L)); @@ -10396,7 +10046,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerPlasmaArcFurnace() { ItemList.Machine_LV_PlasmaArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_LV.ID, "basicmachine.plasmaarcfurnace.tier.01", "Basic Plasma Arc Furnace", @@ -10407,12 +10057,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_MV_PlasmaArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_MV.ID, "basicmachine.plasmaarcfurnace.tier.02", "Advanced Plasma Arc Furnace", @@ -10423,12 +10073,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_HV_PlasmaArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_HV.ID, "basicmachine.plasmaarcfurnace.tier.03", "Advanced Plasma Arc Furnace II", @@ -10439,12 +10089,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_EV_PlasmaArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_EV.ID, "basicmachine.plasmaarcfurnace.tier.04", "Advanced Plasma Arc Furnace III", @@ -10455,12 +10105,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.Machine_IV_PlasmaArcFurnace.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_IV.ID, "basicmachine.plasmaarcfurnace.tier.05", "Advanced Plasma Arc Furnace IV", @@ -10471,12 +10121,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_LuV.ID, "basicmachine.plasmaarcfurnace.tier.06", "Elite Plasma Arc Furnace", @@ -10487,12 +10137,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_ZPM.ID, "basicmachine.plasmaarcfurnace.tier.07", "Elite Plasma Arc Furnace II", @@ -10503,12 +10153,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_UV.ID, "basicmachine.plasmaarcfurnace.tier.08", "Ultimate Plasma Discharge Heater", @@ -10519,12 +10169,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_UHV.ID, "basicmachine.plasmaarcfurnace.tier.09", "Epic Plasma Discharge Heater", @@ -10535,12 +10185,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_UEV.ID, "basicmachine.plasmaarcfurnace.tier.10", "Epic Plasma Discharge Heater II", @@ -10551,12 +10201,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_UIV.ID, "basicmachine.plasmaarcfurnace.tier.11", "Epic Plasma Discharge Heater III", @@ -10567,12 +10217,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); ItemList.PlasmaArcFurnaceUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( PLASMA_ARC_FURNACE_UMV.ID, "basicmachine.plasmaarcfurnace.tier.12", "Epic Plasma Discharge Heater IV", @@ -10583,14 +10233,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9, true, SoundResource.IC2_MACHINES_INDUCTION_LOOP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "PLASMA_ARC_FURNACE", null).getStackForm(1L)); } private void registerCanningMachine() { ItemList.Machine_LV_Canner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNER_LV.ID, "basicmachine.canner.tier.01", "Basic Canning Machine", @@ -10601,12 +10251,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.Machine_MV_Canner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNER_MV.ID, "basicmachine.canner.tier.02", "Advanced Canning Machine", @@ -10617,12 +10267,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.Machine_HV_Canner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNER_HV.ID, "basicmachine.canner.tier.03", "Advanced Canning Machine II", @@ -10633,12 +10283,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.Machine_EV_Canner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNER_EV.ID, "basicmachine.canner.tier.04", "Advanced Canning Machine III", @@ -10649,12 +10299,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.Machine_IV_Canner.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNER_IV.ID, "basicmachine.canner.tier.05", "Advanced Canning Machine IV", @@ -10665,12 +10315,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineLuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_LuV.ID, "basicmachine.canner.tier.06", "Elite Canning Machine", @@ -10681,12 +10331,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_ZPM.ID, "basicmachine.canner.tier.07", "Elite Canning Machine II", @@ -10697,12 +10347,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineUV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_UV.ID, "basicmachine.canner.tier.08", "Ultimate Can Operator", @@ -10713,12 +10363,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_UHV.ID, "basicmachine.canner.tier.09", "Epic Can Operator", @@ -10729,12 +10379,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_UEV.ID, "basicmachine.canner.tier.10", "Epic Can Operator II", @@ -10745,12 +10395,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_UIV.ID, "basicmachine.canner.tier.11", "Epic Can Operator III", @@ -10761,12 +10411,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); ItemList.CanningMachineUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CANNING_MACHINE_UMV.ID, "basicmachine.canner.tier.12", "Epic Can Operator IV", @@ -10777,221 +10427,178 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, false, SoundResource.IC2_MACHINES_EXTRACTOR_OP, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CANNER", null).getStackForm(1L)); } private static void registerDynamoHatch() { ItemList.Hatch_Dynamo_ULV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_ULV.ID, "hatch.dynamo.tier.00", "ULV Dynamo Hatch", 0) - .getStackForm(1L)); - ItemList.Hatch_Dynamo_LV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_LV.ID, "hatch.dynamo.tier.01", "LV Dynamo Hatch", 1) - .getStackForm(1L)); - ItemList.Hatch_Dynamo_MV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_MV.ID, "hatch.dynamo.tier.02", "MV Dynamo Hatch", 2) - .getStackForm(1L)); - ItemList.Hatch_Dynamo_HV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_HV.ID, "hatch.dynamo.tier.03", "HV Dynamo Hatch", 3) - .getStackForm(1L)); - ItemList.Hatch_Dynamo_EV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_EV.ID, "hatch.dynamo.tier.04", "EV Dynamo Hatch", 4) - .getStackForm(1L)); - ItemList.Hatch_Dynamo_IV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_IV.ID, "hatch.dynamo.tier.05", "IV Dynamo Hatch", 5) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_ULV.ID, "hatch.dynamo.tier.00", "ULV Dynamo Hatch", 0).getStackForm(1L)); + ItemList.Hatch_Dynamo_LV + .set(new MTEHatchDynamo(DYNAMO_HATCH_LV.ID, "hatch.dynamo.tier.01", "LV Dynamo Hatch", 1).getStackForm(1L)); + ItemList.Hatch_Dynamo_MV + .set(new MTEHatchDynamo(DYNAMO_HATCH_MV.ID, "hatch.dynamo.tier.02", "MV Dynamo Hatch", 2).getStackForm(1L)); + ItemList.Hatch_Dynamo_HV + .set(new MTEHatchDynamo(DYNAMO_HATCH_HV.ID, "hatch.dynamo.tier.03", "HV Dynamo Hatch", 3).getStackForm(1L)); + ItemList.Hatch_Dynamo_EV + .set(new MTEHatchDynamo(DYNAMO_HATCH_EV.ID, "hatch.dynamo.tier.04", "EV Dynamo Hatch", 4).getStackForm(1L)); + ItemList.Hatch_Dynamo_IV + .set(new MTEHatchDynamo(DYNAMO_HATCH_IV.ID, "hatch.dynamo.tier.05", "IV Dynamo Hatch", 5).getStackForm(1L)); ItemList.Hatch_Dynamo_LuV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_LuV.ID, "hatch.dynamo.tier.06", "LuV Dynamo Hatch", 6) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_LuV.ID, "hatch.dynamo.tier.06", "LuV Dynamo Hatch", 6).getStackForm(1L)); ItemList.Hatch_Dynamo_ZPM.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_ZPM.ID, "hatch.dynamo.tier.07", "ZPM Dynamo Hatch", 7) - .getStackForm(1L)); - ItemList.Hatch_Dynamo_UV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UV.ID, "hatch.dynamo.tier.08", "UV Dynamo Hatch", 8) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_ZPM.ID, "hatch.dynamo.tier.07", "ZPM Dynamo Hatch", 7).getStackForm(1L)); + ItemList.Hatch_Dynamo_UV + .set(new MTEHatchDynamo(DYNAMO_HATCH_UV.ID, "hatch.dynamo.tier.08", "UV Dynamo Hatch", 8).getStackForm(1L)); ItemList.Hatch_Dynamo_UHV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UHV.ID, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_UHV.ID, "hatch.dynamo.tier.09", "UHV Dynamo Hatch", 9).getStackForm(1L)); ItemList.Hatch_Dynamo_UEV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UEV.ID, "hatch.dynamo.tier.10", "UEV Dynamo Hatch", 10) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_UEV.ID, "hatch.dynamo.tier.10", "UEV Dynamo Hatch", 10).getStackForm(1L)); ItemList.Hatch_Dynamo_UIV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UIV.ID, "hatch.dynamo.tier.11", "UIV Dynamo Hatch", 11) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_UIV.ID, "hatch.dynamo.tier.11", "UIV Dynamo Hatch", 11).getStackForm(1L)); ItemList.Hatch_Dynamo_UMV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UMV.ID, "hatch.dynamo.tier.12", "UMV Dynamo Hatch", 12) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_UMV.ID, "hatch.dynamo.tier.12", "UMV Dynamo Hatch", 12).getStackForm(1L)); ItemList.Hatch_Dynamo_UXV.set( - new GT_MetaTileEntity_Hatch_Dynamo(DYNAMO_HATCH_UXV.ID, "hatch.dynamo.tier.13", "UXV Dynamo Hatch", 13) - .getStackForm(1L)); + new MTEHatchDynamo(DYNAMO_HATCH_UXV.ID, "hatch.dynamo.tier.13", "UXV Dynamo Hatch", 13).getStackForm(1L)); } private static void registerEnergyHatch() { ItemList.Hatch_Energy_ULV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_ULV.ID, "hatch.energy.tier.00", "ULV Energy Hatch", 0) - .getStackForm(1L)); - ItemList.Hatch_Energy_LV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_LV.ID, "hatch.energy.tier.01", "LV Energy Hatch", 1) - .getStackForm(1L)); - ItemList.Hatch_Energy_MV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_MV.ID, "hatch.energy.tier.02", "MV Energy Hatch", 2) - .getStackForm(1L)); - ItemList.Hatch_Energy_HV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_HV.ID, "hatch.energy.tier.03", "HV Energy Hatch", 3) - .getStackForm(1L)); - ItemList.Hatch_Energy_EV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_EV.ID, "hatch.energy.tier.04", "EV Energy Hatch", 4) - .getStackForm(1L)); - ItemList.Hatch_Energy_IV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_IV.ID, "hatch.energy.tier.05", "IV Energy Hatch", 5) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_ULV.ID, "hatch.energy.tier.00", "ULV Energy Hatch", 0).getStackForm(1L)); + ItemList.Hatch_Energy_LV + .set(new MTEHatchEnergy(ENERGY_HATCH_LV.ID, "hatch.energy.tier.01", "LV Energy Hatch", 1).getStackForm(1L)); + ItemList.Hatch_Energy_MV + .set(new MTEHatchEnergy(ENERGY_HATCH_MV.ID, "hatch.energy.tier.02", "MV Energy Hatch", 2).getStackForm(1L)); + ItemList.Hatch_Energy_HV + .set(new MTEHatchEnergy(ENERGY_HATCH_HV.ID, "hatch.energy.tier.03", "HV Energy Hatch", 3).getStackForm(1L)); + ItemList.Hatch_Energy_EV + .set(new MTEHatchEnergy(ENERGY_HATCH_EV.ID, "hatch.energy.tier.04", "EV Energy Hatch", 4).getStackForm(1L)); + ItemList.Hatch_Energy_IV + .set(new MTEHatchEnergy(ENERGY_HATCH_IV.ID, "hatch.energy.tier.05", "IV Energy Hatch", 5).getStackForm(1L)); ItemList.Hatch_Energy_LuV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_LuV.ID, "hatch.energy.tier.06", "LuV Energy Hatch", 6) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_LuV.ID, "hatch.energy.tier.06", "LuV Energy Hatch", 6).getStackForm(1L)); ItemList.Hatch_Energy_ZPM.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_ZPM.ID, "hatch.energy.tier.07", "ZPM Energy Hatch", 7) - .getStackForm(1L)); - ItemList.Hatch_Energy_UV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UV.ID, "hatch.energy.tier.08", "UV Energy Hatch", 8) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_ZPM.ID, "hatch.energy.tier.07", "ZPM Energy Hatch", 7).getStackForm(1L)); + ItemList.Hatch_Energy_UV + .set(new MTEHatchEnergy(ENERGY_HATCH_UV.ID, "hatch.energy.tier.08", "UV Energy Hatch", 8).getStackForm(1L)); ItemList.Hatch_Energy_UHV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UHV.ID, "hatch.energy.tier.09", "UHV Energy Hatch", 9) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_UHV.ID, "hatch.energy.tier.09", "UHV Energy Hatch", 9).getStackForm(1L)); ItemList.Hatch_Energy_UEV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UEV.ID, "hatch.energy.tier.10", "UEV Energy Hatch", 10) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_UEV.ID, "hatch.energy.tier.10", "UEV Energy Hatch", 10).getStackForm(1L)); ItemList.Hatch_Energy_UIV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UIV.ID, "hatch.energy.tier.11", "UIV Energy Hatch", 11) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_UIV.ID, "hatch.energy.tier.11", "UIV Energy Hatch", 11).getStackForm(1L)); ItemList.Hatch_Energy_UMV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UMV.ID, "hatch.energy.tier.12", "UMV Energy Hatch", 12) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_UMV.ID, "hatch.energy.tier.12", "UMV Energy Hatch", 12).getStackForm(1L)); ItemList.Hatch_Energy_UXV.set( - new GT_MetaTileEntity_Hatch_Energy(ENERGY_HATCH_UXV.ID, "hatch.energy.tier.13", "UXV Energy Hatch", 13) - .getStackForm(1L)); + new MTEHatchEnergy(ENERGY_HATCH_UXV.ID, "hatch.energy.tier.13", "UXV Energy Hatch", 13).getStackForm(1L)); } private static void registerInputHatch() { - ItemList.Hatch_Input_ULV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_ULV.ID, "hatch.input.tier.00", "Input Hatch (ULV)", 0) - .getStackForm(1L)); - ItemList.Hatch_Input_LV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_LV.ID, "hatch.input.tier.01", "Input Hatch (LV)", 1) - .getStackForm(1L)); - ItemList.Hatch_Input_MV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_MV.ID, "hatch.input.tier.02", "Input Hatch (MV)", 2) - .getStackForm(1L)); - ItemList.Hatch_Input_HV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_HV.ID, "hatch.input.tier.03", "Input Hatch (HV)", 3) - .getStackForm(1L)); - ItemList.Hatch_Input_EV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_EV.ID, "hatch.input.tier.04", "Input Hatch (EV)", 4) - .getStackForm(1L)); - ItemList.Hatch_Input_IV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_IV.ID, "hatch.input.tier.05", "Input Hatch (IV)", 5) - .getStackForm(1L)); - ItemList.Hatch_Input_LuV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_LuV.ID, "hatch.input.tier.06", "Input Hatch (LuV)", 6) - .getStackForm(1L)); - ItemList.Hatch_Input_ZPM.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_ZPM.ID, "hatch.input.tier.07", "Input Hatch (ZPM)", 7) - .getStackForm(1L)); - ItemList.Hatch_Input_UV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UV.ID, "hatch.input.tier.08", "Input Hatch (UV)", 8) - .getStackForm(1L)); - ItemList.Hatch_Input_UHV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UHV.ID, "hatch.input.tier.09", "Input Hatch (UHV)", 9) - .getStackForm(1L)); + ItemList.Hatch_Input_ULV + .set(new MTEHatchInput(INPUT_HATCH_ULV.ID, "hatch.input.tier.00", "Input Hatch (ULV)", 0).getStackForm(1L)); + ItemList.Hatch_Input_LV + .set(new MTEHatchInput(INPUT_HATCH_LV.ID, "hatch.input.tier.01", "Input Hatch (LV)", 1).getStackForm(1L)); + ItemList.Hatch_Input_MV + .set(new MTEHatchInput(INPUT_HATCH_MV.ID, "hatch.input.tier.02", "Input Hatch (MV)", 2).getStackForm(1L)); + ItemList.Hatch_Input_HV + .set(new MTEHatchInput(INPUT_HATCH_HV.ID, "hatch.input.tier.03", "Input Hatch (HV)", 3).getStackForm(1L)); + ItemList.Hatch_Input_EV + .set(new MTEHatchInput(INPUT_HATCH_EV.ID, "hatch.input.tier.04", "Input Hatch (EV)", 4).getStackForm(1L)); + ItemList.Hatch_Input_IV + .set(new MTEHatchInput(INPUT_HATCH_IV.ID, "hatch.input.tier.05", "Input Hatch (IV)", 5).getStackForm(1L)); + ItemList.Hatch_Input_LuV + .set(new MTEHatchInput(INPUT_HATCH_LuV.ID, "hatch.input.tier.06", "Input Hatch (LuV)", 6).getStackForm(1L)); + ItemList.Hatch_Input_ZPM + .set(new MTEHatchInput(INPUT_HATCH_ZPM.ID, "hatch.input.tier.07", "Input Hatch (ZPM)", 7).getStackForm(1L)); + ItemList.Hatch_Input_UV + .set(new MTEHatchInput(INPUT_HATCH_UV.ID, "hatch.input.tier.08", "Input Hatch (UV)", 8).getStackForm(1L)); + ItemList.Hatch_Input_UHV + .set(new MTEHatchInput(INPUT_HATCH_UHV.ID, "hatch.input.tier.09", "Input Hatch (UHV)", 9).getStackForm(1L)); ItemList.Hatch_Input_UEV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UEV.ID, "hatch.input.tier.10", "Input Hatch (UEV)", 10) - .getStackForm(1L)); + new MTEHatchInput(INPUT_HATCH_UEV.ID, "hatch.input.tier.10", "Input Hatch (UEV)", 10).getStackForm(1L)); ItemList.Hatch_Input_UIV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UIV.ID, "hatch.input.tier.11", "Input Hatch (UIV)", 11) - .getStackForm(1L)); + new MTEHatchInput(INPUT_HATCH_UIV.ID, "hatch.input.tier.11", "Input Hatch (UIV)", 11).getStackForm(1L)); ItemList.Hatch_Input_UMV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UMV.ID, "hatch.input.tier.12", "Input Hatch (UMV)", 12) - .getStackForm(1L)); + new MTEHatchInput(INPUT_HATCH_UMV.ID, "hatch.input.tier.12", "Input Hatch (UMV)", 12).getStackForm(1L)); ItemList.Hatch_Input_UXV.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_UXV.ID, "hatch.input.tier.13", "Input Hatch (UXV)", 13) - .getStackForm(1L)); + new MTEHatchInput(INPUT_HATCH_UXV.ID, "hatch.input.tier.13", "Input Hatch (UXV)", 13).getStackForm(1L)); ItemList.Hatch_Input_MAX.set( - new GT_MetaTileEntity_Hatch_Input(INPUT_HATCH_MAX.ID, "hatch.input.tier.14", "Input Hatch (MAX)", 14) - .getStackForm(1L)); + new MTEHatchInput(INPUT_HATCH_MAX.ID, "hatch.input.tier.14", "Input Hatch (MAX)", 14).getStackForm(1L)); } private static void registerQuadrupleInputHatch() { ItemList.Hatch_Input_Multi_2x2_EV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_EV.ID, 4, "hatch.multi.input.tier.01", "Quadruple Input Hatch (EV)", 4).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_IV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_IV.ID, 4, "hatch.multi.input.tier.02", "Quadruple Input Hatch (IV)", 5).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_LuV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_LuV.ID, 4, "hatch.multi.input.tier.03", "Quadruple Input Hatch (LuV)", 6).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_ZPM.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_ZPM.ID, 4, "hatch.multi.input.tier.04", "Quadruple Input Hatch (ZPM)", 7).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_UV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_UV.ID, 4, "hatch.multi.input.tier.05", "Quadruple Input Hatch (UV)", 8).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_UHV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_UHV.ID, 4, "hatch.multi.input.tier.06", "Quadruple Input Hatch (UHV)", 9).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_UEV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_UEV.ID, 4, "hatch.multi.input.tier.07", "Quadruple Input Hatch (UEV)", 10).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_UIV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_UIV.ID, 4, "hatch.multi.input.tier.08", "Quadruple Input Hatch (UIV)", 11).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_UMV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_UMV.ID, 4, "hatch.multi.input.tier.09", "Quadruple Input Hatch (UMV)", 12).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_UXV.set( - new GT_MetaTileEntity_Hatch_MultiInput( + new MTEHatchMultiInput( QUADRUPLE_INPUT_HATCHES_UXV.ID, 4, "hatch.multi.input.tier.10", @@ -10999,7 +10606,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 13).getStackForm(1L)); ItemList.Hatch_Input_Multi_2x2_Humongous.set( - new GT_MetaTileEntity_Hatch_QuadrupleHumongous( + new MTEHatchQuadrupleHumongous( QUADRUPLE_INPUT_HATCHES_MAX.ID, 4, "hatch.multi.input.tier.11", @@ -11008,133 +10615,98 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerOutputHatch() { ItemList.Hatch_Output_ULV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_ULV.ID, "hatch.output.tier.00", "Output Hatch (ULV)", 0) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_ULV.ID, "hatch.output.tier.00", "Output Hatch (ULV)", 0).getStackForm(1L)); ItemList.Hatch_Output_LV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_LV.ID, "hatch.output.tier.01", "Output Hatch (LV)", 1) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_LV.ID, "hatch.output.tier.01", "Output Hatch (LV)", 1).getStackForm(1L)); ItemList.Hatch_Output_MV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_MV.ID, "hatch.output.tier.02", "Output Hatch (MV)", 2) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_MV.ID, "hatch.output.tier.02", "Output Hatch (MV)", 2).getStackForm(1L)); ItemList.Hatch_Output_HV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_HV.ID, "hatch.output.tier.03", "Output Hatch (HV)", 3) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_HV.ID, "hatch.output.tier.03", "Output Hatch (HV)", 3).getStackForm(1L)); ItemList.Hatch_Output_EV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_EV.ID, "hatch.output.tier.04", "Output Hatch (EV)", 4) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_EV.ID, "hatch.output.tier.04", "Output Hatch (EV)", 4).getStackForm(1L)); ItemList.Hatch_Output_IV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_IV.ID, "hatch.output.tier.05", "Output Hatch (IV)", 5) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_IV.ID, "hatch.output.tier.05", "Output Hatch (IV)", 5).getStackForm(1L)); ItemList.Hatch_Output_LuV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_LuV.ID, "hatch.output.tier.06", "Output Hatch (LuV)", 6) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_LuV.ID, "hatch.output.tier.06", "Output Hatch (LuV)", 6).getStackForm(1L)); ItemList.Hatch_Output_ZPM.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_ZPM.ID, "hatch.output.tier.07", "Output Hatch (ZPM)", 7) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_ZPM.ID, "hatch.output.tier.07", "Output Hatch (ZPM)", 7).getStackForm(1L)); ItemList.Hatch_Output_UV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UV.ID, "hatch.output.tier.08", "Output Hatch (UV)", 8) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_UV.ID, "hatch.output.tier.08", "Output Hatch (UV)", 8).getStackForm(1L)); ItemList.Hatch_Output_UHV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UHV.ID, "hatch.output.tier.09", "Output Hatch (UHV)", 9) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_UHV.ID, "hatch.output.tier.09", "Output Hatch (UHV)", 9).getStackForm(1L)); ItemList.Hatch_Output_UEV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UEV.ID, "hatch.output.tier.10", "Output Hatch (UEV)", 10) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_UEV.ID, "hatch.output.tier.10", "Output Hatch (UEV)", 10).getStackForm(1L)); ItemList.Hatch_Output_UIV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UIV.ID, "hatch.output.tier.11", "Output Hatch (UIV)", 11) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_UIV.ID, "hatch.output.tier.11", "Output Hatch (UIV)", 11).getStackForm(1L)); ItemList.Hatch_Output_UMV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UMV.ID, "hatch.output.tier.12", "Output Hatch (UMV)", 12) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_UMV.ID, "hatch.output.tier.12", "Output Hatch (UMV)", 12).getStackForm(1L)); ItemList.Hatch_Output_UXV.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_UXV.ID, "hatch.output.tier.13", "Output Hatch (UXV)", 13) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_UXV.ID, "hatch.output.tier.13", "Output Hatch (UXV)", 13).getStackForm(1L)); ItemList.Hatch_Output_MAX.set( - new GT_MetaTileEntity_Hatch_Output(OUTPUT_HATCH_MAX.ID, "hatch.output.tier.14", "Output Hatch (MAX)", 14) - .getStackForm(1L)); + new MTEHatchOutput(OUTPUT_HATCH_MAX.ID, "hatch.output.tier.14", "Output Hatch (MAX)", 14).getStackForm(1L)); } private static void registerQuantumTank() { - ItemList.Quantum_Tank_LV.set( - new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_LV.ID, "quantum.tank.tier.06", "Quantum Tank I", 6) - .getStackForm(1L)); - ItemList.Quantum_Tank_MV.set( - new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_MV.ID, "quantum.tank.tier.07", "Quantum Tank II", 7) - .getStackForm(1L)); + ItemList.Quantum_Tank_LV + .set(new MTEQuantumTank(QUANTUM_TANK_LV.ID, "quantum.tank.tier.06", "Quantum Tank I", 6).getStackForm(1L)); + ItemList.Quantum_Tank_MV + .set(new MTEQuantumTank(QUANTUM_TANK_MV.ID, "quantum.tank.tier.07", "Quantum Tank II", 7).getStackForm(1L)); ItemList.Quantum_Tank_HV.set( - new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_HV.ID, "quantum.tank.tier.08", "Quantum Tank III", 8) - .getStackForm(1L)); - ItemList.Quantum_Tank_EV.set( - new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_EV.ID, "quantum.tank.tier.09", "Quantum Tank IV", 9) - .getStackForm(1L)); - ItemList.Quantum_Tank_IV.set( - new GT_MetaTileEntity_QuantumTank(QUANTUM_TANK_IV.ID, "quantum.tank.tier.10", "Quantum Tank V", 10) - .getStackForm(1L)); + new MTEQuantumTank(QUANTUM_TANK_HV.ID, "quantum.tank.tier.08", "Quantum Tank III", 8).getStackForm(1L)); + ItemList.Quantum_Tank_EV + .set(new MTEQuantumTank(QUANTUM_TANK_EV.ID, "quantum.tank.tier.09", "Quantum Tank IV", 9).getStackForm(1L)); + ItemList.Quantum_Tank_IV + .set(new MTEQuantumTank(QUANTUM_TANK_IV.ID, "quantum.tank.tier.10", "Quantum Tank V", 10).getStackForm(1L)); } private static void registerQuantumChest() { ItemList.Quantum_Chest_LV.set( - new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_LV.ID, "quantum.chest.tier.06", "Quantum Chest I", 6) - .getStackForm(1L)); + new MTEQuantumChest(QUANTUM_CHEST_LV.ID, "quantum.chest.tier.06", "Quantum Chest I", 6).getStackForm(1L)); ItemList.Quantum_Chest_MV.set( - new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_MV.ID, "quantum.chest.tier.07", "Quantum Chest II", 7) - .getStackForm(1L)); + new MTEQuantumChest(QUANTUM_CHEST_MV.ID, "quantum.chest.tier.07", "Quantum Chest II", 7).getStackForm(1L)); ItemList.Quantum_Chest_HV.set( - new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_HV.ID, "quantum.chest.tier.08", "Quantum Chest III", 8) - .getStackForm(1L)); + new MTEQuantumChest(QUANTUM_CHEST_HV.ID, "quantum.chest.tier.08", "Quantum Chest III", 8).getStackForm(1L)); ItemList.Quantum_Chest_EV.set( - new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_EV.ID, "quantum.chest.tier.09", "Quantum Chest IV", 9) - .getStackForm(1L)); + new MTEQuantumChest(QUANTUM_CHEST_EV.ID, "quantum.chest.tier.09", "Quantum Chest IV", 9).getStackForm(1L)); ItemList.Quantum_Chest_IV.set( - new GT_MetaTileEntity_QuantumChest(QUANTUM_CHEST_IV.ID, "quantum.chest.tier.10", "Quantum Chest V", 10) - .getStackForm(1L)); + new MTEQuantumChest(QUANTUM_CHEST_IV.ID, "quantum.chest.tier.10", "Quantum Chest V", 10).getStackForm(1L)); } private static void registerSuperTank() { - ItemList.Super_Tank_LV.set( - new GT_MetaTileEntity_SuperTank(SUPER_TANK_LV.ID, "super.tank.tier.01", "Super Tank I", 1) - .getStackForm(1L)); - ItemList.Super_Tank_MV.set( - new GT_MetaTileEntity_SuperTank(SUPER_TANK_MV.ID, "super.tank.tier.02", "Super Tank II", 2) - .getStackForm(1L)); - ItemList.Super_Tank_HV.set( - new GT_MetaTileEntity_SuperTank(SUPER_TANK_HV.ID, "super.tank.tier.03", "Super Tank III", 3) - .getStackForm(1L)); - ItemList.Super_Tank_EV.set( - new GT_MetaTileEntity_SuperTank(SUPER_TANK_EV.ID, "super.tank.tier.04", "Super Tank IV", 4) - .getStackForm(1L)); - ItemList.Super_Tank_IV.set( - new GT_MetaTileEntity_SuperTank(SUPER_TANK_IV.ID, "super.tank.tier.05", "Super Tank V", 5) - .getStackForm(1L)); + ItemList.Super_Tank_LV + .set(new MTESuperTank(SUPER_TANK_LV.ID, "super.tank.tier.01", "Super Tank I", 1).getStackForm(1L)); + ItemList.Super_Tank_MV + .set(new MTESuperTank(SUPER_TANK_MV.ID, "super.tank.tier.02", "Super Tank II", 2).getStackForm(1L)); + ItemList.Super_Tank_HV + .set(new MTESuperTank(SUPER_TANK_HV.ID, "super.tank.tier.03", "Super Tank III", 3).getStackForm(1L)); + ItemList.Super_Tank_EV + .set(new MTESuperTank(SUPER_TANK_EV.ID, "super.tank.tier.04", "Super Tank IV", 4).getStackForm(1L)); + ItemList.Super_Tank_IV + .set(new MTESuperTank(SUPER_TANK_IV.ID, "super.tank.tier.05", "Super Tank V", 5).getStackForm(1L)); } private static void registerSuperChest() { - ItemList.Super_Chest_LV.set( - new GT_MetaTileEntity_SuperChest(SUPER_CHEST_LV.ID, "super.chest.tier.01", "Super Chest I", 1) - .getStackForm(1L)); - ItemList.Super_Chest_MV.set( - new GT_MetaTileEntity_SuperChest(SUPER_CHEST_MV.ID, "super.chest.tier.02", "Super Chest II", 2) - .getStackForm(1L)); - ItemList.Super_Chest_HV.set( - new GT_MetaTileEntity_SuperChest(SUPER_CHEST_HV.ID, "super.chest.tier.03", "Super Chest III", 3) - .getStackForm(1L)); - ItemList.Super_Chest_EV.set( - new GT_MetaTileEntity_SuperChest(SUPER_CHEST_EV.ID, "super.chest.tier.04", "Super Chest IV", 4) - .getStackForm(1L)); - ItemList.Super_Chest_IV.set( - new GT_MetaTileEntity_SuperChest(SUPER_CHEST_IV.ID, "super.chest.tier.05", "Super Chest V", 5) - .getStackForm(1L)); + ItemList.Super_Chest_LV + .set(new MTESuperChest(SUPER_CHEST_LV.ID, "super.chest.tier.01", "Super Chest I", 1).getStackForm(1L)); + ItemList.Super_Chest_MV + .set(new MTESuperChest(SUPER_CHEST_MV.ID, "super.chest.tier.02", "Super Chest II", 2).getStackForm(1L)); + ItemList.Super_Chest_HV + .set(new MTESuperChest(SUPER_CHEST_HV.ID, "super.chest.tier.03", "Super Chest III", 3).getStackForm(1L)); + ItemList.Super_Chest_EV + .set(new MTESuperChest(SUPER_CHEST_EV.ID, "super.chest.tier.04", "Super Chest IV", 4).getStackForm(1L)); + ItemList.Super_Chest_IV + .set(new MTESuperChest(SUPER_CHEST_IV.ID, "super.chest.tier.05", "Super Chest V", 5).getStackForm(1L)); } private static void registerLongDistancePipe() { ItemList.Long_Distance_Pipeline_Fluid.set( - new GT_MetaTileEntity_LongDistancePipelineFluid( + new MTELongDistancePipelineFluid( LONG_DISTANCE_PIPELINE_FLUID.ID, "long.distance.pipeline.fluid", "Long Distance Fluid Pipeline", 1).getStackForm(1L)); ItemList.Long_Distance_Pipeline_Item.set( - new GT_MetaTileEntity_LongDistancePipelineItem( + new MTELongDistancePipelineItem( LONG_DISTANCE_PIPELINE_ITEM.ID, "long.distance.pipeline.item", "Long Distance Item Pipeline", @@ -11142,181 +10714,151 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } private static void registerAE2Hatches() { - ItemList.Hatch_Output_Bus_ME.set( - new GT_MetaTileEntity_Hatch_OutputBus_ME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)") - .getStackForm(1L)); + ItemList.Hatch_Output_Bus_ME + .set(new MTEHatchOutputBusME(OUTPUT_BUS_ME.ID, "hatch.output_bus.me", "Output Bus (ME)").getStackForm(1L)); ItemList.Hatch_Input_Bus_ME.set( - new GT_MetaTileEntity_Hatch_InputBus_ME( - INPUT_BUS_ME.ID, - false, - "hatch.input_bus.me.basic", - "Stocking Input Bus (ME)").getStackForm(1L)); + new MTEHatchInputBusME(INPUT_BUS_ME.ID, false, "hatch.input_bus.me.basic", "Stocking Input Bus (ME)") + .getStackForm(1L)); ItemList.Hatch_Input_Bus_ME_Advanced.set( - new GT_MetaTileEntity_Hatch_InputBus_ME( + new MTEHatchInputBusME( INPUT_BUS_ME_ADVANCED.ID, true, "hatch.input_bus.me", "Advanced Stocking Input Bus (ME)").getStackForm(1L)); ItemList.Hatch_Input_ME.set( - new GT_MetaTileEntity_Hatch_Input_ME( - INPUT_HATCH_ME.ID, - false, - "hatch.input.me.basic", - "Stocking Input Hatch (ME)").getStackForm(1L)); + new MTEHatchInputME(INPUT_HATCH_ME.ID, false, "hatch.input.me.basic", "Stocking Input Hatch (ME)") + .getStackForm(1L)); ItemList.Hatch_Input_ME_Advanced.set( - new GT_MetaTileEntity_Hatch_Input_ME( + new MTEHatchInputME( INPUT_HATCH_ME_ADVANCED.ID, true, "hatch.input.me", "Advanced Stocking Input Hatch (ME)").getStackForm(1L)); - ItemList.Hatch_Output_ME.set( - new GT_MetaTileEntity_Hatch_Output_ME(OUTPUT_HATCH_ME.ID, "hatch.output.me", "Output Hatch (ME)") - .getStackForm(1L)); + ItemList.Hatch_Output_ME + .set(new MTEHatchOutputME(OUTPUT_HATCH_ME.ID, "hatch.output.me", "Output Hatch (ME)").getStackForm(1L)); ItemList.Hatch_CraftingInput_Bus_ME.set( - new GT_MetaTileEntity_Hatch_CraftingInput_ME( + new MTEHatchCraftingInputME( CRAFTING_INPUT_ME.ID, "hatch.crafting_input.me", "Crafting Input Buffer (ME)", true).getStackForm(1L)); ItemList.Hatch_CraftingInput_Bus_ME_ItemOnly.set( - new GT_MetaTileEntity_Hatch_CraftingInput_ME( + new MTEHatchCraftingInputME( CRAFTING_INPUT_ME_BUS.ID, "hatch.crafting_input.me.item_only", "Crafting Input Bus (ME)", false).getStackForm(1L)); ItemList.Hatch_CraftingInput_Bus_Slave.set( - new GT_MetaTileEntity_Hatch_CraftingInput_Slave( + new MTEHatchCraftingInputSlave( CRAFTING_INPUT_SLAVE.ID, "hatch.crafting_input.proxy", "Crafting Input Proxy").getStackForm(1L)); } private static void registerMagHatch() { - ItemList.Hatch_Electromagnet.set( - new GT_MetaTileEntity_MagHatch(MAG_HATCH.ID, "hatch.mag_hatch", "Electromagnet Housing").getStackForm(1L)); + ItemList.Hatch_Electromagnet + .set(new MTEHatchMagnet(MAG_HATCH.ID, "hatch.mag_hatch", "Electromagnet Housing").getStackForm(1L)); } private static void registerInputBus() { ItemList.Hatch_Input_Bus_ULV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_ULV.ID, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_ULV.ID, "hatch.input_bus.tier.00", "Input Bus (ULV)", 0).getStackForm(1L)); ItemList.Hatch_Input_Bus_LV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_LV.ID, "hatch.input_bus.tier.01", "Input Bus (LV)", 1) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_LV.ID, "hatch.input_bus.tier.01", "Input Bus (LV)", 1).getStackForm(1L)); ItemList.Hatch_Input_Bus_MV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_MV.ID, "hatch.input_bus.tier.02", "Input Bus (MV)", 2) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_MV.ID, "hatch.input_bus.tier.02", "Input Bus (MV)", 2).getStackForm(1L)); ItemList.Hatch_Input_Bus_HV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_HV.ID, "hatch.input_bus.tier.03", "Input Bus (HV)", 3) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_HV.ID, "hatch.input_bus.tier.03", "Input Bus (HV)", 3).getStackForm(1L)); ItemList.Hatch_Input_Bus_EV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_EV.ID, "hatch.input_bus.tier.04", "Input Bus (EV)", 4) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_EV.ID, "hatch.input_bus.tier.04", "Input Bus (EV)", 4).getStackForm(1L)); ItemList.Hatch_Input_Bus_IV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_IV.ID, "hatch.input_bus.tier.05", "Input Bus (IV)", 5) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_IV.ID, "hatch.input_bus.tier.05", "Input Bus (IV)", 5).getStackForm(1L)); ItemList.Hatch_Input_Bus_LuV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_LuV.ID, "hatch.input_bus.tier.06", "Input Bus (LuV)", 6) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_LuV.ID, "hatch.input_bus.tier.06", "Input Bus (LuV)", 6).getStackForm(1L)); ItemList.Hatch_Input_Bus_ZPM.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_ZPM.ID, "hatch.input_bus.tier.07", "Input Bus (ZPM)", 7) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_ZPM.ID, "hatch.input_bus.tier.07", "Input Bus (ZPM)", 7).getStackForm(1L)); ItemList.Hatch_Input_Bus_UV.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_UV.ID, "hatch.input_bus.tier.08", "Input Bus (UV)", 8) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_UV.ID, "hatch.input_bus.tier.08", "Input Bus (UV)", 8).getStackForm(1L)); ItemList.Hatch_Input_Bus_MAX.set( - new GT_MetaTileEntity_Hatch_InputBus(INPUT_BUS_UHV.ID, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9) - .getStackForm(1L)); + new MTEHatchInputBus(INPUT_BUS_UHV.ID, "hatch.input_bus.tier.09", "Input Bus (UHV)", 9).getStackForm(1L)); } private static void registerOutputBus() { ItemList.Hatch_Output_Bus_ULV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_ULV.ID, "hatch.output_bus.tier.00", "Output Bus (ULV)", 0) + new MTEHatchOutputBus(OUTPUT_BUS_ULV.ID, "hatch.output_bus.tier.00", "Output Bus (ULV)", 0) .getStackForm(1L)); ItemList.Hatch_Output_Bus_LV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_LV.ID, "hatch.output_bus.tier.01", "Output Bus (LV)", 1) - .getStackForm(1L)); + new MTEHatchOutputBus(OUTPUT_BUS_LV.ID, "hatch.output_bus.tier.01", "Output Bus (LV)", 1).getStackForm(1L)); ItemList.Hatch_Output_Bus_MV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_MV.ID, "hatch.output_bus.tier.02", "Output Bus (MV)", 2) - .getStackForm(1L)); + new MTEHatchOutputBus(OUTPUT_BUS_MV.ID, "hatch.output_bus.tier.02", "Output Bus (MV)", 2).getStackForm(1L)); ItemList.Hatch_Output_Bus_HV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_HV.ID, "hatch.output_bus.tier.03", "Output Bus (HV)", 3) - .getStackForm(1L)); + new MTEHatchOutputBus(OUTPUT_BUS_HV.ID, "hatch.output_bus.tier.03", "Output Bus (HV)", 3).getStackForm(1L)); ItemList.Hatch_Output_Bus_EV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_EV.ID, "hatch.output_bus.tier.04", "Output Bus (EV)", 4) - .getStackForm(1L)); + new MTEHatchOutputBus(OUTPUT_BUS_EV.ID, "hatch.output_bus.tier.04", "Output Bus (EV)", 4).getStackForm(1L)); ItemList.Hatch_Output_Bus_IV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_IV.ID, "hatch.output_bus.tier.05", "Output Bus (IV)", 5) - .getStackForm(1L)); + new MTEHatchOutputBus(OUTPUT_BUS_IV.ID, "hatch.output_bus.tier.05", "Output Bus (IV)", 5).getStackForm(1L)); ItemList.Hatch_Output_Bus_LuV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_LuV.ID, "hatch.output_bus.tier.06", "Output Bus (LuV)", 6) + new MTEHatchOutputBus(OUTPUT_BUS_LuV.ID, "hatch.output_bus.tier.06", "Output Bus (LuV)", 6) .getStackForm(1L)); ItemList.Hatch_Output_Bus_ZPM.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_ZPM.ID, "hatch.output_bus.tier.07", "Output Bus (ZPM)", 7) + new MTEHatchOutputBus(OUTPUT_BUS_ZPM.ID, "hatch.output_bus.tier.07", "Output Bus (ZPM)", 7) .getStackForm(1L)); ItemList.Hatch_Output_Bus_UV.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_UV.ID, "hatch.output_bus.tier.08", "Output Bus (UV)", 8) - .getStackForm(1L)); + new MTEHatchOutputBus(OUTPUT_BUS_UV.ID, "hatch.output_bus.tier.08", "Output Bus (UV)", 8).getStackForm(1L)); ItemList.Hatch_Output_Bus_MAX.set( - new GT_MetaTileEntity_Hatch_OutputBus(OUTPUT_BUS_UHV.ID, "hatch.output_bus.tier.09", "Output Bus (UHV)", 9) + new MTEHatchOutputBus(OUTPUT_BUS_UHV.ID, "hatch.output_bus.tier.09", "Output Bus (UHV)", 9) .getStackForm(1L)); } private static void registerMufflerHatch() { ItemList.Hatch_Muffler_LV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_LV.ID, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1) + new MTEHatchMuffler(MUFFLER_HATCH_LV.ID, "hatch.muffler.tier.01", "Muffler Hatch (LV)", 1) .getStackForm(1L)); ItemList.Hatch_Muffler_MV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_MV.ID, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2) + new MTEHatchMuffler(MUFFLER_HATCH_MV.ID, "hatch.muffler.tier.02", "Muffler Hatch (MV)", 2) .getStackForm(1L)); ItemList.Hatch_Muffler_HV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_HV.ID, "hatch.muffler.tier.03", "Muffler Hatch (HV)", 3) + new MTEHatchMuffler(MUFFLER_HATCH_HV.ID, "hatch.muffler.tier.03", "Muffler Hatch (HV)", 3) .getStackForm(1L)); ItemList.Hatch_Muffler_EV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_EV.ID, "hatch.muffler.tier.04", "Muffler Hatch (EV)", 4) + new MTEHatchMuffler(MUFFLER_HATCH_EV.ID, "hatch.muffler.tier.04", "Muffler Hatch (EV)", 4) .getStackForm(1L)); ItemList.Hatch_Muffler_IV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_IV.ID, "hatch.muffler.tier.05", "Muffler Hatch (IV)", 5) + new MTEHatchMuffler(MUFFLER_HATCH_IV.ID, "hatch.muffler.tier.05", "Muffler Hatch (IV)", 5) .getStackForm(1L)); ItemList.Hatch_Muffler_LuV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_LuV.ID, "hatch.muffler.tier.06", "Muffler Hatch (LuV)", 6) + new MTEHatchMuffler(MUFFLER_HATCH_LuV.ID, "hatch.muffler.tier.06", "Muffler Hatch (LuV)", 6) .getStackForm(1L)); ItemList.Hatch_Muffler_ZPM.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_ZPM.ID, "hatch.muffler.tier.07", "Muffler Hatch (ZPM)", 7) + new MTEHatchMuffler(MUFFLER_HATCH_ZPM.ID, "hatch.muffler.tier.07", "Muffler Hatch (ZPM)", 7) .getStackForm(1L)); ItemList.Hatch_Muffler_UV.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_UV.ID, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8) + new MTEHatchMuffler(MUFFLER_HATCH_UV.ID, "hatch.muffler.tier.08", "Muffler Hatch (UV)", 8) .getStackForm(1L)); ItemList.Hatch_Muffler_MAX.set( - new GT_MetaTileEntity_Hatch_Muffler(MUFFLER_HATCH_UHV.ID, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9) + new MTEHatchMuffler(MUFFLER_HATCH_UHV.ID, "hatch.muffler.tier.09", "Muffler Hatch (UHV)", 9) .getStackForm(1L)); } private static void registerBoiler() { - ItemList.Machine_Bronze_Boiler.set( - new GT_MetaTileEntity_Boiler_Bronze(SMALL_COAL_BOILER.ID, "boiler.bronze", "Small Coal Boiler") - .getStackForm(1L)); + ItemList.Machine_Bronze_Boiler + .set(new MTEBoilerBronze(SMALL_COAL_BOILER.ID, "boiler.bronze", "Small Coal Boiler").getStackForm(1L)); ItemList.Machine_Steel_Boiler.set( - new GT_MetaTileEntity_Boiler_Steel( - HIGH_PRESSURE_COAL_BOILER.ID, - "boiler.steel", - "High Pressure Coal Boiler").getStackForm(1L)); - ItemList.Machine_Steel_Boiler_Lava.set( - new GT_MetaTileEntity_Boiler_Lava(HIGH_PRESSURE_LAVA_BOILER.ID, "boiler.lava", "High Pressure Lava Boiler") + new MTEBoilerSteel(HIGH_PRESSURE_COAL_BOILER.ID, "boiler.steel", "High Pressure Coal Boiler") .getStackForm(1L)); - ItemList.Machine_Bronze_Boiler_Solar.set( - new GT_MetaTileEntity_Boiler_Solar(SIMPLE_SOLAR_BOILER.ID, "boiler.solar", "Simple Solar Boiler") + ItemList.Machine_Steel_Boiler_Lava.set( + new MTEBoilerLava(HIGH_PRESSURE_LAVA_BOILER.ID, "boiler.lava", "High Pressure Lava Boiler") .getStackForm(1L)); + ItemList.Machine_Bronze_Boiler_Solar + .set(new MTEBoilerSolar(SIMPLE_SOLAR_BOILER.ID, "boiler.solar", "Simple Solar Boiler").getStackForm(1L)); ItemList.Machine_HP_Solar.set( - new GT_MetaTileEntity_Boiler_Solar_Steel( - HIGH_PRESSURE_SOLAR_BOILER.ID, - "boiler.steel.solar", - "High Pressure Solar Boiler").getStackForm(1L)); + new MTEBoilerSolarSteel(HIGH_PRESSURE_SOLAR_BOILER.ID, "boiler.steel.solar", "High Pressure Solar Boiler") + .getStackForm(1L)); } private static void registerBatteryBuffer1x1() { ItemList.Battery_Buffer_1by1_ULV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_ULV.ID, "batterybuffer.01.tier.00", "Ultra Low Voltage Battery Buffer", @@ -11324,7 +10866,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_LV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_LV.ID, "batterybuffer.01.tier.01", "Low Voltage Battery Buffer", @@ -11332,7 +10874,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_MV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_MV.ID, "batterybuffer.01.tier.02", "Medium Voltage Battery Buffer", @@ -11340,7 +10882,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_HV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_HV.ID, "batterybuffer.01.tier.03", "High Voltage Battery Buffer", @@ -11348,7 +10890,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_EV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_EV.ID, "batterybuffer.01.tier.04", "Extreme Voltage Battery Buffer", @@ -11356,7 +10898,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_IV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_IV.ID, "batterybuffer.01.tier.05", "Insane Voltage Battery Buffer", @@ -11364,7 +10906,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_LuV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_LuV.ID, "batterybuffer.01.tier.06", "Ludicrous Voltage Battery Buffer", @@ -11372,7 +10914,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_ZPM.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_ZPM.ID, "batterybuffer.01.tier.07", "ZPM Voltage Battery Buffer", @@ -11380,7 +10922,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_UV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UV.ID, "batterybuffer.01.tier.08", "Ultimate Voltage Battery Buffer", @@ -11388,7 +10930,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_UHV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UHV.ID, "batterybuffer.01.tier.09", "Highly Ultimate Voltage Battery Buffer", @@ -11397,7 +10939,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_UEV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UEV.ID, "batterybuffer.01.tier.10", "Extremely Ultimate Battery Buffer", @@ -11406,7 +10948,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_UIV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UIV.ID, "batterybuffer.01.tier.11", "Insanely Ultimate Battery Buffer", @@ -11415,7 +10957,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_UMV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UMV.ID, "batterybuffer.01.tier.12", "Mega Ultimate Battery Buffer", @@ -11424,7 +10966,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_UXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_UXV.ID, "batterybuffer.01.tier.13", "Extended Mega Ultimate Battery Buffer", @@ -11433,7 +10975,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1).getStackForm(1L)); ItemList.Battery_Buffer_1by1_MAXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_1_BY_1_MAX.ID, "batterybuffer.01.tier.14", "Maximum Battery Buffer", @@ -11444,7 +10986,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerBatteryBuffer2x2() { ItemList.Battery_Buffer_2by2_ULV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_ULV.ID, "batterybuffer.04.tier.00", "Ultra Low Voltage Battery Buffer", @@ -11452,7 +10994,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_LV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_LV.ID, "batterybuffer.04.tier.01", "Low Voltage Battery Buffer", @@ -11460,7 +11002,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_MV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_MV.ID, "batterybuffer.04.tier.02", "Medium Voltage Battery Buffer", @@ -11468,7 +11010,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_HV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_HV.ID, "batterybuffer.04.tier.03", "High Voltage Battery Buffer", @@ -11476,7 +11018,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_EV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_EV.ID, "batterybuffer.04.tier.04", "Extreme Voltage Battery Buffer", @@ -11484,7 +11026,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_IV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_IV.ID, "batterybuffer.04.tier.05", "Insane Voltage Battery Buffer", @@ -11492,7 +11034,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_LuV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_LuV.ID, "batterybuffer.04.tier.06", "Ludicrous Voltage Battery Buffer", @@ -11500,7 +11042,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_ZPM.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_ZPM.ID, "batterybuffer.04.tier.07", "ZPM Voltage Battery Buffer", @@ -11508,7 +11050,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_UV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UV.ID, "batterybuffer.04.tier.08", "Ultimate Voltage Battery Buffer", @@ -11516,7 +11058,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_UHV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UHV.ID, "batterybuffer.04.tier.09", "Highly Ultimate Voltage Battery Buffer", @@ -11525,7 +11067,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_UEV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UEV.ID, "batterybuffer.04.tier.10", "Extremely Ultimate Battery Buffer", @@ -11534,7 +11076,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_UIV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UIV.ID, "batterybuffer.04.tier.11", "Insanely Ultimate Battery Buffer", @@ -11543,7 +11085,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_UMV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UMV.ID, "batterybuffer.04.tier.12", "Mega Ultimate Battery Buffer", @@ -11552,7 +11094,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_UXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_UXV.ID, "batterybuffer.04.tier.13", "Extended Mega Ultimate Battery Buffer", @@ -11561,7 +11103,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Buffer_2by2_MAXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_2_BY_2_MAX.ID, "batterybuffer.04.tier.14", "Maximum Battery Buffer", @@ -11572,7 +11114,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerBatteryBuffer3x3() { ItemList.Battery_Buffer_3by3_ULV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_ULV.ID, "batterybuffer.09.tier.00", "Ultra Low Voltage Battery Buffer", @@ -11580,7 +11122,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_LV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_LV.ID, "batterybuffer.09.tier.01", "Low Voltage Battery Buffer", @@ -11588,7 +11130,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_MV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_MV.ID, "batterybuffer.09.tier.02", "Medium Voltage Battery Buffer", @@ -11596,7 +11138,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_HV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_HV.ID, "batterybuffer.09.tier.03", "High Voltage Battery Buffer", @@ -11604,7 +11146,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_EV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_EV.ID, "batterybuffer.09.tier.04", "Extreme Voltage Battery Buffer", @@ -11612,7 +11154,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_IV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_IV.ID, "batterybuffer.09.tier.05", "Insane Voltage Battery Buffer", @@ -11620,7 +11162,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_LuV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_LuV.ID, "batterybuffer.09.tier.06", "Ludicrous Voltage Battery Buffer", @@ -11628,7 +11170,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_ZPM.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_ZPM.ID, "batterybuffer.09.tier.07", "ZPM Voltage Battery Buffer", @@ -11636,7 +11178,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_UV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UV.ID, "batterybuffer.09.tier.08", "Ultimate Voltage Battery Buffer", @@ -11644,7 +11186,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_UHV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UHV.ID, "batterybuffer.09.tier.09", "Highly Ultimate Voltage Battery Buffer", @@ -11653,7 +11195,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_UEV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UEV.ID, "batterybuffer.09.tier.10", "Extremely Ultimate Battery Buffer", @@ -11662,7 +11204,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_UIV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UIV.ID, "batterybuffer.09.tier.11", "Insanely Ultimate Battery Buffer", @@ -11671,7 +11213,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_UMV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UMV.ID, "batterybuffer.09.tier.12", "Mega Ultimate Battery Buffer", @@ -11680,7 +11222,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_UXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_UXV.ID, "batterybuffer.09.tier.13", "Extended Mega Ultimate Battery Buffer", @@ -11689,7 +11231,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 9).getStackForm(1L)); ItemList.Battery_Buffer_3by3_MAXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_3_BY_3_MAX.ID, "batterybuffer.09.tier.14", "Maximum Battery Buffer", @@ -11700,7 +11242,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerBatteryBuffer4x4() { ItemList.Battery_Buffer_4by4_ULV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_ULV.ID, "batterybuffer.16.tier.00", "Ultra Low Voltage Battery Buffer", @@ -11708,7 +11250,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_LV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_LV.ID, "batterybuffer.16.tier.01", "Low Voltage Battery Buffer", @@ -11716,7 +11258,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_MV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_MV.ID, "batterybuffer.16.tier.02", "Medium Voltage Battery Buffer", @@ -11724,7 +11266,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_HV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_HV.ID, "batterybuffer.16.tier.03", "High Voltage Battery Buffer", @@ -11732,7 +11274,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_EV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_EV.ID, "batterybuffer.16.tier.04", "Extreme Voltage Battery Buffer", @@ -11740,7 +11282,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_IV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_IV.ID, "batterybuffer.16.tier.05", "Insane Voltage Battery Buffer", @@ -11748,7 +11290,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_LuV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_LuV.ID, "batterybuffer.16.tier.06", "Ludicrous Voltage Battery Buffer", @@ -11756,7 +11298,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_ZPM.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_ZPM.ID, "batterybuffer.16.tier.07", "ZPM Voltage Battery Buffer", @@ -11764,7 +11306,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_UV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UV.ID, "batterybuffer.16.tier.08", "Ultimate Voltage Battery Buffer", @@ -11772,7 +11314,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_UHV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UHV.ID, "batterybuffer.16.tier.09", "Highly Ultimate Voltage Battery Buffer", @@ -11780,7 +11322,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "", 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_UEV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UEV.ID, "batterybuffer.16.tier.10", "Extremely Ultimate Battery Buffer", @@ -11789,7 +11331,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_UIV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UIV.ID, "batterybuffer.16.tier.11", "Insanely Ultimate Battery Buffer", @@ -11798,7 +11340,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_UMV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UMV.ID, "batterybuffer.16.tier.12", "Mega Ultimate Battery Buffer", @@ -11807,7 +11349,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_UXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_UXV.ID, "batterybuffer.16.tier.13", "Extended Mega Ultimate Battery Buffer", @@ -11816,7 +11358,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 16).getStackForm(1L)); ItemList.Battery_Buffer_4by4_MAXV.set( - new GT_MetaTileEntity_BasicBatteryBuffer( + new MTEBasicBatteryBuffer( BATTERY_BUFFER_4_BY_4_MAX.ID, "batterybuffer.16.tier.14", "Maximum Battery Buffer", @@ -11827,7 +11369,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerCharger4x4() { ItemList.Battery_Charger_4by4_ULV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_ULV.ID, "batterycharger.16.tier.00", "Ultra Low Voltage Battery Charger", @@ -11835,7 +11377,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_LV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_LV.ID, "batterycharger.16.tier.01", "Low Voltage Battery Charger", @@ -11843,7 +11385,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_MV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_MV.ID, "batterycharger.16.tier.02", "Medium Voltage Battery Charger", @@ -11851,7 +11393,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_HV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_HV.ID, "batterycharger.16.tier.03", "High Voltage Battery Charger", @@ -11859,7 +11401,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_EV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_EV.ID, "batterycharger.16.tier.04", "Extreme Voltage Battery Charger", @@ -11867,7 +11409,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_IV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_IV.ID, "batterycharger.16.tier.05", "Insane Voltage Battery Charger", @@ -11875,7 +11417,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_LuV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_LuV.ID, "batterycharger.16.tier.06", "Ludicrous Voltage Battery Charger", @@ -11883,7 +11425,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_ZPM.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_ZPM.ID, "batterycharger.16.tier.07", "ZPM Voltage Battery Charger", @@ -11891,7 +11433,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_UV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_UV.ID, "batterycharger.16.tier.08", "Ultimate Voltage Battery Charger", @@ -11899,7 +11441,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "Each battery gives 8A in/4A out (min 4A/2A)", 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_UHV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_BY_4_UHV.ID, "batterycharger.16.tier.09", "Highly Ultimate Voltage Battery Charger", @@ -11908,7 +11450,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_UEV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_4_UEV.ID, "batterycharger.16.tier.10", "Extremely Ultimate Battery Charger", @@ -11917,7 +11459,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_UIV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_4_UIV.ID, "batterycharger.16.tier.11", "Insanely Ultimate Battery Charger", @@ -11926,7 +11468,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_UMV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_4_UMV.ID, "batterycharger.16.tier.12", "Mega Ultimate Battery Charger", @@ -11935,7 +11477,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_Charger_4by4_UXV.set( - new GT_MetaTileEntity_Charger( + new MTECharger( BATTERY_CHARGER_4_4_UXV.ID, "batterycharger.16.tier.13", "Extended Mega Ultimate Battery Charger", @@ -11946,7 +11488,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerCircuitAssembler() { ItemList.Machine_LV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_LV.ID, "basicmachine.circuitassembler.tier.01", "Basic Circuit Assembler", @@ -11957,12 +11499,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_MV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_MV.ID, "basicmachine.circuitassembler.tier.02", "Advanced Circuit Assembler", @@ -11973,12 +11515,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_HV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_HV.ID, "basicmachine.circuitassembler.tier.03", "Advanced Circuit Assembler II", @@ -11989,12 +11531,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_EV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_EV.ID, "basicmachine.circuitassembler.tier.04", "Advanced Circuit Assembler III", @@ -12005,12 +11547,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_IV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_IV.ID, "basicmachine.circuitassembler.tier.05", "Advanced Circuit Assembler IV", @@ -12021,12 +11563,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_LuV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_LuV.ID, "basicmachine.circuitassembler.tier.06", "Advanced Circuit Assembler V", @@ -12037,12 +11579,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_ZPM_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_ZPM.ID, "basicmachine.circuitassembler.tier.07", "Advanced Circuit Assembler VI", @@ -12053,12 +11595,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.Machine_UV_CircuitAssembler.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_UV.ID, "basicmachine.circuitassembler.tier.08", "Advanced Circuit Assembler VII", @@ -12069,12 +11611,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.CircuitAssemblerUHV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_UHV.ID, "basicmachine.circuitassembler.tier.09", "Ultimate Circuit Assembling Machine", @@ -12085,12 +11627,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.CircuitAssemblerUEV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_UEV.ID, "basicmachine.circuitassembler.tier.10", "Ultimate Circuit Assembling Machine II", @@ -12101,12 +11643,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.CircuitAssemblerUIV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_UIV.ID, "basicmachine.circuitassembler.tier.11", "Ultimate Circuit Assembling Machine III", @@ -12117,12 +11659,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.CircuitAssemblerUMV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_UMV.ID, "basicmachine.circuitassembler.tier.12", "Ultimate Circuit Assembling Machine IV", @@ -12133,12 +11675,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.CircuitAssemblerUXV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_UXV.ID, "basicmachine.circuitassembler.tier.13", "Ultimate Circuit Assembling Machine V", @@ -12149,12 +11691,12 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); ItemList.CircuitAssemblerMAX.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( CIRCUIT_ASSEMBLER_MAX.ID, "basicmachine.circuitassembler.tier.14", "MAX Circuit Assembling Machine", @@ -12165,14 +11707,14 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, true, SoundResource.NONE, - GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects.NONE, + MTEBasicMachineWithRecipe.SpecialEffects.NONE, "CIRCUITASSEMBLER", null).getStackForm(1L)); } private void registerWetTransformer() { ItemList.WetTransformer_LV_ULV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_LV_ULV.ID, "wettransformer.tier.00", "Ultra Low Voltage Power Transformer", @@ -12180,7 +11722,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "LV -> ULV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_MV_LV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_MV_LV.ID, "wetransformer.tier.01", "Low Voltage Power Transformer", @@ -12188,7 +11730,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "MV -> LV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_HV_MV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_HV_MV.ID, "wettransformer.tier.02", "Medium Voltage Power Transformer", @@ -12196,7 +11738,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "HV -> MV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_EV_HV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_EV_HV.ID, "wettransformer.tier.03", "High Voltage Power Transformer", @@ -12204,7 +11746,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "EV -> HV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_IV_EV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_IV_EV.ID, "wettransformer.tier.04", "Extreme Power Transformer", @@ -12212,7 +11754,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "IV -> EV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_LuV_IV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_LuV_IV.ID, "wettransformer.tier.05", "Insane Power Transformer", @@ -12220,7 +11762,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "LuV -> IV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_ZPM_LuV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_ZPM_LuV.ID, "wettransformer.tier.06", "Ludicrous Power Transformer", @@ -12228,7 +11770,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "ZPM -> LuV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_UV_ZPM.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_UV_ZPM.ID, "wettransformer.tier.07", "ZPM Voltage Power Transformer", @@ -12236,7 +11778,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UV -> ZPM (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_UHV_UV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_UHV_UV.ID, "wettransformer.tier.08", "Ultimate Power Transformer", @@ -12244,7 +11786,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UHV -> UV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_UEV_UHV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_UEV_UHV.ID, "wettransformer.tier.09", "Highly Ultimate Power Transformer", @@ -12252,7 +11794,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_UIV_UEV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_UIV_UEV.ID, "wettransformer.tier.10", "Extremely Ultimate Power Transformer", @@ -12260,7 +11802,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_UMV_UIV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_UMV_UIV.ID, "wettransformer.tier.11", "Insanely Ultimate Power Transformer", @@ -12268,7 +11810,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_UXV_UMV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_UXV_UMV.ID, "wettransformer.tier.12", "Mega Ultimate Power Transformer", @@ -12276,7 +11818,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.WetTransformer_MAX_UXV.set( - new GT_MetaTileEntity_WetTransformer( + new MTEWetTransformer( WET_TRANSFORMER_MAX_UXV.ID, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", @@ -12286,35 +11828,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerHighAmpTransformer() { ItemList.Transformer_HA_UEV_UHV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( HIGH_AMP_TRANSFORMER_UEV_UHV.ID, "transformer.ha.tier.09", "Highly Ultimate Hi-Amp Transformer", 9, "UEV -> UHV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_HA_UIV_UEV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( HIGH_AMP_TRANSFORMER_UIV_UEV.ID, "transformer.ha.tier.10", "Extremely Ultimate Hi-Amp Transformer", 10, "UIV -> UEV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_HA_UMV_UIV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( HIGH_AMP_TRANSFORMER_UMV_UIV.ID, "transformer.ha.tier.11", "Insanely Ultimate Hi-Amp Transformer", 11, "UMV -> UIV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_HA_UXV_UMV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( HIGH_AMP_TRANSFORMER_UXV_UMV.ID, "transformer.ha.tier.12", "Mega Ultimate Hi-Amp Transformer", 12, "UXV -> UMV (Use Soft Mallet to invert)").getStackForm(1L)); ItemList.Transformer_HA_MAX_UXV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( HIGH_AMP_TRANSFORMER_MAX_UXV.ID, "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", @@ -12325,7 +11867,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private void registerTurboCharger4By4() { ItemList.Battery_TurboCharger_4by4_ULV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_ULV.ID, "batteryturbocharger.16.tier.00", "Ultra Low Voltage Turbo Charger", @@ -12334,7 +11876,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_LV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_LV.ID, "batteryturbocharger.16.tier.01", "Low Voltage Turbo Charger", @@ -12343,7 +11885,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_MV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_MV.ID, "batteryturbocharger.16.tier.02", "Medium Voltage Turbo Charger", @@ -12352,7 +11894,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_HV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_HV.ID, "batteryturbocharger.16.tier.03", "High Voltage Turbo Charger", @@ -12361,7 +11903,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_EV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_EV.ID, "batteryturbocharger.16.tier.04", "Extreme Voltage Turbo Charger", @@ -12370,7 +11912,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_IV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_IV.ID, "batteryturbocharger.16.tier.05", "Insane Voltage Turbo Charger", @@ -12379,7 +11921,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_LuV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_LuV.ID, "batteryturbocharger.16.tier.06", "Ludicrous Voltage Turbo Charger", @@ -12388,7 +11930,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_ZPM.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_ZPM.ID, "batteryturbocharger.16.tier.07", "ZPM Voltage Turbo Charger", @@ -12397,7 +11939,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_UV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_UV.ID, "batteryturbocharger.16.tier.08", "Ultimate Voltage Turbo Charger", @@ -12406,7 +11948,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4).getStackForm(1L)); ItemList.Battery_TurboCharger_4by4_UHV.set( - new GT_MetaTileEntity_TurboCharger( + new MTETurboCharger( TURBO_CHARGER_UHV.ID, "batteryturbocharger.16.tier.09", "Highly Ultimate Voltage Turbo Charger", @@ -12418,91 +11960,91 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerWirelessEnergyHatch() { ItemList.Wireless_Hatch_Energy_ULV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_ULV.ID, "hatch.wireless.receiver.tier.00", "ULV Wireless Energy Hatch", 0).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_LV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_LV.ID, "hatch.wireless.receiver.tier.01", "LV Wireless Energy Hatch", 1).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_MV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_MV.ID, "hatch.wireless.receiver.tier.02", "MV Wireless Energy Hatch", 2).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_HV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_HV.ID, "hatch.wireless.receiver.tier.03", "HV Wireless Energy Hatch", 3).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_EV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_EV.ID, "hatch.wireless.receiver.tier.04", "EV Wireless Energy Hatch", 4).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_IV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_IV.ID, "hatch.wireless.receiver.tier.05", "IV Wireless Energy Hatch", 5).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_LuV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_LuV.ID, "hatch.wireless.receiver.tier.06", "LuV Wireless Energy Hatch", 6).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_ZPM.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_ZPM.ID, "hatch.wireless.receiver.tier.07", "ZPM Wireless Energy Hatch", 7).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_UV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_UV.ID, "hatch.wireless.receiver.tier.08", "UV Wireless Energy Hatch", 8).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_UHV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_UHV.ID, "hatch.wireless.receiver.tier.09", "UHV Wireless Energy Hatch", 9).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_UEV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_UEV.ID, "hatch.wireless.receiver.tier.10", "UEV Wireless Energy Hatch", 10).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_UIV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_UIV.ID, "hatch.wireless.receiver.tier.11", "UIV Wireless Energy Hatch", 11).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_UMV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_UMV.ID, "hatch.wireless.receiver.tier.12", "UMV Wireless Energy Hatch", 12).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_UXV.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_UXV.ID, "hatch.wireless.receiver.tier.13", "UXV Wireless Energy Hatch", 13).getStackForm(1L)); ItemList.Wireless_Hatch_Energy_MAX.set( - new GT_MetaTileEntity_Wireless_Hatch( + new MTEWirelessEnergy( WIRELESS_HATCH_ENERGY_MAX.ID, "hatch.wireless.receiver.tier.14", "MAX Wireless Energy Hatch", @@ -12511,91 +12053,91 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerWirelessDynamoHatch() { ItemList.Wireless_Dynamo_Energy_ULV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_ULV.ID, "hatch.wireless.transmitter.tier.00", "ULV Wireless Energy Dynamo", 0).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_LV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_LV.ID, "hatch.wireless.transmitter.tier.01", "LV Wireless Energy Dynamo", 1).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_MV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_MV.ID, "hatch.wireless.transmitter.tier.02", "MV Wireless Energy Dynamo", 2).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_HV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_HV.ID, "hatch.wireless.transmitter.tier.03", "HV Wireless Energy Dynamo", 3).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_EV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_EV.ID, "hatch.wireless.transmitter.tier.04", "EV Wireless Energy Dynamo", 4).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_IV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_IV.ID, "hatch.wireless.transmitter.tier.05", "IV Wireless Energy Dynamo", 5).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_LuV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_LuV.ID, "hatch.wireless.transmitter.tier.06", "LuV Wireless Energy Dynamo", 6).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_ZPM.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_ZPM.ID, "hatch.wireless.transmitter.tier.07", "ZPM Wireless Energy Dynamo", 7).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_UV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_UV.ID, "hatch.wireless.transmitter.tier.08", "UV Wireless Energy Dynamo", 8).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_UHV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_UHV.ID, "hatch.wireless.transmitter.tier.09", "UHV Wireless Energy Dynamo", 9).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_UEV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_UEV.ID, "hatch.wireless.transmitter.tier.10", "UEV Wireless Energy Dynamo", 10).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_UIV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_UIV.ID, "hatch.wireless.transmitter.tier.11", "UIV Wireless Energy Dynamo", 11).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_UMV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_UMV.ID, "hatch.wireless.transmitter.tier.12", "UMV Wireless Energy Dynamo", 12).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_UXV.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_UXV.ID, "hatch.wireless.transmitter.tier.13", "UXV Wireless Energy Dynamo", 13).getStackForm(1L)); ItemList.Wireless_Dynamo_Energy_MAX.set( - new GT_MetaTileEntity_Wireless_Dynamo( + new MTEWirelessDynamo( WIRELESS_DYNAMO_ENERGY_HATCH_MAX.ID, "hatch.wireless.transmitter.tier.14", "MAX Wireless Energy Dynamo", @@ -12604,40 +12146,31 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerLightningRods() { ItemList.Machine_HV_LightningRod.set( - new GT_MetaTileEntity_LightningRod( - LIGHTNING_ROD_HV.ID, - "basicgenerator.lightningrod.03", - "Lightning Rod", - 3).getStackForm(1)); + new MTELightningRod(LIGHTNING_ROD_HV.ID, "basicgenerator.lightningrod.03", "Lightning Rod", 3) + .getStackForm(1)); ItemList.Machine_EV_LightningRod.set( - new GT_MetaTileEntity_LightningRod( - LIGHTNING_ROD_EV.ID, - "basicgenerator.lightningrod.04", - "Lightning Rod II", - 4).getStackForm(1)); + new MTELightningRod(LIGHTNING_ROD_EV.ID, "basicgenerator.lightningrod.04", "Lightning Rod II", 4) + .getStackForm(1)); ItemList.Machine_IV_LightningRod.set( - new GT_MetaTileEntity_LightningRod( - LIGHTNING_ROD_IV.ID, - "basicgenerator.lightningrod.05", - "Lightning Rod III", - 5).getStackForm(1)); + new MTELightningRod(LIGHTNING_ROD_IV.ID, "basicgenerator.lightningrod.05", "Lightning Rod III", 5) + .getStackForm(1)); } private static void registerCombustionGenerators() { ItemList.Generator_Diesel_LV.set( - new GT_MetaTileEntity_DieselGenerator( + new MTEDieselGenerator( COMBUSTION_GENERATOR_LV.ID, "basicgenerator.diesel.tier.01", "Basic Combustion Generator", 1).getStackForm(1L)); ItemList.Generator_Diesel_MV.set( - new GT_MetaTileEntity_DieselGenerator( + new MTEDieselGenerator( COMBUSTION_GENERATOR_MV.ID, "basicgenerator.diesel.tier.02", "Advanced Combustion Generator", 2).getStackForm(1L)); ItemList.Generator_Diesel_HV.set( - new GT_MetaTileEntity_DieselGenerator( + new MTEDieselGenerator( COMBUSTION_GENERATOR_HV.ID, "basicgenerator.diesel.tier.03", "Turbo Combustion Generator", @@ -12646,94 +12179,65 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerGasTurbines() { ItemList.Generator_Gas_Turbine_LV.set( - new GT_MetaTileEntity_GasTurbine( - GAS_TURBINE_LV.ID, - "basicgenerator.gasturbine.tier.01", - "Basic Gas Turbine", - 1, - 95).getStackForm(1L)); + new MTEGasTurbine(GAS_TURBINE_LV.ID, "basicgenerator.gasturbine.tier.01", "Basic Gas Turbine", 1, 95) + .getStackForm(1L)); ItemList.Generator_Gas_Turbine_MV.set( - new GT_MetaTileEntity_GasTurbine( - GAS_TURBINE_MV.ID, - "basicgenerator.gasturbine.tier.02", - "Advanced Gas Turbine", - 2, - 90).getStackForm(1L)); + new MTEGasTurbine(GAS_TURBINE_MV.ID, "basicgenerator.gasturbine.tier.02", "Advanced Gas Turbine", 2, 90) + .getStackForm(1L)); ItemList.Generator_Gas_Turbine_HV.set( - new GT_MetaTileEntity_GasTurbine( - GAS_TURBINE_HV.ID, - "basicgenerator.gasturbine.tier.03", - "Turbo Gas Turbine", - 3, - 85).getStackForm(1L)); + new MTEGasTurbine(GAS_TURBINE_HV.ID, "basicgenerator.gasturbine.tier.03", "Turbo Gas Turbine", 3, 85) + .getStackForm(1L)); ItemList.Generator_Gas_Turbine_EV.set( - new GT_MetaTileEntity_GasTurbine( - GAS_TURBINE_EV.ID, - "basicgenerator.gasturbine.tier.04", - "Turbo Gas Turbine II", - 4, - 60).getStackForm(1L)); + new MTEGasTurbine(GAS_TURBINE_EV.ID, "basicgenerator.gasturbine.tier.04", "Turbo Gas Turbine II", 4, 60) + .getStackForm(1L)); ItemList.Generator_Gas_Turbine_IV.set( - new GT_MetaTileEntity_GasTurbine( - GAS_TURBINE_IV.ID, - "basicgenerator.gasturbine.tier.05", - "Turbo Gas Turbine III", - 5, - 50).getStackForm(1L)); + new MTEGasTurbine(GAS_TURBINE_IV.ID, "basicgenerator.gasturbine.tier.05", "Turbo Gas Turbine III", 5, 50) + .getStackForm(1L)); } private static void registerSteamTurbines() { ItemList.Generator_Steam_Turbine_LV.set( - new GT_MetaTileEntity_SteamTurbine( - STEAM_TURBINE_LV.ID, - "basicgenerator.steamturbine.tier.01", - "Basic Steam Turbine", - 1).getStackForm(1L)); + new MTESteamTurbine(STEAM_TURBINE_LV.ID, "basicgenerator.steamturbine.tier.01", "Basic Steam Turbine", 1) + .getStackForm(1L)); ItemList.Generator_Steam_Turbine_MV.set( - new GT_MetaTileEntity_SteamTurbine( - STEAM_TURBINE_MV.ID, - "basicgenerator.steamturbine.tier.02", - "Advanced Steam Turbine", - 2).getStackForm(1L)); + new MTESteamTurbine(STEAM_TURBINE_MV.ID, "basicgenerator.steamturbine.tier.02", "Advanced Steam Turbine", 2) + .getStackForm(1L)); ItemList.Generator_Steam_Turbine_HV.set( - new GT_MetaTileEntity_SteamTurbine( - STEAM_TURBINE_HV.ID, - "basicgenerator.steamturbine.tier.03", - "Turbo Steam Turbine", - 3).getStackForm(1L)); + new MTESteamTurbine(STEAM_TURBINE_HV.ID, "basicgenerator.steamturbine.tier.03", "Turbo Steam Turbine", 3) + .getStackForm(1L)); } private static void registerNaquadahReactors() { ItemList.Generator_Naquadah_Mark_I.set( - new GT_MetaTileEntity_NaquadahReactor( + new MTENaquadahReactor( NAQUADAH_REACTOR_EV.ID, "basicgenerator.naquadah.tier.04", new String[] { "Requires Enriched Naquadah Bolts" }, "Naquadah Reactor Mark I", 4).getStackForm(1L)); ItemList.Generator_Naquadah_Mark_II.set( - new GT_MetaTileEntity_NaquadahReactor( + new MTENaquadahReactor( NAQUADAH_REACTOR_IV.ID, "basicgenerator.naquadah.tier.05", new String[] { "Requires Enriched Naquadah Rods" }, "Naquadah Reactor Mark II", 5).getStackForm(1L)); ItemList.Generator_Naquadah_Mark_III.set( - new GT_MetaTileEntity_NaquadahReactor( + new MTENaquadahReactor( NAQUADAH_REACTOR_LuV.ID, "basicgenerator.naquadah.tier.06", new String[] { "Requires Enriched Naquadah Long Rods" }, "Naquadah Reactor Mark III", 6).getStackForm(1L)); ItemList.Generator_Naquadah_Mark_IV.set( - new GT_MetaTileEntity_NaquadahReactor( + new MTENaquadahReactor( NAQUADAH_REACTOR_ZPM.ID, "basicgenerator.naquadah.tier.07", new String[] { "Requires Naquadria Bolts" }, "Naquadah Reactor Mark IV", 7).getStackForm(1L)); ItemList.Generator_Naquadah_Mark_V.set( - new GT_MetaTileEntity_NaquadahReactor( + new MTENaquadahReactor( NAQUADAH_REACTOR_UV.ID, "basicgenerator.naquadah.tier.08", new String[] { "Requires Naquadria Rods" }, @@ -12743,19 +12247,19 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerMagicEnergyConverters() { ItemList.MagicEnergyConverter_LV.set( - new GT_MetaTileEntity_MagicEnergyConverter( + new MTEMagicEnergyConverter( MAGIC_ENERGY_CONVERTER_LV.ID, "basicgenerator.magicenergyconverter.tier.01", "Novice Magic Energy Converter", 1).getStackForm(1L)); ItemList.MagicEnergyConverter_MV.set( - new GT_MetaTileEntity_MagicEnergyConverter( + new MTEMagicEnergyConverter( MAGIC_ENERGY_CONVERTER_MV.ID, "basicgenerator.magicenergyconverter.tier.02", "Adept Magic Energy Converter", 2).getStackForm(1L)); ItemList.MagicEnergyConverter_HV.set( - new GT_MetaTileEntity_MagicEnergyConverter( + new MTEMagicEnergyConverter( MAGIC_ENERGY_CONVERTER_HV.ID, "basicgenerator.magicenergyconverter.tier.03", "Master Magic Energy Converter", @@ -12764,25 +12268,25 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerMagicEnergyAbsorbers() { ItemList.MagicEnergyAbsorber_LV.set( - new GT_MetaTileEntity_MagicalEnergyAbsorber( + new MTEMagicalEnergyAbsorber( MAGIC_ENERGY_ABSORBER_LV.ID, "basicgenerator.magicenergyabsorber.tier.01", "Novice Magic Energy Absorber", 1).getStackForm(1L)); ItemList.MagicEnergyAbsorber_MV.set( - new GT_MetaTileEntity_MagicalEnergyAbsorber( + new MTEMagicalEnergyAbsorber( MAGIC_ENERGY_ABSORBER_MV.ID, "basicgenerator.magicenergyabsorber.tier.02", "Adept Magic Energy Absorber", 2).getStackForm(1L)); ItemList.MagicEnergyAbsorber_HV.set( - new GT_MetaTileEntity_MagicalEnergyAbsorber( + new MTEMagicalEnergyAbsorber( MAGIC_ENERGY_ABSORBER_HV.ID, "basicgenerator.magicenergyabsorber.tier.03", "Master Magic Energy Absorber", 3).getStackForm(1L)); ItemList.MagicEnergyAbsorber_EV.set( - new GT_MetaTileEntity_MagicalEnergyAbsorber( + new MTEMagicalEnergyAbsorber( MAGIC_ENERGY_ABSORBER_EV.ID, "basicgenerator.magicenergyabsorber.tier.04", "Grandmaster Magic Energy Absorber", @@ -12791,33 +12295,33 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void registerPlasmaGenerators() { ItemList.Generator_Plasma_EV.set( - new GT_MetaTileEntity_PlasmaGenerator( + new MTEPlasmaGenerator( PLASMA_GENERATOR_EV.ID, "basicgenerator.plasmagenerator.tier.05", "Plasma Generator Mark I", 4).getStackForm(1L)); ItemList.Generator_Plasma_IV.set( - new GT_MetaTileEntity_PlasmaGenerator( + new MTEPlasmaGenerator( PLASMA_GENERATOR_IV.ID, "basicgenerator.plasmagenerator.tier.06", "Plasma Generator Mark II", 5).getStackForm(1L)); ItemList.Generator_Plasma_LuV.set( - new GT_MetaTileEntity_PlasmaGenerator( + new MTEPlasmaGenerator( PLASMA_GENERATOR_LuV.ID, "basicgenerator.plasmagenerator.tier.07", "Plasma Generator Mark III", 6).getStackForm(1L)); ItemList.Generator_Plasma_ZPMV.set( - new GT_MetaTileEntity_PlasmaGenerator( + new MTEPlasmaGenerator( PLASMA_GENERATOR_ZPM.ID, "basicgenerator.plasmagenerator.tier.08", "Plasma Generator Mark IV", 7).getStackForm(1L)); ItemList.Generator_Plasma_UV.set( - new GT_MetaTileEntity_PlasmaGenerator( + new MTEPlasmaGenerator( PLASMA_GENERATOR_UV.ID, "basicgenerator.plasmagenerator.tier.09", "Ultimate Pocket Sun", @@ -12825,35 +12329,35 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } private static void generateWiresAndPipes() { - for (int meta = 0; meta < GregTech_API.sGeneratedMaterials.length; meta++) { - Materials material = GregTech_API.sGeneratedMaterials[meta]; + for (int meta = 0; meta < GregTechAPI.sGeneratedMaterials.length; meta++) { + Materials material = GregTechAPI.sGeneratedMaterials[meta]; // This check is separated out because IntelliJ thinks Materials.Wood can be null. if (material == null) continue; if ((material.mTypes & 0x2) != 0 || material == Materials.Wood) { - new GT_MetaPipeEntity_Frame( + new MTEFrame( 4096 + meta, "GT_Frame_" + material, - (GT_LanguageManager.i18nPlaceholder ? "%material" : material.mDefaultLocalName) + (GTLanguageManager.i18nPlaceholder ? "%material" : material.mDefaultLocalName) + " Frame Box (TileEntity)", material); // Generate recipes for frame box - GT_Block_FrameBox block = (GT_Block_FrameBox) GregTech_API.sBlockFrames; - GT_OreDictUnificator.registerOre(OrePrefixes.frameGt, material, block.getStackForm(1, meta)); + BlockFrameBox block = (BlockFrameBox) GregTechAPI.sBlockFrames; + GTOreDictUnificator.registerOre(OrePrefixes.frameGt, material, block.getStackForm(1, meta)); if (material.getProcessingMaterialTierEU() < TierEU.IV) { - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( block.getStackForm(2, meta), - GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.NOT_REMOVABLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "SSS", "SwS", "SSS", 'S', OrePrefixes.stick.get(material) }); } if (!material.contains(SubTag.NO_RECIPES) - && GT_OreDictUnificator.get(OrePrefixes.stick, material, 1) != null) { + && GTOreDictUnificator.get(OrePrefixes.stick, material, 1) != null) { // Auto generate frame box recipe in an assembler. - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stick, material, 4), - GT_Utility.getIntegratedCircuit(4)) + GTOreDictUnificator.get(OrePrefixes.stick, material, 4), + GTUtility.getIntegratedCircuit(4)) .itemOutputs(block.getStackForm(1, meta)) .duration(3 * SECONDS + 4 * TICKS) .eut(calculateRecipeEU(material, 7)) @@ -12862,169 +12366,99 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC } } - makeWires(Materials.RedAlloy, 2000, 0L, 1L, 1L, gregtech.api.enums.GT_Values.V[0], true, false); + makeWires(Materials.RedAlloy, 2000, 0L, 1L, 1L, GTValues.V[0], true, false); - makeWires(Materials.Cobalt, 1200, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[1], true, false); - makeWires(Materials.Lead, 1220, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[1], true, false); - makeWires(Materials.Tin, 1240, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false); + makeWires(Materials.Cobalt, 1200, 2L, 4L, 2L, GTValues.V[1], true, false); + makeWires(Materials.Lead, 1220, 2L, 4L, 2L, GTValues.V[1], true, false); + makeWires(Materials.Tin, 1240, 1L, 2L, 1L, GTValues.V[1], true, false); - makeWires(Materials.Zinc, 1260, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false); - makeWires(Materials.SolderingAlloy, 1280, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[1], true, false); + makeWires(Materials.Zinc, 1260, 1L, 2L, 1L, GTValues.V[1], true, false); + makeWires(Materials.SolderingAlloy, 1280, 1L, 2L, 1L, GTValues.V[1], true, false); - makeWires(Materials.Iron, 1300, 3L, 6L, 2L, gregtech.api.enums.GT_Values.V[2], true, false); - makeWires(Materials.Nickel, 1320, 3L, 6L, 3L, gregtech.api.enums.GT_Values.V[2], true, false); - makeWires(Materials.Cupronickel, 1340, 3L, 6L, 2L, gregtech.api.enums.GT_Values.V[2], true, false); - makeWires(Materials.Copper, 1360, 2L, 4L, 1L, gregtech.api.enums.GT_Values.V[2], true, false); - makeWires(Materials.AnnealedCopper, 1380, 2L, 4L, 1L, gregtech.api.enums.GT_Values.V[2], true, false); + makeWires(Materials.Iron, 1300, 3L, 6L, 2L, GTValues.V[2], true, false); + makeWires(Materials.Nickel, 1320, 3L, 6L, 3L, GTValues.V[2], true, false); + makeWires(Materials.Cupronickel, 1340, 3L, 6L, 2L, GTValues.V[2], true, false); + makeWires(Materials.Copper, 1360, 2L, 4L, 1L, GTValues.V[2], true, false); + makeWires(Materials.AnnealedCopper, 1380, 2L, 4L, 1L, GTValues.V[2], true, false); - makeWires(Materials.Kanthal, 1400, 3L, 6L, 4L, gregtech.api.enums.GT_Values.V[3], true, false); - makeWires(Materials.Gold, 1420, 2L, 4L, 3L, gregtech.api.enums.GT_Values.V[3], true, false); - makeWires(Materials.Electrum, 1440, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[3], true, false); - makeWires(Materials.Silver, 1460, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[3], true, false); - makeWires(Materials.BlueAlloy, 1480, 1L, 2L, 2L, gregtech.api.enums.GT_Values.V[3], true, false); + makeWires(Materials.Kanthal, 1400, 3L, 6L, 4L, GTValues.V[3], true, false); + makeWires(Materials.Gold, 1420, 2L, 4L, 3L, GTValues.V[3], true, false); + makeWires(Materials.Electrum, 1440, 2L, 4L, 2L, GTValues.V[3], true, false); + makeWires(Materials.Silver, 1460, 1L, 2L, 1L, GTValues.V[3], true, false); + makeWires(Materials.BlueAlloy, 1480, 1L, 2L, 2L, GTValues.V[3], true, false); - makeWires(Materials.Nichrome, 1500, 4L, 8L, 3L, gregtech.api.enums.GT_Values.V[4], true, false); - makeWires(Materials.Steel, 1520, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[4], true, false); - makeWires(Materials.BlackSteel, 1540, 2L, 4L, 3L, gregtech.api.enums.GT_Values.V[4], true, false); - makeWires(Materials.Titanium, 1560, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[4], true, false); - makeWires(Materials.Aluminium, 1580, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[4], true, false); + makeWires(Materials.Nichrome, 1500, 4L, 8L, 3L, GTValues.V[4], true, false); + makeWires(Materials.Steel, 1520, 2L, 4L, 2L, GTValues.V[4], true, false); + makeWires(Materials.BlackSteel, 1540, 2L, 4L, 3L, GTValues.V[4], true, false); + makeWires(Materials.Titanium, 1560, 2L, 4L, 4L, GTValues.V[4], true, false); + makeWires(Materials.Aluminium, 1580, 1L, 2L, 1L, GTValues.V[4], true, false); - makeWires(Materials.Graphene, 1600, 1L, 2L, 1L, gregtech.api.enums.GT_Values.V[5], false, true); - makeWires(Materials.Osmium, 1620, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[5], true, false); - makeWires(Materials.Platinum, 1640, 1L, 2L, 2L, gregtech.api.enums.GT_Values.V[5], true, false); - makeWires(Materials.TungstenSteel, 1660, 2L, 4L, 3L, gregtech.api.enums.GT_Values.V[5], true, false); - makeWires(Materials.Tungsten, 1680, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[5], true, false); + makeWires(Materials.Graphene, 1600, 1L, 2L, 1L, GTValues.V[5], false, true); + makeWires(Materials.Osmium, 1620, 2L, 4L, 4L, GTValues.V[5], true, false); + makeWires(Materials.Platinum, 1640, 1L, 2L, 2L, GTValues.V[5], true, false); + makeWires(Materials.TungstenSteel, 1660, 2L, 4L, 3L, GTValues.V[5], true, false); + makeWires(Materials.Tungsten, 1680, 2L, 4L, 2L, GTValues.V[5], true, false); - makeWires(Materials.HSSG, 1700, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[6], true, false); - makeWires(Materials.NiobiumTitanium, 1720, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[6], true, false); - makeWires(Materials.VanadiumGallium, 1740, 2L, 4L, 4L, gregtech.api.enums.GT_Values.V[6], true, false); - makeWires(Materials.YttriumBariumCuprate, 1760, 4L, 8L, 4L, gregtech.api.enums.GT_Values.V[6], true, false); + makeWires(Materials.HSSG, 1700, 2L, 4L, 4L, GTValues.V[6], true, false); + makeWires(Materials.NiobiumTitanium, 1720, 2L, 4L, 4L, GTValues.V[6], true, false); + makeWires(Materials.VanadiumGallium, 1740, 2L, 4L, 4L, GTValues.V[6], true, false); + makeWires(Materials.YttriumBariumCuprate, 1760, 4L, 8L, 4L, GTValues.V[6], true, false); - makeWires(Materials.Naquadah, 1780, 2L, 4L, 2L, gregtech.api.enums.GT_Values.V[7], true, false); + makeWires(Materials.Naquadah, 1780, 2L, 4L, 2L, GTValues.V[7], true, false); - makeWires(Materials.NaquadahAlloy, 1800, 4L, 8L, 2L, gregtech.api.enums.GT_Values.V[8], true, false); - makeWires(Materials.Duranium, 1820, 8L, 16L, 1L, gregtech.api.enums.GT_Values.V[8], true, false); - makeWires(Materials.TPV, 1840, 1L, 2L, 6L, gregtech.api.enums.GT_Values.V[4], true, false); + makeWires(Materials.NaquadahAlloy, 1800, 4L, 8L, 2L, GTValues.V[8], true, false); + makeWires(Materials.Duranium, 1820, 8L, 16L, 1L, GTValues.V[8], true, false); + makeWires(Materials.TPV, 1840, 1L, 2L, 6L, GTValues.V[4], true, false); // Superconductor base. - makeWires( - Materials.Pentacadmiummagnesiumhexaoxid, - 2200, - 1L, - 2L, - 1L, - gregtech.api.enums.GT_Values.V[2], - false, - false); - makeWires( - Materials.Titaniumonabariumdecacoppereikosaoxid, - 2220, - 1L, - 8L, - 2L, - gregtech.api.enums.GT_Values.V[3], - false, - false); - makeWires(Materials.Uraniumtriplatinid, 2240, 1L, 16L, 3L, gregtech.api.enums.GT_Values.V[4], false, false); - makeWires(Materials.Vanadiumtriindinid, 2260, 1L, 64L, 4L, gregtech.api.enums.GT_Values.V[5], false, false); + makeWires(Materials.Pentacadmiummagnesiumhexaoxid, 2200, 1L, 2L, 1L, GTValues.V[2], false, false); + makeWires(Materials.Titaniumonabariumdecacoppereikosaoxid, 2220, 1L, 8L, 2L, GTValues.V[3], false, false); + makeWires(Materials.Uraniumtriplatinid, 2240, 1L, 16L, 3L, GTValues.V[4], false, false); + makeWires(Materials.Vanadiumtriindinid, 2260, 1L, 64L, 4L, GTValues.V[5], false, false); makeWires( Materials.Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, 2280, 2L, 256L, 6L, - gregtech.api.enums.GT_Values.V[6], - false, - false); - makeWires( - Materials.Tetranaquadahdiindiumhexaplatiumosminid, - 2300, - 2L, - 1024L, - 8L, - gregtech.api.enums.GT_Values.V[7], - false, - false); - makeWires( - Materials.Longasssuperconductornameforuvwire, - 2500, - 2L, - 4096L, - 12L, - gregtech.api.enums.GT_Values.V[8], + GTValues.V[6], false, false); - makeWires( - Materials.Longasssuperconductornameforuhvwire, - 2520, - 2L, - 16384L, - 16L, - gregtech.api.enums.GT_Values.V[9], - false, - false); - makeWires( - Materials.SuperconductorUEVBase, - 2032, - 2L, - 65536L, - 24L, - gregtech.api.enums.GT_Values.V[10], - false, - false); - makeWires( - Materials.SuperconductorUIVBase, - 2052, - 2L, - 262144L, - 32L, - gregtech.api.enums.GT_Values.V[11], - false, - false); - makeWires(Materials.SuperconductorUMVBase, 2072, 2L, 1048576L, 32L, GT_Values.V[12], false, false); + makeWires(Materials.Tetranaquadahdiindiumhexaplatiumosminid, 2300, 2L, 1024L, 8L, GTValues.V[7], false, false); + makeWires(Materials.Longasssuperconductornameforuvwire, 2500, 2L, 4096L, 12L, GTValues.V[8], false, false); + makeWires(Materials.Longasssuperconductornameforuhvwire, 2520, 2L, 16384L, 16L, GTValues.V[9], false, false); + makeWires(Materials.SuperconductorUEVBase, 2032, 2L, 65536L, 24L, GTValues.V[10], false, false); + makeWires(Materials.SuperconductorUIVBase, 2052, 2L, 262144L, 32L, GTValues.V[11], false, false); + makeWires(Materials.SuperconductorUMVBase, 2072, 2L, 1048576L, 32L, GTValues.V[12], false, false); // Actual superconductors. - makeWires(Materials.SuperconductorMV, 2320, 0L, 0L, 4L, gregtech.api.enums.GT_Values.V[2], false, true); - makeWires(Materials.SuperconductorHV, 2340, 0L, 0L, 6L, gregtech.api.enums.GT_Values.V[3], false, true); - makeWires(Materials.SuperconductorEV, 2360, 0L, 0L, 8L, gregtech.api.enums.GT_Values.V[4], false, true); - makeWires(Materials.SuperconductorIV, 2380, 0L, 0L, 12L, gregtech.api.enums.GT_Values.V[5], false, true); - makeWires(Materials.SuperconductorLuV, 2400, 0L, 0L, 16L, gregtech.api.enums.GT_Values.V[6], false, true); - makeWires(Materials.SuperconductorZPM, 2420, 0L, 0L, 24L, gregtech.api.enums.GT_Values.V[7], false, true); - makeWires(Materials.SuperconductorUV, 2440, 0L, 0L, 32L, gregtech.api.enums.GT_Values.V[8], false, true); - makeWires(Materials.SuperconductorUHV, 2020, 0L, 0L, 48L, gregtech.api.enums.GT_Values.V[9], false, true); - makeWires(Materials.SuperconductorUEV, 2026, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[10], false, true); - makeWires(Materials.SuperconductorUIV, 2081, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[11], false, true); - makeWires(Materials.SuperconductorUMV, 2089, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[12], false, true); - - makeWires(Materials.Ichorium, 2600, 2L, 2L, 12L, GT_Values.V[9], false, true); - makeWires(MaterialsUEVplus.SpaceTime, 2606, 0L, 0L, 1_000_000L, GT_Values.V[14], false, true); - - GT_OreDictUnificator.registerOre( + makeWires(Materials.SuperconductorMV, 2320, 0L, 0L, 4L, GTValues.V[2], false, true); + makeWires(Materials.SuperconductorHV, 2340, 0L, 0L, 6L, GTValues.V[3], false, true); + makeWires(Materials.SuperconductorEV, 2360, 0L, 0L, 8L, GTValues.V[4], false, true); + makeWires(Materials.SuperconductorIV, 2380, 0L, 0L, 12L, GTValues.V[5], false, true); + makeWires(Materials.SuperconductorLuV, 2400, 0L, 0L, 16L, GTValues.V[6], false, true); + makeWires(Materials.SuperconductorZPM, 2420, 0L, 0L, 24L, GTValues.V[7], false, true); + makeWires(Materials.SuperconductorUV, 2440, 0L, 0L, 32L, GTValues.V[8], false, true); + makeWires(Materials.SuperconductorUHV, 2020, 0L, 0L, 48L, GTValues.V[9], false, true); + makeWires(Materials.SuperconductorUEV, 2026, 0L, 0L, 64L, GTValues.V[10], false, true); + makeWires(Materials.SuperconductorUIV, 2081, 0L, 0L, 64L, GTValues.V[11], false, true); + makeWires(Materials.SuperconductorUMV, 2089, 0L, 0L, 64L, GTValues.V[12], false, true); + + makeWires(Materials.Ichorium, 2600, 2L, 2L, 12L, GTValues.V[9], false, true); + makeWires(MaterialsUEVplus.SpaceTime, 2606, 0L, 0L, 1_000_000L, GTValues.V[14], false, true); + + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Wood), - new GT_MetaPipeEntity_Fluid( - 5101, - "GT_Pipe_Wood_Small", - "Small Wooden Fluid Pipe", - 0.375F, - Materials.Wood, - 10, - 350, - false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + new MTEFluid(5101, "GT_Pipe_Wood_Small", "Small Wooden Fluid Pipe", 0.375F, Materials.Wood, 10, 350, false) + .getStackForm(1L)); + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(Materials.Wood), - new GT_MetaPipeEntity_Fluid(5102, "GT_Pipe_Wood", "Wooden Fluid Pipe", 0.5F, Materials.Wood, 30, 350, false) + new MTEFluid(5102, "GT_Pipe_Wood", "Wooden Fluid Pipe", 0.5F, Materials.Wood, 30, 350, false) .getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(Materials.Wood), - new GT_MetaPipeEntity_Fluid( - 5103, - "GT_Pipe_Wood_Large", - "Large Wooden Fluid Pipe", - 0.75F, - Materials.Wood, - 60, - 350, - false).getStackForm(1L)); + new MTEFluid(5103, "GT_Pipe_Wood_Large", "Large Wooden Fluid Pipe", 0.75F, Materials.Wood, 60, 350, false) + .getStackForm(1L)); generateFluidPipes(Materials.Copper, Materials.Copper.mName, 5110, 20, 1000, true); generateFluidMultiPipes(Materials.Copper, Materials.Copper.mName, 5115, 20, 1000, true); @@ -13054,9 +12488,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 600, 1000, true); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(Materials.Ultimate), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( 5165, "GT_Pipe_HighPressure_Small", "Small High Pressure Fluid Pipe", @@ -13065,9 +12499,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4800, 1500, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(Materials.Ultimate), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( 5166, "GT_Pipe_HighPressure", "High Pressure Fluid Pipe", @@ -13076,9 +12510,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 7200, 1500, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(Materials.Ultimate), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( 5167, "GT_Pipe_HighPressure_Large", "Large High Pressure Fluid Pipe", @@ -13180,11 +12614,11 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC @SuppressWarnings("PointlessArithmeticExpression") private static void makeWires(Materials aMaterial, int aStartID, long aLossInsulated, long aLoss, long aAmperage, long aVoltage, boolean aInsulatable, boolean aAutoInsulated) { - String name = GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName; - GT_OreDictUnificator.registerOre( + String name = GTLanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName; + GTOreDictUnificator.registerOre( OrePrefixes.wireGt01, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 0, aTextWire1 + aMaterial.mName.toLowerCase() + ".01", "1x " + name + aTextWire2, @@ -13195,10 +12629,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt02, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 1, aTextWire1 + aMaterial.mName.toLowerCase() + ".02", "2x " + name + aTextWire2, @@ -13209,10 +12643,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt04, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 2, aTextWire1 + aMaterial.mName.toLowerCase() + ".04", "4x " + name + aTextWire2, @@ -13223,10 +12657,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt08, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 3, aTextWire1 + aMaterial.mName.toLowerCase() + ".08", "8x " + name + aTextWire2, @@ -13237,10 +12671,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt12, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 4, aTextWire1 + aMaterial.mName.toLowerCase() + ".12", "12x " + name + aTextWire2, @@ -13251,10 +12685,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, false, !aAutoInsulated).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt16, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 5, aTextWire1 + aMaterial.mName.toLowerCase() + ".16", "16x " + name + aTextWire2, @@ -13266,10 +12700,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC false, !aAutoInsulated).getStackForm(1L)); if (aInsulatable) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt01, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 6, aTextCable1 + aMaterial.mName.toLowerCase() + ".01", "1x " + name + aTextCable2, @@ -13280,10 +12714,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt02, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 7, aTextCable1 + aMaterial.mName.toLowerCase() + ".02", "2x " + name + aTextCable2, @@ -13294,10 +12728,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt04, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 8, aTextCable1 + aMaterial.mName.toLowerCase() + ".04", "4x " + name + aTextCable2, @@ -13308,10 +12742,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt08, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 9, aTextCable1 + aMaterial.mName.toLowerCase() + ".08", "8x " + name + aTextCable2, @@ -13322,10 +12756,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt12, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 10, aTextCable1 + aMaterial.mName.toLowerCase() + ".12", "12x " + name + aTextCable2, @@ -13336,10 +12770,10 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC aVoltage, true, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt16, aMaterial, - new GT_MetaPipeEntity_Cable( + new MTECable( aStartID + 11, aTextCable1 + aMaterial.mName.toLowerCase() + ".16", "16x " + name + aTextCable2, @@ -13355,7 +12789,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC @Override public void run() { - GT_Log.out.println("GT_Mod: Registering MetaTileEntities."); + GTLog.out.println("GTMod: Registering MetaTileEntities."); registerMachineHull(); registerTransformer(); registerDynamoHatch(); @@ -13463,56 +12897,47 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC registerOven(); ItemList.AdvDebugStructureWriter.set( - new GT_MetaTileEntity_AdvDebugStructureWriter( + new MTEAdvDebugStructureWriter( ADVANCED_DEBUG_STRUCTURE_WRITTER.ID, "advdebugstructurewriter", "Advanced Debug Structure Writer", 5).getStackForm(1L)); ItemList.Hatch_Maintenance.set( - new GT_MetaTileEntity_Hatch_Maintenance(MAINTENANCE_HATCH.ID, "hatch.maintenance", "Maintenance Hatch", 1) + new MTEHatchMaintenance(MAINTENANCE_HATCH.ID, "hatch.maintenance", "Maintenance Hatch", 1) .getStackForm(1L)); ItemList.Hatch_AutoMaintenance.set( - new GT_MetaTileEntity_Hatch_Maintenance( + new MTEHatchMaintenance( AUTO_MAINTENANCE_HATCH.ID, "hatch.maintenance.auto", "Auto Maintenance Hatch", 6, true).getStackForm(1L)); ItemList.Hatch_DroneDownLink.set( - new GT_MetaTileEntity_Hatch_DroneDownLink( - DroneDownLink.ID, - "hatch.dronedownlink", - "Drone DownLink Module", - 5).getStackForm(1)); + new MTEHatchDroneDownLink(DroneDownLink.ID, "hatch.dronedownlink", "Drone DownLink Module", 5) + .getStackForm(1)); ItemList.Hatch_DataAccess_EV.set( - new GT_MetaTileEntity_Hatch_DataAccess(DATA_ACCESS_HATCH.ID, "hatch.dataaccess", "Data Access Hatch", 4) - .getStackForm(1L)); + new MTEHatchDataAccess(DATA_ACCESS_HATCH.ID, "hatch.dataaccess", "Data Access Hatch", 4).getStackForm(1L)); ItemList.Hatch_DataAccess_LuV.set( - new GT_MetaTileEntity_Hatch_DataAccess( + new MTEHatchDataAccess( ADVANCED_DATA_ACCESS_HATCH.ID, "hatch.dataaccess.adv", "Advanced Data Access Hatch", 6).getStackForm(1L)); ItemList.Hatch_DataAccess_UV.set( - new GT_MetaTileEntity_Hatch_DataAccess( + new MTEHatchDataAccess( AUTOMATABLE_DATA_ACCESS_HATCH.ID, "hatch.dataaccess.auto", "Automatable Data Access Hatch", 8).getStackForm(1L)); - ItemList.Hatch_HeatSensor.set( - new GT_MetaTileEntity_HeatSensor(HEAT_DETECTOR_HATCH.ID, "hatch.heatsensor", "Heat Sensor Hatch", 7) - .getStackForm(1)); - ItemList.Hatch_pHSensor.set( - new GT_MetaTileEntity_pHSensor(HATCH_PH_SENSOR.ID, "hatch.phsensor", "pH Sensor Hatch", 7).getStackForm(1)); - ItemList.Hatch_LensHousing.set( - new GT_MetaTileEntity_LensHousing(HATCH_LENS_HOUSING.ID, "hatch.lenshousing", "Lens Housing") - .getStackForm(1L)); + ItemList.Hatch_HeatSensor + .set(new MTEHeatSensor(HEAT_DETECTOR_HATCH.ID, "hatch.heatsensor", "Heat Sensor Hatch", 7).getStackForm(1)); + ItemList.Hatch_pHSensor + .set(new MTEHatchPHSensor(HATCH_PH_SENSOR.ID, "hatch.phsensor", "pH Sensor Hatch", 7).getStackForm(1)); + ItemList.Hatch_LensHousing + .set(new MTEHatchLensHousing(HATCH_LENS_HOUSING.ID, "hatch.lenshousing", "Lens Housing").getStackForm(1L)); ItemList.Hatch_LensIndicator.set( - new GT_MetaTileEntity_LensIndicator( - HATCH_LENS_INDICATOR.ID, - "hatch.lensindicator", - "Lens Indicator Hatch", - 8).getStackForm(1L)); + new MTEHatchLensIndicator(HATCH_LENS_INDICATOR.ID, "hatch.lensindicator", "Lens Indicator Hatch", 8) + .getStackForm(1L)); generateWiresAndPipes(); } @@ -13520,16 +12945,16 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC generateItemPipes( aMaterial, name, - GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName, + GTLanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName, startID, baseInvSlots); } private static void generateItemPipes(Materials aMaterial, String name, String displayName, int startID, int baseInvSlots) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(aMaterial), - new GT_MetaPipeEntity_Item( + new MTEItem( startID, "GT_Pipe_" + name, displayName + " Item Pipe", @@ -13538,9 +12963,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseInvSlots, 32768 / baseInvSlots, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(aMaterial), - new GT_MetaPipeEntity_Item( + new MTEItem( startID + 1, "GT_Pipe_" + name + "_Large", "Large " + displayName + " Item Pipe", @@ -13549,9 +12974,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseInvSlots * 2, 16384 / baseInvSlots, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(aMaterial), - new GT_MetaPipeEntity_Item( + new MTEItem( startID + 2, "GT_Pipe_" + name + "_Huge", "Huge " + displayName + " Item Pipe", @@ -13560,9 +12985,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseInvSlots * 4, 8192 / baseInvSlots, false).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveMedium.get(aMaterial), - new GT_MetaPipeEntity_Item( + new MTEItem( startID + 3, "GT_Pipe_Restrictive_" + name, "Restrictive " + displayName + " Item Pipe", @@ -13571,9 +12996,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseInvSlots, 3276800 / baseInvSlots, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveLarge.get(aMaterial), - new GT_MetaPipeEntity_Item( + new MTEItem( startID + 4, "GT_Pipe_Restrictive_" + name + "_Large", "Large Restrictive " + displayName + " Item Pipe", @@ -13582,9 +13007,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseInvSlots * 2, 1638400 / baseInvSlots, true).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeRestrictiveHuge.get(aMaterial), - new GT_MetaPipeEntity_Item( + new MTEItem( startID + 5, "GT_Pipe_Restrictive_" + name + "_Huge", "Huge Restrictive " + displayName + " Item Pipe", @@ -13601,7 +13026,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC generateFluidPipes( aMaterial, name, - GT_LanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName, + GTLanguageManager.i18nPlaceholder ? "%material" : aMaterial.mDefaultLocalName, startID, baseCapacity, heatCapacity, @@ -13610,9 +13035,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void generateFluidPipes(Materials aMaterial, String name, String displayName, int startID, int baseCapacity, int heatCapacity, boolean gasProof) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID, "GT_Pipe_" + name + "_Tiny", "Tiny " + displayName + " Fluid Pipe", @@ -13621,9 +13046,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseCapacity / 6, heatCapacity, gasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 1, "GT_Pipe_" + name + "_Small", "Small " + displayName + " Fluid Pipe", @@ -13632,9 +13057,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseCapacity / 3, heatCapacity, gasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 2, "GT_Pipe_" + name, displayName + " Fluid Pipe", @@ -13643,9 +13068,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseCapacity, heatCapacity, gasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 3, "GT_Pipe_" + name + "_Large", "Large " + displayName + " Fluid Pipe", @@ -13654,9 +13079,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC baseCapacity * 2, heatCapacity, gasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 4, "GT_Pipe_" + name + "_Huge", "Huge " + displayName + " Fluid Pipe", @@ -13675,9 +13100,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC private static void generateFluidMultiPipes(Materials aMaterial, String name, String displayName, int startID, int baseCapacity, int heatCapacity, boolean gasProof) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeQuadruple.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID, "GT_Pipe_" + name + "_Quadruple", "Quadruple " + displayName + " Fluid Pipe", @@ -13687,9 +13112,9 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC heatCapacity, gasProof, 4).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeNonuple.get(aMaterial), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 1, "GT_Pipe_" + name + "_Nonuple", "Nonuple " + displayName + " Fluid Pipe", diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java b/src/main/java/gregtech/loaders/preload/LoaderOreProcessing.java index 598d9e882a..f38bbd6b76 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_OreProcessing.java +++ b/src/main/java/gregtech/loaders/preload/LoaderOreProcessing.java @@ -1,6 +1,6 @@ package gregtech.loaders.preload; -import gregtech.api.util.GT_Log; +import gregtech.api.util.GTLog; import gregtech.loaders.oreprocessing.ProcessingAll; import gregtech.loaders.oreprocessing.ProcessingBeans; import gregtech.loaders.oreprocessing.ProcessingBlock; @@ -52,11 +52,11 @@ import gregtech.loaders.oreprocessing.ProcessingTransforming; import gregtech.loaders.oreprocessing.ProcessingWax; import gregtech.loaders.oreprocessing.ProcessingWire; -public class GT_Loader_OreProcessing implements Runnable { +public class LoaderOreProcessing implements Runnable { @Override public void run() { - GT_Log.out.println("GT_Mod: Register Ore processing."); + GTLog.out.println("GTMod: Register Ore processing."); new ProcessingAll(); new ProcessingBeans(); new ProcessingBlock(); |