aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kubatech
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/kubatech
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/kubatech')
-rw-r--r--src/main/java/kubatech/loaders/DEFCRecipes.java23
-rw-r--r--src/main/java/kubatech/loaders/RecipeLoader.java119
2 files changed, 74 insertions, 68 deletions
diff --git a/src/main/java/kubatech/loaders/DEFCRecipes.java b/src/main/java/kubatech/loaders/DEFCRecipes.java
index d23637d7d2..f3b8774758 100644
--- a/src/main/java/kubatech/loaders/DEFCRecipes.java
+++ b/src/main/java/kubatech/loaders/DEFCRecipes.java
@@ -3,6 +3,7 @@ package kubatech.loaders;
import static gregtech.api.enums.Mods.ElectroMagicTools;
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.mixerRecipes;
+import static gregtech.api.util.GT_RecipeConstants.DEFC_CASING_TIER;
import java.util.Arrays;
@@ -172,7 +173,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "draconicCore", 1, 0))
.eut(500_000)
.duration(400)
- .specialValue(1)
+ .metadata(DEFC_CASING_TIER, 1)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
@@ -187,7 +188,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "wyvernCore", 1, 0))
.eut(2_000_000)
.duration(800)
- .specialValue(2)
+ .metadata(DEFC_CASING_TIER, 2)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
@@ -203,7 +204,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0))
.eut(8_000_000)
.duration(1600)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
} else {
@@ -218,7 +219,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "awakenedCore", 1, 0))
.eut(8_000_000)
.duration(1600)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
}
@@ -234,7 +235,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "chaoticCore", 1, 0))
.eut(24_000_000)
.duration(3200)
- .specialValue(4)
+ .metadata(DEFC_CASING_TIER, 4)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
@@ -250,7 +251,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 0))
.eut(500_000)
.duration(1000)
- .specialValue(2)
+ .metadata(DEFC_CASING_TIER, 2)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
@@ -264,7 +265,7 @@ public class DEFCRecipes {
.itemOutputs(GT_ModHandler.getModItem("DraconicEvolution", "draconiumEnergyCore", 1, 1))
.eut(2_000_000)
.duration(2000)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.addTo(fusionCraftingRecipes)
.forEach(DEFCRecipes::addOldHiddenRecipe);
@@ -278,7 +279,7 @@ public class DEFCRecipes {
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 288))
.eut(1_966_080)
.duration(4200)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.noOptimize()
.addTo(fusionCraftingRecipes);
@@ -291,7 +292,7 @@ public class DEFCRecipes {
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
.eut(1_966_080)
.duration(3600)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.noOptimize()
.addTo(fusionCraftingRecipes);
@@ -304,7 +305,7 @@ public class DEFCRecipes {
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 432))
.eut(1_966_080)
.duration(2800)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.noOptimize()
.addTo(fusionCraftingRecipes);
@@ -317,7 +318,7 @@ public class DEFCRecipes {
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.dragonblood"), 648))
.eut(1_966_080)
.duration(2400)
- .specialValue(3)
+ .metadata(DEFC_CASING_TIER, 3)
.noOptimize()
.addTo(fusionCraftingRecipes);
}
diff --git a/src/main/java/kubatech/loaders/RecipeLoader.java b/src/main/java/kubatech/loaders/RecipeLoader.java
index 3ebba3fea6..9c3ded4992 100644
--- a/src/main/java/kubatech/loaders/RecipeLoader.java
+++ b/src/main/java/kubatech/loaders/RecipeLoader.java
@@ -37,6 +37,7 @@ import static gregtech.api.util.GT_RecipeConstants.AssemblyLine;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM;
import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME;
import static gregtech.api.util.GT_RecipeConstants.UniversalChemical;
+import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
import static kubatech.api.enums.ItemList.BlackTea;
import static kubatech.api.enums.ItemList.BlackTeaLeaf;
import static kubatech.api.enums.ItemList.BruisedTeaLeaf;
@@ -83,7 +84,6 @@ import gregtech.api.enums.OrePrefixes;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
-import gtPlusPlus.core.lib.CORE;
import ic2.core.Ic2Items;
import kubatech.api.enums.ItemList;
import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_DEFusionCrafter;
@@ -227,22 +227,20 @@ public class RecipeLoader {
private static void RegisterTeaLine() {
// TEA LINE //
if (PamsHarvestCraft.isModLoaded()) {
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1) },
- null,
- null,
- new ItemStack[] { TeaLeafDehydrated.get(1) },
- null,
- 100,
- 32);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { TeaLeafDehydrated.get(1) },
- null,
- null,
- new ItemStack[] { WhiteTeaLeaf.get(1) },
- null,
- 100,
- 32);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GameRegistry.findItemStack("harvestcraft", "tealeafItem", 1))
+ .itemOutputs(TeaLeafDehydrated.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(TeaLeafDehydrated.get(1))
+ .itemOutputs(WhiteTeaLeaf.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(TeaLeafDehydrated.get(1))
.itemOutputs(SteamedTeaLeaf.get(1))
@@ -250,86 +248,89 @@ public class RecipeLoader {
.eut(32)
.duration(5 * SECONDS)
.addTo(mixerRecipes);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { SteamedTeaLeaf.get(1) },
- null,
- null,
- new ItemStack[] { YellowTeaLeaf.get(1) },
- null,
- 100,
- 32);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(SteamedTeaLeaf.get(1))
+ .itemOutputs(YellowTeaLeaf.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(TeaLeafDehydrated.get(1), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(RolledTeaLeaf.get(1))
.eut(32)
.duration(5 * SECONDS)
.addTo(benderRecipes);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { RolledTeaLeaf.get(1) },
- null,
- null,
- new ItemStack[] { GreenTeaLeaf.get(1) },
- null,
- 100,
- 32);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(RolledTeaLeaf.get(1))
+ .itemOutputs(GreenTeaLeaf.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(OxidizedTeaLeaf.get(1))
.eut(32)
.duration(5 * SECONDS)
.addTo(UniversalChemical);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { OxidizedTeaLeaf.get(1) },
- null,
- null,
- new ItemStack[] { BlackTeaLeaf.get(1) },
- null,
- 100,
- 32);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(OxidizedTeaLeaf.get(1))
+ .itemOutputs(BlackTeaLeaf.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(RolledTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(2))
.itemOutputs(FermentedTeaLeaf.get(1))
.eut(32)
.duration(10 * SECONDS)
.addTo(UniversalChemical);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { FermentedTeaLeaf.get(1) },
- null,
- null,
- new ItemStack[] { PuerhTeaLeaf.get(1) },
- null,
- 100,
- 32);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(FermentedTeaLeaf.get(1))
+ .itemOutputs(PuerhTeaLeaf.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(TeaLeafDehydrated.get(1))
.itemOutputs(BruisedTeaLeaf.get(1))
.eut(32)
.duration(5 * SECONDS)
.addTo(cutterRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(BruisedTeaLeaf.get(1), GT_Utility.getIntegratedCircuit(1))
.itemOutputs(PartiallyOxidizedTeaLeaf.get(1))
.eut(32)
.duration(2 * SECONDS + 10 * TICKS)
.addTo(UniversalChemical);
- CORE.RA.addDehydratorRecipe(
- new ItemStack[] { PartiallyOxidizedTeaLeaf.get(1) },
- null,
- null,
- new ItemStack[] { OolongTeaLeaf.get(1) },
- null,
- 100,
- 32);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(PartiallyOxidizedTeaLeaf.get(1))
+ .itemOutputs(OolongTeaLeaf.get(1))
+ .eut(32)
+ .duration(5 * SECONDS)
+ .addTo(chemicalDehydratorRecipes);
// Tea Assembly
GameRegistry.addSmelting(BlackTeaLeaf.get(1), BlackTea.get(1), 10);
+
GT_Values.RA.stdBuilder()
.itemInputs(BlackTea.get(1), GameRegistry.findItemStack("harvestcraft", "limejuiceItem", 1))
.itemOutputs(EarlGrayTea.get(1))
.eut(32)
.duration(5 * SECONDS)
.addTo(mixerRecipes);
+
GameRegistry.addSmelting(GreenTeaLeaf.get(1), GreenTea.get(1), 10);
+
GT_Values.RA.stdBuilder()
.itemInputs(BlackTea.get(1))
.itemOutputs(LemonTea.get(1))
@@ -337,6 +338,7 @@ public class RecipeLoader {
.eut(32)
.duration(5 * SECONDS)
.addTo(mixerRecipes);
+
GT_Values.RA.stdBuilder()
.itemInputs(BlackTea.get(1))
.itemOutputs(MilkTea.get(1))
@@ -344,7 +346,9 @@ public class RecipeLoader {
.eut(32)
.duration(5 * SECONDS)
.addTo(mixerRecipes);
+
GameRegistry.addSmelting(OolongTeaLeaf.get(1), OolongTea.get(1), 10);
+
GT_Values.RA.stdBuilder()
.itemInputs(GameRegistry.findItemStack("harvestcraft", "peppermintItem", 1))
.itemOutputs(PeppermintTea.get(1))
@@ -352,6 +356,7 @@ public class RecipeLoader {
.eut(32)
.duration(5 * SECONDS)
.addTo(mixerRecipes);
+
GameRegistry.addSmelting(PuerhTeaLeaf.get(1), PuerhTea.get(1), 10);
GameRegistry.addSmelting(WhiteTeaLeaf.get(1), WhiteTea.get(1), 10);
GameRegistry.addSmelting(YellowTeaLeaf.get(1), YellowTea.get(1), 10);