Remove collisions (#3324)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 5 insertions, 36 deletions

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index 87e5a7b22f..ac745f5ae6 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.item.chemistry;
 
+import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes;
 import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 import static gregtech.api.recipe.RecipeMaps.pyrolyseRecipes;
@@ -86,7 +87,7 @@ public class CoalTar extends ItemPackage {
     public static void recipeCreateEthylbenzene() {
         // C2H4 + C6H6 = C8H10
         GTValues.RA.stdBuilder()
-            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(1))
+            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2), GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
             .fluidInputs(FluidUtils.getFluidStack("benzene", 2000))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
@@ -95,13 +96,13 @@ public class CoalTar extends ItemPackage {
             .addTo(UniversalChemical);
 
         GTValues.RA.stdBuilder()
-            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(1))
+            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2), GTUtility.getIntegratedCircuit(3))
             .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2))
             .fluidInputs(FluidUtils.getFluidStack("ethylene", 2000))
             .fluidOutputs(FluidUtils.getFluidStack("fluid.ethylbenzene", 2000))
             .duration(15 * SECONDS)
             .eut(TierEU.RECIPE_LV)
-            .addTo(UniversalChemical);
+            .addTo(chemicalReactorRecipes);
     }
 
     public static void recipeCoalToCoalTar() {
diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
index bf587a137f..4e8071829e 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RecipesGregTech.java
@@ -10,7 +10,6 @@ import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes;
 import static gregtech.api.recipe.RecipeMaps.brewingRecipes;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
-import static gregtech.api.recipe.RecipeMaps.cutterRecipes;
 import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes;
 import static gregtech.api.recipe.RecipeMaps.distilleryRecipes;
 import static gregtech.api.recipe.RecipeMaps.electrolyzerRecipes;
@@ -110,7 +109,6 @@ public class RecipesGregTech {
         cyclotronRecipes();
         blastSmelterRecipes();
         extruderRecipes();
-        cuttingSawRecipes();
         breweryRecipes();
         laserEngraverRecipes();
         assemblyLineRecipes();
@@ -679,15 +677,6 @@ public class RecipesGregTech {
             .addTo(brewingRecipes);
     }
 
-    private static void cuttingSawRecipes() {
-        RA.stdBuilder()
-            .itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("blockMeatRaw", 1))
-            .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("plateMeatRaw", 9))
-            .duration(16 * TICKS)
-            .eut(TierEU.RECIPE_ULV)
-            .addTo(cutterRecipes);
-    }
-
     private static void electrolyzerRecipes() {
         RA.stdBuilder()
             .itemInputs(ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1))
@@ -985,17 +974,6 @@ public class RecipesGregTech {
             .duration(1 * SECONDS + 10 * TICKS)
             .eut(TierEU.RECIPE_LV)
             .addTo(multiblockChemicalReactorRecipes);
-
-        // Short-cut Styrene
-        // C6H6 + C2H4 = C8H8 + 2H
-        RA.stdBuilder()
-            .itemInputs(GTUtility.getIntegratedCircuit(24))
-            .itemOutputs()
-            .fluidInputs(Materials.Ethylene.getGas(500L), Materials.Benzene.getFluid(500L))
-            .fluidOutputs(Materials.Styrene.getFluid(500L), Materials.Hydrogen.getGas(1000))
-            .duration(12 * SECONDS)
-            .eut(TierEU.RECIPE_MV)
-            .addTo(multiblockChemicalReactorRecipes);
     }
 
     private static void assemblerRecipes() {
@@ -1550,12 +1528,6 @@ public class RecipesGregTech {
             .duration(15 * SECONDS)
             .eut(2)
             .addTo(compressorRecipes);
-        RA.stdBuilder()
-            .itemInputs(GTOreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L))
-            .itemOutputs(GTOreDictUnificator.get(OrePrefixes.block, Materials.MeatRaw, 1L))
-            .duration(15 * SECONDS)
-            .eut(2)
-            .addTo(compressorRecipes);
 
         RA.stdBuilder()
             .itemInputs(ItemList.FusionComputer_UV.get(9))
diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
index 317c61ee63..d95f27f479 100644
--- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
+++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java
@@ -31,10 +31,6 @@ public abstract class LogBase extends BlockLog {
         String blockName = "block" + Utils.sanitizeString(blockNameLocalized) + "Log";
         GameRegistry.registerBlock(this, ItemBlock.class, blockName);
         this.setBlockName(blockName);
-        ItemUtils.addItemToOreDictionary(
-            ItemUtils.getSimpleStack(this),
-            "log" + Utils.sanitizeString(blockNameLocalized),
-            true);
         ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), "logWood", true);
         this.setCreativeTab(AddToCreativeTab.tabBOP);
         Blocks.fire.setFireInfo(this, 20, 100);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
index 37ef0edc66..5218d0e451 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java
@@ -59,7 +59,7 @@ public class RecipeGenBlastSmelter extends RecipeGenBase {
 
         final Material[] badMaterials = { MaterialsFluorides.THORIUM_HEXAFLUORIDE,
             MaterialsFluorides.THORIUM_TETRAFLUORIDE, MaterialsAlloy.BLOODSTEEL, MaterialsNuclides.LiFBeF2ThF4UF4,
-            MaterialsNuclides.LiFBeF2ZrF4UF4, MaterialsNuclides.LiFBeF2ZrF4U235 };
+            MaterialsNuclides.LiFBeF2ZrF4UF4, MaterialsNuclides.LiFBeF2ZrF4U235, MaterialsAlloy.NITINOL_60 };
         for (final Material R : badMaterials) {
             if (M == R) {
                 return;