aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-05-29 22:19:38 +0100
committerGitHub <noreply@github.com>2023-05-29 23:19:38 +0200
commit556586c1871ca56da316472ffa6658d5033446d6 (patch)
tree0e0055ffdcc7bbcebade99716219eef706199e46 /src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
parentae6a0ce551f6e2e2fde1fff77cd32daa7958ea8f (diff)
downloadGT5-Unofficial-556586c1871ca56da316472ffa6658d5033446d6.tar.gz
GT5-Unofficial-556586c1871ca56da316472ffa6658d5033446d6.tar.bz2
GT5-Unofficial-556586c1871ca56da316472ffa6658d5033446d6.zip
Final stretch for GT RA2 conversions (#2038)
* (un)boxing RA2 * fuel ra2 * blast RA2 * primitive blast RA2 * remaining cutter ra2 * fix
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java141
1 files changed, 92 insertions, 49 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
index d61d2bfc7b..410800f614 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrate.java
@@ -1,11 +1,14 @@
package gregtech.loaders.oreprocessing;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sUnboxinatorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+
import net.minecraft.item.ItemStack;
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Proxy;
public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegistrator {
@@ -24,72 +27,112 @@ public class ProcessingCrate implements gregtech.api.interfaces.IOreRecipeRegist
&& !aMaterial.contains(SubTag.NO_WORKING);
switch (aPrefix) {
case crateGtDust -> {
- GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L)),
- ItemList.Crate_Empty.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L),
- 100,
- 8);
- GT_Values.RA.addUnboxingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L),
- GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
- ItemList.Crate_Empty.get(1L),
- 800,
- 1);
+ if (GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 1L) != null) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(5 * SECONDS)
+ .eut(8)
+ .addTo(sBoxinatorRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtDust, aMaterial, 1L))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(40 * SECONDS)
+ .eut(1)
+ .addTo(sUnboxinatorRecipes);
+ }
if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, 16L),
GT_Proxy.tBits,
new Object[] { "Xc", 'X', OrePrefixes.crateGtDust.get(aMaterial) });
}
case crateGtIngot -> {
- GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L)),
- ItemList.Crate_Empty.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L),
- 100,
- 8);
- GT_Values.RA.addUnboxingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L),
- GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
- ItemList.Crate_Empty.get(1L),
- 800,
- 1);
+ if (GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L) != null) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(5 * SECONDS)
+ .eut(8)
+ .addTo(sBoxinatorRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtIngot, aMaterial, 1L))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(40 * SECONDS)
+ .eut(1)
+ .addTo(sUnboxinatorRecipes);
+ }
if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 16L),
GT_Proxy.tBits,
new Object[] { "Xc", 'X', OrePrefixes.crateGtIngot.get(aMaterial) });
}
case crateGtGem -> {
- GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L)),
- ItemList.Crate_Empty.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L),
- 100,
- 8);
- GT_Values.RA.addUnboxingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L),
- GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
- ItemList.Crate_Empty.get(1L),
- 800,
- 1);
+ if (GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L) != null) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(5 * SECONDS)
+ .eut(8)
+ .addTo(sBoxinatorRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtGem, aMaterial, 1L))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(40 * SECONDS)
+ .eut(1)
+ .addTo(sUnboxinatorRecipes);
+ }
if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 16L),
GT_Proxy.tBits,
new Object[] { "Xc", 'X', OrePrefixes.crateGtGem.get(aMaterial) });
}
case crateGtPlate -> {
- GT_Values.RA.addBoxingRecipe(
- GT_Utility.copyAmount(16L, GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L)),
- ItemList.Crate_Empty.get(1L),
- GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L),
- 100,
- 8);
- GT_Values.RA.addUnboxingRecipe(
- GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L),
- GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
- ItemList.Crate_Empty.get(1L),
- 800,
- 1);
+ if (GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(
+ GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(5 * SECONDS)
+ .eut(8)
+ .addTo(sBoxinatorRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crateGtPlate, aMaterial, 1L))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
+ ItemList.Crate_Empty.get(1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(40 * SECONDS)
+ .eut(1)
+ .addTo(sUnboxinatorRecipes);
+ }
if (aSpecialRecipeReq2) GT_ModHandler.addCraftingRecipe(
GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 16L),
GT_Proxy.tBits,