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 - |
