Merge pull request #2 from OffsetMods538/1-support-paper

Support paper

Author: OffsetMonkey538

.github/workflows/build_artifacts.yml

@@ -29,8 +29,11 @@ jobs:
         env:
           DISABLE_PROPERTIES_UPDATE: true
 
+      - name: Delete common libs
+        run: rm -r ./common/build/libs
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: Artifacts
-          path: build/libs/
+          path: ./*/build/libs/

.github/workflows/publish.yml

@@ -45,7 +45,10 @@ jobs:
           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: ./*/build/libs/*.jar

build.gradle

@@ -1,168 +1,101 @@
 import dex.plugins.outlet.v2.util.ReleaseType
 
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
-	id 'io.github.dexman545.outlet' version '1.6.1'
-	id 'com.modrinth.minotaur' version '2.+'
+	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'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = "mesh-lib"
-version = "${project.mod_version}+${project.minecraft_version}"
-group = "top.offsetmonkey538.meshlib"
-
-outlet {
-	maintainPropertiesFile = System.getenv("DISABLE_PROPERTIES_UPDATE") == null
-	mcVersionRange = project.supported_minecraft_versions
-	allowedReleaseTypes = Set.of(ReleaseType.RELEASE)
-	propertiesData = [
-			'yarn_version': outlet.yarnVersion(project.minecraft_version),
-			'loader_version': outlet.loaderVersion()
-	]
+ext {
+	debugVersion = System.currentTimeMillis()
 }
 
-
-loom {
-	runs {
-		client {
-			runDir "run/client"
-		}
-		server {
-			runDir "run/server"
-		}
-	}
-}
-
-// https://gist.github.com/maityyy/3dbcd558d58a6412c3a2a38c72706e8e
-afterEvaluate {
-	loom.runs.configureEach {
-		vmArg "-javaagent:${configurations.compileClasspath.find{ it.name.contains("sponge-mixin") }}"
-		if (System.getenv("DISABLE_PROPERTIES_UPDATE") == null) vmArg "-Ddevauth.enabled=true"
-	}
+allprojects {
+	group = "top.offsetmonkey538.meshlib"
 }
 
-configurations {
-	includeModImplementation
-
-	include.extendsFrom           includeModImplementation
-	modImplementation.extendsFrom includeModImplementation
-
-
-	includeImplementation
+subprojects {
+	apply plugin: "maven-publish"
+	apply plugin: "java"
+	apply plugin: "java-library"
 
-	include.extendsFrom        includeImplementation
-	implementation.extendsFrom includeImplementation
+	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"))
+	}
 
-	includeApi
-
-	include.extendsFrom includeApi
-	api.extendsFrom     includeApi
-}
+	java {
+		withSourcesJar()
+		withJavadocJar()
+	}
 
-repositories {
-	mavenCentral()
-	mavenLocal()
-	maven {
-		name = "DevAuth"
-		url = "https://pkgs.dev.azure.com/djtheredstoner/DevAuth/_packaging/public/maven/v1"
-		content {
-			includeGroup "me.djtheredstoner"
+	jar {
+		from("${rootProject.projectDir}/LICENSE") {
+			rename { "${it}" }
 		}
 	}
-}
-
-dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_version}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-	// DevAuth
-	modLocalRuntime "me.djtheredstoner:DevAuth-fabric:${devauth_version}"
-
-	// Netty
-	includeApi "io.netty:netty-codec-http:${project.netty_version}"
-
-	// Uncomment for including a module of fabric api
-	// includeModImplementation fabricApi.module("fabric-api-base", project.fapi_version)
-}
 
-processResources {
-	final Map properties = Map<String, String>.of(
-			"modVersion",                 project.mod_version,
-			"supportedMinecraftVersions", project.supported_minecraft_versions
-	)
-
-	inputs.properties(properties)
-
-	filesMatching("fabric.mod.json") {
-		expand(properties)
+	dependencies {
+		compileOnly "org.jetbrains:annotations:24.0.0"
+		compileOnly "org.slf4j:slf4j-api:2.0.16"
 	}
 
-	exclude ".cache/**"
-}
-
-tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
-}
-
-java {
-	withSourcesJar()
-	withJavadocJar()
-}
-
-tasks.named("javadoc", Javadoc) {
-	options.addFileOption('-add-stylesheet', project.file("javadoc-stylesheet.css"))
-}
+	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
 
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}" }
+				from(components["java"])
+			}
+		}
+	}
+	tasks.publishMavenPublicationToMavenLocal.doLast {
+		if (System.getenv("IS_DEBUG") == "true") System.out.println("Version: " + version)
 	}
 }
 
-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"
-	uploadFile = remapJar.archiveFile
-	//additionalFiles = [sourcesJar.archiveFile, javadocJar.archiveFile]
-	additionalFiles = [sourcesJar.archiveFile]
-	gameVersions = outlet.mcVersions()
-	syncBodyFrom = rootProject.file("README.md").text
-	def changelogEnv = System.getenv("VERSION_CHANGELOG")
-	if (changelogEnv != null) changelog = changelogEnv
-}
+configure(subprojects.findAll { it.name != "common" }) {
+	apply plugin: 'com.modrinth.minotaur'
+	apply plugin: 'io.github.dexman545.outlet'
 
-tasks.modrinth.dependsOn(tasks.modrinthSyncBody)
+	if (System.getenv("IS_DEBUG") == "true") version = "${version}-${rootProject.debugVersion}"
 
-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)
-			}
-		}
+	outlet {
+		mcVersionRange = rootProject.supported_minecraft_versions
+		allowedReleaseTypes = Set.of(ReleaseType.RELEASE)
 	}
-	publications {
-		maven(MavenPublication) {
-			artifactId = "mesh-lib"
 
-			from(components["java"])
-		}
+	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)
 }

common/build.gradle

@@ -0,0 +1,28 @@
+plugins {
+	id 'com.gradleup.shadow' version '9.0.0-beta4'
+	id 'maven-publish'
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	// Netty
+	api "io.netty:netty-codec-http:${project.netty_version}"
+}
+
+processResources {
+	final Map properties = Map<String, String>.of(
+			"modVersion",                 project.mod_version,
+			"supportedMinecraftVersions", project.supported_minecraft_versions
+	)
+
+	inputs.properties(properties)
+
+	filesMatching("fabric.mod.json") {
+		expand(properties)
+	}
+
+	exclude ".cache/**"
+}

common/gradle.properties

@@ -0,0 +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
+
+
+nameSuffix                   = api

src/main/java/top/offsetmonkey538/meshlib/MESHLib.java renamed to common/src/main/java/top/offsetmonkey538/meshlib/MESHLib.java

@@ -9,6 +9,7 @@
 import io.netty.handler.codec.http.FullHttpResponse;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.util.CharsetUtil;
+import top.offsetmonkey538.meshlib.example.SimpleHttpHandler;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +24,7 @@
  * <br>
  * For example {@link #sendError(ChannelHandlerContext, HttpResponseStatus)} {@link #sendError(ChannelHandlerContext, HttpResponseStatus, String)}
  * <p>
- * Look at {@link top.offsetmonkey538.meshlib.example.SimpleHttpHandler SimpleHttpHandler} for an example
+ * Look at {@link SimpleHttpHandler SimpleHttpHandler} for an example
  *
  * @see HttpHandlerRegistry
  */

