From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../registration/gregtech/Gregtech4Content.java | 106 +++---- .../gregtech/GregtechAdvancedBoilers.java | 78 ++--- .../gregtech/GregtechAlgaeContent.java | 33 +- .../gregtech/GregtechAmazonWarehouse.java | 4 +- .../gregtech/GregtechBufferDynamos.java | 44 +-- .../registration/gregtech/GregtechConduits.java | 352 ++++++++++++--------- .../gregtech/GregtechCustomHatches.java | 106 +++---- .../registration/gregtech/GregtechCyclotron.java | 9 +- .../registration/gregtech/GregtechDehydrator.java | 80 +++-- .../gregtech/GregtechEnergyBuffer.java | 117 ++++--- .../GregtechFactoryGradeReplacementMultis.java | 31 +- .../GregtechGeothermalThermalGenerator.java | 46 +-- .../gregtech/GregtechHiAmpTransformer.java | 54 ++-- .../gregtech/GregtechIndustrialAlloySmelter.java | 4 +- .../gregtech/GregtechIndustrialArcFurnace.java | 4 +- .../gregtech/GregtechIndustrialBlastSmelter.java | 12 +- .../gregtech/GregtechIndustrialCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialChisel.java | 21 +- .../gregtech/GregtechIndustrialCokeOven.java | 8 +- .../gregtech/GregtechIndustrialCuttingFactory.java | 8 +- .../gregtech/GregtechIndustrialElectrolyzer.java | 8 +- .../GregtechIndustrialElementDuplicator.java | 8 +- .../gregtech/GregtechIndustrialExtruder.java | 8 +- .../gregtech/GregtechIndustrialFishPond.java | 4 +- .../gregtech/GregtechIndustrialFluidHeater.java | 4 +- .../gregtech/GregtechIndustrialForgeHammer.java | 4 +- .../gregtech/GregtechIndustrialFuelRefinery.java | 8 +- .../gregtech/GregtechIndustrialMacerator.java | 8 +- .../gregtech/GregtechIndustrialMassFabricator.java | 40 +-- .../gregtech/GregtechIndustrialMixer.java | 8 +- .../gregtech/GregtechIndustrialMultiMachine.java | 8 +- .../gregtech/GregtechIndustrialPlatePress.java | 8 +- .../gregtech/GregtechIndustrialRockBreaker.java | 4 +- .../gregtech/GregtechIndustrialSifter.java | 8 +- .../GregtechIndustrialThermalCentrifuge.java | 8 +- .../gregtech/GregtechIndustrialTreeFarm.java | 12 +- .../gregtech/GregtechIndustrialWashPlant.java | 8 +- .../gregtech/GregtechIndustrialWiremill.java | 8 +- .../registration/gregtech/GregtechIsaMill.java | 19 +- .../registration/gregtech/GregtechLFTR.java | 36 +-- .../GregtechLargeTurbinesAndHeatExchanger.java | 39 +-- .../gregtech/GregtechMolecularTransformer.java | 4 +- .../GregtechNuclearSaltProcessingPlant.java | 8 +- .../gregtech/GregtechPollutionDevices.java | 32 +- .../gregtech/GregtechPowerSubStation.java | 36 +-- .../gregtech/GregtechQuantumForceTransformer.java | 8 +- .../registration/gregtech/GregtechRTG.java | 9 +- .../gregtech/GregtechRedstoneButtonPanel.java | 8 +- .../gregtech/GregtechRedstoneCircuitBlock.java | 9 +- .../gregtech/GregtechRedstoneLamp.java | 8 +- .../gregtech/GregtechRedstoneStrengthDisplay.java | 8 +- .../gregtech/GregtechRedstoneStrengthScale.java | 9 +- .../gregtech/GregtechRocketFuelGenerator.java | 58 ++-- .../gregtech/GregtechSemiFluidgenerators.java | 16 +- .../gregtech/GregtechSimpleWasher.java | 36 +-- .../registration/gregtech/GregtechSolarTower.java | 22 +- .../registration/gregtech/GregtechSteamMultis.java | 45 ++- .../registration/gregtech/GregtechSuperChests.java | 37 +-- .../gregtech/GregtechThaumcraftDevices.java | 4 +- .../gregtech/GregtechThreadedBuffers.java | 9 +- .../gregtech/GregtechTieredFluidTanks.java | 36 +-- .../gregtech/GregtechTreeFarmerTE.java | 8 +- .../registration/gregtech/GregtechWaterPump.java | 7 +- .../gregtech/GregtechWirelessChargers.java | 20 +- 64 files changed, 873 insertions(+), 947 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index fe61fd608d..02141388bb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -21,23 +21,23 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT4_Tesseract_Generator; import static gregtech.api.enums.MetaTileEntityIDs.GT4_Tesseract_Terminal; import static gregtech.api.enums.MetaTileEntityIDs.GT4_Thermal_Boiler; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_CropHarvestor; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTEElectricAutoWorkbench; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTECropHarvestor; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAutoCrafter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEThermalBoiler; public class Gregtech4Content { // ID Range 828, 829, 833 - 850 public static void run() { - Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS); + Logger.INFO("Max MTE: " + GregTechAPI.METATILEENTITIES.length + " | " + GregTechAPI.MAXIMUM_METATILE_IDS); thermalBoiler(); multiCrafter(); tesseracts(); @@ -48,73 +48,57 @@ public class Gregtech4Content { private static void automation() { Logger.INFO("Gregtech 4 Content | Registering Auto Workbenches."); GregtechItemList.GT4_Electric_Auto_Workbench_LV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_LV.ID, - 1, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_LV.ID, 1, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_MV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_MV.ID, - 2, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_MV.ID, 2, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_HV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_HV.ID, - 3, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_HV.ID, 3, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_EV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_EV.ID, - 4, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_EV.ID, 4, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_IV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_IV.ID, - 5, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_IV.ID, 5, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_LuV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_LuV.ID, - 6, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_LuV.ID, 6, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_ZPM.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_ZPM.ID, - 7, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_ZPM.ID, 7, "Automatic crafting machine") + .getStackForm(1L)); GregtechItemList.GT4_Electric_Auto_Workbench_UV.set( - new GT_MetaTileEntity_ElectricAutoWorkbench( - GT4_Electric_Auto_Workbench_UV.ID, - 8, - "Automatic crafting machine").getStackForm(1L)); + new MTEElectricAutoWorkbench(GT4_Electric_Auto_Workbench_UV.ID, 8, "Automatic crafting machine") + .getStackForm(1L)); } private static void basic() { Logger.INFO("Gregtech 4 Content | Registering Crop Managers."); GregtechItemList.GT4_Crop_Harvester_LV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_LV.ID, 1, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_LV.ID, 1, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_MV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_MV.ID, 2, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_MV.ID, 2, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_HV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_HV.ID, 3, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_HV.ID, 3, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_EV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_EV.ID, 4, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_EV.ID, 4, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_IV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_IV.ID, 5, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_IV.ID, 5, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_LuV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_LuV.ID, 6, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_LuV.ID, 6, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_ZPM.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_ZPM.ID, 7, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_ZPM.ID, 7, "Harvests the Cropsticks in front of it") .getStackForm(1L)); GregtechItemList.GT4_Crop_Harvester_UV.set( - new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_UV.ID, 8, "Harvests the Cropsticks in front of it") + new MTECropHarvestor(GT4_Crop_Harvester_UV.ID, 8, "Harvests the Cropsticks in front of it") .getStackForm(1L)); } @@ -122,25 +106,19 @@ public class Gregtech4Content { // Gregtech 4 Tesseracts Logger.INFO("Gregtech 4 Content | Registering Tesseracts."); GregtechItemList.GT4_Tesseract_Generator.set( - new GT_MetaTileEntity_TesseractGenerator( - GT4_Tesseract_Generator.ID, - "tesseract.generator", - "Tesseract Generator", - 4).getStackForm(1L)); + new MTETesseractGenerator(GT4_Tesseract_Generator.ID, "tesseract.generator", "Tesseract Generator", 4) + .getStackForm(1L)); GregtechItemList.GT4_Tesseract_Terminal.set( - new GT_MetaTileEntity_TesseractTerminal( - GT4_Tesseract_Terminal.ID, - "tesseract.terminal", - "Tesseract Terminal", - 4).getStackForm(1L)); + new MTETesseractTerminal(GT4_Tesseract_Terminal.ID, "tesseract.terminal", "Tesseract Terminal", 4) + .getStackForm(1L)); } private static void thermalBoiler() { // Gregtech 4 Thermal Boiler - if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) { + if (GTPPCore.ConfigSwitches.enableMultiblock_ThermalBoiler) { Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); GregtechItemList.GT4_Thermal_Boiler.set( - new GT4Entity_ThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") + new MTEThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") .getStackForm(1L)); } } @@ -149,9 +127,7 @@ public class Gregtech4Content { // Gregtech 4 Multiblock Auto-Crafter Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter."); GregtechItemList.GT4_Multi_Crafter.set( - new GT4Entity_AutoCrafter( - GT4_Multi_Crafter.ID, - "gtplusplus.autocrafter.multi", - "Large Scale Auto-Assembler v1.01").getStackForm(1L)); + new MTEAutoCrafter(GT4_Multi_Crafter.ID, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java index 7d031dfeff..2e076e7fbe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -9,15 +9,15 @@ import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.recipe.RECIPES_MachineComponents; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.recipe.RecipesMachineComponents; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_HV; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_LV; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_MV; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEBoilerHV; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEBoilerLV; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEBoilerMV; public class GregtechAdvancedBoilers { @@ -29,11 +29,11 @@ public class GregtechAdvancedBoilers { private static void run1() { // Boilers GregtechItemList.Boiler_Advanced_LV - .set(new GT_MetaTileEntity_Boiler_LV(Boiler_Advanced_LV.ID, "Advanced Boiler [LV]", 1).getStackForm(1L)); + .set(new MTEBoilerLV(Boiler_Advanced_LV.ID, "Advanced Boiler [LV]", 1).getStackForm(1L)); GregtechItemList.Boiler_Advanced_MV - .set(new GT_MetaTileEntity_Boiler_MV(Boiler_Advanced_MV.ID, "Advanced Boiler [MV]", 2).getStackForm(1L)); + .set(new MTEBoilerMV(Boiler_Advanced_MV.ID, "Advanced Boiler [MV]", 2).getStackForm(1L)); GregtechItemList.Boiler_Advanced_HV - .set(new GT_MetaTileEntity_Boiler_HV(Boiler_Advanced_HV.ID, "Advanced Boiler [HV]", 3).getStackForm(1L)); + .set(new MTEBoilerHV(Boiler_Advanced_HV.ID, "Advanced Boiler [HV]", 3).getStackForm(1L)); ItemStack chassisT1 = ItemUtils .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1); @@ -45,60 +45,62 @@ public class GregtechAdvancedBoilers { // Make the Coil in each following recipe a hammer and a Screwdriver. // Chassis Recipes - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( chassisT1, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_ULV, 'P', OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.ULV), 'W', OrePrefixes.plate.get(Materials.Lead), 'G', OrePrefixes.pipeSmall.get(Materials.Copper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( chassisT2, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_LV, 'P', OrePrefixes.pipeLarge.get(Materials.Steel), 'C', OrePrefixes.circuit.get(Materials.LV), 'W', OrePrefixes.plate.get(Materials.Steel), 'G', OrePrefixes.pipeSmall.get(Materials.Bronze) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( chassisT3, - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_MV, 'P', OrePrefixes.pipeLarge.get(Materials.StainlessSteel), 'C', OrePrefixes.circuit.get(Materials.MV), 'W', OrePrefixes.plate.get(Materials.Aluminium), 'G', OrePrefixes.pipeSmall.get(Materials.Steel) }); - ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier7, 1); - ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier8, 1); - ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RECIPES_MachineComponents.pipeTier9, 1); + ItemStack pipeTier1 = ItemUtils.getItemStackOfAmountFromOreDict(RecipesMachineComponents.pipeTier7, 1); + ItemStack pipeTier2 = ItemUtils.getItemStackOfAmountFromOreDict(RecipesMachineComponents.pipeTier8, 1); + ItemStack pipeTier3 = ItemUtils.getItemStackOfAmountFromOreDict(RecipesMachineComponents.pipeTier9, 1); // Boiler Recipes - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_LV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_LV, 'P', pipeTier1, 'C', OrePrefixes.circuit.get(Materials.LV), 'W', chassisT1, 'G', OrePrefixes.gear.get(Materials.Steel) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_MV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_MV, 'P', pipeTier2, 'C', - OrePrefixes.circuit.get(Materials.MV), 'W', chassisT2, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); + OrePrefixes.circuit.get(Materials.MV), 'W', chassisT2, 'G', + MaterialsAlloy.SILICON_CARBIDE.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Boiler_Advanced_HV.get(1L), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED, + GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED, new Object[] { "dCw", "WMW", "GPG", 'M', ItemList.Hull_HV, 'P', pipeTier3, 'C', - OrePrefixes.circuit.get(Materials.HV), 'W', chassisT3, 'G', ALLOY.SILICON_CARBIDE.getGear(1) }); + OrePrefixes.circuit.get(Materials.HV), 'W', chassisT3, 'G', + MaterialsAlloy.SILICON_CARBIDE.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java index 4666357f4c..f543286fbe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAlgaeContent.java @@ -4,13 +4,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.AlgaeFarm_Controller; import static gregtech.api.enums.MetaTileEntityIDs.Bus_Catalysts; import static gregtech.api.enums.MetaTileEntityIDs.ChemicalPlant_Controller; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_Catalysts; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.GregtechMTE_AlgaePondBase; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.GregtechMTE_ChemicalPlant; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchCatalysts; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.algae.MTEAlgaePondBase; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.MTEChemicalPlant; public class GregtechAlgaeContent { @@ -23,35 +23,34 @@ public class GregtechAlgaeContent { // Algae Pond GregtechItemList.AlgaeFarm_Controller.set( - new GregtechMTE_AlgaePondBase(AlgaeFarm_Controller.ID, "algaefarm.controller.tier.single", "Algae Farm") + new MTEAlgaePondBase(AlgaeFarm_Controller.ID, "algaefarm.controller.tier.single", "Algae Farm") .getStackForm(1L)); // Chemical Plant GregtechItemList.ChemicalPlant_Controller.set( - new GregtechMTE_ChemicalPlant( + new MTEChemicalPlant( ChemicalPlant_Controller.ID, "chemicalplant.controller.tier.single", "ExxonMobil Chemical Plant").getStackForm(1L)); - GregtechItemList.Bus_Catalysts.set( - (new GT_MetaTileEntity_Hatch_Catalysts(Bus_Catalysts.ID, "hatch.catalysts", "Catalyst Housing")) - .getStackForm(1L)); + GregtechItemList.Bus_Catalysts + .set((new MTEHatchCatalysts(Bus_Catalysts.ID, "hatch.catalysts", "Catalyst Housing")).getStackForm(1L)); // Bronze - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(0, ModBlocks.blockCustomMachineCasings, 0, 10); + MTEChemicalPlant.registerMachineCasingForTier(0, ModBlocks.blockCustomMachineCasings, 0, 10); // Steel - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(1, GregTech_API.sBlockCasings2, 0, 16); + MTEChemicalPlant.registerMachineCasingForTier(1, GregTechAPI.sBlockCasings2, 0, 16); // Aluminium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(2, ModBlocks.blockCustomMachineCasings, 1, 17); + MTEChemicalPlant.registerMachineCasingForTier(2, ModBlocks.blockCustomMachineCasings, 1, 17); // Stainless - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(3, GregTech_API.sBlockCasings4, 1, 49); + MTEChemicalPlant.registerMachineCasingForTier(3, GregTechAPI.sBlockCasings4, 1, 49); // Titanium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(4, GregTech_API.sBlockCasings4, 2, 50); + MTEChemicalPlant.registerMachineCasingForTier(4, GregTechAPI.sBlockCasings4, 2, 50); // Tungsten - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(5, GregTech_API.sBlockCasings4, 0, 48); + MTEChemicalPlant.registerMachineCasingForTier(5, GregTechAPI.sBlockCasings4, 0, 48); // Laurenium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(6, ModBlocks.blockCustomMachineCasings, 2, 84); + MTEChemicalPlant.registerMachineCasingForTier(6, ModBlocks.blockCustomMachineCasings, 2, 84); // Botmium - GregtechMTE_ChemicalPlant.registerMachineCasingForTier(7, ModBlocks.blockCustomMachineCasings, 3, 11); + MTEChemicalPlant.registerMachineCasingForTier(7, ModBlocks.blockCustomMachineCasings, 3, 11); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java index 1800ee9440..f3201d9973 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAmazonWarehouse.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Amazon_Warehouse_Controller; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc.GMTE_AmazonPackager; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.misc.MTEAmazonPackager; public class GregtechAmazonWarehouse { @@ -16,7 +16,7 @@ public class GregtechAmazonWarehouse { private static void run1() { // Amazon packager multiblock GregtechItemList.Amazon_Warehouse_Controller.set( - new GMTE_AmazonPackager( + new MTEAmazonPackager( Amazon_Warehouse_Controller.ID, "amazonprime.controller.tier.single", "Amazon Warehousing Depot.").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 7ec4897482..9e2e29a7fc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -15,10 +15,10 @@ import static gtPlusPlus.core.recipe.common.CI.bitsd; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DynamoBuffer; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchDynamoBuffer; public class GregtechBufferDynamos { @@ -28,111 +28,111 @@ public class GregtechBufferDynamos { private static void run2() { GregtechItemList.Hatch_Buffer_Dynamo_ULV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_ULV.ID, "hatch.dynamo.buffer.tier.00", "ULV Dynamo Hatch [Buffered]", 0).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_LV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_LV.ID, "hatch.dynamo.buffer.tier.01", "LV Dynamo Hatch [Buffered]", 1).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_MV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_MV.ID, "hatch.dynamo.buffer.tier.02", "MV Dynamo Hatch [Buffered]", 2).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_HV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_HV.ID, "hatch.dynamo.buffer.tier.03", "HV Dynamo Hatch [Buffered]", 3).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_EV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_EV.ID, "hatch.dynamo.buffer.tier.04", "EV Dynamo Hatch [Buffered]", 4).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_IV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_IV.ID, "hatch.dynamo.buffer.tier.05", "IV Dynamo Hatch [Buffered]", 5).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_LuV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_LuV.ID, "hatch.dynamo.buffer.tier.06", "LuV Dynamo Hatch [Buffered]", 6).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_ZPM.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_ZPM.ID, "hatch.dynamo.buffer.tier.07", "ZPM Dynamo Hatch [Buffered]", 7).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_UV.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_UV.ID, "hatch.dynamo.buffer.tier.08", "UV Dynamo Hatch [Buffered]", 8).getStackForm(1L)); GregtechItemList.Hatch_Buffer_Dynamo_MAX.set( - new GT_MetaTileEntity_Hatch_DynamoBuffer( + new MTEHatchDynamoBuffer( Hatch_Buffer_Dynamo_MAX.ID, "hatch.dynamo.buffer.tier.09", "UHV Dynamo Hatch [Buffered]", 9).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_ULV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ULV, 'T', CI.getTieredCircuit(0), 'C', OrePrefixes.cableGt04.get((Object) Materials.Lead) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_LV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LV, 'T', CI.getTieredCircuit(1), 'C', OrePrefixes.cableGt04.get((Object) Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_MV, 'T', CI.getTieredCircuit(2), 'C', OrePrefixes.cableGt04.get((Object) Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_HV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_HV, 'T', CI.getTieredCircuit(3), 'C', OrePrefixes.cableGt04.get((Object) Materials.Gold) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_EV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_EV, 'T', CI.getTieredCircuit(4), 'C', OrePrefixes.cableGt04.get((Object) Materials.Aluminium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_IV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_IV, 'T', CI.getTieredCircuit(5), 'C', OrePrefixes.cableGt04.get((Object) Materials.Tungsten) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_LuV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_LuV, 'T', CI.getTieredCircuit(6), 'C', OrePrefixes.cableGt04.get((Object) Materials.VanadiumGallium) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_ZPM.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_ZPM, 'T', CI.getTieredCircuit(7), 'C', OrePrefixes.cableGt04.get((Object) Materials.Naquadah) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_UV.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UV, 'T', CI.getTieredCircuit(8), 'C', OrePrefixes.wireGt12.get((Object) Materials.NaquadahAlloy) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Buffer_Dynamo_MAX.get(1L), bitsd, new Object[] { "TMC", 'M', ItemList.Hatch_Dynamo_UHV, 'T', CI.getTieredCircuit(9), 'C', diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 9b12d4ca11..f08457f807 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -6,8 +6,8 @@ import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; import static gregtech.api.recipe.RecipeMaps.extruderRecipes; import static gregtech.api.recipe.RecipeMaps.unpackagerRecipes; 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.GTRecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -16,18 +16,18 @@ import java.util.ArrayList; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -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.OrePrefixes; -import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.metatileentity.implementations.MTEFluid; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; -import gtPlusPlus.core.material.ELEMENT; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.material.Material; +import gtPlusPlus.core.material.MaterialsAlloy; +import gtPlusPlus.core.material.MaterialsElements; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -35,8 +35,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntityFluid; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GregtechMetaPipeEntity_Cable; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GTPPMTECable; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GTPPMTEFluid; public class GregtechConduits { @@ -48,10 +48,10 @@ public class GregtechConduits { public static void run() { Logger.INFO("Gregtech5u Content | Registering Custom Cables/Wires/Pipes."); - if (CORE.ConfigSwitches.enableCustom_Cables) { + if (GTPPCore.ConfigSwitches.enableCustom_Cables) { run1(); } - if (CORE.ConfigSwitches.enableCustom_Pipes) { + if (GTPPCore.ConfigSwitches.enableCustom_Pipes) { run2(); run3(); } @@ -60,8 +60,8 @@ public class GregtechConduits { private static void run3() { try { - Class aPipeEntity = GT_MetaPipeEntity_Fluid.class; - Constructor constructor = aPipeEntity.getConstructor( + Class aPipeEntity = MTEFluid.class; + Constructor constructor = aPipeEntity.getConstructor( int.class, String.class, String.class, @@ -159,9 +159,9 @@ public class GregtechConduits { } } - private static void generateFluidMultiPipes(Constructor aClazz, Materials aMaterial, - String name, String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) { - GT_MetaPipeEntity_Fluid aPipe; + private static void generateFluidMultiPipes(Constructor aClazz, Materials aMaterial, String name, + String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) { + MTEFluid aPipe; final int transferRatePerTick = transferRatePerSec / 20; try { aPipe = aClazz.newInstance( @@ -178,7 +178,7 @@ public class GregtechConduits { Logger.INFO("Failed to Generate " + aMaterial + " Hexadecuple pipes."); } else { Logger.INFO("Generated " + aMaterial + " Hexadecuple pipes."); - GT_OreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L)); + GTOreDictUnificator.registerOre("pipeHexadecuple" + aMaterial, aPipe.getStackForm(1L)); } } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { @@ -192,24 +192,66 @@ public class GregtechConduits { wireFactory("RedstoneAlloy", 32, BaseWireID + 45, 0, 2, 1, new short[] { 178, 34, 34, 0 }); // need to go back id because fluid pipes already occupy - makeCustomWires(ELEMENT.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GT_Values.V[11], false, true); + makeCustomWires(MaterialsElements.STANDALONE.HYPOGEN, BaseWireID - 15, 0, 0, 8, GTValues.V[11], false, true); } private static void run2() { - generateNonGTFluidPipes(GT_Materials.Staballoy, ALLOY.STABALLOY, BasePipeID, 12500, 7500, true); - generateNonGTFluidPipes(GT_Materials.Tantalloy60, ALLOY.TANTALLOY_60, BasePipeID + 5, 10000, 4250, true); - generateNonGTFluidPipes(GT_Materials.Tantalloy61, ALLOY.TANTALLOY_61, BasePipeID + 10, 12000, 5800, true); + generateNonGTFluidPipes(GT_Materials.Staballoy, MaterialsAlloy.STABALLOY, BasePipeID, 12500, 7500, true); + generateNonGTFluidPipes( + GT_Materials.Tantalloy60, + MaterialsAlloy.TANTALLOY_60, + BasePipeID + 5, + 10000, + 4250, + true); + generateNonGTFluidPipes( + GT_Materials.Tantalloy61, + MaterialsAlloy.TANTALLOY_61, + BasePipeID + 10, + 12000, + 5800, + true); if (Thaumcraft.isModLoaded()) { generateNonGTFluidPipes(GT_Materials.Void, null, BasePipeID + 15, 1600, 25000, true); } generateGTFluidPipes(Materials.Europium, BasePipeID + 20, 12000, 7500, true); - generateNonGTFluidPipes(GT_Materials.Potin, ALLOY.POTIN, BasePipeID + 25, 500, 2000, true); - generateNonGTFluidPipes(GT_Materials.MaragingSteel300, ALLOY.MARAGING300, BasePipeID + 30, 14000, 2500, true); - generateNonGTFluidPipes(GT_Materials.MaragingSteel350, ALLOY.MARAGING350, BasePipeID + 35, 16000, 2500, true); - generateNonGTFluidPipes(GT_Materials.Inconel690, ALLOY.INCONEL_690, BasePipeID + 40, 15000, 4800, true); - generateNonGTFluidPipes(GT_Materials.Inconel792, ALLOY.INCONEL_792, BasePipeID + 45, 16000, 5500, true); - generateNonGTFluidPipes(GT_Materials.HastelloyX, ALLOY.HASTELLOY_X, BasePipeID + 50, 20000, 4200, true); + generateNonGTFluidPipes(GT_Materials.Potin, MaterialsAlloy.POTIN, BasePipeID + 25, 500, 2000, true); + generateNonGTFluidPipes( + GT_Materials.MaragingSteel300, + MaterialsAlloy.MARAGING300, + BasePipeID + 30, + 14000, + 2500, + true); + generateNonGTFluidPipes( + GT_Materials.MaragingSteel350, + MaterialsAlloy.MARAGING350, + BasePipeID + 35, + 16000, + 2500, + true); + generateNonGTFluidPipes( + GT_Materials.Inconel690, + MaterialsAlloy.INCONEL_690, + BasePipeID + 40, + 15000, + 4800, + true); + generateNonGTFluidPipes( + GT_Materials.Inconel792, + MaterialsAlloy.INCONEL_792, + BasePipeID + 45, + 16000, + 5500, + true); + generateNonGTFluidPipes( + GT_Materials.HastelloyX, + MaterialsAlloy.HASTELLOY_X, + BasePipeID + 50, + 20000, + 4200, + true); generateGTFluidPipes(Materials.Tungsten, BasePipeID + 55, 4320, 7200, true); if (EnderIO.isModLoaded()) { @@ -220,7 +262,7 @@ public class GregtechConduits { generateNonGTFluidPipes( GT_Materials.TriniumNaquadahCarbonite, - ALLOY.TRINIUM_NAQUADAH_CARBON, + MaterialsAlloy.TRINIUM_NAQUADAH_CARBON, 30500, 20, 250000, @@ -230,23 +272,23 @@ public class GregtechConduits { private static void wireFactory(final String Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps, final short[] rgb) { final Materials T = Materials.get(Material); - int V = GT_Utility.getTier(Voltage); + int V = GTUtility.getTier(Voltage); if (V == -1) { Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); Logger.ERROR(Material + " has defaulted to 8v."); V = 0; } - makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false, rgb); + makeWires(T, ID, insulatedLoss, uninsulatedLoss, Amps, GTValues.V[V], true, false, rgb); } private static void makeWires(final Materials aMaterial, final int aStartID, final long aLossInsulated, final long aLoss, final long aAmperage, final long aVoltage, final boolean aInsulatable, final boolean aAutoInsulated, final short[] aRGB) { Logger.WARNING("Gregtech5u Content | Registered " + aMaterial.mName + " as a new material for Wire & Cable."); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 0, "wire." + aMaterial.mName.toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Wire", @@ -258,10 +300,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 1, "wire." + aMaterial.mName.toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Wire", @@ -273,10 +315,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 2, "wire." + aMaterial.mName.toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Wire", @@ -288,10 +330,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 3, "wire." + aMaterial.mName.toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Wire", @@ -303,10 +345,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 4, "wire." + aMaterial.mName.toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Wire", @@ -318,10 +360,10 @@ public class GregtechConduits { false, !aAutoInsulated, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.wireGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 5, "wire." + aMaterial.mName.toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Wire", @@ -334,10 +376,10 @@ public class GregtechConduits { !aAutoInsulated, aRGB).getStackForm(1L)); if (aInsulatable) { - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 6, "cable." + aMaterial.mName.toLowerCase() + ".01", "1x " + aMaterial.mDefaultLocalName + " Cable", @@ -349,10 +391,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 7, "cable." + aMaterial.mName.toLowerCase() + ".02", "2x " + aMaterial.mDefaultLocalName + " Cable", @@ -364,10 +406,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 8, "cable." + aMaterial.mName.toLowerCase() + ".04", "4x " + aMaterial.mDefaultLocalName + " Cable", @@ -379,10 +421,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 9, "cable." + aMaterial.mName.toLowerCase() + ".08", "8x " + aMaterial.mDefaultLocalName + " Cable", @@ -394,10 +436,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 10, "cable." + aMaterial.mName.toLowerCase() + ".12", "12x " + aMaterial.mDefaultLocalName + " Cable", @@ -409,10 +451,10 @@ public class GregtechConduits { true, false, aRGB).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.cableGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 11, "cable." + aMaterial.mName.toLowerCase() + ".16", "16x " + aMaterial.mDefaultLocalName + " Cable", @@ -429,13 +471,13 @@ public class GregtechConduits { private static void customWireFactory(final Material Material, final int Voltage, final int ID, final long insulatedLoss, final long uninsulatedLoss, final long Amps) { - int V = GT_Utility.getTier(Voltage); + int V = GTUtility.getTier(Voltage); if (V == -1) { Logger.ERROR("Failed to set voltage on " + Material + ". Invalid voltage of " + Voltage + "V set."); Logger.ERROR(Material + " has defaulted to 8v."); V = 0; } - makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); + makeCustomWires(Material, ID, insulatedLoss, uninsulatedLoss, Amps, GTValues.V[V], true, false); } private static void makeCustomWires(final Material aMaterial, final int aStartID, final long aLossInsulated, @@ -446,7 +488,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 0, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".01", @@ -461,7 +503,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 1, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".02", @@ -476,7 +518,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 2, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".04", @@ -491,7 +533,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 3, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".08", @@ -506,7 +548,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 4, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".12", @@ -521,7 +563,7 @@ public class GregtechConduits { registerOre( OrePrefixes.wireGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 5, "wire." + aMaterial.getLocalizedName() .toLowerCase() + ".16", @@ -537,7 +579,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt01, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 6, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".01", @@ -552,7 +594,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt02, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 7, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".02", @@ -567,7 +609,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt04, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 8, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".04", @@ -582,7 +624,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt08, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 9, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".08", @@ -597,7 +639,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt12, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 10, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".12", @@ -612,7 +654,7 @@ public class GregtechConduits { registerOre( OrePrefixes.cableGt16, aMaterial, - new GregtechMetaPipeEntity_Cable( + new GTPPMTECable( aStartID + 11, "cable." + aMaterial.getLocalizedName() .toLowerCase() + ".16", @@ -632,9 +674,9 @@ public class GregtechConduits { final int transferRatePerTick = transferRatePerSec / 20; final long mass = material.getMass(); final long voltage = material.mMeltingPoint >= 2800 ? 64 : 16; - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID, "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", "Tiny " + material.mDefaultLocalName + " Fluid Pipe", @@ -643,9 +685,9 @@ public class GregtechConduits { transferRatePerTick * 2, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 1, "GT_Pipe_" + material.mDefaultLocalName + "_Small", "Small " + material.mDefaultLocalName + " Fluid Pipe", @@ -654,9 +696,9 @@ public class GregtechConduits { transferRatePerTick * 4, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 2, "GT_Pipe_" + material.mDefaultLocalName + "", "" + material.mDefaultLocalName + " Fluid Pipe", @@ -665,9 +707,9 @@ public class GregtechConduits { transferRatePerTick * 12, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 3, "GT_Pipe_" + material.mDefaultLocalName + "_Large", "Large " + material.mDefaultLocalName + " Fluid Pipe", @@ -676,9 +718,9 @@ public class GregtechConduits { transferRatePerTick * 24, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material), - new GT_MetaPipeEntity_Fluid( + new MTEFluid( startID + 4, "GT_Pipe_" + material.mDefaultLocalName + "_Huge", "Huge " + material.mDefaultLocalName + " Fluid Pipe", @@ -689,13 +731,13 @@ public class GregtechConduits { isGasProof).getStackForm(1L)); } - private static void generateNonGTFluidPipes(final GT_Materials material, final Material myMaterial, + private static void generateNonGTFluidPipes(final GT_Materials material, final Material GGMaterial, final int startID, final int transferRatePerSec, final int heatResistance, final boolean isGasProof) { final int transferRatePerTick = transferRatePerSec / 20; - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeTiny.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID, "GT_Pipe_" + material.mDefaultLocalName + "_Tiny", "Tiny " + material.mDefaultLocalName + " Fluid Pipe", @@ -704,9 +746,9 @@ public class GregtechConduits { transferRatePerTick * 2, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeSmall.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 1, "GT_Pipe_" + material.mDefaultLocalName + "_Small", "Small " + material.mDefaultLocalName + " Fluid Pipe", @@ -715,9 +757,9 @@ public class GregtechConduits { transferRatePerTick * 4, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeMedium.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 2, "GT_Pipe_" + material.mDefaultLocalName + "", "" + material.mDefaultLocalName + " Fluid Pipe", @@ -726,9 +768,9 @@ public class GregtechConduits { transferRatePerTick * 12, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeLarge.get(material), - new GregtechMetaPipeEn