From c4083c98841142ee9d464e5e2a808499ebeb5284 Mon Sep 17 00:00:00 2001
From: Su5eD <su5ed@outlook.com>
Date: Wed, 5 Jul 2023 16:45:23 +0200
Subject: [PATCH] Add implementation version

---
 .github/workflows/build.yml                   | 34 +++++++++++++++++--
 build.gradle                                  |  2 +-
 .../META-INF/asm/injectTooltipComponent.js    |  2 +-
 gradle.properties                             |  1 +
 gradle/ffapi-setup.gradle                     |  1 +
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e52307de..8296cbcae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,22 @@ jobs:
         with:
           fetch-depth: 0
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew check build publishToMavenLocal --stacktrace --warning-mode=fail -Porg.gradle.parallel.threads=4
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-excludes: |
+            gradle.properties
+      - name: Setup gradle.properties
+        env:
+          GRADLE_PROPERTIES: ${{ vars.GRADLE_PROPERTIES }}
+        shell: bash
+        run: |
+          mkdir -p ~/.gradle/
+          echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+          echo "${GRADLE_PROPERTIES}" > ~/.gradle/gradle.properties
+      - name: Create placeholder assets dir
+        run: mkdir -p ${{ env.GRADLE_USER_HOME }}/caches/fabric-loom/assets
+      - run: ./gradlew check build publishToMavenLocal --stacktrace
       - uses: Juuxel/publish-checkstyle-report@v1
         if: ${{ failure() }}
         with:
@@ -76,5 +91,20 @@ jobs:
         with:
           distribution: 'microsoft'
           java-version: '17'
-      - run: ./gradlew generateResources --stacktrace --warning-mode=fail
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-excludes: |
+            gradle.properties
+      - name: Setup gradle.properties
+        env:
+          GRADLE_PROPERTIES: ${{ vars.GRADLE_PROPERTIES }}
+        shell: bash
+        run: |
+          mkdir -p ~/.gradle/
+          echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
+          echo "${GRADLE_PROPERTIES}" > ~/.gradle/gradle.properties
+      - name: Create placeholder assets dir
+        run: mkdir -p ${{ env.GRADLE_USER_HOME }}/caches/fabric-loom/assets
+      - run: ./gradlew generateResources --stacktrace
       - run: if [ -n "$(git status --porcelain)" ]; then exit 1; fi
diff --git a/build.gradle b/build.gradle
index 1bebff758..6aca8d19a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ def ENV = System.getenv()
 def signingEnabled = ENV.SIGNING_SERVER
 
 def configuredVersion = project.version
-version = project.version + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") + getBranch()
+version = project.version + '+' + project.forgified_version + "+" + (ENV.GITHUB_RUN_NUMBER ? "" : "local-") + getBranch()
 logger.lifecycle("Building Fabric: " + version)
 
 
diff --git a/fabric-rendering-v1/src/client/resources/META-INF/asm/injectTooltipComponent.js b/fabric-rendering-v1/src/client/resources/META-INF/asm/injectTooltipComponent.js
index cc74b7a92..198baaf97 100644
--- a/fabric-rendering-v1/src/client/resources/META-INF/asm/injectTooltipComponent.js
+++ b/fabric-rendering-v1/src/client/resources/META-INF/asm/injectTooltipComponent.js
@@ -26,7 +26,7 @@ function initializeCoreMod() {
                 list.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/fabricmc/fabric/api/event/Event", "invoker", "()Ljava/lang/Object;"));
                 list.add(new TypeInsnNode(Opcodes.CHECKCAST, "net/fabricmc/fabric/api/client/rendering/v1/TooltipComponentCallback"));
                 list.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                list.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "net/fabricmc/fabric/api/client/rendering/v1/TooltipComponentCallback", "getComponent", "(Lnet/minecraft/client/item/TooltipData;)Lnet/minecraft/client/gui/tooltip/TooltipComponent;"));
+                list.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, "net/fabricmc/fabric/api/client/rendering/v1/TooltipComponentCallback", "getComponent", yarn ? "(Lnet/minecraft/client/item/TooltipData;)Lnet/minecraft/client/gui/tooltip/TooltipComponent;" : "(Lnet/minecraft/world/inventory/tooltip/TooltipComponent;)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent;"));
                 list.add(new InsnNode(Opcodes.DUP));
                 list.add(new JumpInsnNode(Opcodes.IFNULL, end));
                 list.add(new InsnNode(Opcodes.ARETURN));
diff --git a/gradle.properties b/gradle.properties
index 71f8723f1..4b65a91e4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -67,3 +67,4 @@ loom.platform=forge
 forge_version=1.19.4-45.1.2
 server_data_pack_format=12
 pack_format=13
+forgified_version=1.1.0
diff --git a/gradle/ffapi-setup.gradle b/gradle/ffapi-setup.gradle
index 96b0f367e..363258ea6 100644
--- a/gradle/ffapi-setup.gradle
+++ b/gradle/ffapi-setup.gradle
@@ -157,6 +157,7 @@ remapJar {
 		.map { it.left().collect { it.resolve() } }
 }
 remapTestmodJar {
+	mustRunAfter remapJar
 	forgeNestedJars.addAll includedJarFactory.getForgeNestedJars(configurations.includedTestModRemappedJars)
 		.map { it.left().collect { it.resolve() } }
 	addNestedDependencies = true