From 76566c04a14f7e57e843cd9d3d976b1dd680385b Mon Sep 17 00:00:00 2001
From: Serenibyss <10861407+serenibyss@users.noreply.github.com>
Date: Wed, 12 Jul 2023 06:31:26 -0500
Subject: Fix some recipe conflicts (#688)

* Rope conflict

* Ethylbenzene conflict

* Rock Salt, Potash conflicts

* spotless apply
---
 src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java  | 12 ++++++++++--
 src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gtPlusPlus/core')

diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
index d335281fd9..b542cd392e 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java
@@ -98,10 +98,18 @@ public class CoalTar extends ItemPackage {
         // C2H4 + C6H6 = C8H10
         GT_Values.RA.addChemicalRecipe(
                 ItemUtils.getItemStackOfAmountFromOreDict("cellEthylene", 2),
+                ItemUtils.getGregtechCircuit(1),
+                FluidUtils.getFluidStack("benzene", 2000),
+                FluidUtils.getFluidStack("fluid.ethylbenzene", 2000),
+                ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
+                300);
+
+        GT_Values.RA.addChemicalRecipe(
                 ItemUtils.getItemStackOfAmountFromOreDict("cellBenzene", 2),
-                null,
+                ItemUtils.getGregtechCircuit(1),
+                FluidUtils.getFluidStack("ethylene", 2000),
                 FluidUtils.getFluidStack("fluid.ethylbenzene", 2000),
-                ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 4),
+                ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2),
                 300);
     }
 
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index a887a18145..92d1301a1d 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1137,7 +1137,7 @@ public class RECIPES_GREGTECH {
          */
 
         CORE.RA.addSixSlotAssemblingRecipe(
-                new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6) },
+                new ItemStack[] { ItemUtils.getSimpleStack(ModItems.itemRope, 6), ItemUtils.getGregtechCircuit(6) },
                 null,
                 ItemUtils.getSimpleStack(ModBlocks.blockNet, 2),
                 1 * 20,
-- 
cgit