aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2024-07-21 16:36:34 +0200
committerGitHub <noreply@github.com>2024-07-21 21:36:34 +0700
commita8b46c11f5a02608101ef33ed39f103736ba5920 (patch)
tree6daf492e524dcae9f2f5a8cb1d87c057c21a6760 /src/main/java/gregtech/loaders/oreprocessing
parent8b077c28bea7bcc046be1e4b8485d69b4c245a43 (diff)
downloadGT5-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/gregtech/loaders/oreprocessing')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java23
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java16
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java31
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java8
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java28
5 files changed, 52 insertions, 54 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
index 5a6bdfcf13..f7057065eb 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCell.java
@@ -1,8 +1,11 @@
package gregtech.loaders.oreprocessing;
+import static gregtech.api.enums.GT_Values.RA;
import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
+import static gregtech.api.recipe.RecipeMaps.extractorRecipes;
import static gregtech.api.recipe.RecipeMaps.vacuumFreezerRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
@@ -11,7 +14,6 @@ import java.util.ArrayList;
import net.minecraft.item.ItemStack;
-import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
@@ -39,11 +41,16 @@ public class ProcessingCell implements IOreRecipeRegistrator {
if (aMaterial == Materials.Empty) {
GT_ModHandler.removeRecipeByOutputDelayed(aStack);
if (aModName.equalsIgnoreCase("AtomicScience")) {
- GT_ModHandler.addExtractionRecipe(ItemList.Cell_Empty.get(1L), aStack);
+ RA.stdBuilder()
+ .itemInputs(ItemList.Cell_Empty.get(1L))
+ .itemOutputs(aStack)
+ .duration(15 * SECONDS)
+ .eut(2)
+ .addTo(extractorRecipes);
}
} else {
if (aMaterial.mFuelPower > 0) {
- GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+ GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack));
if (GT_Utility.getFluidForFilledItem(aStack, true) == null
&& GT_Utility.getContainerItem(aStack, true) != null) {
@@ -122,7 +129,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
// Electrolyzer recipe
if (GT_Utility.getFluidForFilledItem(aStack, true) == null) {
// dust stuffed cell e.g. Phosphate, Phosphorous Pentoxide
- GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+ GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
if (tCapsuleCount > 0L) {
recipeBuilder.itemInputs(
GT_Utility.copyAmount(tItemAmount, aStack),
@@ -140,7 +147,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
.addTo(electrolyzerRecipes);
} else {
long tCellBalance = tCapsuleCount + tItemAmount - 1;
- GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+ GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
if (tCellBalance > 0L) {
recipeBuilder.itemInputs(aStack, ItemList.Cell_Empty.get(tCellBalance));
} else {
@@ -157,7 +164,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
}
}
if ((aMaterial.mExtraData & 0x2) != 0) {
- GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+ GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
if (tCapsuleCount > 0L) {
recipeBuilder.itemInputs(
GT_Utility.copyAmount(tItemAmount, aStack),
@@ -180,7 +187,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
if (aMaterial == Materials.Empty) {
GT_ModHandler.removeRecipeByOutputDelayed(aStack);
} else {
- GT_RecipeBuilder recipeBuilder = GT_Values.RA.stdBuilder();
+ GT_RecipeBuilder recipeBuilder = RA.stdBuilder();
recipeBuilder.itemInputs(GT_Utility.copyAmount(1, aStack));
if (GT_Utility.getFluidForFilledItem(aStack, true) == null
&& GT_Utility.getContainerItem(aStack, true) != null) {
@@ -426,7 +433,7 @@ public class ProcessingCell implements IOreRecipeRegistrator {
.addTo(GT_RecipeConstants.Fuel);
}
if (GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L) != null) {
- GT_Values.RA.stdBuilder()
+ RA.stdBuilder()
.itemInputs(GT_Utility.copyAmount(1, aStack))
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L))
.duration(((int) Math.max(aMaterial.getMass() * 2L, 1L)) * TICKS)
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index 7cb26f7c36..c8a3af1130 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -290,16 +290,12 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatCooked, 1L));
break;
case "Oilsands":
- centrifugeRecipes.addRecipe(
- true,
- new ItemStack[] { GT_Utility.copyAmount(1, aStack) },
- null,
- null,
- null,
- new FluidStack[] { Materials.OilHeavy.getFluid(1000) },
- 660,
- 8,
- 0);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1, aStack))
+ .fluidOutputs(Materials.OilHeavy.getFluid(1000))
+ .duration(33 * SECONDS)
+ .eut(8)
+ .addTo(centrifugeRecipes);
break;
case "HydratedCoal":
GT_ModHandler.addSmeltingRecipe(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
index f3e82c0b0e..9661033e6a 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDye.java
@@ -1,8 +1,11 @@
package gregtech.loaders.oreprocessing;
+import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
import java.util.Locale;
@@ -59,21 +62,21 @@ public class ProcessingDye implements IOreRecipeRegistrator {
}
public void registerAlloySmelter(ItemStack stack, Dyes dye) {
- GT_ModHandler.addAlloySmelterRecipe(
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L),
- GT_Utility.copyAmount(1, stack),
- new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex),
- 200,
- 8,
- false);
+ RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glass, 8L),
+ GT_Utility.copyAmount(1, stack))
+ .itemOutputs(new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex))
+ .duration(10 * SECONDS)
+ .eut(8)
+ .addTo(alloySmelterRecipes);
- GT_ModHandler.addAlloySmelterRecipe(
- new ItemStack(Blocks.glass, 8, 32767),
- GT_Utility.copyAmount(1, stack),
- new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex),
- 200,
- 8,
- false);
+ RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.glass, 8, WILDCARD), GT_Utility.copyAmount(1, stack))
+ .itemOutputs(new ItemStack(Blocks.stained_glass, 8, 15 - dye.mIndex))
+ .duration(10 * SECONDS)
+ .eut(8)
+ .addTo(alloySmelterRecipes);
}
public void registerChemicalReactor(ItemStack stack, Dyes dye) {
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
index 737ef4682a..5985e24dc7 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java
@@ -187,10 +187,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
.duration(10 * SECONDS)
.eut(8)
.addTo(cutterRecipes);
- GT_ModHandler.addSawmillRecipe(
- new ItemStack(aStack.getItem(), 1, i),
- tPlanks,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
GT_ModHandler.removeRecipeDelayed(new ItemStack(aStack.getItem(), 1, i));
GT_ModHandler.addCraftingRecipe(
GT_Utility.copyAmount(
@@ -260,10 +256,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra
.duration(10 * SECONDS)
.eut(8)
.addTo(cutterRecipes);
- GT_ModHandler.addSawmillRecipe(
- GT_Utility.copyAmount(1, aStack),
- tPlanks,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 1L));
GT_ModHandler.removeRecipeDelayed(GT_Utility.copyAmount(1, aStack));
GT_ModHandler.addCraftingRecipe(
GT_Utility.copyAmount(
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index be8322f30c..801eaa8354 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -2,6 +2,7 @@ package gregtech.loaders.oreprocessing;
import static gregtech.api.enums.GT_Values.L;
import static gregtech.api.enums.GT_Values.NI;
+import static gregtech.api.enums.GT_Values.RA;
import static gregtech.api.enums.GT_Values.W;
import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
@@ -15,6 +16,7 @@ import static gregtech.api.util.GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLIS
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
+import static gregtech.api.util.GT_RecipeBuilder.WILDCARD;
import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
import static gregtech.api.util.GT_Utility.calculateRecipeEU;
@@ -552,20 +554,18 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
.addTo(alloySmelterRecipes);
}
case "plateAlloyAdvanced" -> {
- GT_ModHandler.addAlloySmelterRecipe(
- GT_Utility.copyAmount(1, aStack),
- new ItemStack(Blocks.glass, 3, W),
- GT_ModHandler.getIC2Item("reinforcedGlass", 4L),
- 400,
- 4,
- false);
- GT_ModHandler.addAlloySmelterRecipe(
- GT_Utility.copyAmount(1, aStack),
- Materials.Glass.getDust(3),
- GT_ModHandler.getIC2Item("reinforcedGlass", 4L),
- 400,
- 4,
- false);
+ RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1, aStack), new ItemStack(Blocks.glass, 3, WILDCARD))
+ .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L))
+ .duration(20 * SECONDS)
+ .eut(4)
+ .addTo(alloySmelterRecipes);
+ RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1, aStack), Materials.Glass.getDust(3))
+ .itemOutputs(GT_ModHandler.getIC2Item("reinforcedGlass", 4L))
+ .duration(20 * SECONDS)
+ .eut(4)
+ .addTo(alloySmelterRecipes);
}
case "plateAlloyIridium" ->