Start working on the Hurricane-Modded merge

Author: onebeastchris

.github/workflows/build-workflow.yml

@@ -26,6 +26,8 @@ jobs:
         with:
           artifacts: |
             spigot/build/libs/hurricane-spigot.jar
+            fabric/build/libs/hurricane-fabric.jar
+            neoforge/build/libs/hurricane-neoforge.jar
 
       - name: Get Version
         if: ${{ success() && github.repository == 'GeyserMC/Hurricane' && github.ref_name == 'master' }}
@@ -43,6 +45,8 @@ jobs:
           appPrivateKey: ${{ secrets.RELEASE_APP_PK }}
           files: |
             spigot:spigot/build/libs/hurricane-spigot.jar
+            fabric:fabric/build/libs/hurricane-fabric.jar
+            neoforge:neoforge/build/libs/hurricane-neoforge.jar
           releaseEnabled: false
           saveMetadata: true
           releaseProject: 'hurricane'
@@ -57,6 +61,8 @@ jobs:
           host: ${{ secrets.DOWNLOADS_SERVER_IP }}
           files: |
             spigot/build/libs/hurricane-spigot.jar
+            fabric/build/libs/hurricane-fabric.jar
+            neoforge/build/libs/hurricane-neoforge.jar
           changelog: ${{ steps.metadata.outputs.body }}
 
       - name: Notify Discord

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Camotoy
+Copyright (c) 2025 GeyserMC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,5 +1,5 @@
 # Hurricane
-Various workarounds for Geyser players that modify the server in order to achieve their goal.
+Various workarounds for Bedrock players playing on Java servers through Geyser that modify the server in order to achieve their goal.
 
 Issues with each workaround are listed in the plugin's config. **Please take your time to read them as the workarounds in this plugin can be used for exploitative purposes.**
 

build-logic/build.gradle.kts

@@ -4,10 +4,20 @@ plugins {
 
 repositories {
     gradlePluginPortal()
+    mavenCentral()
+    maven("https://maven.architectury.dev/")
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.neoforged.net/releases/")
 }
 
 dependencies {
+    // this is OK as long as the same version catalog is used in the main build and build-logic
+    // see https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
+    implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
     implementation(libs.shadow)
     implementation(libs.paperweight)
     implementation(libs.javadowngrader)
+    implementation(libs.architectury.plugin)
+    implementation(libs.architectury.loom)
+    implementation(libs.minotaur)
 }

build-logic/src/main/kotlin/LibsAccessor.kt

@@ -0,0 +1,6 @@
+import org.gradle.accessors.dm.LibrariesForLibs
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.getByType
+
+val Project.libs: LibrariesForLibs
+    get() = rootProject.extensions.getByType()

build-logic/src/main/kotlin/hurricane.build-logic.gradle.kts

@@ -0,0 +1,50 @@
+plugins {
+    `java-library`
+    `maven-publish`
+}
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+}
+
+tasks {
+    processResources {
+        filesMatching(listOf("fabric.mod.json", "META-INF/neoforge.mods.toml")) {
+            expand(
+                "id" to "hurricane",
+                "name" to "Hurricane",
+                "version" to project.version,
+                "description" to "Hacky fixes to make Bedrock players that join via Geyser happy."
+            )
+        }
+        filesMatching(listOf("plugin.yml")) {
+            expand(
+                "version" to properties["version"]
+            )
+        }
+    }
+}
+
+repositories {
+    // mavenLocal()
+    mavenCentral()
+    maven("https://maven.fabricmc.net/")
+    maven("https://maven.neoforged.net/releases")
+    maven("https://repo.opencollab.dev/main/")
+    maven("https://repo.papermc.io/repository/maven-public/")
+    maven("https://jitpack.io") {
+        content {
+            includeGroupByRegex("com.github.*")
+        }
+    }
+}
+
+group = properties["group"] as String
+version = properties["version"] as String
+java.sourceCompatibility = JavaVersion.VERSION_21
+
+publishing {
+    publications.create<MavenPublication>("maven") {
+        from(components["java"])
+    }
+}

build-logic/src/main/kotlin/hurricane.downgrader-conventions.gradle.kts

@@ -0,0 +1,22 @@
+plugins {
+    id("hurricane.build-logic")
+    id("com.gradleup.shadow")
+    id("xyz.wagyourtail.jvmdowngrader")
+}
+
+tasks {
+    downgradeJar {
+        mustRunAfter(shadowJar)
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveClassifier.set("")
+        archiveVersion.set("")
+    }
+
+    build {
+        dependsOn(downgradeJar)
+    }
+}
+
+jvmdg {
+    downgradeTo = JavaVersion.VERSION_1_8
+}

build-logic/src/main/kotlin/hurricane.java-conventions.gradle.kts

@@ -0,0 +1,53 @@
+import net.fabricmc.loom.task.RemapJarTask
+
+plugins {
+    id("hurricane.shadow-conventions")
+    id("architectury-plugin")
+    id("dev.architectury.loom")
+}
+
+architectury {
+    minecraft = libs.versions.minecraft.version.get()
+}
+
+java {
+    withSourcesJar()
+}
+
+loom {
+    silentMojangMappingsLicense()
+}
+
+dependencies {
+    minecraft(libs.minecraft)
+    mappings(loom.officialMojangMappings())
+}
+
+tasks {
+    shadowJar {
+        // Mirrors the example fabric project, otherwise tons of dependencies are shaded that shouldn't be
+        configurations = listOf(project.configurations.shadow.get())
+
+        // The remapped shadowJar is the final desired mod jar
+        archiveVersion.set("")
+    }
+
+    remapJar {
+        dependsOn(shadowJar)
+        inputFile.set(shadowJar.get().archiveFile)
+        archiveClassifier.set("")
+        archiveVersion.set(project.version.toString())
+    }
+
+//    // TODO can we make this not stupid pls
+//    register("remapModrinthJar", RemapJarTask::class) {
+//        dependsOn(shadowJar)
+//        inputFile.set(shadowJar.get().archiveFile)
+//        archiveVersion.set(project.version.toString() + "+build." + System.getenv("GITHUB_RUN_NUMBER"))
+//        archiveClassifier.set("")
+//    }
+
+    build {
+        dependsOn(remapJar)
+    }
+}

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

@@ -0,0 +1,17 @@
+plugins {
+    id("com.modrinth.minotaur")
+}
+
+modrinth {
+    token.set(System.getenv("MODRINTH_TOKEN")) // Even though this is the default value, apparently this prevents GitHub Actions caching the token?
+    projectId.set("hurricane")
+    //versionNumber.set(project.version as String + "-" + System.getenv("GITHUB_RUN_NUMBER"))
+    versionType.set("release")
+
+    syncBodyFrom.set(rootProject.file("README.md").readText())
+    //changelog.set(rootProject.file("CHANGELOG.md").readText())
+
+    //uploadFile.set(tasks.getByPath("remapModrinthJar"))
+    //gameVersions.addAll("1.21.3")
+    failSilently.set(false)
+}