aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-09-22 17:11:54 +0200
committerGitHub <noreply@github.com>2023-09-22 17:11:54 +0200
commit2e429bb4ca5a4c756cf6e6c131e176217a9c4bd3 (patch)
tree84646ceffdb12cb18080b89c64f269e0c8c90ba4 /src/main/java/gregtech/loaders
parent2e17750625e73ed55af9cbd446593cbc3e04c978 (diff)
downloadGT5-Unofficial-2e429bb4ca5a4c756cf6e6c131e176217a9c4bd3.tar.gz
GT5-Unofficial-2e429bb4ca5a4c756cf6e6c131e176217a9c4bd3.tar.bz2
GT5-Unofficial-2e429bb4ca5a4c756cf6e6c131e176217a9c4bd3.zip
obliterate RA1 (#2206)
* obliterate RA1 (1/2) * fix wrong recipe map * guard clauses * null check * spotless apply * redo null check properly * update BS --------- Co-authored-by: chochem <40274384+chochem@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r--src/main/java/gregtech/loaders/load/GT_ItemIterator.java139
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java18
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java25
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java17
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java33
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java30
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java27
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java34
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java16
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java63
10 files changed, 242 insertions, 160 deletions
diff --git a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
index 0e10d2a7de..828b1d330a 100644
--- a/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
+++ b/src/main/java/gregtech/loaders/load/GT_ItemIterator.java
@@ -1,6 +1,7 @@
package gregtech.loaders.load;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCannerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GT_RecipeConstants.FUEL_VALUE;
@@ -36,79 +37,91 @@ public class GT_ItemIterator implements Runnable {
@Override
public void run() {
GT_Log.out.println("GT_Mod: Scanning for certain kinds of compatible Machineblocks.");
- ItemStack tStack2;
- ItemStack tStack;
- if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L),
- tStack2,
- tStack2,
- tStack2,
- null,
- tStack2,
- tStack2,
- tStack2,
- tStack2))) {
- GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L),
- null,
- 0,
- false);
+ ItemStack tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 1L);
+ ItemStack tStack = GT_ModHandler
+ .getRecipeOutput(tStack2, tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2);
+
+ if (null != tStack) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tStack)
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
}
- if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L),
- tStack2,
- tStack2,
- tStack2,
- null,
- tStack2,
- tStack2,
- tStack2,
- tStack2))) {
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1L);
+ tStack = GT_ModHandler
+ .getRecipeOutput(tStack2, tStack2, tStack2, tStack2, null, tStack2, tStack2, tStack2, tStack2);
+
+ if (null != tStack) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingRawMachineTier00, tStack);
- GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L),
- null,
- 0,
- false);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tStack)
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Bronze, 8L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
GT_ModHandler.addSmeltingRecipe(tStack, GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Bronze, 8L));
}
- ItemStack tStack3;
- if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L),
- tStack3 = new ItemStack(Blocks.glass, 1, 0),
+
+ ItemStack tStack3 = new ItemStack(Blocks.glass, 1, 0);
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Iron, 1L);
+ tStack = GT_ModHandler.getRecipeOutput(
+ tStack2,
+ tStack3,
tStack2,
tStack3,
GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
tStack3,
tStack2,
tStack3,
- tStack2))) {
- GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L),
- 0,
- false);
+ tStack2);
+
+ if (null != (tStack)) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tStack)
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
+ .outputChances(10000, 1000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
}
- if (null != (tStack = GT_ModHandler.getRecipeOutput(
- tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L),
- tStack3 = new ItemStack(Blocks.glass, 1, 0),
+
+ tStack2 = GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Steel, 1L);
+ tStack3 = new ItemStack(Blocks.glass, 1, 0);
+ tStack = GT_ModHandler.getRecipeOutput(
+ tStack2,
+ tStack3,
tStack2,
tStack3,
GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Gold, 1L),
tStack3,
tStack2,
tStack3,
- tStack2))) {
- GT_ModHandler.addPulverisationRecipe(
- tStack,
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L),
- 0,
- false);
+ tStack2);
+ if (null != tStack) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(tStack)
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Gold, 1L))
+ .outputChances(10000, 1000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
}
GT_Log.out.println("GT_Mod: Registering various Tools to be usable on GregTech Machines");
GregTech_API.registerScrewdriver(
@@ -247,15 +260,21 @@ public class GT_ItemIterator implements Runnable {
.addTo(GT_RecipeConstants.Fuel);
}
if (tName.equals("tile.TFRoots")) {
- GT_ModHandler.addPulverisationRecipe(
- new ItemStack(tItem, 1, 0),
- new ItemStack(Items.stick, 2),
- new ItemStack(Items.stick, 1),
- 30);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(tItem, 1, 0))
+ .itemOutputs(new ItemStack(Items.stick, 2), new ItemStack(Items.stick, 1))
+ .outputChances(10000, 3000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
GT_ModHandler.addSawmillRecipe(
new ItemStack(tItem, 1, 0),
new ItemStack(Items.stick, 4),
new ItemStack(Items.stick, 2));
+
GT_Values.RA.stdBuilder()
.itemInputs(new ItemStack(tItem, 1, 1))
.itemOutputs(new ItemStack(Items.stick, 4))
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java
index 9e57768273..ce14d1b180 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingBeans.java
@@ -1,10 +1,13 @@
package gregtech.loaders.oreprocessing;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
+
import net.minecraft.item.ItemStack;
+import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -17,8 +20,15 @@ public class ProcessingBeans implements gregtech.api.interfaces.IOreRecipeRegist
@Override
public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName,
ItemStack aStack) {
- if (aOreDictName.equals("beansCocoa")) GT_ModHandler.addPulverisationRecipe(
- GT_Utility.copyAmount(1L, aStack),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L));
+ if (aOreDictName.equals("beansCocoa")) {
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cocoa, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+ }
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
index 2b519a48a9..5f16a07830 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrushedOre.java
@@ -1,6 +1,7 @@
package gregtech.loaders.oreprocessing;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sSifterRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
@@ -11,7 +12,6 @@ import net.minecraft.item.ItemStack;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -34,15 +34,20 @@ public class ProcessingCrushedOre implements gregtech.api.interfaces.IOreRecipeR
.eut(16)
.addTo(sHammerRecipes);
- GT_ModHandler.addPulverisationRecipe(
- GT_Utility.copyAmount(1L, aStack),
- GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
- GT_OreDictUnificator.get(
- OrePrefixes.dust,
- GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
- 1L),
- 10,
- false);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+ GT_OreDictUnificator.get(
+ OrePrefixes.dust,
+ GT_Utility.selectItemInList(2, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+ 1L))
+ .outputChances(10000, 1000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
}
case crushedPurified -> {
GT_Values.RA.stdBuilder()
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java
index 7daf83504a..868b9c2451 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingCrystallized.java
@@ -1,6 +1,8 @@
package gregtech.loaders.oreprocessing;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;
import net.minecraft.item.ItemStack;
@@ -8,7 +10,6 @@ import net.minecraft.item.ItemStack;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -32,12 +33,14 @@ public class ProcessingCrystallized implements gregtech.api.interfaces.IOreRecip
.eut(16)
.addTo(sHammerRecipes);
- GT_ModHandler.addPulverisationRecipe(
- GT_Utility.copyAmount(1L, aStack),
- GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
- null,
- 10,
- false);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
}
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
index 3ca8180f6e..20eac3ec1c 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDirty.java
@@ -2,6 +2,7 @@ package gregtech.loaders.oreprocessing;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
@@ -34,19 +35,25 @@ public class ProcessingDirty implements gregtech.api.interfaces.IOreRecipeRegist
.eut(16)
.addTo(sHammerRecipes);
- GT_ModHandler.addPulverisationRecipe(
- GT_Utility.copyAmount(1L, aStack),
- GT_OreDictUnificator.get(
- OrePrefixes.dustImpure,
- aMaterial.mMacerateInto,
- GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
- 1L),
- GT_OreDictUnificator.get(
- OrePrefixes.dust,
- GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
- 1L),
- 10,
- false);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(
+ GT_OreDictUnificator.get(
+ OrePrefixes.dustImpure,
+ aMaterial.mMacerateInto,
+ GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+ 1L),
+ GT_OreDictUnificator.get(
+ OrePrefixes.dust,
+ GT_Utility.selectItemInList(0, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+ 1L))
+ .outputChances(10000, 1000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
GT_ModHandler.addOreWasherRecipe(
GT_Utility.copyAmount(1L, aStack),
new int[] { 10000, 1111, 10000 },
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
index 42bad3325d..b17ac6d071 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
@@ -3,6 +3,7 @@ package gregtech.loaders.oreprocessing;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT;
@@ -206,23 +207,28 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
.eut(16)
.addTo(sHammerRecipes);
- GT_ModHandler.addPulverisationRecipe(
- aOreStack,
- GT_Utility.mul(2L, tCrushed),
- tMaterial.contains(SubTag.PULVERIZING_CINNABAR)
- ? GT_OreDictUnificator.get(
+ int chanceOre2 = tPrimaryByProduct == null ? 0
+ : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier;
+ chanceOre2 = 100 * chanceOre2; // converting to the GT format, 100% is 10000
+ GT_Values.RA.stdBuilder()
+ .itemInputs(aOreStack)
+ .itemOutputs(
+ GT_Utility.mul(2L, tCrushed),
+ tMaterial.contains(SubTag.PULVERIZING_CINNABAR) ? GT_OreDictUnificator.get(
OrePrefixes.crystal,
Materials.Cinnabar,
GT_OreDictUnificator
.get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L),
1L)
- : GT_OreDictUnificator
- .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L),
- tPrimaryByProduct == null ? 0
- : tPrimaryByProduct.stackSize * 10 * aMultiplier * aMaterial.mByProductMultiplier,
- GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial),
- 50,
- true);
+ : GT_OreDictUnificator
+ .get(OrePrefixes.gem, tPrimaryByMaterial, GT_Utility.copyAmount(1L, tPrimaryByProduct), 1L),
+ GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
+ .outputChances(10000, chanceOre2, 5000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
}
return true;
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java
index 6c43ceb135..a365c09f51 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOrePoor.java
@@ -1,6 +1,8 @@
package gregtech.loaders.oreprocessing;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import net.minecraft.item.ItemStack;
@@ -48,15 +50,22 @@ public class ProcessingOrePoor implements gregtech.api.interfaces.IOreRecipeRegi
.eut(16)
.addTo(sHammerRecipes);
- GT_ModHandler.addPulverisationRecipe(
- GT_Utility.copyAmount(1L, aStack),
- GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier),
- GT_OreDictUnificator
- .get(OrePrefixes.dustTiny, GT_Utility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts), 1L),
- 5 * aMultiplier,
- GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial),
- 100,
- true);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(
+ GT_OreDictUnificator.get(OrePrefixes.dustTiny, aMaterial, 2 * aMultiplier),
+ GT_OreDictUnificator.get(
+ OrePrefixes.dustTiny,
+ GT_Utility.selectItemInList(0, aMaterial, aMaterial.mOreByProducts),
+ 1L),
+ GT_OreDictUnificator.getDust(aPrefix.mSecondaryMaterial))
+ .outputChances(10000, 100 * 5 * aMultiplier, 10000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
if (aMaterial.contains(SubTag.NO_SMELTING)) GT_ModHandler.addSmeltingRecipe(
GT_Utility.copyAmount(1L, aStack),
GT_OreDictUnificator.get(OrePrefixes.nugget, aMaterial.mDirectSmelting, aMultiplier));
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java
index e4875e15e7..a8dae7f284 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPure.java
@@ -1,13 +1,14 @@
package gregtech.loaders.oreprocessing;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sHammerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
+import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import net.minecraft.item.ItemStack;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -29,18 +30,23 @@ public class ProcessingPure implements gregtech.api.interfaces.IOreRecipeRegistr
.eut(16)
.addTo(sHammerRecipes);
- GT_ModHandler.addPulverisationRecipe(
- GT_Utility.copyAmount(1L, aStack),
- GT_OreDictUnificator.get(
- OrePrefixes.dustPure,
- aMaterial.mMacerateInto,
- GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
- 1L),
- GT_OreDictUnificator.get(
- OrePrefixes.dust,
- GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
- 1L),
- 10,
- false);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.copyAmount(1L, aStack))
+ .itemOutputs(
+ GT_OreDictUnificator.get(
+ OrePrefixes.dustPure,
+ aMaterial.mMacerateInto,
+ GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial.mMacerateInto, 1L),
+ 1L),
+ GT_OreDictUnificator.get(
+ OrePrefixes.dust,
+ GT_Utility.selectItemInList(1, aMaterial.mMacerateInto, aMaterial.mOreByProducts),
+ 1L))
+ .outputChances(10000, 1000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
}
}
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
index cbb92ee128..d90902d9c0 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java
@@ -2,6 +2,7 @@ package gregtech.loaders.postload.chains;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCrackingRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
@@ -47,13 +48,14 @@ public class GT_BauxiteRefineChain {
.eut(TierEU.RECIPE_MV)
.addTo(sMixerRecipes);
- GT_Values.RA.addCrackingRecipe(
- 1,
- MaterialsOreAlum.BauxiteSlurry.getFluid(32000),
- GT_ModHandler.getSteam(2000),
- MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(32000),
- 160,
- 400);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(1))
+ .noItemOutputs()
+ .fluidInputs(MaterialsOreAlum.BauxiteSlurry.getFluid(32000), GT_ModHandler.getSteam(2000))
+ .fluidOutputs(MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(32000))
+ .duration(8 * SECONDS)
+ .eut(400)
+ .addTo(sCrackingRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(Materials.Aluminiumhydroxide.getDust(1))
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index 056ebadca9..9f35cf94d5 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -11,9 +11,11 @@ import static gregtech.api.enums.Mods.Thaumcraft;
import static gregtech.api.enums.Mods.TwilightForest;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes;
+import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes;
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 java.util.Locale;
@@ -2070,30 +2072,43 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
}
}
}
- GT_ModHandler.addPulverisationRecipe(
- new ItemStack(Blocks.cobblestone, 1, 32767),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L),
- null,
- 0,
- false);
- GT_ModHandler.addPulverisationRecipe(
- new ItemStack(Blocks.gravel, 1, 32767),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L),
- new ItemStack(Items.flint, 1),
- 10,
- false);
- GT_ModHandler.addPulverisationRecipe(
- new ItemStack(Blocks.furnace, 1, 32767),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L),
- null,
- 0,
- false);
- GT_ModHandler.addPulverisationRecipe(
- new ItemStack(Blocks.lit_furnace, 1, 32767),
- GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L),
- null,
- 0,
- false);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.cobblestone, 1, WILDCARD))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.gravel, 1, WILDCARD))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L), new ItemStack(Items.flint, 1))
+ .outputChances(10000, 1000)
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.furnace, 1, WILDCARD))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(new ItemStack(Blocks.lit_furnace, 1, WILDCARD))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 8L))
+ .noFluidInputs()
+ .noFluidOutputs()
+ .duration(20 * SECONDS)
+ .eut(2)
+ .addTo(sMaceratorRecipes);
GT_OreDictUnificator.set(
OrePrefixes.ingot,