Port to 1.20.4 (#718)

Co-authored-by: Minecraftschurli <[email protected]>
VazkiiMods · Jan 27, 2024 · 0e43b26 · 0e43b26
1 parent b87e91a
commit 0e43b26
Show file tree

Hide file tree

Showing 45 changed files with 541 additions and 450 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -9,6 +9,7 @@ body:
       label: Mod loader
       options:
         - Forge
+        - NeoForge
         - Fabric
     validations:
       required: true

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -40,7 +40,7 @@ jobs:
         SNAPSHOT_SUFFIX=${{ !startsWith(github.ref, 'refs/tags/release-') && '-SNAPSHOT' || '' }}
         MC=$(awk -F '=' '/mc_version/ { print $2; }' gradle.properties)
         BUILD=$(awk -F '=' '/build_number/ { print $2; }' gradle.properties)
-        echo "forge=Forge/build/libs/Patchouli-${MC}-${BUILD}-FORGE${SNAPSHOT_SUFFIX}.jar" >> "$GITHUB_OUTPUT"
+        echo "neoforge=NeoForge/build/libs/Patchouli-${MC}-${BUILD}-NEOFORGE${SNAPSHOT_SUFFIX}.jar" >> "$GITHUB_OUTPUT"
         echo "fabric=Fabric/build/libs/Patchouli-${MC}-${BUILD}-FABRIC${SNAPSHOT_SUFFIX}.jar" >> "$GITHUB_OUTPUT"
     - name: Sign jars
       env:
@@ -49,22 +49,22 @@ jobs:
       run: |
         echo "${SIGNING_KEY}" | gpg --import -
         gpg --local-user "Violet Moon Signing Key" --armor \
-          --detach-sign ${{ steps.calculate_artifact_names.outputs.forge }}
+          --detach-sign ${{ steps.calculate_artifact_names.outputs.neoforge }}
         gpg --local-user "Violet Moon Signing Key" --armor \
           --detach-sign ${{ steps.calculate_artifact_names.outputs.fabric }}
-    - name: Archive Forge Jar
+    - name: Archive NeoForge Jar
       uses: actions/upload-artifact@v2
       with:
-        name: Forge Jar
+        name: NeoForge Jar
         path: |
-          ${{ steps.calculate_artifact_names.outputs.forge }}
-    - name: Archive Forge Signature
+          ${{ steps.calculate_artifact_names.outputs.neoforge }}
+    - name: Archive NeoForge Signature
       uses: actions/upload-artifact@v2
       if: ${{ env.SIGNING_KEY != '' && startsWith(github.ref, 'refs/tags/release-')}}
       with:
-        name: Forge Signature
+        name: NeoForge Signature
         path: |
-          ${{ steps.calculate_artifact_names.outputs.forge }}.asc
+          ${{ steps.calculate_artifact_names.outputs.neoforge }}.asc
     - name: Archive Fabric Jar
       uses: actions/upload-artifact@v2
       with:
@@ -84,7 +84,7 @@ jobs:
         GH_TOKEN: ${{ github.token }}
         GIT_REF: ${{ github.ref }}
         FABRIC_JAR: ${{ steps.calculate_artifact_names.outputs.fabric }}
-        FORGE_JAR: ${{ steps.calculate_artifact_names.outputs.forge }}
+        FORGE_JAR: ${{ steps.calculate_artifact_names.outputs.neoforge }}
         CURSEFORGE_TOKEN: ${{ secrets.WILLIEWILLUS_CURSEFORGE_TOKEN }}
         MODRINTH_TOKEN: ${{ secrets.WILLIEWILLUS_MODRINTH_TOKEN }}
       run: |

diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,4 @@ Xplat/logs/
 # Java
 Fabric/bin/
 Xplat/bin/
-Forge/bin/
+NeoForge/bin/
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -61,15 +61,15 @@ dependencies {
 
 	minecraft "com.mojang:minecraft:${mc_version}"
 	mappings loom.officialMojangMappings()
-	modImplementation "net.fabricmc:fabric-loader:0.14.21"
+	modImplementation "net.fabricmc:fabric-loader:0.15.3"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:0.87.0+1.20.1"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:0.92.1+1.20.4"
     compileOnly project(":Xplat")
 
-	modCompileOnly "mezz.jei:jei-1.20.1-common-api:15.2.0.27"
+	modCompileOnly "mezz.jei:jei-1.20.4-common-api:17.0.0.30"
 
-	modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:10.0.578") { transitive = false }
-	modCompileOnly("me.shedaniel.cloth:cloth-config-fabric:9.0.94") { transitive = false }
+	modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:14.0.688") { transitive = false }
+	modCompileOnly("me.shedaniel.cloth:cloth-config-fabric:13.0.121") { transitive = false }
 }
 
 compileJava {

diff --git a/Fabric/src/main/java/vazkii/patchouli/mixin/client/MixinMinecraft.java b/Fabric/src/main/java/vazkii/patchouli/mixin/client/MixinMinecraft.java
@@ -12,7 +12,7 @@
 
 @Mixin(Minecraft.class)
 public class MixinMinecraft {
-	@Inject(at = @At("HEAD"), method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V")
+	@Inject(at = @At("HEAD"), method = "disconnect(Lnet/minecraft/client/gui/screens/Screen;)V")
 	public void patchouli_onLogout(Screen screen, CallbackInfo info) {
 		ClientAdvancements.playerLogout();
 	}

diff --git a/Forge/build.gradle b/Forge/build.gradle
diff --git a/Forge/src/main/java/vazkii/patchouli/forge/network/ForgeMessageOpenBookGui.java b/Forge/src/main/java/vazkii/patchouli/forge/network/ForgeMessageOpenBookGui.java
diff --git a/Forge/src/main/java/vazkii/patchouli/forge/network/ForgeMessageReloadBookContents.java b/Forge/src/main/java/vazkii/patchouli/forge/network/ForgeMessageReloadBookContents.java
diff --git a/Forge/src/main/java/vazkii/patchouli/forge/network/ForgeNetworkHandler.java b/Forge/src/main/java/vazkii/patchouli/forge/network/ForgeNetworkHandler.java
diff --git a/Forge/src/main/resources/META-INF/services/vazkii.patchouli.xplat.IClientXplatAbstractions b/Forge/src/main/resources/META-INF/services/vazkii.patchouli.xplat.IClientXplatAbstractions
diff --git a/Forge/src/main/resources/META-INF/services/vazkii.patchouli.xplat.IXplatAbstractions b/Forge/src/main/resources/META-INF/services/vazkii.patchouli.xplat.IXplatAbstractions
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline {
     }
     post {
         always {
-            archiveArtifacts artifacts: 'Forge/build/libs/*.jar, Fabric/build/libs/*.jar'
+            archiveArtifacts artifacts: 'NeoForge/build/libs/*.jar, Fabric/build/libs/*.jar'
         }
     }
 }