Make chemplant tier visually 1-indexed (#557)

* updateBuildScript

* Make chemplant tier visually 1-indexed

5 files changed, 23 insertions, 16 deletions

diff --git a/build.gradle b/build.gradle
index b438d6c28b..5dc6b8b965 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1676922328
+//version: 1677142954
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -73,7 +73,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.2.1'
+    id 'com.gtnewhorizons.retrofuturagradle' version '1.2.2'
 }
 boolean settingsupdated = verifySettingsGradle()
 settingsupdated = verifyGitAttributes() || settingsupdated
@@ -466,8 +466,9 @@ repositories.configureEach { repo ->
 apply from: 'repositories.gradle'
 
 configurations {
+    runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
+    testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable)
     for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) {
-        config.extendsFrom(runtimeOnlyNonPublishable)
         if (usesShadowedDependencies.toBoolean()) {
             config.extendsFrom(shadowImplementation)
             // TODO: remove Compile after all uses are refactored to Implementation
@@ -685,8 +686,13 @@ ext.java17Toolchain = (JavaToolchainSpec spec) -> {
     spec.vendor.set(JvmVendorSpec.matching("jetbrains"))
 }
 
-ext.java17DependenciesCfg = configurations.create("java17Dependencies")
-ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies")
+ext.java17DependenciesCfg = configurations.create("java17Dependencies") {
+    extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution
+    canBeConsumed = false
+}
+ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") {
+    canBeConsumed = false
+}
 
 dependencies {
     def lwjgl3ifyVersion = '1.1.28'
@@ -706,7 +712,7 @@ dependencies {
     java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}")
     java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1')
     java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0")
-    java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches")
+    java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
 }
 
 ext.java17JvmArgs = [
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710..943f0cbfa7 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4b..fc10b601f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java
index 0ed296cd66..6c18f7fed8 100644
--- a/src/main/java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java
@@ -858,7 +858,8 @@ public class GTPP_Recipe extends GT_Recipe implements IComparableRecipe {
                         tierMaterial = tierMaterialNames.get(i);
                     }
                 }
-                return Collections.singletonList(applyPrefixAndSuffix.apply(specialValue) + " - " + tierMaterial);
+                // blockrenderer uses 1-indexed
+                return Collections.singletonList(applyPrefixAndSuffix.apply(specialValue + 1) + " - " + tierMaterial);
             });
         }
 
diff --git a/src/main/java/gtPlusPlus/core/handler/BookHandler.java b/src/main/java/gtPlusPlus/core/handler/BookHandler.java
index b9831d3105..273179bdcc 100644
--- a/src/main/java/gtPlusPlus/core/handler/BookHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/BookHandler.java
@@ -215,21 +215,21 @@ public class BookHandler {
 
                         // Machine Casings
                         "Valid Solid Machine Casings:" + "\n"
-                                + "0 - Strong Bronze"
+                                + "1 - Strong Bronze"
                                 + "\n"
-                                + "1 - Solid Steel"
+                                + "2 - Solid Steel"
                                 + "\n"
-                                + "2 - Sturdy Aluminium"
+                                + "3 - Sturdy Aluminium"
                                 + "\n"
-                                + "3 - Clean Stainless Steel"
+                                + "4 - Clean Stainless Steel"
                                 + "\n"
-                                + "4 - Stable Titanium"
+                                + "5 - Stable Titanium"
                                 + "\n"
-                                + "5 - Robust Tungstensteel"
+                                + "6 - Robust Tungstensteel"
                                 + "\n"
-                                + "6 - Vigorous Laurenium"
+                                + "7 - Vigorous Laurenium"
                                 + "\n"
-                                + "7 - Rugged Botmium",
+                                + "8 - Rugged Botmium",
 
                         // Machine Casings
                         "Valid Tiered Machine Casings:" + "\n"