V2

.github/dependabot.yml

@@ -1,3 +1,9 @@
+<<<<<<< v2
+# Set update schedule for GitHub Actions
+
+version: 2
+updates:
+=======
 version: 2
 updates:
   - package-ecosystem: "github-actions"
@@ -9,13 +15,19 @@ updates:
       master-actions:
         patterns:
           - "*"
+>>>>>>> master
 
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
+<<<<<<< v2
+      # Check for updates to GitHub Actions every week
+      interval: "daily"
+=======
       interval: "weekly"
     target-branch: "docs/master"
     groups:
       docs-actions:
         patterns:
           - "*"
+>>>>>>> master

.github/workflows/build_artifacts.yml

@@ -12,28 +12,41 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-read-only: false
 
+      - name: Store short commit hash
+        run: echo "short_commit_hash=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+
       - name: Build with Gradle
         run: ./gradlew build
         env:
+          PRESERVE_PRERELEASE_VERSION: true
           DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ${{ env.short_commit_hash }}
 
-      - name: Delete common libs
-        run: rm -r ./common/build/libs
+      - name: Publish to Maven
+        run: ./gradlew publishMavenPublicationToOffsetMonkey538Repository
+        env:
+          PRESERVE_PRERELEASE_VERSION: true
+          DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ${{ env.short_commit_hash }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: Artifacts
-          path: ./*/build/libs/
+          name: Build Artifacts
+          path: ./loader/*/*/build/libs/

.github/workflows/publish.yml

@@ -14,26 +14,33 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: '21'
           distribution: 'temurin'
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v5
         with:
           cache-read-only: false
 
       - name: Build with Gradle
         run: ./gradlew build
         env:
+          IS_RELEASE: true
           DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ""
 
       - name: Upload to Modrinth
         run: ./gradlew modrinth
         env:
+          IS_RELEASE: true
+          DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ""
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           VERSION_NAME: ${{ github.event.release.name }}
           VERSION_IS_PRERELEASE: ${{ github.event.release.prerelease }}
@@ -42,13 +49,13 @@ jobs:
       - name: Publish to Maven
         run: ./gradlew publishMavenPublicationToOffsetMonkey538Repository
         env:
+          IS_RELEASE: true
+          DISABLE_PROPERTIES_UPDATE: true
+          VERSION_SUFFIX: ""
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
 
-      - name: Delete common libs
-        run: rm -r ./common/build/libs
-
       - name: Upload to GitHub
         uses: softprops/action-gh-release@v2
         with:
-          files: ./*/build/libs/*.jar
+          files: ./loader/*/*/build/libs/*.jar

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "buildSrc"]
+	path = buildSrc
+	url = https://github.com/OffsetMods538/multiversion-buildscripts

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024,2025 OffsetMonkey538
+Copyright (c) 2024-2026 OffsetMonkey538
 
 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

@@ -56,15 +56,15 @@ This class has to implement the `HttpHandler` interface, this will look somethin
 public class MyHttpHandler implements HttpHandler {
 
     @Override
-    public void handleRequest(@NotNull ChannelHandlerContext ctx, @NotNull FullHttpRequest request) throws Exception {
+    public void handleRequest(@NonNull ChannelHandlerContext ctx, @NonNull FullHttpRequest request) throws Exception {
         // Logic will go here
     }
 }
 ```
 
 Now we'll need to actually implement the handler. You can google "HTTP Netty" for more info on how to handle HTTP requests with Netty.
 ```java
-public void handleRequest(@NotNull ChannelHandlerContext ctx, @NotNull FullHttpRequest request) throws Exception {
+public void handleRequest(@NonNull ChannelHandlerContext ctx, @NonNull FullHttpRequest request) throws Exception {
     // Write "Hello, World!" to a buffer, encoded in UTF-8
     final ByteBuf content = Unpooled.copiedBuffer("Hello, World!", StandardCharsets.UTF_8);
     // Create a response with said buffer

build.gradle

@@ -1,101 +1,73 @@
-import dex.plugins.outlet.v2.util.ReleaseType
-
 plugins {
-	id 'fabric-loom' version '1.9-SNAPSHOT' apply false
-	id 'io.github.dexman545.outlet' version '1.6.1' apply false
-	id 'com.modrinth.minotaur' version '2.+' apply false
-	id 'maven-publish'
-}
-
-ext {
-	debugVersion = System.currentTimeMillis()
+    id 'multiloader-root'
+    id 'java'
+    id 'java-library'
+    id 'net.neoforged.moddev'           version "${neoforged_moddev}"            apply false
+    id 'fabric-loom'                    version "${fabric_loom}"                 apply false
+    id 'io.papermc.paperweight.userdev' version "${papermc_paperweight_userdev}" apply false
+    id 'xyz.jpenilla.run-paper'         version "${jpenilla_run_task}"           apply false
+    id 'com.gradleup.shadow'            version "${gradleup_shadow}"             apply false
+    id 'xyz.jpenilla.resource-factory'  version "${jpenilla_resource_factory}"   apply false
+    id 'io.github.dexman545.outlet'     version "${dexman_outlet}"               apply false
+    id 'com.modrinth.minotaur'          version "${modrinth_minotaur}"           apply false
+    id 'hamburg.janove.elevator-music'  version "0.1"
 }
 
-allprojects {
-	group = "top.offsetmonkey538.meshlib"
-}
+//elevatorMusic {
+//    if (Boolean.parseBoolean(System.getenv("DISABLE_MUSIC"))) return
+//    waitMusic = file("${rootProject.projectDir}/veryImportant/music.wav")
+//    successSound = file("${rootProject.projectDir}/veryImportant/done.wav")
+//}
 
 subprojects {
-	apply plugin: "maven-publish"
-	apply plugin: "java"
-	apply plugin: "java-library"
-
-	archivesBaseName = "mesh-lib-${project.nameSuffix}"
-	version = "${rootProject.mod_version}+${rootProject.minecraft_version}"
-
-	tasks.named("javadoc", Javadoc) {
-		options.addFileOption('-add-stylesheet', rootProject.file("javadoc-stylesheet.css"))
-	}
-
-	java {
-		withSourcesJar()
-		withJavadocJar()
-	}
-
-	jar {
-		from("${rootProject.projectDir}/LICENSE") {
-			rename { "${it}" }
-		}
-	}
-
-	dependencies {
-		compileOnly "org.jetbrains:annotations:24.0.0"
-		compileOnly "org.slf4j:slf4j-api:2.0.16"
-	}
-
-	publishing {
-		repositories {
-			maven {
-				name = "OffsetMonkey538"
-				url = "https://maven.offsetmonkey538.top/releases"
-				credentials {
-					username = providers.gradleProperty("OffsetMonkey538Username").getOrElse(System.getenv("MAVEN_USERNAME"))
-					password = providers.gradleProperty("OffsetMonkey538Password").getOrElse(System.getenv("MAVEN_PASSWORD"))
-				}
-				authentication {
-					basic(BasicAuthentication)
-				}
-			}
-		}
-		publications {
-			maven(MavenPublication) {
-				artifactId = project.archivesBaseName
-
-				from(components["java"])
-			}
-		}
-	}
-	tasks.publishMavenPublicationToMavenLocal.doLast {
-		if (System.getenv("IS_DEBUG") == "true") System.out.println("Version: " + version)
-	}
+    apply plugin: "java-library"
+
+    repositories {
+        mavenCentral()
+        mavenLocal()
+        exclusiveContent {
+            forRepository {
+                maven {
+                    name = "OffsetMods538"
+                    url = "https://maven.offsetmonkey538.top/releases"
+                }
+            }
+            filter {
+                includeGroupAndSubgroups "top.offsetmonkey538"
+            }
+        }
+    }
+
+    dependencies {
+        compileOnlyApi "org.jspecify:jspecify:${rootProject.jspecify_version}"
+    }
 }
 
-configure(subprojects.findAll { it.name != "common" }) {
-	apply plugin: 'com.modrinth.minotaur'
-	apply plugin: 'io.github.dexman545.outlet'
-
-	if (System.getenv("IS_DEBUG") == "true") version = "${version}-${rootProject.debugVersion}"
-
-	outlet {
-		mcVersionRange = rootProject.supported_minecraft_versions
-		allowedReleaseTypes = Set.of(ReleaseType.RELEASE)
-	}
-
-	modrinth {
-		token = System.getenv("MODRINTH_TOKEN")
-		projectId = "mesh-lib"
-		def customVersionName = System.getenv("VERSION_NAME")
-		if (customVersionName != null) versionName = customVersionName
-		versionNumber = "${project.version}"
-		versionType = "alpha"
-		def isPreRelease = System.getenv("VERSION_IS_PRERELEASE")
-		versionType = !"false".equals(isPreRelease) ? "beta" : "release"
-		additionalFiles = [sourcesJar.archiveFile]
-		gameVersions = outlet.mcVersions()
-		syncBodyFrom = rootProject.file("README.md").text
-		def changelogEnv = System.getenv("VERSION_CHANGELOG")
-		if (changelogEnv != null) changelog = changelogEnv
-	}
-
-	tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
+configure(subprojects.findAll { it.hasProperty("project_name") }) {
+    apply plugin: "maven-publish"
+
+    publishing {
+        repositories {
+            maven {
+                name = "OffsetMonkey538"
+                url = "https://maven.offsetmonkey538.top/releases"
+                credentials {
+                    username = providers.gradleProperty("OffsetMonkey538Username").getOrElse(System.getenv("MAVEN_USERNAME"))
+                    password = providers.gradleProperty("OffsetMonkey538Password").getOrElse(System.getenv("MAVEN_PASSWORD"))
+                }
+                authentication {
+                    basic(BasicAuthentication)
+                }
+            }
+        }
+        publications {
+            register("maven", MavenPublication) {
+                afterEvaluate {
+                    artifactId base.archivesName.get()
+                }
+                groupId "top.offsetmonkey538.meshlib"
+                from components.java
+            }
+        }
+    }
 }

common/build.gradle

@@ -1,14 +1,25 @@
 plugins {
-	id 'com.gradleup.shadow' version '9.0.0-beta4'
-	id 'maven-publish'
+    id 'multiloader-base'
 }
 
 repositories {
-	mavenCentral()
+    maven {
+        name = "Mojang Libraries"
+        url = "https://libraries.minecraft.net"
+        content {
+            includeGroup "com.mojang"
+        }
+    }
 }
 
 dependencies {
-	// Netty
-	api "io.netty:netty-codec-http:${project.netty_version}"
+    compileOnlyApi("top.offsetmonkey538.monkeylib538:monkeylib538-common:${rootProject.monkeylib538_version}+common") {
+        exclude(group: "net.kyori")
+    }
+    compileOnlyApi "io.netty:netty-codec-http:${rootProject.netty_version}"
+    compileOnlyApi "io.netty:netty-transport-classes-epoll:${rootProject.netty_version}"
+    compileOnly "com.google.guava:guava:${rootProject.guava_version}"
+    compileOnly "com.mojang:brigadier:${rootProject.brigadier_version}"
+
+    compileOnlyApi "net.kyori:adventure-api:${project.adventure_api_version}"
 }
-tasks.build.dependsOn(shadowJar)

common/gradle.properties

@@ -1,5 +1,5 @@
-## Netty, only used for netty-codec-http. Hopefully this version won't conflict with other versions of Netty
-netty_version                = 4.1.82.Final
+project_name          = common
 
-
-nameSuffix                   = api
+# Dependencies
+## Adventure
+adventure_api_version = 4.26.1