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>

6 files changed, 47 insertions, 21 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index 8eba4c5526..3cd82939d4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -1,7 +1,9 @@
 package gtPlusPlus.xmod.gregtech.common.items;
 
+import static gregtech.api.util.GT_RecipeConstants.RTG_DURATION_IN_DAYS;
 import static gregtech.client.GT_TooltipHandler.Tier.EV;
 import static gregtech.client.GT_TooltipHandler.registerTieredTooltip;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.rtgFuels;
 import static gtPlusPlus.core.util.Utils.getTcAspectStack;
 import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_1;
 import static gtPlusPlus.xmod.gregtech.common.items.Ids_MetaGeneratedGregtechItems.Battery_Casing_Gem_2;
@@ -45,10 +47,10 @@ import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TC_Aspects;
 import gregtech.api.enums.Textures;
+import gregtech.api.enums.TierEU;
 import gregtech.api.objects.GT_MultiTexture;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.data.StringUtils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -329,11 +331,40 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 {
     }
 
     private void registerFuelRTGRecipes() {
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64);
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32);
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PO210.get(1), 1, 512);
-        CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), 216, 16);
-        CORE.RA.addFuelForRTG(GT_ModHandler.getIC2Item("RTGPellets", 1), MathUtils.roundToClosestInt(2.6f), 8);
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GregtechItemList.Pellet_RTG_PU238.get(1))
+            .duration(0)
+            .eut(64)
+            .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(87.7f))
+            .addTo(rtgFuels);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GregtechItemList.Pellet_RTG_SR90.get(1))
+            .duration(0)
+            .eut(32)
+            .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(28.8f))
+            .addTo(rtgFuels);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GregtechItemList.Pellet_RTG_PO210.get(1))
+            .duration(0)
+            .eut(TierEU.HV)
+            .metadata(RTG_DURATION_IN_DAYS, 1)
+            .addTo(rtgFuels);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GregtechItemList.Pellet_RTG_AM241.get(1))
+            .duration(0)
+            .eut(16)
+            .metadata(RTG_DURATION_IN_DAYS, 216)
+            .addTo(rtgFuels);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("RTGPellets", 1))
+            .duration(0)
+            .eut(8)
+            .metadata(RTG_DURATION_IN_DAYS, MathUtils.roundToClosestInt(2.6f))
+            .addTo(rtgFuels);
     }
 
     private void registerCovers() {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index dbafbc7866..6b56de1832 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -61,8 +61,6 @@ import gregtech.common.tileentities.machines.IDualInputHatch;
 import gregtech.common.tileentities.machines.IDualInputInventory;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Solidifier;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
@@ -244,7 +242,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
 
     private ItemStack getCircuit(ItemStack[] t) {
         for (ItemStack j : t) {
-            if (j.getItem() == CI.getNumberedCircuit(0)
+            if (j.getItem() == GT_Utility.getIntegratedCircuit(0)
                 .getItem()) {
                 if (j.getItemDamage() >= 20 && j.getItemDamage() <= 22) {
                     return j;
@@ -417,7 +415,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends
                     if (mold != null && fluid != null) {
                         List<ItemStack> inputItems = new ArrayList<>();
                         inputItems.add(mold);
-                        inputItems.add(ItemUtils.getGregtechCircuit(22));
+                        inputItems.add(GT_Utility.getIntegratedCircuit(22));
 
                         processingLogic.setInputItems(inputItems.toArray(new ItemStack[0]));
                         processingLogic.setInputFluids(fluid);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
index 580efdcdab..c2ed2cbd31 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java
@@ -37,7 +37,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
@@ -171,7 +170,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter
             .isServerSide()) {
             // Get Controller Circuit
             if (circuit == null) {
-                circuit = CI.getNumberedCircuit(0)
+                circuit = GT_Utility.getIntegratedCircuit(0)
                     .getItem();
             }
             if (aStack != null && aStack.getItem() == circuit) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
index 78e4a17274..0133c8b301 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java
@@ -49,7 +49,6 @@ import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -62,7 +61,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
     GregtechMeta_MultiBlockBase<GregtechMetaTileEntity_IndustrialFishingPond> implements ISurvivalConstructable {
 
     private boolean isUsingControllerCircuit = false;
-    private static final Item circuit = CI.getNumberedCircuit(0)
+    private static final Item circuit = GT_Utility.getIntegratedCircuit(0)
         .getItem();
     private int mCasing;
     private static IStructureDefinition<GregtechMetaTileEntity_IndustrialFishingPond> STRUCTURE_DEFINITION = null;
@@ -394,7 +393,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends
     private int getCircuit(ItemStack[] t) {
         if (!this.isUsingControllerCircuit) {
             for (ItemStack j : t) {
-                if (j.getItem() == CI.getNumberedCircuit(0)
+                if (j.getItem() == GT_Utility.getIntegratedCircuit(0)
                     .getItem()) {
                     // Fish
                     if (j.getItemDamage() == 14) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
index e7e74ac061..597b2b95ca 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialRockBreaker.java
@@ -46,7 +46,6 @@ import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -190,7 +189,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
     private static void generateRecipes() {
         sRecipe_Cobblestone = new GT_Recipe(
             false,
-            new ItemStack[] { CI.getNumberedCircuit(1) },
+            new ItemStack[] { GT_Utility.getIntegratedCircuit(1) },
             new ItemStack[] { ItemUtils.getSimpleStack(Blocks.cobblestone) },
             null,
             new int[] { 10000 },
@@ -201,7 +200,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
             0);
         sRecipe_SmoothStone = new GT_Recipe(
             false,
-            new ItemStack[] { CI.getNumberedCircuit(2) },
+            new ItemStack[] { GT_Utility.getIntegratedCircuit(2) },
             new ItemStack[] { ItemUtils.getSimpleStack(Blocks.stone) },
             null,
             new int[] { 10000 },
@@ -212,7 +211,7 @@ public class GregtechMetaTileEntity_IndustrialRockBreaker extends
             0);
         sRecipe_Redstone = new GT_Recipe(
             false,
-            new ItemStack[] { CI.getNumberedCircuit(3),
+            new ItemStack[] { GT_Utility.getIntegratedCircuit(3),
                 GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L) },
             new ItemStack[] { ItemUtils.getSimpleStack(Blocks.obsidian) },
             null,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
index 22b17e545a..7f2e7db51f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java
@@ -41,6 +41,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.enums.ConfigCategories;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TAE;
+import gregtech.api.enums.TierEU;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -59,7 +60,6 @@ import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -291,7 +291,7 @@ public class GregtechMetaTileEntity_MassFabricator
                                 null,
                                 null,
                                 40,
-                                MaterialUtils.getVoltageForTier(1),
+                                (int) TierEU.RECIPE_LV,
                                 0);
                             return Stream.of(recipe);
                         }