Merge pull request #147 from GTNewHorizons/TPM

Add recipe for TPM multiblock controller

3 files changed, 33 insertions, 7 deletions

diff --git a/build.gradle b/build.gradle
index e2e8960ee9..5ff6d7186a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1675173326
+//version: 1675268365
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -66,7 +66,7 @@ plugins {
     id 'com.diffplug.spotless' version '6.7.2' apply false
     id 'com.modrinth.minotaur' version '2.+' apply false
     id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
-    id 'com.gtnewhorizons.retrofuturagradle' version '1.1.3'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.1.4'
 }
 boolean settingsupdated = verifySettingsGradle()
 settingsupdated = verifyGitAttributes() || settingsupdated
@@ -520,20 +520,20 @@ dependencies {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
         annotationProcessor('com.google.guava:guava:24.1.1-jre')
         annotationProcessor('com.google.code.gson:gson:2.8.6')
-        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.12:processor')
         if (usesMixinDebug.toBoolean()) {
             runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16')
         }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        implementation('com.gtnewhorizon:gtnhmixins:2.1.10')
+        implementation('com.gtnewhorizon:gtnhmixins:2.1.12')
     }
 }
 
 pluginManager.withPlugin('org.jetbrains.kotlin.kapt') {
     if (usesMixins.toBoolean()) {
         dependencies {
-            kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor')
+            kapt('com.gtnewhorizon:gtnhmixins:2.1.12:processor')
         }
     }
 }
@@ -633,6 +633,7 @@ tasks.named("processResources", ProcessResources).configure {
 
     if (usesMixins.toBoolean()) {
         from refMap
+        dependsOn("compileJava", "compileScala")
     }
 }
 
diff --git a/dependencies.gradle b/dependencies.gradle
index 4999bebfe9..284dbae9e0 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -2,8 +2,8 @@
 
 dependencies {
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
-    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.266:dev")
-    compile('com.github.GTNewHorizons:ModularUI:1.0.52:dev')
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.268:dev")
+    compile('com.github.GTNewHorizons:ModularUI:1.0.56:dev')
     compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev')
     compile('com.github.GTNewHorizons:NotEnoughItems:2.3.24-GTNH:dev')
     compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.7:dev')
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index 8598928433..1f0dfc18e6 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -2923,6 +2923,31 @@ public class DreamCraftRecipeLoader {
                 20000,
                 512_000_000);
 
+        // Transcendent Plasma Mixer - TPM.
+        TT_recipeAdder.addResearchableAssemblylineRecipe(
+                CustomItemList.eM_energyTunnel7_UV.get(1),
+                32_000_000,
+                4096,
+                32_000_000,
+                1,
+                new Object[] { CustomItemList.eM_energyTunnel7_UV.get(32),
+                        new Object[] { OrePrefixes.circuit.get(Materials.Piko), 32L },
+                        ItemList.Electric_Pump_UIV.get(16),
+                        GT_OreDictUnificator.get(OrePrefixes.plate, Materials.TranscendentMetal, 64),
+
+                        GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TranscendentMetal, 16),
+                        GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, Materials.TranscendentMetal, 64),
+                        GT_OreDictUnificator.get(OrePrefixes.screw, Materials.TranscendentMetal, 64),
+                        ItemList.EnergisedTesseract.get(32),
+
+                        ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L),
+                        ItemList.Reactor_Coolant_Sp_6.get(1L), ItemList.Reactor_Coolant_Sp_6.get(1L), },
+                new FluidStack[] { Materials.ExcitedDTCC.getFluid(2_048_000), Materials.ExcitedDTPC.getFluid(2_048_000),
+                        Materials.ExcitedDTRC.getFluid(2_048_000), Materials.ExcitedDTEC.getFluid(2_048_000), },
+                ItemList.Machine_Multi_TranscendentPlasmaMixer.get(1),
+                36_000,
+                32_000_000);
+
         // Stargate Recipes
         if (Loader.isModLoaded("eternalsingularity") && Loader.isModLoaded("SGCraft")) {
             TT_recipeAdder.addResearchableAssemblylineRecipe(