Changes implosion & bio vat recipe generation (#3104)

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

2 files changed, 1 insertions, 43 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));
-    }
 }