aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-09-10 01:00:27 +0100
committerGitHub <noreply@github.com>2023-09-10 01:00:27 +0100
commit87f5c9648088ad8c5683f0d9ce99fadcd8052aad (patch)
treed07647838351577700a43259368f547e0eba34e0 /src/main/java/gtPlusPlus/xmod/gregtech
parent9cff98e7429fb320edbcc1d88b8f897b1fbf35da (diff)
downloadGT5-Unofficial-87f5c9648088ad8c5683f0d9ce99fadcd8052aad.tar.gz
GT5-Unofficial-87f5c9648088ad8c5683f0d9ce99fadcd8052aad.tar.bz2
GT5-Unofficial-87f5c9648088ad8c5683f0d9ce99fadcd8052aad.zip
Ra2ify gt++ Part 1 (#739)
* another deprecation * agrichem ra2 * dehydrator coils * nuclear chem * general recipes * generic chem RA2 and NO,NO2 cleanup * start with gregtech recipes * another deprecation * more gregtech recipes * dont deprecate ABS yet, was just a mistake * gregtech recipes * even more gregtech recipes * finish assembler recipes * fuels and fluid extraction * centrifuge and mixer * chem recipes * compression and maceration * remove duplicate bending * blast furnace (remove a broken one) * AL recipes * distilling * baseitemingots * bee recipes and some cleanup * coke things * random one * cryo and pyro
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java16
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java16
2 files changed, 18 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
index d03bd2bcf2..6754828db2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/interfaces/internal/IGregtech_RecipeAdder.java
@@ -67,7 +67,7 @@ public interface IGregtech_RecipeAdder {
* @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- @Deprecated
+
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aOutput, int aChance, int aDuration, int aEUt);
/**
@@ -81,7 +81,7 @@ public interface IGregtech_RecipeAdder {
* @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- @Deprecated
+
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
int aDuration, int aEUt);
@@ -96,7 +96,7 @@ public interface IGregtech_RecipeAdder {
* @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- @Deprecated
+
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
int aDuration, int aEUt);
@@ -112,15 +112,13 @@ public interface IGregtech_RecipeAdder {
* @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- @Deprecated
+
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
- @Deprecated
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput, int aChance,
int aDuration, int aEUt, int aSpecialValue);
- @Deprecated
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
boolean aOptimizeRecipe);
@@ -137,15 +135,13 @@ public interface IGregtech_RecipeAdder {
* @param aEUt = EU per tick needed for heating up (must be >= 0)
* @return true if the Recipe got added, otherwise false.
*/
- @Deprecated
+
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt);
- @Deprecated
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput, int aChance,
int aDuration, int aEUt, int aSpecialValue);
- @Deprecated
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack[] aInputFluid, FluidStack aOutput,
ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue,
boolean aOptimizeRecipe);
@@ -163,7 +159,7 @@ public interface IGregtech_RecipeAdder {
* @param aSpecialValue = Power produced in EU/t per dynamo
* @return true if the Recipe got added, otherwise false.
*/
- @Deprecated
+
boolean addBlastSmelterRecipe(ItemStack[] aInput, FluidStack aInputFluid, FluidStack aOutput,
ItemStack[] aOutputStack, int[] aChance, int aDuration, int aEUt, int aSpecialValue);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
index a74d3b36ba..9fb011810f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechDehydrator.java
@@ -1,11 +1,15 @@
package gtPlusPlus.xmod.gregtech.registration.gregtech;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+
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;
+import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
@@ -114,10 +118,14 @@ public class GregtechDehydrator {
ItemStack spoolT4 = ItemUtils.getItemStackOfAmountFromOreDict("pipeMediumTitanium", 1);
// Make some coils by wrapping wire around a spool.
- GT_Values.RA.addAssemblerRecipe(coilWire1, spoolT1, coilT1, 8 * 20, 120);
- GT_Values.RA.addAssemblerRecipe(coilWire2, spoolT2, coilT2, 8 * 20, 240);
- GT_Values.RA.addAssemblerRecipe(coilWire3, spoolT3, coilT3, 8 * 20, 480);
- GT_Values.RA.addAssemblerRecipe(coilWire4, spoolT4, coilT4, 8 * 20, 960);
+ GT_Values.RA.stdBuilder().itemInputs(coilWire1, spoolT1).itemOutputs(coilT1).noFluidInputs().noFluidOutputs()
+ .duration(8 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(coilWire2, spoolT2).itemOutputs(coilT2).noFluidInputs().noFluidOutputs()
+ .duration(8 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(coilWire3, spoolT3).itemOutputs(coilT3).noFluidInputs().noFluidOutputs()
+ .duration(8 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes);
+ GT_Values.RA.stdBuilder().itemInputs(coilWire4, spoolT4).itemOutputs(coilT4).noFluidInputs().noFluidOutputs()
+ .duration(8 * SECONDS).eut(TierEU.RECIPE_EV / 2).addTo(sAssemblerRecipes);
// Add recipes for the Dehydrators.