Changes implosion & bio vat recipe generation (#3104)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

6 files changed, 46 insertions, 273 deletions

diff --git a/src/main/java/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/bartworks/common/loaders/BioRecipeLoader.java
index 77ae6b8c2c..84f603a8b3 100644
--- a/src/main/java/bartworks/common/loaders/BioRecipeLoader.java
+++ b/src/main/java/bartworks/common/loaders/BioRecipeLoader.java
@@ -19,7 +19,6 @@ import static gregtech.api.enums.Mods.CropsPlusPlus;
 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.SIEVERTS;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -32,7 +31,6 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
-import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 
@@ -195,17 +193,5 @@ public class BioRecipeLoader {
             .addTo(bacterialVatRecipes);
     }
 
-    public static void runOnServerStarted() {
-        RecipeMaps.fermentingRecipes.getAllRecipes()
-            .forEach(
-                recipe -> GTValues.RA.stdBuilder()
-                    .special(BioItemList.getPetriDish(BioCultureLoader.generalPurposeFermentingBacteria))
-                    .fluidInputs(recipe.mFluidInputs)
-                    .fluidOutputs(recipe.mFluidOutputs)
-                    .duration(recipe.mDuration)
-                    .eut(recipe.mEUt)
-                    .metadata(SIEVERTS, (int) GTUtility.getTier(recipe.mEUt))
-                    .addTo(bacterialVatRecipes));
-
-    }
+    public static void runOnServerStarted() {}
 }
diff --git a/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java
index 1baa5ac7f5..a27da26919 100644
--- a/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java
+++ b/src/main/java/bartworks/common/loaders/StaticRecipeChangeLoaders.java
@@ -13,9 +13,7 @@
 
 package bartworks.common.loaders;
 
-import static bartworks.API.recipe.BartWorksRecipeMaps.electricImplosionCompressorRecipes;
 import static gregtech.api.enums.Mods.TinkerConstruct;
-import static gregtech.api.enums.TickTime.TICK;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -26,7 +24,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidStack;
@@ -46,12 +43,9 @@ import bwcrossmod.BartWorksCrossmod;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gnu.trove.map.hash.TObjectDoubleHashMap;
 import gregtech.api.enums.Element;
-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;
-import gregtech.api.enums.TierEU;
 import gregtech.api.objects.GTItemStack;
 import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
@@ -534,29 +528,7 @@ public class StaticRecipeChangeLoaders {
     }
 
     public static void addElectricImplosionCompressorRecipes() {
-        RecipeMaps.implosionRecipes.getAllRecipes()
-            .stream()
-            .filter(e -> e.mInputs != null)
-            .forEach(
-                recipe -> GTValues.RA.stdBuilder()
-                    .itemInputs(
-                        Arrays.stream(recipe.mInputs)
-                            .filter(e -> !StaticRecipeChangeLoaders.checkForExplosives(e))
-                            .distinct()
-                            .toArray(ItemStack[]::new))
-                    .itemOutputs(recipe.mOutputs)
-                    .duration(1 * TICK)
-                    .eut(TierEU.RECIPE_UEV)
-                    .addTo(electricImplosionCompressorRecipes));
-
         // Custom EIC recipes.
         new ElectricImplosionCompressorRecipes().run();
     }
-
-    private static boolean checkForExplosives(ItemStack input) {
-        return GTUtility.areStacksEqual(input, new ItemStack(Blocks.tnt))
-            || GTUtility.areStacksEqual(input, GTModHandler.getIC2Item("industrialTnt", 1L))
-            || GTUtility.areStacksEqual(input, GTModHandler.getIC2Item("dynamite", 1L))
-            || GTUtility.areStacksEqual(input, ItemList.Block_Powderbarrel.get(1L));
-    }
 }
diff --git a/src/main/java/gregtech/api/recipe/RecipeMaps.java b/src/main/java/gregtech/api/recipe/RecipeMaps.java
index ad2f609dc7..6cd5a83e57 100644
--- a/src/main/java/gregtech/api/recipe/RecipeMaps.java
+++ b/src/main/java/gregtech/api/recipe/RecipeMaps.java
@@ -4,9 +4,11 @@ import static gregtech.api.enums.Mods.Avaritia;
 import static gregtech.api.enums.Mods.GTNHIntergalactic;
 import static gregtech.api.enums.Mods.NEICustomDiagrams;
 import static gregtech.api.enums.Mods.Railcraft;
+import static gregtech.api.enums.TickTime.TICK;
 import static gregtech.api.util.GTModHandler.getModItem;
 import static gregtech.api.util.GTRecipeConstants.ADDITIVE_AMOUNT;
 import static gregtech.api.util.GTRecipeConstants.FUEL_VALUE;
+import static gregtech.api.util.GTRecipeConstants.SIEVERTS;
 import static gregtech.api.util.GTRecipeMapUtil.GTRecipeTemplate;
 import static gregtech.api.util.GTRecipeMapUtil.asTemplate;
 import static gregtech.api.util.GTRecipeMapUtil.buildOrEmpty;
@@ -32,10 +34,14 @@ import org.apache.commons.lang3.ArrayUtils;
 import com.gtnewhorizons.modularui.api.drawable.UITexture;
 import com.gtnewhorizons.modularui.common.widget.ProgressBar;
 
+import bartworks.API.recipe.BartWorksRecipeMaps;
+import bartworks.common.loaders.BioCultureLoader;
+import bartworks.common.loaders.BioItemList;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.TierEU;
 import gregtech.api.gui.modularui.GTUITextures;
 import gregtech.api.interfaces.IRecipeMap;
 import gregtech.api.objects.ItemData;
@@ -1233,5 +1239,17 @@ public final class RecipeMaps {
                             .addDenseLiquidRecipe(r))
                     .map(Collections::singletonList)
                     .orElse(Collections.emptyList())));
+        RecipeMaps.fermentingRecipes.addDownstream(
+            IRecipeMap.newRecipeMap(
+                b -> BartWorksRecipeMaps.bacterialVatRecipes.doAdd(
+                    b.copy()
+                        .special(BioItemList.getPetriDish(BioCultureLoader.generalPurposeFermentingBacteria))
+                        .metadata(SIEVERTS, (int) GTUtility.getTier(b.getEUt())))));
+        RecipeMaps.implosionRecipes.addDownstream(
+            IRecipeMap.newRecipeMap(
+                b -> BartWorksRecipeMaps.electricImplosionCompressorRecipes.doAdd(
+                    b.copy()
+                        .duration(1 * TICK)
+                        .eut(TierEU.RECIPE_UEV))));
     }
 }
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);
         }
     }