src/main/java/top/offsetmonkey538/meshlib/api/HttpHandler.java renamed to common/src/main/java/top/offsetmonkey538/meshlib/api/HttpHandler.java

@@ -1,22 +1,25 @@
 package top.offsetmonkey538.meshlib.example;
 
-import net.fabricmc.api.DedicatedServerModInitializer;
 import top.offsetmonkey538.meshlib.api.HttpHandlerRegistry;
 
 import static top.offsetmonkey538.meshlib.MESHLib.LOGGER;
 
 /**
- * Mod initializer for the example handlers
+ * Initializer for the example handlers
+ * <p>
+ * Called from either the plugin initializer {@code MeshLibPlugin} or defined as an entrypoint in the {@code fabric.mod.json} file
  */
-public class ExampleMain implements DedicatedServerModInitializer {
+public final class ExampleMain {
+    private ExampleMain() {
+
+    }
 
     /**
      * Initializer for example handlers
      * <br>
-     * Checks if {@code meshEnableExamples} is enabled and registers the example handlers if so
+     * Checks if the {@code meshEnableExamples} system property is enabled and registers the example handlers if so
      */
-    @Override
-    public void onInitializeServer() {
+    public static void onInitialize() {
         // Ignore if "meshEnableExamples" isn't set
         if (System.getProperty("meshEnableExamples", "").isEmpty()) return;