diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/xmod/gregtech/registration | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
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
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration')
64 files changed, 873 insertions, 947 deletions
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<GT_MetaPipeEntity_Fluid> aPipeEntity = GT_MetaPipeEntity_Fluid.class; - Constructor<GT_MetaPipeEntity_Fluid> constructor = aPipeEntity.getConstructor( + Class<MTEFluid> aPipeEntity = MTEFluid.class; + Constructor<MTEFluid> constructor = aPipeEntity.getConstructor( int.class, String.class, String.class, @@ -159,9 +159,9 @@ public class GregtechConduits { } } - private static void generateFluidMultiPipes(Constructor<GT_MetaPipeEntity_Fluid> aClazz, Materials aMaterial, - String name, String displayName, int startID, int transferRatePerSec, int heatCapacity, boolean gasProof) { - GT_MetaPipeEntity_Fluid aPipe; + private static void generateFluidMultiPipes(Constructor<MTEFluid> 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 GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 3, "GT_Pipe_" + material.mDefaultLocalName + "_Large", "Large " + material.mDefaultLocalName + " Fluid Pipe", @@ -737,9 +779,9 @@ public class GregtechConduits { transferRatePerTick * 24, heatResistance, isGasProof).getStackForm(1L)); - GT_OreDictUnificator.registerOre( + GTOreDictUnificator.registerOre( OrePrefixes.pipeHuge.get(material), - new GregtechMetaPipeEntityFluid( + new GTPPMTEFluid( startID + 4, "GT_Pipe_" + material.mDefaultLocalName + "_Huge", "Huge " + material.mDefaultLocalName + " Fluid Pipe", @@ -836,7 +878,7 @@ public class GregtechConduits { if (pipeIngot != null && ItemUtils.checkForInvalidItems(pipeIngot)) { // 1 Clay Plate = 1 Clay Dust = 2 Clay Ball int inputMultiplier = materialName.equals("Clay") ? 2 : 1; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 1 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Tiny.get(0)) @@ -844,7 +886,7 @@ public class GregtechConduits { .duration(5 * TICKS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 1 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Small.get(0)) @@ -852,7 +894,7 @@ public class GregtechConduits { .duration(10 * TICKS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 3 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Medium.get(0)) @@ -860,7 +902,7 @@ public class GregtechConduits { .duration(20 * TICKS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 6 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Large.get(0)) @@ -868,7 +910,7 @@ public class GregtechConduits { .duration(2 * SECONDS) .eut(eut) .addTo(extruderRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( ItemUtils.getSimpleStack(pipeIngot, 12 * inputMultiplier), ItemList.Shape_Extruder_Pipe_Huge.get(0)) @@ -911,13 +953,13 @@ public class GregtechConduits { } public static boolean registerOre(Object aName, ItemStack aStack) { - if ((aName == null) || (GT_Utility.isStackInvalid(aStack))) return false; + if ((aName == null) || (GTUtility.isStackInvalid(aStack))) return false; String tName = aName.toString(); - if (GT_Utility.isStringInvalid(tName)) return false; - ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName); + if (GTUtility.isStringInvalid(tName)) return false; + ArrayList<ItemStack> tList = GTOreDictUnificator.getOres(tName); for (ItemStack itemStack : tList) - if (GT_Utility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; - OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack })); + if (GTUtility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; + OreDictionary.registerOre(tName, GTUtility.copyAmount(1L, new Object[] { aStack })); return true; } @@ -949,38 +991,38 @@ public class GregtechConduits { // Wire mill if (ItemUtils .checkForInvalidItems(new ItemStack[] { aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(aMaterial.getWire01(2)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(1), GTUtility.getIntegratedCircuit(2)) .itemOutputs(aMaterial.getWire02(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(2), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(2), GTUtility.getIntegratedCircuit(4)) .itemOutputs(aMaterial.getWire04(1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(4), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(4), GTUtility.getIntegratedCircuit(8)) .itemOutputs(aMaterial.getWire08(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(6), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(6), GTUtility.getIntegratedCircuit(12)) .itemOutputs(aMaterial.getWire12(1)) .duration(15 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(8), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(8), GTUtility.getIntegratedCircuit(16)) .itemOutputs(aMaterial.getWire16(1)) .duration(17 * SECONDS + 10 * TICKS) .eut(4) @@ -990,38 +1032,38 @@ public class GregtechConduits { if (ItemUtils .checkForInvalidItems(new ItemStack[] { aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(aMaterial.getWire01(1)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(aMaterial.getWire02(1)) .duration(5 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(aMaterial.getWire04(1)) .duration(7 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(8), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(8), GTUtility.getIntegratedCircuit(8)) .itemOutputs(aMaterial.getWire08(1)) .duration(10 * SECONDS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(12), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(12), GTUtility.getIntegratedCircuit(12)) .itemOutputs(aMaterial.getWire12(1)) .duration(12 * SECONDS + 10 * TICKS) .eut(4) .addTo(wiremillRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(16), GTUtility.getIntegratedCircuit(16)) .itemOutputs(aMaterial.getWire16(1)) .duration(15 * SECONDS) .eut(4) @@ -1030,8 +1072,8 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aFineWire })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getIngot(1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(aMaterial.getFineWire(8)) .duration(5 * SECONDS) .eut(4) @@ -1040,8 +1082,8 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aRod, aFineWire })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getRod(1), GTUtility.getIntegratedCircuit(3)) .itemOutputs(aMaterial.getFineWire(4)) .duration(2 * SECONDS + 10 * TICKS) .eut(4) @@ -1050,8 +1092,8 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aFineWire })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(1), GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(1), GTUtility.getIntegratedCircuit(1)) .itemOutputs(aMaterial.getFineWire(4)) .duration(10 * SECONDS) .eut(8) @@ -1061,7 +1103,7 @@ public class GregtechConduits { // Extruder if (ItemUtils.checkForInvalidItems(new ItemStack[] { aIngot, aWire01 })) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aIngot, ItemList.Shape_Extruder_Wire.get(0)) .itemOutputs(aMaterial.getWire01(2)) .duration(9 * SECONDS + 16 * TICKS) @@ -1070,7 +1112,7 @@ public class GregtechConduits { } if (ItemUtils.checkForInvalidItems(new ItemStack[] { aCable01, aWire01 })) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aCable01) .itemOutputs(aWire01) .duration(5 * SECONDS) @@ -1149,8 +1191,8 @@ public class GregtechConduits { // Wire to Cable // 1x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aCable01 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire01, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire01, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable01) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 144)) .duration(5 * SECONDS) @@ -1161,8 +1203,8 @@ public class GregtechConduits { // 2x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire02, aCable02 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire02, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire02, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable02) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 144)) .duration(5 * SECONDS) @@ -1173,8 +1215,8 @@ public class GregtechConduits { // 4x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire04, aCable04 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire04, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire04, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable04) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 288)) .duration(5 * SECONDS) @@ -1185,8 +1227,8 @@ public class GregtechConduits { // 8x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire08, aCable08 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire08, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire08, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable08) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 432)) .duration(5 * SECONDS) @@ -1197,8 +1239,8 @@ public class GregtechConduits { // 12x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire12, aCable12 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire12, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire12, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable12) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 576)) .duration(5 * SECONDS) @@ -1209,8 +1251,8 @@ public class GregtechConduits { // 16x if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire16, aCable16 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aWire16, GT_Utility.getIntegratedCircuit(24)) + GTValues.RA.stdBuilder() + .itemInputs(aWire16, GTUtility.getIntegratedCircuit(24)) .itemOutputs(aCable16) .fluidInputs(FluidUtils.getFluidStack("molten.rubber", 720)) .duration(5 * SECONDS) @@ -1221,32 +1263,32 @@ public class GregtechConduits { // Assemble small wires into bigger wires if (ItemUtils.checkForInvalidItems(new ItemStack[] { aWire01, aWire02 })) { - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(2), GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(2), GTUtility.getIntegratedCircuit(2)) .itemOutputs(aWire02) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(4), GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(4), GTUtility.getIntegratedCircuit(4)) .itemOutputs(aWire04) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(8), GT_Utility.getIntegratedCircuit(8)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(8), GTUtility.getIntegratedCircuit(8)) .itemOutputs(aWire08) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(12), GT_Utility.getIntegratedCircuit(12)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(12), GTUtility.getIntegratedCircuit(12)) .itemOutputs(aWire12) .duration(5 * SECONDS) .eut(8) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(aMaterial.getWire01(16), GT_Utility.getIntegratedCircuit(16)) + GTValues.RA.stdBuilder() + .itemInputs(aMaterial.getWire01(16), GTUtility.getIntegratedCircuit(16)) .itemOutputs(aWire16) .duration(5 * SECONDS) .eut(8) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 35b5c6719e..2781730229 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -22,17 +22,17 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ChiselBus; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake_Extreme; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Naquadah; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Reservoir; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Solidifier; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_TurbineProvider; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Input; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_SuperBus_Output; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GT_MetaTileEntity_Hatch_CustomFluidBase; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchAirIntakeExtreme; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchMufflerAdvanced; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchNaquadah; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchReservoir; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSuperBusInput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbineProvider; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTESuperBusOutput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase; public class GregtechCustomHatches { @@ -50,7 +50,7 @@ public class GregtechCustomHatches { private static void run1() { GregtechItemList.Hatch_Input_Cryotheum.set( - new GT_MetaTileEntity_Hatch_CustomFluidBase( + new MTEHatchCustomFluidBase( FluidUtils.getFluidStack("cryotheum", 1) .getFluid(), // Fluid to restrict hatch to 128000, // Capacity @@ -61,7 +61,7 @@ public class GregtechCustomHatches { ).getStackForm(1L)); GregtechItemList.Hatch_Input_Pyrotheum.set( - new GT_MetaTileEntity_Hatch_CustomFluidBase( + new MTEHatchCustomFluidBase( FluidUtils.getFluidStack("pyrotheum", 1) .getFluid(), // Fluid to restrict hatch to 128000, // Capacity @@ -72,14 +72,14 @@ public class GregtechCustomHatches { ).getStackForm(1L)); GregtechItemList.Hatch_Input_Naquadah.set( - new GT_MetaTileEntity_Hatch_Naquadah( + new MTEHatchNaquadah( Hatch_Input_Naquadah.ID, // ID "hatch.naquadah.input.tier.00", // unlocal name "Naquadah Reactor Input hatch" // Local name ).getStackForm(1L)); GregtechItemList.Hatch_Input_TurbineHousing.set( - new GT_MetaTileEntity_Hatch_TurbineProvider( + new MTEHatchTurbineProvider( Hatch_Input_TurbineHousing.ID, // ID "hatch.turbine.input.tier.00", // unlocal name "Turbine Housing", // Local name @@ -87,13 +87,10 @@ public class GregtechCustomHatches { // Multiblock Air Intake Hatch GregtechItemList.Hatch_Air_Intake.set( - new GT_MetaTileEntity_Hatch_AirIntake( - Hatch_Air_Intake.ID, - "hatch.air.intake.tier.00", - "Air Intake Hatch", - 5).getStackForm(1L)); + new METHatchAirIntake(Hatch_Air_Intake.ID, "hatch.air.intake.tier.00", "Air Intake Hatch", 5) + .getStackForm(1L)); GregtechItemList.Hatch_Air_Intake_Extreme.set( - new GT_MetaTileEntity_Hatch_AirIntake_Extreme( + new MTEHatchAirIntakeExtreme( Hatch_Air_Intake_Extreme.ID, "hatch.air.intake.tier.01", "Extreme Air Intake Hatch", @@ -101,15 +98,12 @@ public class GregtechCustomHatches { // Multiblock Reservoir Hatch GregtechItemList.Hatch_Reservoir.set( - new GT_MetaTileEntity_Hatch_Reservoir( - Hatch_Reservoir.ID, - "hatch.water.intake.tier.00", - "Reservoir Hatch", - 4).getStackForm(1L)); + new MTEHatchReservoir(Hatch_Reservoir.ID, "hatch.water.intake.tier.00", "Reservoir Hatch", 4) + .getStackForm(1L)); // Steam Hatch GregtechItemList.Hatch_Input_Steam.set( - new GT_MetaTileEntity_Hatch_CustomFluidBase( + new MTEHatchCustomFluidBase( FluidUtils.getSteam(1) .getFluid(), // Fluid to restrict hatch to 64000, // Capacity @@ -122,55 +116,52 @@ public class GregtechCustomHatches { private static void run2() { GregtechItemList.Hatch_Muffler_Adv_LV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( - 30001, - "hatch.muffler.adv.tier.01", - "Advanced Muffler Hatch (LV)", - 1)).getStackForm(1L)); + (new MTEHatchMufflerAdvanced(30001, "hatch.muffler.adv.tier.01", "Advanced Muffler Hatch (LV)", 1)) + .getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_MV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_MV.ID, "hatch.muffler.adv.tier.02", "Advanced Muffler Hatch (MV)", 2)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_HV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_HV.ID, "hatch.muffler.adv.tier.03", "Advanced Muffler Hatch (HV)", 3)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_EV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_EV.ID, "hatch.muffler.adv.tier.04", "Advanced Muffler Hatch (EV)", 4)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_IV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_IV.ID, "hatch.muffler.adv.tier.05", "Advanced Muffler Hatch (IV)", 5)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_LuV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_LuV.ID, "hatch.muffler.adv.tier.06", "Advanced Muffler Hatch (LuV)", 6)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_ZPM.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_ZPM.ID, "hatch.muffler.adv.tier.07", "Advanced Muffler Hatch (ZPM)", 7)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_UV.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_UV.ID, "hatch.muffler.adv.tier.08", "Advanced Muffler Hatch (UV)", 8)).getStackForm(1L)); GregtechItemList.Hatch_Muffler_Adv_MAX.set( - (new GT_MetaTileEntity_Hatch_Muffler_Adv( + (new MTEHatchMufflerAdvanced( Hatch_Muffler_Adv_MAX.ID, "hatch.muffler.adv.tier.09", "Advanced Muffler Hatch (UHV)", @@ -245,19 +236,16 @@ public class GregtechCustomHatches { .getStackForm(1L)); } - private static GT_MetaTileEntity_SuperBus_Input makeInputBus(int id, String unlocalizedName, String localizedName, - int tier) { - return new GT_MetaTileEntity_SuperBus_Input(id, unlocalizedName, localizedName, tier); + private static MTEHatchSuperBusInput makeInputBus(int id, String unlocalizedName, String localizedName, int tier) { + return new MTEHatchSuperBusInput(id, unlocalizedName, localizedName, tier); } - private static GT_MetaTileEntity_SuperBus_Output makeOutputBus(int id, String unlocalizedName, String localizedName, - int tier) { - return new GT_MetaTileEntity_SuperBus_Output(id, unlocalizedName, localizedName, tier); + private static MTESuperBusOutput makeOutputBus(int id, String unlocalizedName, String localizedName, int tier) { + return new MTESuperBusOutput(id, unlocalizedName, localizedName, tier); } - private static GT_MetaTileEntity_ChiselBus makeChiselBus(int id, String unlocalizedName, String localizedName, - int tier) { - return new GT_MetaTileEntity_ChiselBus(id, unlocalizedName, localizedName, tier); + private static MTEHatchChiselBus makeChiselBus(int id, String unlocalizedName, String localizedName, int tier) { + return new MTEHatchChiselBus(id, unlocalizedName, localizedName, tier); } private static void run4() { @@ -275,18 +263,14 @@ public class GregtechCustomHatches { private static void run6() { int aID = 31781; // 31781-31784 - GregtechItemList.GT_MetaTileEntity_Solidifier_I.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5) - .getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_II.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6) - .getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_III.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7) - .getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_Solidifier_IV.set( - new GT_MetaTileEntity_Hatch_Solidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8) - .getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_I + .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.05", "Solidifier Hatch I", 5).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_II + .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.06", "Solidifier Hatch II", 6).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_III + .set(new MTEHatchSolidifier(aID++, "hatch.solidifier.tier.07", "Solidifier Hatch III", 7).getStackForm(1L)); + GregtechItemList.GT_MetaTileEntity_Solidifier_IV + .set(new MTEHatchSolidifier(aID, "hatch.solidifier.tier.08", "Solidifier Hatch IV", 8).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java index 500bc1c57c..014257ff98 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.COMET_Cyclotron; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_Cyclotron; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTECyclotron; public class GregtechCyclotron { @@ -15,10 +15,7 @@ public class GregtechCyclotron { private static void run1() { GregtechItemList.COMET_Cyclotron.set( - new GregtechMetaTileEntity_Cyclotron( - COMET_Cyclotron.ID, - "cyclotron.tier.single", - "COMET - Compact Cyclotron", - 6).getStackForm(1L)); + new MTECyclotron(COMET_Cyclotron.ID, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java index 94c669c4e9..85d87cb706 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java @@ -7,35 +7,35 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_IV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_LuV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_MV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Dehydrator_ZPM; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.CIRCUIT; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.HULL; -import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.X.ROBOT_ARM; +import static gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.X.CIRCUIT; +import static gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.X.HULL; +import static gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.X.ROBOT_ARM; import static gregtech.api.recipe.RecipeMaps.assemblerRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import net.minecraft.item.ItemStack; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; import gregtech.api.enums.TierEU; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.SpecialEffects; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialDehydrator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialDehydrator; public class GregtechDehydrator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Chemical Dehydrators."); - if (CORE.ConfigSwitches.enableMachine_Dehydrators) { + if (GTPPCore.ConfigSwitches.enableMachine_Dehydrators) { run1(); } } @@ -47,34 +47,34 @@ public class GregtechDehydrator { ItemStack coilT4 = new ItemStack(ModItems.itemDehydratorCoil, 1, 3); // Make some coils by wrapping wire around a spool. - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 0), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Bronze, 1)) .itemOutputs(coilT1) .duration(8 * SECONDS) .eut(TierEU.RECIPE_MV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 1), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Steel, 1)) .itemOutputs(coilT2) .duration(8 * SECONDS) .eut(TierEU.RECIPE_HV / 2) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 2), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.StainlessSteel, 1)) .itemOutputs(coilT3) .duration(8 * SECONDS) .eut(TierEU.RECIPE_HV) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( new ItemStack(ModItems.itemDehydratorCoilWire, 4, 3), - GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1)) + GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Titanium, 1)) .itemOutputs(coilT4) .duration(8 * SECONDS) .eut(TierEU.RECIPE_EV / 2) @@ -82,12 +82,12 @@ public class GregtechDehydrator { // Basic GregtechItemList.GT_Dehydrator_MV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_MV.ID, "machine.dehydrator.tier.00", "Basic Dehydrator I", 2, - new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, + new String[] { "This dehydrates your Grapes into Raisins.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -102,12 +102,12 @@ public class GregtechDehydrator { .getStackForm(1L)); GregtechItemList.GT_Dehydrator_HV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_HV.ID, "machine.dehydrator.tier.01", "Basic Dehydrator II", 3, - new String[] { "This dehydrates your Grapes into Raisins.", CORE.GT_Tooltip.get() }, + new String[] { "This dehydrates your Grapes into Raisins.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -117,18 +117,18 @@ public class GregtechDehydrator { "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', OrePrefixes.wireFine.get(Materials.Electrum), 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Silver), 'G', ALLOY.POTIN.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Silver), 'G', MaterialsAlloy.POTIN.getGear(1) }) .setRecipeCatalystPriority(5) .getStackForm(1L)); // Chemical GregtechItemList.GT_Dehydrator_EV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_EV.ID, "advancedmachine.dehydrator.tier.01", "Chemical Dehydrator I", 4, - new String[] { "A hangover is the way your body reacts to dehydration.", CORE.GT_Tooltip.get() }, + new String[] { "A hangover is the way your body reacts to dehydration.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -137,17 +137,17 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT1, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TUMBAGA.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', MaterialsAlloy.TUMBAGA.getGear(1) }) .setRecipeCatalystPriority(4) .getStackForm(1L)); GregtechItemList.GT_Dehydrator_IV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_IV.ID, "advancedmachine.dehydrator.tier.02", "Chemical Dehydrator II", 5, - new String[] { "A hangover is the way your body reacts to dehydration.", CORE.GT_Tooltip.get() }, + new String[] { "A hangover is the way your body reacts to dehydration.", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -156,17 +156,17 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT2, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', ALLOY.INCONEL_690.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', MaterialsAlloy.INCONEL_690.getGear(1) }) .setRecipeCatalystPriority(3) .getStackForm(1L)); GregtechItemList.GT_Dehydrator_LuV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_LuV.ID, "advancedmachine.dehydrator.tier.03", "Chemical Dehydrator III", 6, - new String[] { "You could probably make space icecream with this..", CORE.GT_Tooltip.get() }, + new String[] { "You could probably make space icecream with this..", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -175,17 +175,17 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT3, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', ALLOY.HASTELLOY_N.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Naquadah), 'G', MaterialsAlloy.HASTELLOY_N.getGear(1) }) .setRecipeCatalystPriority(2) .getStackForm(1L)); GregtechItemList.GT_Dehydrator_ZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( GT_Dehydrator_ZPM.ID, "advancedmachine.dehydrator.tier.04", "Chemical Dehydrator IV", 7, - new String[] { "You can definitely make space icecream with this..", CORE.GT_Tooltip.get() }, + new String[] { "You can definitely make space icecream with this..", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.chemicalDehydratorRecipes, 2, 9, @@ -194,15 +194,13 @@ public class GregtechDehydrator { SpecialEffects.NONE, "DEHYDRATOR", new Object[] { "ECE", "WMW", "GPG", 'M', HULL, 'P', ROBOT_ARM, 'E', coilT4, 'C', CIRCUIT, 'W', - OrePrefixes.cableGt04.get(Materials.Osmium), 'G', ALLOY.ZERON_100.getGear(1) }) + OrePrefixes.cableGt04.get(Materials.Osmium), 'G', MaterialsAlloy.ZERON_100.getGear(1) }) .setRecipeCatalystPriority(1) .getStackForm(1L)); // Advanced GregtechItemList.Controller_Vacuum_Furnace.set( - new GregtechMetaTileEntity_IndustrialDehydrator( - Controller_Vacuum_Furnace.ID, - "multimachine.adv.vacuumfurnace", - "Utupu-Tanuri").getStackForm(1L)); + new MTEIndustrialDehydrator(Controller_Vacuum_Furnace.ID, "multimachine.adv.vacuumfurnace", "Utupu-Tanuri") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java index 4b43158f54..528efc5712 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechEnergyBuffer.java @@ -14,11 +14,11 @@ import static gregtech.api.enums.MetaTileEntityIDs.Energy_Buffer_1by1_ZPM; 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.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOreDictNames; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTEEnergyBuffer; public class GregtechEnergyBuffer { @@ -34,7 +34,7 @@ public class GregtechEnergyBuffer { // Energy Buffers GregtechItemList.Energy_Buffer_1by1_ULV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_ULV.ID, "energybuffer.tier.00", "Ultra Low Voltage Energy Buffer", @@ -42,15 +42,10 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_LV.set( - new GregtechMetaEnergyBuffer( - Energy_Buffer_1by1_LV.ID, - "energybuffer.tier.01", - "Low Voltage Energy Buffer", - 1, - "", - 1).getStackForm(1L)); + new MTEEnergyBuffer(Energy_Buffer_1by1_LV.ID, "energybuffer.tier.01", "Low Voltage Energy Buffer", 1, "", 1) + .getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_MV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_MV.ID, "energybuffer.tier.02", "Medium Voltage Energy Buffer", @@ -58,7 +53,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_HV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_HV.ID, "energybuffer.tier.03", "High Voltage Energy Buffer", @@ -66,7 +61,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_EV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_EV.ID, "energybuffer.tier.04", "Extreme Voltage Energy Buffer", @@ -74,7 +69,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_IV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_IV.ID, "energybuffer.tier.05", "Insane Voltage Energy Buffer", @@ -82,7 +77,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_LuV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_LuV.ID, "energybuffer.tier.06", "Ludicrous Voltage Energy Buffer", @@ -90,7 +85,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_ZPM.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_ZPM.ID, "energybuffer.tier.07", "ZPM Voltage Energy Buffer", @@ -98,7 +93,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_UV.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_UV.ID, "energybuffer.tier.08", "Ultimate Voltage Energy Buffer", @@ -106,7 +101,7 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); GregtechItemList.Energy_Buffer_1by1_MAX.set( - new GregtechMetaEnergyBuffer( + new MTEEnergyBuffer( Energy_Buffer_1by1_MAX.ID, "energybuffer.tier.09", "MAX Voltage Energy Buffer", @@ -114,80 +109,80 @@ public class GregtechEnergyBuffer { "", 1).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_ULV, 'W', OrePrefixes.wireGt08.get(Materials.Lead), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_LV, 'W', OrePrefixes.wireGt08.get(Materials.Tin), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_MV, 'W', OrePrefixes.wireGt08.get(Materials.AnyCopper), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_HV, 'W', OrePrefixes.wireGt08.get(Materials.Gold), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_EV, 'W', OrePrefixes.wireGt08.get(Materials.Aluminium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_IV, 'W', OrePrefixes.wireGt08.get(Materials.Tungsten), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_LuV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_ZPM, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_UV, 'W', OrePrefixes.wireGt08.get(Materials.Osmium), 'T', GregtechOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - 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[] { "WTW", "WMW", 'M', ItemList.Hull_MAX, 'W', OrePrefixes.wireGt08.get(Materials.SuperconductorUHV), 'T', GregtechOreDictNames.buffer_core }); /* - * GT_ModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), - * GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | - * GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", + * GTModHandler.addCraftingRecipe( GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), + * GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE | + * GTModHandler.RecipeBits.REVERSIBLE | GTModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", * Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), * OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), GregtechOreDictNames.buffer_core * }); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java index deaefb3e9d..0f284446fe 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechFactoryGradeReplacementMultis.java @@ -9,12 +9,12 @@ import static gregtech.api.enums.MetaTileEntityIDs.Machine_Adv_ImplosionCompress import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialVacuumFreezer; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_DistillationTower; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_EBF; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK4; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Fusion_MK5; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_Implosion; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialVacuumFreezer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvDistillationTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvEBF; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvFusionMk4; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvFusionMk5; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvImplosionCompressor; public class GregtechFactoryGradeReplacementMultis { @@ -25,32 +25,25 @@ public class GregtechFactoryGradeReplacementMultis { private static void run1() { Logger.INFO("Gregtech 5 Content | Registering Advanced GT Multiblock replacements."); GregtechItemList.Machine_Adv_BlastFurnace.set( - new GregtechMetaTileEntity_Adv_EBF(Machine_Adv_BlastFurnace.ID, "multimachine.adv.blastfurnace", "Volcanus") - .getStackForm(1L)); + new MTEAdvEBF(Machine_Adv_BlastFurnace.ID, "multimachine.adv.blastfurnace", "Volcanus").getStackForm(1L)); GregtechItemList.Machine_Adv_ImplosionCompressor.set( - new GregtechMetaTileEntity_Adv_Implosion( + new MTEAdvImplosionCompressor( Machine_Adv_ImplosionCompressor.ID, "multimachine.adv.implosioncompressor", "Density^2").getStackForm(1L)); GregtechItemList.Industrial_Cryogenic_Freezer.set( - new GregtechMetaTileEntity_IndustrialVacuumFreezer( + new MTEIndustrialVacuumFreezer( Industrial_Cryogenic_Freezer.ID, "multimachine.adv.industrialfreezer", "Cryogenic Freezer").getStackForm(1L)); GregtechItemList.FusionComputer_UV2.set( - new GregtechMetaTileEntity_Adv_Fusion_MK4( - FusionComputer_UV2.ID, - "fusioncomputer.tier.09", - "FusionTech MK IV").getStackForm(1L)); + new MTEAdvFusionMk4(FusionComputer_UV2.ID, "fusioncomputer.tier.09", "FusionTech MK IV").getStackForm(1L)); GregtechItemList.FusionComputer_UV3.set( - new GregtechMetaTileEntity_Adv_Fusion_MK5( - FusionComputer_UV3.ID, - "fusioncomputer.tier.10", - "FusionTech MK V").getStackForm(1L)); + new MTEAdvFusionMk5(FusionComputer_UV3.ID, "fusioncomputer.tier.10", "FusionTech MK V").getStackForm(1L)); // 31021 GregtechItemList.Machine_Adv_DistillationTower.set( - new GregtechMetaTileEntity_Adv_DistillationTower( + new MTEAdvDistillationTower( Machine_Adv_DistillationTower.ID, "multimachine.adv.distillationtower", "Dangote Distillus").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java index ed577a1551..0be94d63c9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeothermalThermalGenerator.java @@ -9,70 +9,70 @@ 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.lib.CORE; -import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityGeothermalGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTEGeothermalGenerator; public class GregtechGeothermalThermalGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Geothermal Engines."); - if (CORE.ConfigSwitches.enableMachine_GeothermalEngines) { + if (GTPPCore.ConfigSwitches.enableMachine_GeothermalEngines) { run1(); } } private static void run1() { GregtechItemList.Geothermal_Engine_EV.set( - new GregtechMetaTileEntityGeothermalGenerator( + new MTEGeothermalGenerator( Geothermal_Engine_EV.ID, "advancedgenerator.geothermalFuel.tier.01", "Basic Geothermal Engine", 4).getStackForm(1L)); GregtechItemList.Geothermal_Engine_IV.set( - new GregtechMetaTileEntityGeothermalGenerator( + new MTEGeothermalGenerator( Geothermal_Engine_IV.ID, "advancedgenerator.geothermalFuel.tier.02", "Turbo Geothermal Engine", 5).getStackForm(1L)); GregtechItemList.Geothermal_Engine_LuV.set( - new GregtechMetaTileEntityGeothermalGenerator( + new MTEGeothermalGenerator( Geothermal_Engine_LuV.ID, "advancedgenerator.geothermalFuel.tier.03", "Vulcan Geothermal Engine", 6).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_EV.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[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', - OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', ALLOY.TANTALLOY_61.getGear(1) }); + OrePrefixes.cableGt04.get(Materials.Aluminium), 'G', MaterialsAlloy.TANTALLOY_61.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_IV.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[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.UV), 'W', - OrePrefixes.cableGt04.get(Materials.Platinum), 'G', ALLOY.STELLITE.getGear(1) }); + OrePrefixes.cableGt04.get(Materials.Platinum), 'G', MaterialsAlloy.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Geothermal_Engine_LuV.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[] { "CEC", "GMG", "PWP", 'M', ItemList.Hull_LuV, 'P', INGREDIENT_1, 'E', INGREDIENT_2, 'C', OrePrefixes.circuit.get(Materials.UHV), 'W', OrePrefixes.cableGt04.get(Materials.Tungsten), 'G', - ALLOY.ZERON_100.getGear(1) }); + MaterialsAlloy.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java index 8c452cbca4..7d5d6b5169 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechHiAmpTransformer.java @@ -12,83 +12,83 @@ import static gregtech.api.enums.MetaTileEntityIDs.Transformer_HA_ZPM_LuV; import net.minecraft.item.ItemStack; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; 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.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTransformerHiAmp; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTETransformerHiAmp; public class GregtechHiAmpTransformer { public static void run() { - long bitsd = GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE - | GT_ModHandler.RecipeBits.REVERSIBLE - | GT_ModHandler.RecipeBits.BUFFERED; + long bitsd = GTModHandler.RecipeBits.DISMANTLEABLE | GTModHandler.RecipeBits.NOT_REMOVABLE + | GTModHandler.RecipeBits.REVERSIBLE + | GTModHandler.RecipeBits.BUFFERED; String mHammerName = "Mallet"; GregtechItemList.Transformer_HA_LV_ULV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_LV_ULV.ID, "transformer.ha.tier.00", "ULV Hi-Amp Transformer", 0, "LV -> ULV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_MV_LV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_MV_LV.ID, "transformer.ha.tier.01", "LV Hi-Amp Transformer", 1, "MV -> LV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_HV_MV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_HV_MV.ID, "transformer.ha.tier.02", "MV Hi-Amp Transformer", 2, "HV -> MV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_EV_HV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_EV_HV.ID, "transformer.ha.tier.03", "HV Hi-Amp Transformer", 3, "EV -> HV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_IV_EV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_IV_EV.ID, "transformer.ha.tier.04", "EV Hi-Amp Transformer", 4, "IV -> EV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_LuV_IV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_LuV_IV.ID, "transformer.ha.tier.05", "IV Hi-Amp Transformer", 5, "LuV -> IV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_ZPM_LuV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_ZPM_LuV.ID, "transformer.ha.tier.06", "LuV Hi-Amp Transformer", 6, "ZPM -> LuV (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_UV_ZPM.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_UV_ZPM.ID, "transformer.ha.tier.07", "ZPM Hi-Amp Transformer", 7, "UV -> ZPM (Use Soft " + mHammerName + " to invert)").getStackForm(1L)); GregtechItemList.Transformer_HA_MAX_UV.set( - new GregtechMetaTransformerHiAmp( + new MTETransformerHiAmp( Transformer_HA_MAX_UV.ID, "transformer.ha.tier.08", "UV Hi-Amp Transformer", @@ -99,67 +99,67 @@ public class GregtechHiAmpTransformer { ItemStack mItem_3; mItem_1 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(GregTech_API.sBlockCasings5) + ItemUtils.getSimpleStack(GregTechAPI.sBlockCasings5) .getItem(), 3, 1); mItem_2 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(GregTech_API.sBlockCasings5) + ItemUtils.getSimpleStack(GregTechAPI.sBlockCasings5) .getItem(), 4, 1); mItem_3 = ItemUtils.simpleMetaStack( - ItemUtils.getSimpleStack(GregTech_API.sBlockCasings5) + ItemUtils.getSimpleStack(GregTechAPI.sBlockCasings5) .getItem(), 9, 1); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_LV_ULV.get(1L), bitsd, new Object[] { " BB", "CM ", " BB", 'M', ItemList.Transformer_LV_ULV, 'C', OrePrefixes.wireGt04.get(Materials.Tin), 'B', OrePrefixes.wireGt04.get(Materials.Lead) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_MV_LV.get(1L), bitsd, new Object[] { " BB", "CM ", " BB", 'M', ItemList.Transformer_MV_LV, 'C', OrePrefixes.wireGt04.get(Materials.AnyCopper), 'B', OrePrefixes.wireGt04.get(Materials.Tin) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_HV_MV.get(1L), bitsd, new Object[] { " BB", "CM ", " BB", 'M', ItemList.Transformer_HV_MV, 'C', OrePrefixes.wireGt04.get(Materials.Gold), 'B', OrePrefixes.wireGt04.get(Materials.AnyCopper) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_EV_HV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_EV_HV, 'C', OrePrefixes.wireGt04.get(Materials.Aluminium), 'B', OrePrefixes.wireGt04.get(Materials.Gold), 'K', ItemList.Casing_Coil_Cupronickel }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_IV_EV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_IV_EV, 'C', OrePrefixes.wireGt04.get(Materials.Tungsten), 'B', OrePrefixes.wireGt04.get(Materials.Aluminium), 'K', ItemList.Casing_Coil_Kanthal }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_LuV_IV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_LuV_IV, 'C', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'B', OrePrefixes.wireGt04.get(Materials.Tungsten), 'K', ItemList.Casing_Coil_Nichrome }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_ZPM_LuV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_ZPM_LuV, 'C', OrePrefixes.wireGt04.get(Materials.Naquadah), 'B', OrePrefixes.wireGt04.get(Materials.VanadiumGallium), 'K', mItem_1 }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_UV_ZPM.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_UV_ZPM, 'C', OrePrefixes.wireGt04.get(Materials.NaquadahAlloy), 'B', OrePrefixes.wireGt04.get(Materials.Naquadah), 'K', mItem_2 }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Transformer_HA_MAX_UV.get(1L), bitsd, new Object[] { "KBB", "CM ", "KBB", 'M', ItemList.Transformer_MAX_UV, 'C', diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java index e40a2ad86b..dc2a5a552e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialAlloySmelter.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloySmelter; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialAlloySmelter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialAlloySmelter; public class GregtechIndustrialAlloySmelter { @@ -15,7 +15,7 @@ public class GregtechIndustrialAlloySmelter { private static void run1() { GregtechItemList.Industrial_AlloySmelter.set( - new GregtechMetaTileEntity_IndustrialAlloySmelter( + new MTEIndustrialAlloySmelter( Industrial_AlloySmelter.ID, "industrialalloysmelter.controller.tier.single", "Zyngen").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java index 85ea33917a..af2b911bdd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialArcFurnace.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Arc_Furnace; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialArcFurnace; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialArcFurnace; public class GregtechIndustrialArcFurnace { @@ -16,7 +16,7 @@ public class GregtechIndustrialArcFurnace { private static void run1() { // Industrial Arc Furnace Multiblock GregtechItemList.Industrial_Arc_Furnace.set( - new GregtechMetaTileEntity_IndustrialArcFurnace( + new MTEIndustrialArcFurnace( Industrial_Arc_Furnace.ID, "industrialarcfurnace.controller.tier.single", "High Current Industrial Arc Furnace").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java index 498b504eb1..956193bef2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialBlastSmelter.java @@ -4,16 +4,16 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_AlloyBlastSmelter; import static gregtech.api.enums.MetaTileEntityIDs.Mega_AlloyBlastSmelter; 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.machines.multi.production.GregtechMetaTileEntity_AlloyBlastSmelter; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.GregTechMetaTileEntity_MegaAlloyBlastSmelter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEAlloyBlastSmelter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.mega.MTEMegaAlloyBlastSmelter; public class GregtechIndustrialBlastSmelter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Alloy Blast Smelter Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { + if (GTPPCore.ConfigSwitches.enableMultiblock_AlloyBlastSmelter) { run1(); } } @@ -21,12 +21,12 @@ public class GregtechIndustrialBlastSmelter { private static void run1() { // Industrial Alloy Blast Smelter Multiblock GregtechItemList.Industrial_AlloyBlastSmelter.set( - new GregtechMetaTileEntity_AlloyBlastSmelter( + new MTEAlloyBlastSmelter( Industrial_AlloyBlastSmelter.ID, "industrialsalloyamelter.controller.tier.single", "Alloy Blast Smelter").getStackForm(1L)); GregtechItemList.Mega_AlloyBlastSmelter.set( - new GregTechMetaTileEntity_MegaAlloyBlastSmelter( + new MTEMegaAlloyBlastSmelter( Mega_AlloyBlastSmelter.ID, "industrialsalloyamelter.controller.tier.mega", "Mega Alloy Blast Smelter").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java index 4dab825902..4a0da61dbd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCentrifuge.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Centrifuge; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCentrifuge; public class GregtechIndustrialCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Centrifuge Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCentrifuge) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialCentrifuge { private static void run1() { // Industrial Centrifuge Multiblock GregtechItemList.Industrial_Centrifuge.set( - new GregtechMetaTileEntity_IndustrialCentrifuge( + new MTEIndustrialCentrifuge( Industrial_Centrifuge.ID, "industrialcentrifuge.controller.tier.single", "Industrial Centrifuge").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java index 23bd4565fc..2fd0517895 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialChisel.java @@ -6,24 +6,21 @@ import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_LV; import static gregtech.api.enums.MetaTileEntityIDs.GT_Chisel_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntity_AutoChisel; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialChisel; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEAutoChisel; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialChisel; public class GregtechIndustrialChisel { public static void run() { - GregtechItemList.GT_Chisel_LV.set( - new GregtechMetaTileEntity_AutoChisel(GT_Chisel_LV.ID, "chisel.tier.01", "Basic Auto-Chisel", 1) - .getStackForm(1L)); - GregtechItemList.GT_Chisel_MV.set( - new GregtechMetaTileEntity_AutoChisel(GT_Chisel_MV.ID, "chisel.tier.02", "Advanced Auto-Chisel", 2) - .getStackForm(1L)); - GregtechItemList.GT_Chisel_HV.set( - new GregtechMetaTileEntity_AutoChisel(GT_Chisel_HV.ID, "chisel.tier.03", "Precision Auto-Chisel", 3) - .getStackForm(1L)); + GregtechItemList.GT_Chisel_LV + .set(new MTEAutoChisel(GT_Chisel_LV.ID, "chisel.tier.01", "Basic Auto-Chisel", 1).getStackForm(1L)); + GregtechItemList.GT_Chisel_MV + .set(new MTEAutoChisel(GT_Chisel_MV.ID, "chisel.tier.02", "Advanced Auto-Chisel", 2).getStackForm(1L)); + GregtechItemList.GT_Chisel_HV + .set(new MTEAutoChisel(GT_Chisel_HV.ID, "chisel.tier.03", "Precision Auto-Chisel", 3).getStackForm(1L)); GregtechItemList.Controller_IndustrialAutoChisel.set( - new GregtechMetaTileEntity_IndustrialChisel( + new MTEIndustrialChisel( Controller_IndustrialAutoChisel.ID, "multimachine.adv.chisel", "Industrial 3D Copying Machine").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java index de8b253534..219b5ee196 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCokeOven.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CokeOven; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialCokeOven; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCokeOven; public class GregtechIndustrialCokeOven { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Coke Oven Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCokeOven) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialCokeOven { private static void run1() { // Industrial Centrifuge Multiblock GregtechItemList.Industrial_CokeOven.set( - new GregtechMetaTileEntity_IndustrialCokeOven( + new MTEIndustrialCokeOven( Industrial_CokeOven.ID, "industrialcokeoven.controller.tier.single", "Industrial Coke Oven").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java index 69a449c70b..c05614827d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialCuttingFactory.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_CuttingFactoryController; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialCuttingMachine; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialCuttingMachine; public class GregtechIndustrialCuttingFactory { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Cutting Factory Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialCuttingFactory { private static void run1() { // Industrial Wire Factory Multiblock GregtechItemList.Industrial_CuttingFactoryController.set( - new GregtechMetaTileEntity_IndustrialCuttingMachine( + new MTEIndustrialCuttingMachine( Industrial_CuttingFactoryController.ID, "industrialcuttingmachine.controller.tier.01", "Cutting Factory Controller").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java index 0493662f85..34f736e0f7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElectrolyzer.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Electrolyzer; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialElectrolyzer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEndustrialElectrolyzer; public class GregtechIndustrialElectrolyzer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Electrolyzer Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialElectrolyzer { private static void run1() { // Industrial Electrolyzer Multiblock GregtechItemList.Industrial_Electrolyzer.set( - new GregtechMetaTileEntity_IndustrialElectrolyzer( + new MTEndustrialElectrolyzer( Industrial_Electrolyzer.ID, "industrialelectrolyzer.controller.tier.single", "Industrial Electrolyzer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java index c3f86d8e2e..527e1549e6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialElementDuplicator.java @@ -5,8 +5,8 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Input_Elemental_Duplica import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_ElementalDataOrbHolder; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_ElementalDuplicator; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEElementalDuplicator; public class GregtechIndustrialElementDuplicator { @@ -15,12 +15,12 @@ public class GregtechIndustrialElementDuplicator { Logger.INFO("Gregtech5u Content | Registering Elemental Duplicator Multiblock."); GregtechItemList.Controller_ElementalDuplicator.set( - new GregtechMTE_ElementalDuplicator( + new MTEElementalDuplicator( Controller_ElementalDuplicator.ID, "gtpp.multimachine.replicator", "Elemental Duplicator").getStackForm(1L)); GregtechItemList.Hatch_Input_Elemental_Duplicator.set( - new GT_MetaTileEntity_Hatch_ElementalDataOrbHolder( + new MTEHatchElementalDataOrbHolder( Hatch_Input_Elemental_Duplicator.ID, "hatch.input_bus.elementalorbholder", "Data Orb Repository", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java index ad9d267b3b..1af1b8dec1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialExtruder.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Extruder; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialExtruder; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialExtruder; public class GregtechIndustrialExtruder { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Extrusion Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialExtruder { private static void run1() { // Industrial Presser Multiblock GregtechItemList.Industrial_Extruder.set( - new GregtechMetaTileEntity_IndustrialExtruder( + new MTEIndustrialExtruder( Industrial_Extruder.ID, "industrialextruder.controller.tier.single", "Industrial Extrusion Machine").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java index 0bba25461e..489ad334f5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFishPond.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FishingPond; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialFishingPond; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEIndustrialFishingPond; public class GregtechIndustrialFishPond { @@ -15,7 +15,7 @@ public class GregtechIndustrialFishPond { private static void run1() { GregtechItemList.Industrial_FishingPond.set( - new GregtechMetaTileEntity_IndustrialFishingPond( + new MTEIndustrialFishingPond( Industrial_FishingPond.ID, "industrial.fishpond.controller.tier.single", "Zhuhai - Fishing Port").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java index 23bb34e16e..11a3013882 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFluidHeater.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialFluidHea import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialFluidHeater; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialFluidHeater; public class GregtechIndustrialFluidHeater { @@ -15,7 +15,7 @@ public class GregtechIndustrialFluidHeater { private static void run1() { GregtechItemList.Controller_IndustrialFluidHeater.set( - new GregtechMetaTileEntity_IndustrialFluidHeater( + new MTEIndustrialFluidHeater( Controller_IndustrialFluidHeater.ID, "industrialfluidheater.controller.tier.single", "Thermic Heating Device").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java index f55e5e2a97..9b24118b85 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialForgeHammer.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialForgeHam import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialForgeHammer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialForgeHammer; public class GregtechIndustrialForgeHammer { @@ -15,7 +15,7 @@ public class GregtechIndustrialForgeHammer { private static void run1() { GregtechItemList.Controller_IndustrialForgeHammer.set( - new GregtechMetaTileEntity_IndustrialForgeHammer( + new MTEIndustrialForgeHammer( Controller_IndustrialForgeHammer.ID, "industrialhammer.controller.tier.single", "Industrial Sledgehammer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java index e7b3d700ad..96883ac3c2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialFuelRefinery.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_FuelRefinery; 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.machines.multi.production.GregtechMetaTileEntity_Refinery; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTERefinery; public class GregtechIndustrialFuelRefinery { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Fuel Processing and Refinery Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { + if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearFuelRefinery) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialFuelRefinery { private static void run1() { // Industrial Maceration Stack Multiblock GregtechItemList.Industrial_FuelRefinery.set( - new GregtechMetaTileEntity_Refinery( + new MTERefinery( Industrial_FuelRefinery.ID, "industrialrefinery.controller.tier.single", "Reactor Fuel Processing Plant").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java index f9cb57f504..6d9d17c987 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMacerator.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MacerationStack; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialMacerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMacerator; public class GregtechIndustrialMacerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Maceration Stack Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMacerationStack) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialMacerator { private static void run1() { // Industrial Maceration Stack Multiblock GregtechItemList.Industrial_MacerationStack.set( - new GregtechMetaTileEntity_IndustrialMacerator( + new MTEIndustrialMacerator( Industrial_MacerationStack.ID, "industrialmacerator.controller.tier.single", "Maceration Stack Controller").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java index 9bf1a3746f..9d680127dd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMassFabricator.java @@ -1,25 +1,25 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MassFab; -import static gregtech.api.util.GT_RecipeBuilder.MINUTES; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.MINUTES; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.multiblockMassFabricatorRecipes; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_MassFabricator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEMassFabricator; public class GregtechIndustrialMassFabricator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Matter Fabricator Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_MatterFabricator) { + if (GTPPCore.ConfigSwitches.enableMultiblock_MatterFabricator) { generateRecipes(); run1(); } @@ -28,7 +28,7 @@ public class GregtechIndustrialMassFabricator { private static void run1() { // Industrial Matter Fabricator Multiblock GregtechItemList.Industrial_MassFab.set( - new GregtechMetaTileEntity_MassFabricator( + new MTEMassFabricator( Industrial_MassFab.ID, "industrialmassfab.controller.tier.single", "Matter Fabrication CPU").getStackForm(1L)); @@ -39,9 +39,9 @@ public class GregtechIndustrialMassFabricator { // Generate Scrap->UUA Recipes // Basic UUA1 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(9), + GTUtility.getIntegratedCircuit(9), ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrap"), 9)) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) @@ -50,9 +50,9 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Basic UUA2 - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs( - GT_Utility.getIntegratedCircuit(19), + GTUtility.getIntegratedCircuit(19), ItemUtils.getSimpleStack(ItemUtils.getItemFromFQRN("IC2:itemScrapbox"))) .fluidOutputs(Materials.UUAmplifier.getFluid(1)) .duration(9 * SECONDS) @@ -61,8 +61,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Basic UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(1)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(1)) .fluidOutputs(Materials.UUMatter.getFluid(16)) .duration(2 * MINUTES + 40 * SECONDS) .eut(4096) @@ -70,8 +70,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Basic UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(2)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(2)) .fluidInputs(Materials.UUAmplifier.getFluid(16)) .fluidOutputs(Materials.UUMatter.getFluid(16)) .duration(40 * SECONDS) @@ -80,8 +80,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Advanced UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(3)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(3)) .fluidOutputs(Materials.UUMatter.getFluid(256)) .duration(2 * MINUTES + 40 * SECONDS) .eut(65536) @@ -89,8 +89,8 @@ public class GregtechIndustrialMassFabricator { .addTo(multiblockMassFabricatorRecipes); // Advanced UUM - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.getIntegratedCircuit(4)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.getIntegratedCircuit(4)) .fluidInputs(Materials.UUAmplifier.getFluid(256)) .fluidOutputs(Materials.UUMatter.getFluid(256)) .duration(40 * SECONDS) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java index 7da9e59425..9508061d6f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMixer.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Mixer; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialMixer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMixer; public class GregtechIndustrialMixer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Mixer Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialMixer { private static void run1() { // Industrial Mixer Multiblock GregtechItemList.Industrial_Mixer.set( - new GregtechMetaTileEntity_IndustrialMixer( + new MTEIndustrialMixer( Industrial_Mixer.ID, "industrialmixer.controller.tier.single", "Industrial Mixing Machine").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java index ae9dae1773..051569195a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialMultiMachine.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_MultiMachine; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialMultiMachine; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMultiMachine; public class GregtechIndustrialMultiMachine { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Multi-Machine Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) { run1(); } } private static void run1() { GregtechItemList.Industrial_MultiMachine.set( - new GregtechMetaTileEntity_IndustrialMultiMachine( + new MTEIndustrialMultiMachine( Industrial_MultiMachine.ID, "industrialmultimachine.controller.tier.single", "Large Processing Factory").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java index 96446b4380..de6bab91d0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialPlatePress.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_PlatePress; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialPlatePress; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialPlatePress; public class GregtechIndustrialPlatePress { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Press Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialPlatePress) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialPlatePress { private static void run1() { // Industrial Presser Multiblock GregtechItemList.Industrial_PlatePress.set( - new GregtechMetaTileEntity_IndustrialPlatePress( + new MTEIndustrialPlatePress( Industrial_PlatePress.ID, "industrialbender.controller.tier.single", "Industrial Material Press").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java index 5523103d18..1c59ad421f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialRockBreaker.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Controller_IndustrialRockBreaker; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_IndustrialRockBreaker; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEIndustrialRockBreaker; public class GregtechIndustrialRockBreaker { public static void run() { GregtechItemList.Controller_IndustrialRockBreaker.set( - new GregtechMetaTileEntity_IndustrialRockBreaker( + new MTEIndustrialRockBreaker( Controller_IndustrialRockBreaker.ID, "industrialrockcrusher.controller.tier.single", "Boldarnator").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java index 12ff0a281e..e82a9f2027 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialSifter.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Sifter; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialSifter; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialSifter; public class GregtechIndustrialSifter { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Sifter Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialSifter) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialSifter) { run1(); } } private static void run1() { GregtechItemList.Industrial_Sifter.set( - new GregtechMetaTileEntity_IndustrialSifter( + new MTEIndustrialSifter( Industrial_Sifter.ID, "industrialsifter.controller.tier.single", "Large Sifter Control Block").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java index 74b2d26e35..7ee3452d34 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialThermalCentrifuge.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_ThermalCentrifuge; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialThermalCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialThermalCentrifuge; public class GregtechIndustrialThermalCentrifuge { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Thermal Centrifuge Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge) { run1(); } } private static void run1() { GregtechItemList.Industrial_ThermalCentrifuge.set( - new GregtechMetaTileEntity_IndustrialThermalCentrifuge( + new MTEIndustrialThermalCentrifuge( Industrial_ThermalCentrifuge.ID, "industrialthermalcentrifuge.controller.tier.single", "Large Thermal Refinery").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java index 6327c424ce..5c43c70fc3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialTreeFarm.java @@ -3,14 +3,14 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_TreeFarm; 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.machines.multi.production.GregtechMetaTileEntityTreeFarm; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTETreeFarm; public class GregtechIndustrialTreeFarm { public static void run() { - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { Logger.INFO("Gregtech5u Content | Registering Tree Farm Multiblock."); run1(); } @@ -18,9 +18,7 @@ public class GregtechIndustrialTreeFarm { private static void run1() { GregtechItemList.Industrial_TreeFarm.set( - new GregtechMetaTileEntityTreeFarm( - Industrial_TreeFarm.ID, - "treefarm.controller.tier.single", - "Tree Growth Simulator").getStackForm(1L)); + new MTETreeFarm(Industrial_TreeFarm.ID, "treefarm.controller.tier.single", "Tree Growth Simulator") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java index 20804a9138..2ae9795b0d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWashPlant.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WashPlant; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialWashPlant; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWashPlant; public class GregtechIndustrialWashPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wash Plant Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWashPlant) { run1(); } } private static void run1() { GregtechItemList.Industrial_WashPlant.set( - new GregtechMetaTileEntity_IndustrialWashPlant( + new MTEIndustrialWashPlant( Industrial_WashPlant.ID, "industrialwashplant.controller.tier.single", "Ore Washing Plant").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java index 51bb20a6f6..39920a4553 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIndustrialWiremill.java @@ -3,15 +3,15 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_WireFactory; 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.machines.multi.processing.GregtechMetaTileEntity_IndustrialWireMill; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialWireMill; public class GregtechIndustrialWiremill { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Wire Factory Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill) { + if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialWireMill) { run1(); } } @@ -19,7 +19,7 @@ public class GregtechIndustrialWiremill { private static void run1() { // Industrial Wire Factory Multiblock GregtechItemList.Industrial_WireFactory.set( - new GregtechMetaTileEntity_IndustrialWireMill( + new MTEIndustrialWireMill( Industrial_WireFactory.ID, "industrialwiremill.controller.tier.single", "Wire Factory Controller").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java index 1fae804b7d..90a107de32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechIsaMill.java @@ -6,9 +6,9 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_IsaMill; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.GT_MetaTileEntity_Hatch_MillingBalls; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IsaMill; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_FrothFlotationCell; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers.MTEHatchMillingBalls; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIsaMill; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEFrothFlotationCell; public class GregtechIsaMill { @@ -17,19 +17,16 @@ public class GregtechIsaMill { Logger.INFO("Gregtech5u Content | Registering Milling Content."); GregtechItemList.Controller_IsaMill.set( - new GregtechMetaTileEntity_IsaMill( - Controller_IsaMill.ID, - "gtpp.multimachine.isamill", - "IsaMill Grinding Machine").getStackForm(1L)); + new MTEIsaMill(Controller_IsaMill.ID, "gtpp.multimachine.isamill", "IsaMill Grinding Machine") + .getStackForm(1L)); GregtechItemList.Controller_Flotation_Cell.set( - new GregtechMTE_FrothFlotationCell( + new MTEFrothFlotationCell( Controller_Flotation_Cell.ID, "gtpp.multimachine.flotationcell", "Flotation Cell Regulator").getStackForm(1L)); // Milling Ball Bus - GregtechItemList.Bus_Milling_Balls.set( - (new GT_MetaTileEntity_Hatch_MillingBalls(Bus_Milling_Balls.ID, "hatch.milling", "Ball Housing")) - .getStackForm(1L)); + GregtechItemList.Bus_Milling_Balls + .set((new MTEHatchMillingBalls(Bus_Milling_Balls.ID, "hatch.milling", "Ball Housing")).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java index f4d6eae1b8..71bc6937bc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLFTR.java @@ -8,20 +8,20 @@ import static gregtech.api.enums.MetaTileEntityIDs.ReactorProcessingUnit_ZPM; import static gregtech.api.enums.MetaTileEntityIDs.ThoriumReactor; import gregtech.api.enums.SoundResource; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.SpecialEffects; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_SpargeTower; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_NuclearReactor; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTESpargeTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTENuclearReactor; public class GregtechLFTR { public static void run() { Logger.INFO("Gregtech5u Content | Registering Liquid Fluorine Thorium Reactor [LFTR]."); - if (CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { + if (GTPPCore.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor) { run1(); } } @@ -29,16 +29,16 @@ public class GregtechLFTR { private static void run1() { // LFTR GregtechItemList.ThoriumReactor.set( - new GregtechMTE_NuclearReactor(ThoriumReactor.ID, "lftr.controller.single", "Thorium Reactor [LFTR]") + new MTENuclearReactor(ThoriumReactor.ID, "lftr.controller.single", "Thorium Reactor [LFTR]") .getStackForm(1L)); // Reactor Processing Units GregtechItemList.ReactorProcessingUnit_IV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ReactorProcessingUnit_IV.ID, "rpu.tier.01", "Reactor Processing Unit I", 5, - new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, + new String[] { "Processes Nuclear things", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.reactorProcessingUnitRecipes, 2, 9, @@ -48,12 +48,12 @@ public class GregtechLFTR { "REACTOR_PROCESSING_UNIT", null).getStackForm(1L)); GregtechItemList.ReactorProcessingUnit_ZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ReactorProcessingUnit_ZPM.ID, "rpu.tier.02", "Reactor Processing Unit II", 7, - new String[] { "Processes Nuclear things", CORE.GT_Tooltip.get() }, + new String[] { "Processes Nuclear things", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.reactorProcessingUnitRecipes, 2, 9, @@ -64,12 +64,12 @@ public class GregtechLFTR { null).getStackForm(1L)); // Cold Traps GregtechItemList.ColdTrap_IV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ColdTrap_IV.ID, "coldtrap.tier.01", "Cold Trap I", 5, - new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, + new String[] { "Just like the Arctic", "Does not require ice cubes", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.coldTrapRecipes, 2, 9, @@ -79,12 +79,12 @@ public class GregtechLFTR { "COLD_TRAP", null).getStackForm(1L)); GregtechItemList.ColdTrap_ZPM.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( ColdTrap_ZPM.ID, "coldtrap.tier.02", "Cold Trap II", 7, - new String[] { "Just like the Arctic", "Does not require ice cubes", CORE.GT_Tooltip.get() }, + new String[] { "Just like the Arctic", "Does not require ice cubes", GTPPCore.GT_Tooltip.get() }, GTPPRecipeMaps.coldTrapRecipes, 2, 9, @@ -95,9 +95,7 @@ public class GregtechLFTR { null).getStackForm(1L)); // Sparge Tower GregtechItemList.Controller_Sparge_Tower.set( - new GregtechMetaTileEntity_SpargeTower( - Controller_Sparge_Tower.ID, - "sparge.controller.single", - "Sparge Tower Controller").getStackForm(1L)); + new MTESpargeTower(Controller_Sparge_Tower.ID, "sparge.controller.single", "Sparge Tower Controller") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java index a367ac009c..580be58352 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechLargeTurbinesAndHeatExchanger.java @@ -10,13 +10,13 @@ import static gregtech.api.enums.MetaTileEntityIDs.XL_HeatExchanger; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Turbine; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.GregtechMetaTileEntity_Adv_HeatExchanger; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Gas; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Plasma; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SCSteam; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_SHSteam; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GT_MTE_LargeTurbine_Steam; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.advanced.MTEAdvHeatExchanger; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineGas; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbinePlasma; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineSCSteam; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineSHSteam; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.MTELargeTurbineSteam; public class GregtechLargeTurbinesAndHeatExchanger { @@ -27,35 +27,30 @@ public class GregtechLargeTurbinesAndHeatExchanger { private static void run1() { GregtechItemList.Large_Steam_Turbine.set( - new GT_MTE_LargeTurbine_Steam( - Large_Steam_Turbine.ID, - "multimachine.largerturbine", - "XL Turbo Steam Turbine").getStackForm(1L)); + new MTELargeTurbineSteam(Large_Steam_Turbine.ID, "multimachine.largerturbine", "XL Turbo Steam Turbine") + .getStackForm(1L)); GregtechItemList.Large_HPSteam_Turbine.set( - new GT_MTE_LargeTurbine_SHSteam( + new MTELargeTurbineSHSteam( Large_HPSteam_Turbine.ID, "multimachine.largerhpturbine", "XL Turbo HP Steam Turbine").getStackForm(1L)); GregtechItemList.Large_Gas_Turbine.set( - new GT_MTE_LargeTurbine_Gas(Large_Gas_Turbine.ID, "multimachine.largergasturbine", "XL Turbo Gas Turbine") + new MTELargeTurbineGas(Large_Gas_Turbine.ID, "multimachine.largergasturbine", "XL Turbo Gas Turbine") .getStackForm(1L)); GregtechItemList.Large_Plasma_Turbine.set( - new GT_MTE_LargeTurbine_Plasma( + new MTELargeTurbinePlasma( Large_Plasma_Turbine.ID, "multimachine.largerplasmaturbine", "XL Turbo Plasma Turbine").getStackForm(1L)); GregtechItemList.Large_SCSteam_Turbine.set( - new GT_MTE_LargeTurbine_SCSteam( + new MTELargeTurbineSCSteam( Large_SCSteam_Turbine.ID, "multimachine.largerscturbine", "XL Turbo SC Steam Turbine").getStackForm(1L)); - GregtechItemList.Hatch_Turbine_Rotor.set( - new GT_MetaTileEntity_Hatch_Turbine(Hatch_Turbine_Rotor.ID, "hatch.turbine", "Rotor Assembly", 8) - .getStackForm(1L)); + GregtechItemList.Hatch_Turbine_Rotor + .set(new MTEHatchTurbine(Hatch_Turbine_Rotor.ID, "hatch.turbine", "Rotor Assembly", 8).getStackForm(1L)); GregtechItemList.XL_HeatExchanger.set( - new GregtechMetaTileEntity_Adv_HeatExchanger( - XL_HeatExchanger.ID, - "multimachine.reallybigheatexchanger", - "Whakawhiti Wera XL").getStackForm(1L)); + new MTEAdvHeatExchanger(XL_HeatExchanger.ID, "multimachine.reallybigheatexchanger", "Whakawhiti Wera XL") + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java index f7014c4cbb..e09d056ceb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechMolecularTransformer.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Controller_MolecularTransform import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.GregtechMetaTileEntity_IndustrialMolecularTransformer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTEIndustrialMolecularTransformer; public class GregtechMolecularTransformer { @@ -15,7 +15,7 @@ public class GregtechMolecularTransformer { private static void run1() { GregtechItemList.Controller_MolecularTransformer.set( - new GregtechMetaTileEntity_IndustrialMolecularTransformer( + new MTEIndustrialMolecularTransformer( Controller_MolecularTransformer.ID, "moleculartransformer.controller.tier.single", "Molecular Transformer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java index c4aee9bd19..2121dde7a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechNuclearSaltProcessingPlant.java @@ -3,18 +3,18 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Nuclear_Salt_Processing_Plant; 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.machines.multi.processing.GregtechMetaTileEntity_NuclearSaltProcessingPlant; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.MTENuclearSaltProcessingPlant; public class GregtechNuclearSaltProcessingPlant { public static void run() { Logger.INFO("Gregtech5u Content | Registering Nuclear Salt Processing Plant Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant) { + if (GTPPCore.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant) { // Nuclear Salt Processing Plant Multiblock GregtechItemList.Nuclear_Salt_Processing_Plant.set( - new GregtechMetaTileEntity_NuclearSaltProcessingPlant( + new MTENuclearSaltProcessingPlant( Nuclear_Salt_Processing_Plant.ID, "nuclearsaltprocessingplant.controller.tier.single", "Nuclear Salt Processing Plant").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index 5f902c05d9..d554a6dc8e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -13,12 +13,12 @@ import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Creator; import static gregtech.api.enums.MetaTileEntityIDs.Pollution_Detector; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaAtmosphericReconditioner; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionDetector; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEAtmosphericReconditioner; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionCreator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionDetector; public class GregtechPollutionDevices { @@ -30,10 +30,10 @@ public class GregtechPollutionDevices { } private static void run1() { - if (CORE.ConfigSwitches.enableMachine_Pollution) { + if (GTPPCore.ConfigSwitches.enableMachine_Pollution) { // 759 GregtechItemList.Pollution_Detector.set( - new GregtechMetaPollutionDetector( + new MTEPollutionDetector( Pollution_Detector.ID, "pollutiondetector.01.tier.single", "Pollution Detection Device", @@ -41,7 +41,7 @@ public class GregtechPollutionDevices { "Tells you if you're living in Gwalior yet.", 0).getStackForm(1L)); GregtechItemList.Pollution_Creator.set( - new GregtechMetaPollutionCreator( + new MTEPollutionCreator( Pollution_Creator.ID, "pollutioncreator.01.tier.single", "Smog Device", @@ -50,55 +50,55 @@ public class GregtechPollutionDevices { 0).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_LV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_LV.ID, "pollutioncleaner.02.tier.single", "Upgraded Pollution Scrubber", 1).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_MV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_MV.ID, "pollutioncleaner.03.tier.single", "Advanced Pollution Scrubber", 2).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_HV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_HV.ID, "pollutioncleaner.04.tier.single", "Precision Pollution Scrubber", 3).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_EV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_EV.ID, "pollutioncleaner.05.tier.single", "Air Recycler", 4).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_IV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_IV.ID, "pollutioncleaner.06.tier.single", "Upgraded Air Recycler", 5).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_LuV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_LuV.ID, "pollutioncleaner.07.tier.single", "Advanced Air Recycler", 6).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_ZPM.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_ZPM.ID, "pollutioncleaner.08.tier.single", "Precision Air Recycler", 7).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_UV.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_UV.ID, "pollutioncleaner.09.tier.single", "Atmospheric Cleaner", 8).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_MAX.set( - new GregtechMetaAtmosphericReconditioner( + new MTEAtmosphericReconditioner( Pollution_Cleaner_MAX.ID, "pollutioncleaner.10.tier.single", "Biosphere Cleanser", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java index ed02264afe..76bde9c81d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPowerSubStation.java @@ -7,20 +7,20 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Output_Battery_MV; import static gregtech.api.enums.MetaTileEntityIDs.PowerSubStation; import gregtech.api.enums.ItemList; -import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GTModHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBattery; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchInputBattery; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchOutputBattery; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage.GregtechMetaTileEntity_PowerSubStationController; public class GregtechPowerSubStation { public static void run() { Logger.INFO("Gregtech5u Content | Registering Power Substation Node."); - if (CORE.ConfigSwitches.enableMultiblock_PowerSubstation) { + if (GTPPCore.ConfigSwitches.enableMultiblock_PowerSubstation) { run1(); } } @@ -34,44 +34,38 @@ public class GregtechPowerSubStation { "Power Station Control Node").getStackForm(1L)); int tID = 886; GregtechItemList.Hatch_Input_Battery_MV.set( - new GT_MetaTileEntity_Hatch_InputBattery( - Hatch_Input_Battery_MV.ID, - "hatch.input_battery.tier.00", - "Charging Bus (MV)", - 2).getStackForm(1L)); + new MTEHatchInputBattery(Hatch_Input_Battery_MV.ID, "hatch.input_battery.tier.00", "Charging Bus (MV)", 2) + .getStackForm(1L)); GregtechItemList.Hatch_Input_Battery_EV.set( - new GT_MetaTileEntity_Hatch_InputBattery( - Hatch_Input_Battery_EV.ID, - "hatch.input_battery.tier.01", - "Charging Bus (EV)", - 4).getStackForm(1L)); + new MTEHatchInputBattery(Hatch_Input_Battery_EV.ID, "hatch.input_battery.tier.01", "Charging Bus (EV)", 4) + .getStackForm(1L)); GregtechItemList.Hatch_Output_Battery_MV.set( - new GT_MetaTileEntity_Hatch_OutputBattery( + new MTEHatchOutputBattery( Hatch_Output_Battery_MV.ID, "hatch.output_battery.tier.00", "Discharging Bus (MV)", 2).getStackForm(1L)); GregtechItemList.Hatch_Output_Battery_EV.set( - new GT_MetaTileEntity_Hatch_OutputBattery( + new MTEHatchOutputBattery( Hatch_Output_Battery_EV.ID, "hatch.output_battery.tier.01", "Discharging Bus (EV)", 4).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Input_Battery_MV.get(1L), CI.bitsd, new Object[] { "C", "M", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Input_Battery_EV.get(1L), CI.bitsd, new Object[] { "C", "M", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Output_Battery_MV.get(1L), CI.bitsd, new Object[] { "M", "C", 'M', ItemList.Hull_MV, 'C', ItemList.Battery_Buffer_2by2_MV }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Hatch_Output_Battery_EV.get(1L), CI.bitsd, new Object[] { "M", "C", 'M', ItemList.Hull_EV, 'C', ItemList.Battery_Buffer_4by4_EV }); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java index f923afc733..77385f6790 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechQuantumForceTransformer.java @@ -3,17 +3,17 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.QuantumForceTransformer; 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.machines.multi.production.GregtechMetaTileEntity_QuantumForceTransformer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTEQuantumForceTransformer; public class GregtechQuantumForceTransformer { public static void run() { Logger.INFO("Gregtech5u Content | Registering Quantum Force Transformer Multiblock."); - if (CORE.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_QuantumForceTransformer) { GregtechItemList.QuantumForceTransformer.set( - new GregtechMetaTileEntity_QuantumForceTransformer( + new MTEQuantumForceTransformer( QuantumForceTransformer.ID, "quantumforcetransformer.controller.tier.single", "Quantum Force Transformer").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java index 60f7b4b0e0..dc11c31c55 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRTG.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.RTG; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntity_RTG; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTERTGenerator; public class GregtechRTG { @@ -15,10 +15,7 @@ public class GregtechRTG { private static void run1() { GregtechItemList.RTG.set( - new GregtechMetaTileEntity_RTG( - RTG.ID, - "basicgenerator.rtg.tier.01", - "Radioisotope Thermoelectric Generator", - 3).getStackForm(1L)); + new MTERTGenerator(RTG.ID, "basicgenerator.rtg.tier.01", "Radioisotope Thermoelectric Generator", 3) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java index c999a7cd08..e7b313d851 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneButtonPanel.java @@ -1,16 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; 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.redstone.GT_MetaTileEntity_RedstoneButtonPanel; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneButtonPanel; public class GregtechRedstoneButtonPanel { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Button Panel."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneButtonPanel.set(new GT_MetaTileEntity_RedstoneButtonPanel(31800).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneButtonPanel.set(new MTERedstoneButtonPanel(31800).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java index 106ee48fba..1d92f61c4a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneCircuitBlock.java @@ -1,17 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; 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.redstone.GT_MetaTileEntity_RedstoneCircuitBlock; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneCircuitBlock; public class GregtechRedstoneCircuitBlock { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Circuit Block."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneCircuitBlock - .set(new GT_MetaTileEntity_RedstoneCircuitBlock(31801).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneCircuitBlock.set(new MTERedstoneCircuitBlock(31801).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java index 81c2a0469d..e6fcbb4cb2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneLamp.java @@ -1,16 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; 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.redstone.GT_MetaTileEntity_RedstoneLamp; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneLamp; public class GregtechRedstoneLamp { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Lamp."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneLamp.set(new GT_MetaTileEntity_RedstoneLamp(31803).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneLamp.set(new MTERedstoneLamp(31803).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java index c8bee5c5c1..7c3cea0213 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthDisplay.java @@ -1,17 +1,17 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; 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.redstone.GT_MetaTileEntity_RedstoneStrengthDisplay; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthDisplay; public class GregtechRedstoneStrengthDisplay { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Display."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { GregtechItemList.RedstoneStrengthDisplay.set( - new GT_MetaTileEntity_RedstoneStrengthDisplay( + new MTERedstoneStrengthDisplay( 31804, "redstone.display", "Redstone Strength Display", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java index e08a489216..149b9647ed 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRedstoneStrengthScale.java @@ -1,17 +1,16 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; 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.redstone.GT_MetaTileEntity_RedstoneStrengthScale; +import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.MTERedstoneStrengthScale; public class GregtechRedstoneStrengthScale { public static void run() { Logger.INFO("Gregtech5u Content | Registering Redstone Strength Scale."); - if (CORE.ConfigSwitches.enableMachine_RedstoneBlocks) { - GregtechItemList.RedstoneStrengthScale - .set(new GT_MetaTileEntity_RedstoneStrengthScale(31805).getStackForm(1L)); + if (GTPPCore.ConfigSwitches.enableMachine_RedstoneBlocks) { + GregtechItemList.RedstoneStrengthScale.set(new MTERedstoneStrengthScale(31805).getStackForm(1L)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java index 2e18957716..06328a7e30 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechRocketFuelGenerator.java @@ -10,90 +10,90 @@ 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.lib.CORE; -import gtPlusPlus.core.material.ALLOY; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.core.material.MaterialsAlloy; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntityRocketFuelGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeRocketEngine; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTERocketFuelGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTELargeRocketEngine; public class GregtechRocketFuelGenerator { public static void run() { Logger.INFO("Gregtech5u Content | Registering Industrial Rocket Engines."); - if (CORE.ConfigSwitches.enableMachine_RocketEngines) { + if (GTPPCore.ConfigSwitches.enableMachine_RocketEngines) { run1(); } } private static void run1() { GregtechItemList.Controller_RocketEngine.set( - new GregtechMetaTileEntity_LargeRocketEngine( + new MTELargeRocketEngine( Controller_RocketEngine.ID, "gtpp.multimachine.rocketengine", "Rocketdyne F-1A Engine").getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Controller_RocketEngine.get(1L), CI.bitsd, new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Machine_Multi_DieselEngine.get(1), 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Field_Generator_EV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', OrePrefixes.cableGt08.get(Materials.Platinum), 'G', - ALLOY.MARAGING350.getGear(1) }); + MaterialsAlloy.MARAGING350.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Casing_RocketEngine.get(1L), CI.bitsd, new Object[] { "PhP", "RFR", "PWP", 'R', OrePrefixes.pipeMedium.get(Materials.TungstenSteel), 'F', - ItemList.Casing_RobustTungstenSteel, 'P', ALLOY.NITINOL_60.getGear(1), 'W', + ItemList.Casing_RobustTungstenSteel, 'P', MaterialsAlloy.NITINOL_60.getGear(1), 'W', OrePrefixes.stickLong.get(Materials.TungstenSteel) }); GregtechItemList.Rocket_Engine_EV.set( - new GregtechMetaTileEntityRocketFuelGenerator( + new MTERocketFuelGenerator( Rocket_Engine_EV.ID, "advancedgenerator.rocketFuel.tier.01", "Basic Rocket Engine", 4).getStackForm(1L)); GregtechItemList.Rocket_Engine_IV.set( - new GregtechMetaTileEntityRocketFuelGenerator( + new MTERocketFuelGenerator( Rocket_Engine_IV.ID, "advancedgenerator.rocketFuel.tier.02", "Advanced Rocket Engine", 5).getStackForm(1L)); GregtechItemList.Rocket_Engine_LuV.set( - new GregtechMetaTileEntityRocketFuelGenerator( + new MTERocketFuelGenerator( Rocket_Engine_LuV.ID, "advancedgenerator.rocketFuel.tier.03", "Turbo Rocket Engine", 6).getStackForm(1L)); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_EV.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[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_EV, 'P', ItemList.Electric_Piston_EV, 'E', ItemList.Electric_Motor_EV, 'C', OrePrefixes.circuit.get(Materials.IV), 'W', - OrePrefixes.cableGt02.get(Materials.Aluminium), 'G', ALLOY.TANTALLOY_61.getGear(1) }); + OrePrefixes.cableGt02.get(Materials.Aluminium), 'G', MaterialsAlloy.TANTALLOY_61.getGear(1) }); - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_IV.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[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_IV, 'P', ItemList.Electric_Piston_IV, 'E', ItemList.Electric_Motor_IV, 'C', OrePrefixes.circuit.get(Materials.LuV), 'W', - OrePrefixes.cableGt02.get(Materials.Platinum), 'G', ALLOY.STELLITE.getGear(1) }); + OrePrefixes.cableGt02.get(Materials.Platinum), 'G', MaterialsAlloy.STELLITE.getGear(1) }); final ItemStack INGREDIENT_1 = CI.electricPiston_LuV; final ItemStack INGREDIENT_2 = CI.electricMotor_LuV; - GT_ModHandler.addCraftingRecipe( + GTModHandler.addCraftingRecipe( GregtechItemList.Rocket_Engine_LuV.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[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_LuV, 'P', INGREDIENT_1, 'E', INGREDIENT_2, 'C', OrePrefixes.circuit.get(Materials.ZPM), 'W', OrePrefixes.cableGt02.get(Materials.Tungsten), 'G', - ALLOY.ZERON_100.getGear(1) }); + MaterialsAlloy.ZERON_100.getGear(1) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java index 6e41bc67f2..adc7517d78 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSemiFluidgenerators.java @@ -8,44 +8,44 @@ import static gregtech.api.enums.MetaTileEntityIDs.Generator_SemiFluid_LV; import static gregtech.api.enums.MetaTileEntityIDs.Generator_SemiFluid_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_SemiFluidGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_LargeSemifluidGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.generators.MTESemiFluidGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTELargeSemifluidGenerator; public class GregtechSemiFluidgenerators { public static void run() { GregtechItemList.Generator_SemiFluid_LV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_LV.ID, "basicgenerator.semifluid.tier.01", "Basic Semi-Fluid Generator", 1).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_MV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_MV.ID, "basicgenerator.semifluid.tier.02", "Advanced Semi-Fluid Generator", 2).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_HV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_HV.ID, "basicgenerator.semifluid.tier.03", "Turbo Semi-Fluid Generator", 3).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_EV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_EV.ID, "basicgenerator.semifluid.tier.04", "Turbo Semi-Fluid Generator II", 4).getStackForm(1L)); GregtechItemList.Generator_SemiFluid_IV.set( - new GT_MetaTileEntity_SemiFluidGenerator( + new MTESemiFluidGenerator( Generator_SemiFluid_IV.ID, "basicgenerator.semifluid.tier.05", "Turbo Semi-Fluid Generator III", 5).getStackForm(1L)); GregtechItemList.Controller_LargeSemifluidGenerator.set( - new GregtechMetaTileEntity_LargeSemifluidGenerator( + new MTELargeSemifluidGenerator( Controller_LargeSemifluidGenerator.ID, "gtpp.multimachine.semifluidgenerator", "Large Semifluid Burner").getStackForm(1L)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java index d0f9cdd6f4..4c6de56d94 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSimpleWasher.java @@ -9,32 +9,32 @@ import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_MV; import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_ULV; import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_UV; import static gregtech.api.enums.MetaTileEntityIDs.SimpleDustWasher_ZPM; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GTRecipeBuilder.TICKS; import static gtPlusPlus.api.recipe.GTPPRecipeMaps.simpleWasherRecipes; import java.util.List; import net.minecraft.item.ItemStack; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.google.common.collect.ImmutableList; -import gregtech.api.enums.GT_Values; +import bartworks.system.material.Werkstoff; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SoundResource; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine_GT_Recipe.SpecialEffects; -import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe; +import gregtech.api.metatileentity.implementations.MTEBasicMachineWithRecipe.SpecialEffects; +import gregtech.api.util.GTOreDictUnificator; import gtPlusPlus.api.objects.data.Quad; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class GregtechSimpleWasher { public static void run() { - if (CORE.ConfigSwitches.enableMachine_SimpleWasher) { + if (GTPPCore.ConfigSwitches.enableMachine_SimpleWasher) { generateDirtyDustRecipes(); generateDirtyCrushedRecipes(); // Register the Simple Washer Entity. @@ -85,13 +85,13 @@ public class GregtechSimpleWasher { "Simple Washer VIII")); GregtechItemList.SimpleDustWasher_ULV.set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( SimpleDustWasher_ULV.ID, "simplewasher.01.tier.01", "Deprecated ULV Simple Washer", 0, new String[] { "It's like an automatic Cauldron for washing dusts.", - "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", CORE.GT_Tooltip.get() }, + "§cDEPRECATED: No recipe.§r Make a Simple Washer I.", GTPPCore.GT_Tooltip.get() }, simpleWasherRecipes, 1, 1, @@ -107,13 +107,13 @@ public class GregtechSimpleWasher { int tier = i + 1; washer.getKey() .set( - new GT_MetaTileEntity_BasicMachine_GT_Recipe( + new MTEBasicMachineWithRecipe( washer.getValue_1(), washer.getValue_2(), washer.getValue_3(), tier, new String[] { "It's like an automatic Cauldron for washing dusts.", - CORE.GT_Tooltip.get() }, + GTPPCore.GT_Tooltip.get() }, simpleWasherRecipes, 1, 1, @@ -140,9 +140,9 @@ public class GregtechSimpleWasher { continue; } - dustClean = GT_OreDictUnificator.get(OrePrefixes.dust, v, 1L); - dustDirty = GT_OreDictUnificator.get(OrePrefixes.dustImpure, v, 1L); - dustPure = GT_OreDictUnificator.get(OrePrefixes.dustPure, v, 1L); + dustClean = GTOreDictUnificator.get(OrePrefixes.dust, v, 1L); + dustDirty = GTOreDictUnificator.get(OrePrefixes.dustImpure, v, 1L); + dustPure = GTOreDictUnificator.get(OrePrefixes.dustPure, v, 1L); addSimpleWashRecipe(dustDirty, dustClean); addSimpleWashRecipe(dustPure, dustClean); } @@ -166,8 +166,8 @@ public class GregtechSimpleWasher { ItemStack crushedClean; ItemStack crushedDirty; for (Materials v : Materials.values()) { - crushedClean = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, v, 1L); - crushedDirty = GT_OreDictUnificator.get(OrePrefixes.crushed, v, 1L); + crushedClean = GTOreDictUnificator.get(OrePrefixes.crushedPurified, v, 1L); + crushedDirty = GTOreDictUnificator.get(OrePrefixes.crushed, v, 1L); addSimpleWashRecipe(crushedDirty, crushedClean); } @@ -183,7 +183,7 @@ public class GregtechSimpleWasher { private static void addSimpleWashRecipe(ItemStack aInput, ItemStack aOutput) { if (aInput != null && aOutput != null) { - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(aInput) .itemOutputs(aOutput) .fluidInputs(FluidUtils.getFluidStack("water", 100)) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java index 232f3d60e5..d9672bf812 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSolarTower.java @@ -3,13 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Industrial_Solar_Tower; import static gregtech.api.enums.MetaTileEntityIDs.Solar_Tower_Reflector; -import gregtech.api.enums.GT_Values; +import gregtech.api.enums.GTValues; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.recipe.GTPPRecipeMaps; -import gtPlusPlus.core.material.MISC_MATERIALS; +import gtPlusPlus.core.material.MaterialMisc; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMetaTileEntity_SolarTower; -import gtPlusPlus.xmod.gregtech.common.tileentities.misc.TileEntitySolarHeater; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.MTESolarTower; +import gtPlusPlus.xmod.gregtech.common.tileentities.misc.MTESolarHeater; public class GregtechSolarTower { @@ -21,12 +21,10 @@ public class GregtechSolarTower { private static void run1() { // Solar Tower GregtechItemList.Industrial_Solar_Tower.set( - new GregtechMetaTileEntity_SolarTower( - Industrial_Solar_Tower.ID, - "solartower.controller.tier.single", - "Solar Tower").getStackForm(1L)); + new MTESolarTower(Industrial_Solar_Tower.ID, "solartower.controller.tier.single", "Solar Tower") + .getStackForm(1L)); GregtechItemList.Solar_Tower_Reflector.set( - new TileEntitySolarHeater( + new MTESolarHeater( Solar_Tower_Reflector.ID, "solarreflector.simple.single", "Solar Reflector", @@ -35,9 +33,9 @@ public class GregtechSolarTower { 0).getStackForm(1L)); // NEI recipe - GT_Values.RA.stdBuilder() - .fluidInputs(MISC_MATERIALS.SOLAR_SALT_COLD.getFluidStack(1000)) - .fluidOutputs(MISC_MATERIALS.SOLAR_SALT_HOT.getFluidStack(1000)) + GTValues.RA.stdBuilder() + .fluidInputs(MaterialMisc.SOLAR_SALT_COLD.getFluidStack(1000)) + .fluidOutputs(MaterialMisc.SOLAR_SALT_HOT.getFluidStack(1000)) .duration(0) .eut(0) .noOptimize() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java index f2ef67157a..3808b6683d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamMultis.java @@ -11,14 +11,14 @@ import static gregtech.api.enums.MetaTileEntityIDs.Hatch_Output_Bus_Steam; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusInput; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Steam_BusOutput; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamCentrifuge; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamCompressor; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamForgeHammer; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamMacerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamMixer; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamWasher; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSteamBusOutput; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MteHatchSteamBusInput; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamCentrifuge; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamCompressor; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamForgeHammer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamMacerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamMixer; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamWasher; public class GregtechSteamMultis { @@ -27,44 +27,37 @@ public class GregtechSteamMultis { Logger.INFO("Gregtech5u Content | Registering Steam Multiblocks."); GregtechItemList.Controller_SteamMaceratorMulti.set( - new GregtechMetaTileEntity_SteamMacerator( + new MTESteamMacerator( Controller_SteamMaceratorMulti.ID, "gtpp.multimachine.steam.macerator", "Steam Grinder").getStackForm(1L)); GregtechItemList.Controller_SteamCompressorMulti.set( - new GregtechMetaTileEntity_SteamCompressor( + new MTESteamCompressor( Controller_SteamCompressorMulti.ID, "gtpp.multimachine.steam.compressor", "Steam Squasher").getStackForm(1L)); GregtechItemList.Controller_SteamCentrifugeMulti.set( - new GregtechMetaTileEntity_SteamCentrifuge( + new MTESteamCentrifuge( Controller_SteamCentrifugeMulti.ID, "gtpp.multimachine.steam.centrifuge", "Steam Centrifuge").getStackForm(1)); GregtechItemList.Controller_SteamWasherMulti.set( - new GregtechMetaTileEntity_SteamWasher( - Controller_SteamWasherMulti.ID, - "gtpp.multimachine.steam.washer", - "Steam Washer").getStackForm(1)); + new MTESteamWasher(Controller_SteamWasherMulti.ID, "gtpp.multimachine.steam.washer", "Steam Washer") + .getStackForm(1)); GregtechItemList.Controller_SteamForgeHammerMulti.set( - new GregtechMetaTileEntity_SteamForgeHammer( + new MTESteamForgeHammer( Controller_SteamForgeHammer.ID, "gtpp.multimachine.steam.forge.hammer", "Steam Forge Hammer").getStackForm(1)); GregtechItemList.Controller_SteamMixerMulti.set( - new GregtechMetaTileEntity_SteamMixer( - Controller_SteamMixerMulti.ID, - "gtpp.multimachine.steam.mixer", - "Steam Mixer").getStackForm(1)); + new MTESteamMixer(Controller_SteamMixerMulti.ID, "gtpp.multimachine.steam.mixer", "Steam Mixer") + .getStackForm(1)); GregtechItemList.Hatch_Input_Bus_Steam.set( - new GT_MetaTileEntity_Hatch_Steam_BusInput( - Hatch_Input_Bus_Steam.ID, - "hatch.input_bus.tier.steam", - "Input Bus (Steam)", - 0).getStackForm(1L)); + new MteHatchSteamBusInput(Hatch_Input_Bus_Steam.ID, "hatch.input_bus.tier.steam", "Input Bus (Steam)", 0) + .getStackForm(1L)); GregtechItemList.Hatch_Output_Bus_Steam.set( - new GT_MetaTileEntity_Hatch_Steam_BusOutput( + new MTEHatchSteamBusOutput( Hatch_Output_Bus_Steam.ID, "hatch.output_bus.tier.steam", "Output Bus (Steam)", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java index b9c92c4241..531eff4c1a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java @@ -7,7 +7,7 @@ import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_LV; import static gregtech.api.enums.MetaTileEntityIDs.Super_Chest_MV; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredChest; public class GregtechSuperChests { @@ -15,35 +15,20 @@ public class GregtechSuperChests { String aSuffix = " [Disabled]"; GregtechItemList.Super_Chest_LV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_LV.ID, - "super.chest.gtpp.tier.01", - "Super Chest I" + aSuffix, - 1)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_LV.ID, "super.chest.gtpp.tier.01", "Super Chest I" + aSuffix, 1)) + .getStackForm(1L)); GregtechItemList.Super_Chest_MV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_MV.ID, - "super.chest.gtpp.tier.02", - "Super Chest II" + aSuffix, - 2)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_MV.ID, "super.chest.gtpp.tier.02", "Super Chest II" + aSuffix, 2)) + .getStackForm(1L)); GregtechItemList.Super_Chest_HV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_HV.ID, - "super.chest.gtpp.tier.03", - "Super Chest III" + aSuffix, - 3)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_HV.ID, "super.chest.gtpp.tier.03", "Super Chest III" + aSuffix, 3)) + .getStackForm(1L)); GregtechItemList.Super_Chest_EV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_EV.ID, - "super.chest.gtpp.tier.04", - "Super Chest IV" + aSuffix, - 4)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_EV.ID, "super.chest.gtpp.tier.04", "Super Chest IV" + aSuffix, 4)) + .getStackForm(1L)); GregtechItemList.Super_Chest_IV.set( - (new GT_MetaTileEntity_TieredChest( - Super_Chest_IV.ID, - "super.chest.gtpp.tier.05", - "Super Chest V" + aSuffix, - 5)).getStackForm(1L)); + (new MTETieredChest(Super_Chest_IV.ID, "super.chest.gtpp.tier.05", "Super Chest V" + aSuffix, 5)) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java index 4acd1ab060..b730da2dcc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThaumcraftDevices.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Mods.Thaumcraft; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaPollutionCreator; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEPollutionCreator; public class GregtechThaumcraftDevices { @@ -19,7 +19,7 @@ public class GregtechThaumcraftDevices { private static void run1() { // 956-960 GregtechItemList.Thaumcraft_Researcher.set( - new GregtechMetaPollutionCreator( + new MTEPollutionCreator( Thaumcraft_Researcher.ID, "thaumcraft.gtpp.machine.01", "Arcane Researcher", diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java index c1427a333f..4ef223c48e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechThreadedBuffers.java @@ -3,16 +3,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.Infinite_Item_Chest; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.GT_MetaTileEntity_InfiniteItemHolder; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.creative.MTEInfiniteItemHolder; public class GregtechThreadedBuffers { public static void run() { GregtechItemList.Infinite_Item_Chest.set( - (new GT_MetaTileEntity_InfiniteItemHolder( - Infinite_Item_Chest.ID, - "infinite.chest.tier.01", - "Infinite Item Chest", - 1)).getStackForm(1L)); + (new MTEInfiniteItemHolder(Infinite_Item_Chest.ID, "infinite.chest.tier.01", "Infinite Item Chest", 1)) + .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java index ea86481c46..77f169ef1c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredFluidTanks.java @@ -1,40 +1,34 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_HV; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_LV; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_MV; -import static gregtech.api.enums.MetaTileEntityIDs.GT_FluidTank_ULV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_HV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_LV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_MV; +import static gregtech.api.enums.MetaTileEntityIDs.GTFluidTank_ULV; 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.storage.GT_MetaTileEntity_TieredTank; +import gtPlusPlus.xmod.gregtech.common.tileentities.storage.MTETieredTank; public class GregtechTieredFluidTanks { public static void run() { Logger.INFO("Gregtech5u Content | Registering Portable Fluid Tanks."); - if (CORE.ConfigSwitches.enableMachine_FluidTanks) { + if (GTPPCore.ConfigSwitches.enableMachine_FluidTanks) { run1(); } } private static void run1() { Logger.INFO("Only loading ULV-IV tier tanks for New Horizons Modpack."); - GregtechItemList.GT_FluidTank_ULV.set( - new GT_MetaTileEntity_TieredTank( - GT_FluidTank_ULV.ID, - "fluidtank.tier.00", - "Ultra Low Voltage Fluid Tank", - 0).getStackForm(1L)); - GregtechItemList.GT_FluidTank_LV.set( - new GT_MetaTileEntity_TieredTank(GT_FluidTank_LV.ID, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1) - .getStackForm(1L)); - GregtechItemList.GT_FluidTank_MV.set( - new GT_MetaTileEntity_TieredTank(GT_FluidTank_MV.ID, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2) - .getStackForm(1L)); - GregtechItemList.GT_FluidTank_HV.set( - new GT_MetaTileEntity_TieredTank(GT_FluidTank_HV.ID, "fluidtank.tier.03", "High Voltage Fluid Tank", 3) + GregtechItemList.GTFluidTank_ULV.set( + new MTETieredTank(GTFluidTank_ULV.ID, "fluidtank.tier.00", "Ultra Low Voltage Fluid Tank", 0) .getStackForm(1L)); + GregtechItemList.GTFluidTank_LV.set( + new MTETieredTank(GTFluidTank_LV.ID, "fluidtank.tier.01", "Low Voltage Fluid Tank", 1).getStackForm(1L)); + GregtechItemList.GTFluidTank_MV.set( + new MTETieredTank(GTFluidTank_MV.ID, "fluidtank.tier.02", "Medium Voltage Fluid Tank", 2).getStackForm(1L)); + GregtechItemList.GTFluidTank_HV.set( + new MTETieredTank(GTFluidTank_HV.ID, "fluidtank.tier.03", "High Voltage Fluid Tank", 3).getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java index 7de699fc22..b848ef1e61 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTreeFarmerTE.java @@ -3,22 +3,22 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import static gregtech.api.enums.MetaTileEntityIDs.TreeFarmer_Structural; 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.api.metatileentity.implementations.GregtechMetaTreeFarmerStructural; +import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTETreeFarmerStructural; public class GregtechTreeFarmerTE { public static void run() { Logger.INFO("Gregtech5u Content | Registering Tree Farmer Structural Block."); - if (CORE.ConfigSwitches.enableMultiblock_TreeFarmer) { + if (GTPPCore.ConfigSwitches.enableMultiblock_TreeFarmer) { run1(); } } private static void run1() { GregtechItemList.TreeFarmer_Structural.set( - new GregtechMetaTreeFarmerStructural(TreeFarmer_Structural.ID, "treefarmer.structural", "Farm Keeper", 0) + new MTETreeFarmerStructural(TreeFarmer_Structural.ID, "treefarmer.structural", "Farm Keeper", 0) .getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java index 476e13bd15..9854921dd4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWaterPump.java @@ -1,14 +1,13 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.GregtechMetaTileEntity_SteamWaterPump; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.steam.MTESteamWaterPump; public class GregtechWaterPump { public static void run() { // Water Pump Multiblock - GregtechItemList.WaterPump.set( - new GregtechMetaTileEntity_SteamWaterPump(31085, "waterpump.controller.tier.single", "Water Pump") - .getStackForm(1L)); + GregtechItemList.WaterPump + .set(new MTESteamWaterPump(31085, "waterpump.controller.tier.single", "Water Pump").getStackForm(1L)); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index 3d615f97a0..c66d2b574a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java @@ -14,7 +14,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaWirelessCharger; +import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.MTEWirelessCharger; public class GregtechWirelessChargers { @@ -25,7 +25,7 @@ public class GregtechWirelessChargers { Utils.registerEvent(new ChargingHelper()); GregtechItemList.Charger_LV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_LV.ID, "wificharger.01.tier.single", "Wireless Charger MK I", @@ -33,7 +33,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_MV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_MV.ID, "wificharger.02.tier.single", "Wireless Charger MK II", @@ -41,7 +41,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_HV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_HV.ID, "wificharger.03.tier.single", "Wireless Charger MK III", @@ -49,7 +49,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_EV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_EV.ID, "wificharger.04.tier.single", "Wireless Charger MK IV", @@ -57,7 +57,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_IV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_IV.ID, "wificharger.05.tier.single", "Wireless Charger MK V", @@ -65,7 +65,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_LuV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_LuV.ID, "wificharger.06.tier.single", "Wireless Charger MK VI", @@ -73,7 +73,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_ZPM.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_ZPM.ID, "wificharger.07.tier.single", "Wireless Charger MK VII", @@ -81,7 +81,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_UV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_UV.ID, "wificharger.08.tier.single", "Wireless Charger MK VIII", @@ -89,7 +89,7 @@ public class GregtechWirelessChargers { "Hopefully won't give you cancer.", 0).getStackForm(1L)); GregtechItemList.Charger_UHV.set( - new GregtechMetaWirelessCharger( + new MTEWirelessCharger( Charger_UHV.ID, "wificharger.09.tier.single", "Wireless Charger MK IX", |