Fix sealed wood + more collisions (#3282)

4 files changed, 4 insertions, 55 deletions

diff --git a/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java b/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java
index 9525041fcc..184e1571e1 100644
--- a/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/ProcessingArrayRecipeLoader.java
@@ -3,6 +3,7 @@ package gregtech.loaders.postload;
 import gregtech.api.enums.SoundResource;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.ProcessingArrayManager;
+import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 
 public class ProcessingArrayRecipeLoader {
 
@@ -35,7 +36,7 @@ public class ProcessingArrayRecipeLoader {
         ProcessingArrayManager.addRecipeMapToPA("basicmachine.canner", RecipeMaps.cannerRecipes);
         ProcessingArrayManager.addSoundResourceToPA("basicmachine.canner", SoundResource.IC2_MACHINES_EXTRACTOR_OP);
         // Centrifuge
-        ProcessingArrayManager.addRecipeMapToPA("basicmachine.centrifuge", RecipeMaps.centrifugeNonCellRecipes);
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.centrifuge", GTPPRecipeMaps.centrifugeNonCellRecipes);
         ProcessingArrayManager.addSoundResourceToPA("basicmachine.centrifuge", SoundResource.NONE);
         // Chemical Bath
         ProcessingArrayManager.addRecipeMapToPA("basicmachine.chemicalbath", RecipeMaps.chemicalBathRecipes);
@@ -60,7 +61,7 @@ public class ProcessingArrayRecipeLoader {
         ProcessingArrayManager
             .addSoundResourceToPA("basicmachine.distillery", SoundResource.GT_MACHINES_DISTILLERY_LOOP);
         // Electrolyzer
-        ProcessingArrayManager.addRecipeMapToPA("basicmachine.electrolyzer", RecipeMaps.electrolyzerNonCellRecipes);
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.electrolyzer", GTPPRecipeMaps.electrolyzerNonCellRecipes);
         ProcessingArrayManager
             .addSoundResourceToPA("basicmachine.electrolyzer", SoundResource.IC2_MACHINES_MAGNETIZER_LOOP);
         // Extractor
@@ -115,7 +116,7 @@ public class ProcessingArrayRecipeLoader {
         ProcessingArrayManager
             .addSoundResourceToPA("basicmachine.microwave", SoundResource.IC2_MACHINES_ELECTROFURNACE_LOOP);
         // Mixer
-        ProcessingArrayManager.addRecipeMapToPA("basicmachine.mixer", RecipeMaps.mixerNonCellRecipes);
+        ProcessingArrayManager.addRecipeMapToPA("basicmachine.mixer", GTPPRecipeMaps.mixerNonCellRecipes);
         ProcessingArrayManager.addSoundResourceToPA("basicmachine.mixer", SoundResource.NONE);
         // Ore Washer
         ProcessingArrayManager.addRecipeMapToPA("basicmachine.orewasher", RecipeMaps.oreWasherRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
index 74b1e0e78e..b3605375bd 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FermenterRecipes.java
@@ -67,13 +67,6 @@ public class FermenterRecipes implements Runnable {
             .addTo(fermentingRecipes);
 
         GTValues.RA.stdBuilder()
-            .fluidInputs(getFluidStack("potion.reedwater", 50))
-            .fluidOutputs(getFluidStack("potion.rum", 25))
-            .duration(51 * SECONDS + 4 * TICKS)
-            .eut(2)
-            .addTo(fermentingRecipes);
-
-        GTValues.RA.stdBuilder()
             .fluidInputs(getFluidStack("potion.rum", 50))
             .fluidOutputs(getFluidStack("potion.piratebrew", 10))
             .duration(1 * MINUTES + 42 * SECONDS + 8 * TICKS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
index d3197b6f30..69a82711e9 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
@@ -1,7 +1,6 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.enums.Mods.IndustrialCraft2;
-import static gregtech.api.enums.Mods.NewHorizonsCoreMod;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
@@ -153,14 +152,6 @@ public class FluidSolidifierRecipes implements Runnable {
             .addTo(fluidSolidifierRecipes);
 
         GTValues.RA.stdBuilder()
-            .itemInputs(ItemList.Shape_Mold_Plate.get(0L))
-            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.plate, Materials.Glass, 1L))
-            .fluidInputs(Materials.Glass.getMolten(144L))
-            .duration(12 * TICKS)
-            .eut(4)
-            .addTo(fluidSolidifierRecipes);
-
-        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Bottle.get(0L))
             .itemOutputs(ItemList.Bottle_Empty.get(1L))
             .fluidInputs(Materials.Glass.getMolten(144L))
@@ -233,14 +224,6 @@ public class FluidSolidifierRecipes implements Runnable {
             .addTo(fluidSolidifierRecipes);
 
         GTValues.RA.stdBuilder()
-            .itemInputs(ItemList.Shape_Mold_Plate.get(0L))
-            .itemOutputs(getModItem(NewHorizonsCoreMod.ID, "item.ReinforcedGlassPlate", 1L, 0))
-            .fluidInputs(Materials.ReinforceGlass.getMolten(72))
-            .duration(8 * SECONDS)
-            .eut(TierEU.RECIPE_EV)
-            .addTo(fluidSolidifierRecipes);
-
-        GTValues.RA.stdBuilder()
             .itemInputs(ItemList.Shape_Mold_Block.get(0L))
             .itemOutputs(getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L))
             .fluidInputs(Materials.ReinforceGlass.getMolten(144))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
index 89f1fc6156..58f578c488 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
@@ -337,34 +337,6 @@ public class VacuumFreezerRecipes implements Runnable {
                 .addTo(vacuumFreezerRecipes);
 
             GTValues.RA.stdBuilder()
-                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L))
-                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L))
-                .duration(5 * TICKS)
-                .eut(TierEU.RECIPE_MV)
-                .addTo(vacuumFreezerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Nitrogen, 1L))
-                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Nitrogen, 1L))
-                .duration(1 * SECONDS + 8 * TICKS)
-                .eut(TierEU.RECIPE_MV)
-                .addTo(vacuumFreezerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Oxygen, 1L))
-                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Oxygen, 1L))
-                .duration(1 * SECONDS + 12 * TICKS)
-                .eut(TierEU.RECIPE_MV)
-                .addTo(vacuumFreezerRecipes);
-
-            GTValues.RA.stdBuilder()
-                .itemInputs(GTOreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Radon, 1L))
-                .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cell, Materials.Radon, 1L))
-                .duration(5 * SECONDS + 10 * TICKS)
-                .eut(TierEU.RECIPE_HV)
-                .addTo(vacuumFreezerRecipes);
-
-            GTValues.RA.stdBuilder()
                 .fluidInputs(Materials.Boron.getPlasma(144L))
                 .fluidOutputs(Materials.Boron.getMolten(144L))
                 .duration(1 * SECONDS)