diff options
| author | boubou19 <miisterunknown@gmail.com> | 2024-07-21 16:36:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-21 21:36:34 +0700 |
| commit | a8b46c11f5a02608101ef33ed39f103736ba5920 (patch) | |
| tree | 6daf492e524dcae9f2f5a8cb1d87c057c21a6760 /src/main/java/gtPlusPlus/xmod/gregtech/registration | |
| parent | 8b077c28bea7bcc046be1e4b8485d69b4c245a43 (diff) | |
| download | GT5-Unofficial-a8b46c11f5a02608101ef33ed39f103736ba5920.tar.gz GT5-Unofficial-a8b46c11f5a02608101ef33ed39f103736ba5920.tar.bz2 GT5-Unofficial-a8b46c11f5a02608101ef33ed39f103736ba5920.zip | |
full RA1 removal (#2713)
* remove addExtractionRecipes
* remove addPulverisationRecipe
* remove thermalcraft fake compat
* deprecate addAlloySmelterRecipe
* remove fake compat
* remove RA1 fusion recipe usage
* remove RA1 centrifuge recipe usage
* remove RA1 compressor recipe usage
* remove RA1 electrolyzer recipe usage
* remove RA1 chemical reactor recipe usage
* deprecate GT based recipes adders
* obliterate RA1 entries in interfaces (1/?)
* remove RA1 blast furnace recipe usage
* remove RA1 canner recipe usage
* remove RA1 alloy smelter recipe usage
* remove RA1 circuit assembler recipe usage
* obliterate RA1 entries in interfaces (2/?)
* remove RA1 bender recipe usage
* clean class
* remove RA1 cutter recipe usage
* remove RA1 fuels recipe usage
* remove RA1 implosion compressor recipe usage
* remove RA1 thermal centrifuge recipe usage
* clean GT_ModHandler
* obliterate RA1 entries in interfaces (3/?)
* remove RA1 packager recipe usage
* remove RA1 lathe recipe usage
* remove RA1 vacuum freezer recipe usage
* remove RA1 fluid heater recipe usage
* remove RA1 nano forge recipe usage
* remove RA1 autoclave recipe usage
* obliterate RA1 entries in interfaces (4/?)
* remove RA1 cracker recipe usage
* remove RA1 pyrolyse recipe usage
* remove RA1 pulveriser recipe usage
* remove RA1 fluid extractor recipe usage
* remove RA1 assembly line recipe usage
* remove RA1 alloy blast smelter recipe usage
* remove RA1 coke oven recipe usage
* obliterate RA1 entries in interfaces (5/?)
* remove RA1 dehydrator recipe usage
* remove deprecated usages
* obliterate RA1 entries in interfaces (6/?)
* remove RA1 assembler recipe usage
* obliterate RA1 entries in interfaces (7/?)
* remove RA1 mixer recipe usage
* remove RA1 forge hammer recipe usage
* remove RA1 wiremill recipe usage
* remove RA1 extruder recipe usage
* remove RA1 fluid soldifier recipe usage
* remove RA1 chemical bath recipe usage
* remove RA1 electromagnetic separator recipe usage
* remove RA1 sifter recipe usage
* remove distillery recipe usage
* remove distillation tower usage
* remove extractor usage
* obliterate RA1 entries in interfaces (8/?)
* remove QFT usage
* cleaning
* remove packager usage
* remove fluid heater usage
* remove vacuum freezer usage
* remove distillery usage
* fix QFT chances arrays
* remove fission fuel usage
* remove cyclotron usage
* remove molecular transformer usage
* remove chemplant usage
* remove coldtrap and reactor processing unit usage
* obliterate RA1 entries in interfaces (9/?)
* spotlessApply
* fixes
* remove addRecipe calls
* migrate forge of gods recipes
* yeet special value calls (1 / 2)
* yeet special value calls (2 / 2)
* migrate GG Fuel recipes
* migrate all GG maps except EHE
* CORE.RA is no more
* clear GT_RecipeAdder
* remove dead code
* clean RecipeMap a bit
* spotless apply
* fix output chances
* Update RecipeLoader.java
* fix
* remove buggy recipe
* migrate to enum for IDs
* sort enum
* move to enum
* fix recipes
* spotless apply
* fix recipe
* remove useless recipes
* spotless apply
* remove unused blocks
* fix GT++ recipe
* Update RecipeLoader.java
* Update RecipeLoader.java
* fix imports
* Spotless apply for branch remove_RA1_calls for #2713 (#2742)
spotlessApply
Co-authored-by: GitHub GTNH Actions <>
* fix recipe
(cherry picked from commit a25d3b62997f080e064369e940eaf53a96a300e6)
* fix
(cherry picked from commit d9af01140f3ee77de2be18be70f04f8fbe4b547f)
* temporarily remove panic mode
* fix recipes
* Revert "temporarily remove panic mode"
This reverts commit 483cfcf74371b91e7d545f058f9d25ff4fcec95a.
* fix recipes
---------
Co-authored-by: Dream Master <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration')
59 files changed, 1377 insertions, 739 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 d08b010e97..7e7ba6a85b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -1,5 +1,26 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_EV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_HV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_IV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_LV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_LuV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_MV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_UV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Crop_Harvester_ZPM; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_EV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_HV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_IV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_LV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_LuV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_MV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_UV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Electric_Auto_Workbench_ZPM; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Multi_Crafter; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Tesseract_Generator; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Tesseract_Terminal; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.GT4_Thermal_Boiler; + import gregtech.api.GregTech_API; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -26,62 +47,101 @@ 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(31091, 1, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_MV - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31092, 2, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_HV - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31093, 3, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_EV - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31094, 4, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_IV - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31095, 5, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_LuV - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31096, 6, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_ZPM - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31097, 7, "Automatic crafting machine").getStackForm(1L)); - GregtechItemList.GT4_Electric_Auto_Workbench_UV - .set(new GT_MetaTileEntity_ElectricAutoWorkbench(31098, 8, "Automatic crafting machine").getStackForm(1L)); + GregtechItemList.GT4_Electric_Auto_Workbench_LV.set( + new GT_MetaTileEntity_ElectricAutoWorkbench( + 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)); + GregtechItemList.GT4_Electric_Auto_Workbench_HV.set( + new GT_MetaTileEntity_ElectricAutoWorkbench( + 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)); + GregtechItemList.GT4_Electric_Auto_Workbench_IV.set( + new GT_MetaTileEntity_ElectricAutoWorkbench( + 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)); + GregtechItemList.GT4_Electric_Auto_Workbench_ZPM.set( + new GT_MetaTileEntity_ElectricAutoWorkbench( + 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)); } private static void basic() { Logger.INFO("Gregtech 4 Content | Registering Crop Managers."); GregtechItemList.GT4_Crop_Harvester_LV.set( - new GT_MetaTileEntity_CropHarvestor(31111, 1, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31112, 2, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31113, 3, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31114, 4, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31115, 5, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31116, 6, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31117, 7, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(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(31118, 8, "Harvests the Cropsticks in front of it").getStackForm(1L)); + new GT_MetaTileEntity_CropHarvestor(GT4_Crop_Harvester_UV.ID, 8, "Harvests the Cropsticks in front of it") + .getStackForm(1L)); } private static void tesseracts() { // Gregtech 4 Tesseracts Logger.INFO("Gregtech 4 Content | Registering Tesseracts."); GregtechItemList.GT4_Tesseract_Generator.set( - new GT_MetaTileEntity_TesseractGenerator(833, "tesseract.generator", "Tesseract Generator", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TesseractGenerator( + GT4_Tesseract_Generator.ID, + "tesseract.generator", + "Tesseract Generator", + 4).getStackForm(1L)); GregtechItemList.GT4_Tesseract_Terminal.set( - new GT_MetaTileEntity_TesseractTerminal(834, "tesseract.terminal", "Tesseract Terminal", 4) - .getStackForm(1L)); + new GT_MetaTileEntity_TesseractTerminal( + GT4_Tesseract_Terminal.ID, + "tesseract.terminal", + "Tesseract Terminal", + 4).getStackForm(1L)); } private static void thermalBoiler() { // Gregtech 4 Thermal Boiler if (CORE.ConfigSwitches.enableMultiblock_ThermalBoiler) { Logger.INFO("Gregtech 4 Content | Registering Thermal Boiler."); - GregtechItemList.GT4_Thermal_Boiler - .set(new GT4Entity_ThermalBoiler(875, "gtplusplus.thermal.boiler", "Thermal Boiler").getStackForm(1L)); + GregtechItemList.GT4_Thermal_Boiler.set( + new GT4Entity_ThermalBoiler(GT4_Thermal_Boiler.ID, "gtplusplus.thermal.boiler", "Thermal Boiler") + .getStackForm(1L)); } } @@ -89,7 +149,9 @@ public class Gregtech4Content { // Gregtech 4 Multiblock Auto-Crafter Logger.INFO("Gregtech 4 Content | Registering Multiblock Crafter."); GregtechItemList.GT4_Multi_Crafter.set( - new GT4Entity_AutoCrafter(876, "gtplusplus.autocrafter.multi", "Large Scale Auto-Assembler v1.01") - .getStackForm(1L)); + new GT4Entity_AutoCrafter( + 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 e77e2b1c54..6c532b4e76 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java @@ -1,5 +1,9 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Boiler_Advanced_HV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Boiler_Advanced_LV; +import static gtPlusPlus.xmod.gregtech.registration.gregtech.MetaTileEntityIDs.Boiler_Advanced_MV; + import net.minecraft.item.ItemStack; import gregtech.api.enums.ItemList; @@ -25,11 +29,11 @@ public class GregtechAdvancedBoilers { private static void run1() { // Boilers GregtechItemList.Boiler_Advanced_LV - .set(new GT_MetaTileEntity_Boiler_LV(753, "Advanced Boiler [LV]", 1).getStackForm(1L)); + .set(new GT_MetaTileEntity_Boiler_LV(Boiler_Advanced_LV.ID, "Advanced Boiler [LV]", 1).getStackForm(1L)); GregtechItemList.Boiler_Advanced_MV - .set(new GT_MetaTileEntity_Boiler_MV(754, "Advanced Boiler [MV]", 2).getStackForm(1L)); + .set(new GT_MetaTileEntity_Boiler_MV(Boiler_Advanced_MV.ID, "Advanced Boiler [MV]", 2).getStackForm(1L)); GregtechItemList.Boiler_Advanced_HV - .set(new GT_MetaTileEntity_Boiler_HV(755, "Advanced Boiler [HV]", 3).getStackForm(1L)); + .set(new GT_MetaTileEntity_Boiler_HV(Boiler_Advanced_HV.ID, "Advanced Boiler [HV]", 3).getStackForm(1L)); ItemStack chassisT1 = ItemUtils .getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1); @@ -46,21 +50,17 @@ public class GregtechAdvancedBoilers { GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('P'), - OrePrefixes.pipeLarge.get(Materials.Bronze), Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Primitive), Character.valueOf('W'), - OrePrefixes.plate.get(Materials.Lead), Character.valueOf('G'), - OrePrefixes.pipeSmall.get(Materials.Copper) }); + new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_ULV, 'P', + OrePrefixes.pipeLarge.get(Materials.Bronze), 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', + OrePrefixes.plate.get(Materials.Lead), 'G', OrePrefixes.pipeSmall.get(Materials.Copper) }); GT_ModHandler.addCraftingRecipe( chassisT2, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "WCW", "GMG", "WPW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('P'), - OrePrefixes.pipeLarge.get(Materials.Steel), Character.valueOf('C'), - OrePrefixes.circuit.get(Materials.Basic), Character.valueOf('W'), - OrePrefixes.plate.get(Materials.Steel), Character.valueOf('G'), + new Object[] { "WCW", "GMG", "WPW", 'M', ItemList.Hull_LV |
