Optical Circuit recipes (#272)

* Bump Dep

* Add wraps for optical parts

* Raw exposed optical chip recipe

* Allow mutated living solder in CAL

* update bs

* Fix chance not shown on NEI with culture transformation recipe (#275) (#276)

Co-authored-by: miozune <miozune@gmail.com>

* merge master in (#278)

* Fix chance not shown on NEI with culture transformation recipe (#275)

* Fix incorrect amount of Liquid DNA shown on NEI for culture synthesis recipe (#277)

---------

Co-authored-by: miozune <miozune@gmail.com>

* Up chip tier by 1

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: miozune <miozune@gmail.com>
Former-commit-id: e1ee12ac98200eb6358f7634ddd2a0c499fe788c

5 files changed, 40 insertions, 7 deletions

diff --git a/build.gradle b/build.gradle
index 2dc32c9f20..505ad92b1a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1673027205
+//version: 1674409054
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -144,6 +144,7 @@ propertyDefaultIfUnset("modrinthProjectId", "")
 propertyDefaultIfUnset("modrinthRelations", "")
 propertyDefaultIfUnset("curseForgeProjectId", "")
 propertyDefaultIfUnset("curseForgeRelations", "")
+propertyDefaultIfUnset("minimizeShadowedDependencies", true)
 
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
@@ -411,7 +412,9 @@ shadowJar {
         attributes(getManifestAttributes())
     }
 
-    minimize()  // This will only allow shading for actually used classes
+    if (minimizeShadowedDependencies.toBoolean()) {
+        minimize()  // This will only allow shading for actually used classes
+    }
     configurations = [
         project.configurations.shadowImplementation,
         project.configurations.shadowCompile
@@ -554,7 +557,9 @@ task shadowDevJar(type: ShadowJar) {
         attributes(getManifestAttributes())
     }
 
-    minimize()  // This will only allow shading for actually used classes
+    if (minimizeShadowedDependencies.toBoolean()) {
+        minimize()  // This will only allow shading for actually used classes
+    }
     configurations = [
         project.configurations.shadowImplementation,
         project.configurations.shadowCompile
diff --git a/dependencies.gradle b/dependencies.gradle
index 0e76c84eaf..6438489b5a 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.211:dev")
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.232:dev")
     compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev")
     compile("com.github.GTNewHorizons:TecTech:5.0.67:dev")
     compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev")
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
index c272985aa4..146cf36eac 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
@@ -609,7 +609,7 @@ public class StaticRecipeChangeLoaders {
                             "Electric Implosion Compressor",
                             (String) null,
                             "gregtech:textures/gui/basicmachines/Default",
-                            1,
+                            2,
                             2,
                             0,
                             0,
@@ -654,6 +654,24 @@ public class StaticRecipeChangeLoaders {
                     1); // aSpecialVaue has no meaning here.
         }
 
+        if (Loader.isModLoaded("universalsingularities")) {
+
+            // Raw Exposed Optical Chip
+            eicMap.addRecipe(
+                    false,
+                    new ItemStack[] {
+                        ItemList.Circuit_Silicon_Wafer7.get(1L),
+                        GT_ModHandler.getModItem("universalsingularities", "universal.general.singularity", 1L, 20)
+                    },
+                    new ItemStack[] {ItemList.Circuit_Chip_Optical.get(16L)},
+                    null,
+                    new FluidStack[] {GT_Values.NF},
+                    new FluidStack[] {GT_Values.NF},
+                    5 * 20,
+                    125_829_120,
+                    1);
+        }
+
         eicMap.addRecipe(
                 false,
                 new ItemStack[] {GT_ModHandler.getModItem("GoodGenerator", "highDensityPlutoniumNugget", 5L)},
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
index 2abfb4e066..6cfe902668 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
@@ -107,8 +107,13 @@ public class CircuitImprintLoader {
                     ? FluidRegistry.getFluid("molten.indalloy140")
                     : FluidRegistry.getFluid("molten.solderingalloy");
 
+            Fluid solderUEV = FluidRegistry.getFluid("molten.mutatedlivingsolder") != null
+                    ? FluidRegistry.getFluid("molten.mutatedlivingsolder")
+                    : FluidRegistry.getFluid("molten.solderingalloy");
+
             if (circuitRecipe.mFluidInputs[0].isFluidEqual(Materials.SolderingAlloy.getMolten(0))
-                    || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderIndalloy, 0))) {
+                    || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderIndalloy, 0))
+                    || circuitRecipe.mFluidInputs[0].isFluidEqual(new FluidStack(solderUEV, 0))) {
                 GT_Recipe newRecipe = CircuitImprintLoader.reBuildRecipe(circuitRecipe);
                 if (newRecipe != null)
                     BWRecipes.instance
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
index 6ba0d7da55..617609a850 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitPartLoader.java
@@ -155,5 +155,10 @@ public class CircuitPartLoader implements Runnable {
             Circuit_Parts_TransistorXSMD,
             Circuit_Parts_CapacitorXSMD,
             Circuit_Parts_InductorASMD,
-            Circuit_Parts_InductorXSMD));
+            Circuit_Parts_InductorXSMD,
+            Circuit_Chip_Optical,
+            Circuit_Board_Optical,
+            Optically_Perfected_CPU,
+            Optical_Cpu_Containment_Housing,
+            Optically_Compatible_Memory));
 }