One step foil (#258)

* addapt gt recipes

* update dep file

* update BS+SA

Former-commit-id: c08935c941af4f9553b7abac32d717d0145ae2f2

3 files changed, 45 insertions, 25 deletions

diff --git a/build.gradle b/build.gradle
index 89350b8a35..fa88ae1be7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1669411416
+//version: 1671313514
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -31,7 +31,7 @@ buildscript {
             url 'https://maven.minecraftforge.net'
         }
         maven {
-            // GTNH ForgeGradle Fork
+            // GTNH ForgeGradle and ASM Fork
             name = "GTNH Maven"
             url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
         }
@@ -45,7 +45,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.11'
+        //Overwrite the current ASM version to fix shading newer than java 8 applicatations.
+        classpath 'org.ow2.asm:asm-debug-all-custom:5.0.3'  
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2.13'
     }
 }
 plugins {
@@ -278,7 +280,9 @@ minecraft {
     runDir = 'run'
 
     if (replaceGradleTokenInFile) {
-        replaceIn replaceGradleTokenInFile
+        for (f in replaceGradleTokenInFile.split(',')) {
+            replaceIn f
+        }
         if (gradleTokenModId) {
             replace gradleTokenModId, modId
         }
@@ -330,6 +334,12 @@ repositories {
             name = "GTNH Maven"
             url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
         }
+        if (usesMixinDebug.toBoolean()) {
+            maven {
+                name = "Fabric Maven"
+                url = "https://maven.fabricmc.net/"
+            }
+        }
     }
 }
 
@@ -338,10 +348,13 @@ 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.1:processor')
+        annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.3:processor')
+        if (usesMixinDebug.toBoolean()) {
+            runtimeOnly('org.jetbrains:intellij-fernflower:1.2.1.16')
+        }
     }
     if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) {
-        compile('com.gtnewhorizon:gtnhmixins:2.1.1')
+        compile('com.gtnewhorizon:gtnhmixins:2.1.3')
     }
 }
 
@@ -694,7 +707,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) {
         }
     }
     if (usesMixins.toBoolean()) {
-        addModrinthDep("required", "version", "gtnhmixins")
+        addModrinthDep("required", "project", "gtnhmixins")
     }
     tasks.modrinth.dependsOn(build)
     tasks.publish.dependsOn(tasks.modrinth)
diff --git a/dependencies.gradle b/dependencies.gradle
index 59ce54381d..2f07a7bb64 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,50 +1,50 @@
 // Add your dependencies here
 
 dependencies {
-    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.195:dev")
+    compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.204:dev")
     compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev")
-    compile("com.github.GTNewHorizons:TecTech:5.0.52:dev")
-    compile("com.github.GTNewHorizons:NotEnoughItems:2.3.14-GTNH:dev")
-    compile("com.github.GTNewHorizons:TinkersConstruct:1.9.4-GTNH:dev")
-    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.5:dev")
-    compile("com.github.GTNewHorizons:CodeChickenCore:1.1.6:dev")
-    compile("com.github.GTNewHorizons:Galacticraft:3.0.47-GTNH:dev") {
+    compile("com.github.GTNewHorizons:TecTech:5.0.67:dev")
+    compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev")
+    compile("com.github.GTNewHorizons:TinkersConstruct:1.9.11-GTNH:dev")
+    compile("com.github.GTNewHorizons:CodeChickenLib:1.1.5.6:dev")
+    compile("com.github.GTNewHorizons:CodeChickenCore:1.1.7:dev")
+    compile("com.github.GTNewHorizons:Galacticraft:3.0.62-GTNH:dev") {
         exclude group:"com.github.GTNewHorizons", module:"SpongePoweredMixin"
         exclude group:"com.github.GTNewHorizons", module:"SpongeMixins"
     }
-    compile("com.github.GTNewHorizons:ModularUI:1.0.23:dev")
+    compile("com.github.GTNewHorizons:ModularUI:1.0.38:dev")
     compile("com.github.GTNewHorizons:GalacticGregGT5:1.0.8:dev") {
         exclude group:"com.github.GTNewHorizons", module:"bartworks"
     }
     compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
 
-    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-107-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-134-GTNH:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:AppleCore:3.2.2:dev") {
+    compileOnly("com.github.GTNewHorizons:AppleCore:3.2.4:dev") {
         transitive = false
     }
     compileOnly("com.github.GTNewHorizons:TinkersGregworks:master-SNAPSHOT:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:ForestryMC:4.4.15:api") {
+    compileOnly("com.github.GTNewHorizons:ForestryMC:4.5.6:api") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:Railcraft:9.13.12:api") {
+    compileOnly("com.github.GTNewHorizons:Railcraft:9.13.14:api") {
         transitive = false
     }
 
-    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.47:api") {
+    compileOnly("com.github.GTNewHorizons:EnderIO:2.3.1.49:api") {
         transitive = false
     }
 
-    compileOnly("com.github.GTNewHorizons:OpenComputers:1.7.5.32-GTNH:api") {
+    compileOnly("com.github.GTNewHorizons:OpenComputers:1.8.0.2-GTNH:api") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.27:dev") {
+    compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.28:dev") {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.7-GTNH:dev") {
+    compileOnly("com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev") {
         transitive = false
     }
     runtime("com.github.GTNewHorizons:Yamcl:0.5.84:dev")
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
index 20ba0564ac..a2418deed6 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
@@ -119,8 +119,15 @@ public class SimpleMetalLoader implements IWerkstoffRunnable {
                     werkstoff.get(plate),
                     GT_Utility.getIntegratedCircuit(1),
                     werkstoff.get(foil, 4),
-                    (int) Math.max(werkstoff.getStats().getMass() * 5L, 1L),
-                    48);
+                    (int) Math.max(werkstoff.getStats().getMass() * 1L, 1L),
+                    24);
+
+            GT_Values.RA.addBenderRecipe(
+                    werkstoff.get(ingot),
+                    GT_Utility.getIntegratedCircuit(10),
+                    werkstoff.get(foil, 4),
+                    (int) Math.max(werkstoff.getStats().getMass() * 2L, 1L),
+                    24);
 
             GT_Values.RA.addForgeHammerRecipe(
                     werkstoff.get(stick, 2),