target 1.20.5 release, build neoforge again

.github/workflows/build-remote.yml

@@ -64,7 +64,7 @@ jobs:
         with:
           name: Geyser NeoForge
           path: geyser/bootstrap/mod/neoforge/build/libs/Geyser-NeoForge.jar
-          #if-no-files-found: error // TODO 1.20.5 until neoforge updates
+          if-no-files-found: error
       - name: Archive artifacts (Geyser Standalone)
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         if: success()

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
         with:
           name: Geyser NeoForge
           path: bootstrap/mod/neoforge/build/libs/Geyser-NeoForge.jar
-          #if-no-files-found: error // TODO 1.20.5 - currently no neoforge artifacts
+          if-no-files-found: error
       - name: Archive artifacts (Geyser Standalone)
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         if: success()

.github/workflows/preview.yml

@@ -53,10 +53,10 @@ jobs:
         with:
           appID: ${{ secrets.RELEASE_APP_ID }}
           appPrivateKey: ${{ secrets.RELEASE_APP_PK }}
-          # neoforge:Geyser-NeoForge.jar // TODO 1.20.5
           files: |
             bungeecord:Geyser-BungeeCord.jar
             fabric:Geyser-Fabric.jar
+            neoforge:Geyser-NeoForge.jar
             spigot:Geyser-Spigot.jar
             standalone:Geyser-Standalone.jar
             velocity:Geyser-Velocity.jar

README.md

@@ -14,7 +14,7 @@ The ultimate goal of this project is to allow Minecraft: Bedrock Edition users t
 
 Special thanks to the DragonProxy project for being a trailblazer in protocol translation and for all the team members who have joined us here!
 
-### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.80 and Minecraft Java 1.20.4
+### Currently supporting Minecraft Bedrock 1.20.40 - 1.20.80 and Minecraft Java 1.20.5
 
 ## Setting Up
 Take a look [here](https://wiki.geysermc.org/geyser/setup/) for how to set up Geyser.

bootstrap/mod/build.gradle.kts

@@ -1,6 +1,5 @@
 architectury {
-    common("fabric")
-    //common("neoforge", "fabric") // todo 1.20.5
+    common("neoforge", "fabric")
 }
 
 loom {

bootstrap/mod/fabric/src/main/resources/fabric.mod.json

@@ -25,6 +25,6 @@
   "depends": {
     "fabricloader": ">=0.15.10",
     "fabric": "*",
-    "minecraft": ">=1.20.4"
+    "minecraft": ">=1.20.5"
   }
 }

bootstrap/mod/neoforge/src/main/resources/META-INF/mods.toml

@@ -14,12 +14,12 @@ config = "geyser.mixins.json"
 [[dependencies.geyser_neoforge]]
     modId="neoforge"
     type="required"
-    versionRange="[20.4.48-beta,)"
+    versionRange="[20.5.0-beta,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.geyser_neoforge]]
     modId="minecraft"
     type="required"
-    versionRange="[1.20,1.21)"
+    versionRange="[1.20.4,1.21)"
     ordering="NONE"
     side="BOTH"

build-logic/src/main/kotlin/geyser.modded-conventions.gradle.kts

@@ -39,7 +39,7 @@ provided("io.netty", "netty-resolver-dns-native-macos")
 provided("org.ow2.asm", "asm")
 
 architectury {
-    minecraft = "1.20.4"
+    minecraft = "1.20.5"
 }
 
 loom {
@@ -110,7 +110,7 @@ afterEvaluate {
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:1.20.5-rc3")
+    minecraft("com.mojang:minecraft:1.20.5")
     mappings(loom.officialMojangMappings())
 }
 

build.gradle.kts

@@ -22,7 +22,7 @@ val basePlatforms = setOf(
 
 val moddedPlatforms = setOf(
     projects.fabric,
-    //projects.neoforge, // todo 1.20.5
+    projects.neoforge,
     projects.mod
 ).map { it.dependencyProject }
 

gradle/libs.versions.toml

@@ -30,11 +30,11 @@ commodore = "2.2"
 bungeecord = "a7c6ede"
 velocity = "3.1.1"
 viaproxy = "3.2.0-SNAPSHOT"
-fabric-minecraft = "1.20.4"
-fabric-loader = "0.15.2"
-fabric-api = "0.91.2+1.20.4"
+fabric-minecraft = "1.20.5"
+fabric-loader = "0.15.10"
+fabric-api = "0.97.6+1.20.5"
 fabric-permissions = "0.2-SNAPSHOT"
-neoforge-minecraft = "20.4.48-beta"
+neoforge-minecraft = "20.5.0-beta"
 mixin = "0.8.5"
 
 # plugin versions

settings.gradle.kts

@@ -66,7 +66,7 @@ include(":ap")
 include(":api")
 include(":bungeecord")
 include(":fabric")
-//include(":neoforge") // todo 1.20.5
+include(":neoforge")
 include(":mod")
 include(":spigot")
 include(":standalone")
@@ -78,7 +78,7 @@ include(":core")
 // Specify project dirs
 project(":bungeecord").projectDir = file("bootstrap/bungeecord")
 project(":fabric").projectDir = file("bootstrap/mod/fabric")
-//project(":neoforge").projectDir = file("bootstrap/mod/neoforge") // todo 1.20.5
+project(":neoforge").projectDir = file("bootstrap/mod/neoforge")
 project(":mod").projectDir = file("bootstrap/mod")
 project(":spigot").projectDir = file("bootstrap/spigot")
 project(":standalone").projectDir = file("bootstrap/standalone")