aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing
diff options
context:
space:
mode:
authorHoleFish <48403212+HoleFish@users.noreply.github.com>2024-09-10 18:36:28 +0800
committerGitHub <noreply@github.com>2024-09-10 10:36:28 +0000
commit8d0163a72794c6ccb79e43c8a9d0d1e6e3305103 (patch)
tree773e3d74d55f541c72b9121f7f234f2331e99535 /src/main/java/gregtech/loaders/oreprocessing
parentb59bea205cfdfc9ebb3e7043d9799ee9a48ca8aa (diff)
downloadGT5-Unofficial-8d0163a72794c6ccb79e43c8a9d0d1e6e3305103.tar.gz
GT5-Unofficial-8d0163a72794c6ccb79e43c8a9d0d1e6e3305103.tar.bz2
GT5-Unofficial-8d0163a72794c6ccb79e43c8a9d0d1e6e3305103.zip
Changes implosion & bio vat recipe generation (#3104)
Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java83
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java146
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java28
3 files changed, 27 insertions, 230 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index 3398fda98d..78a51727af 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -12,13 +12,13 @@ import static gregtech.api.recipe.RecipeMaps.packagerRecipes;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
import static gregtech.api.util.GTRecipeConstants.COIL_HEAT;
import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
import java.util.ArrayList;
-import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
@@ -304,36 +304,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
break;
case "Diamond": {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(64))
- .itemOutputs(
- ItemList.IC2_Industrial_Diamond.get(3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 16, null))
- .itemOutputs(
- ItemList.IC2_Industrial_Diamond.get(3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 32))
- .itemOutputs(
- ItemList.IC2_Industrial_Diamond.get(3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 8))
+ .itemInputs(GTUtility.copyAmount(4, aStack))
.itemOutputs(
ItemList.IC2_Industrial_Diamond.get(3L),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 16L))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 32)
.addTo(implosionRecipes);
}
break;
@@ -348,36 +325,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
case "Tanzanite":
case "Amethyst": {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(48))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 12, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 24))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 6))
+ .itemInputs(GTUtility.copyAmount(4, aStack))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 12L))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 24)
.addTo(implosionRecipes);
}
break;
@@ -391,36 +345,13 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
case "Forcillium":
case "Force": {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), ItemList.Block_Powderbarrel.get(32))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("dynamite", 8, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), new ItemStack(Blocks.tnt, 16))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(4, aStack), GTModHandler.getIC2Item("industrialTnt", 4))
+ .itemInputs(GTUtility.copyAmount(4, aStack))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 3L),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 8L))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 16)
.addTo(implosionRecipes);
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
index 2f92e58e56..2340da88c7 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingGem.java
@@ -9,16 +9,15 @@ import static gregtech.api.recipe.RecipeMaps.latheRecipes;
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
import static gregtech.api.util.GTUtility.calculateRecipeEU;
-import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import gregtech.api.enums.GTValues;
-import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
@@ -190,47 +189,17 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
} else {
if (aMaterial.mUnificatable && (aMaterial.mMaterialInto == aMaterial)) {
// Implosion compressor recipes
- {
- if (GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1) != null) {
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("dynamite", 4, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("industrialTnt", 2))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- }
+ if (GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1) != null) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(GTUtility.copyAmount(3, aStack))
+ .itemOutputs(
+ GTOreDictUnificator.get(OrePrefixes.gemFlawless, aMaterial, 1),
+ GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
+ .duration(1 * SECONDS)
+ .eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 8)
+ .addTo(implosionRecipes);
}
-
// Crafting recipes
{
GTModHandler.addCraftingRecipe(
@@ -302,40 +271,13 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
{
if (GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1) != null) {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("dynamite", 4, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("industrialTnt", 2))
+ .itemInputs(GTUtility.copyAmount(3, aStack))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.gemFlawed, aMaterial, 1),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 8)
.addTo(implosionRecipes);
}
}
@@ -430,40 +372,13 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
{
if (GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1) != null) {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("dynamite", 4, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("industrialTnt", 2))
+ .itemInputs(GTUtility.copyAmount(3, aStack))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.gem, aMaterial, 1),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 8)
.addTo(implosionRecipes);
}
}
@@ -535,40 +450,13 @@ public class ProcessingGem implements gregtech.api.interfaces.IOreRecipeRegistra
{
if (GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1) != null) {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), ItemList.Block_Powderbarrel.get(16))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("dynamite", 4, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(3, aStack), new ItemStack(Blocks.tnt, 8))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTUtility.copyAmount(3, aStack),
- GTModHandler.getIC2Item("industrialTnt", 2))
+ .itemInputs(GTUtility.copyAmount(3, aStack))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, 1),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 2))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 8)
.addTo(implosionRecipes);
}
}
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
index a3b9f4e049..3fff4d57aa 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
@@ -18,6 +18,7 @@ import static gregtech.api.util.GTRecipeBuilder.MINUTES;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
import static gregtech.api.util.GTRecipeBuilder.WILDCARD;
+import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
import static gregtech.api.util.GTRecipeConstants.COMPRESSION_TIER;
import static gregtech.api.util.GTRecipeConstants.FUEL_TYPE;
import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
@@ -288,36 +289,13 @@ public class ProcessingPlate implements gregtech.api.interfaces.IOreRecipeRegist
if (GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L) != null) {
GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Block_Powderbarrel.get(4))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack), GTModHandler.getIC2Item("dynamite", 1, null))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack), new ItemStack(Blocks.tnt, 2))
- .itemOutputs(
- GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
- GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
- .duration(1 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(implosionRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(GTUtility.copyAmount(1, aStack), GTModHandler.getIC2Item("industrialTnt", 1))
+ .itemInputs(GTUtility.copyAmount(1, aStack))
.itemOutputs(
GTOreDictUnificator.get(OrePrefixes.compressed, aMaterial, 1L),
GTOreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L))
.duration(1 * SECONDS)
.eut(TierEU.RECIPE_LV)
+ .metadata(ADDITIVE_AMOUNT, 2)
.addTo(implosionRecipes);
}
}