migrate

KessokuTeaTime · Apr 20, 2024 · de04cce · de04cce
1 parent 127eb67
commit de04cce
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,9 @@
+### Changes
+
+- Unified publishing using **modpublisher.**
+- Jar name migrate: `{id}-{mcversion}-{modversion}` -> `{id}-{modversion}-{loader}{mcversion}`.
+- Tag name migrate: `{id}-{modversion}-mc{mcversion}` -> `{id}-{modversion}-{loader}{mcversion}`.
+
+### Ownership Transfer
+
+- **Transferred** ownership to **[Kessoku Tea Time.](https://github.com/KessokuTeaTime)**
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,26 @@
+class Display {
+	lateinit var name: String
+	lateinit var loader: String
+	lateinit var version: String
+}
+
+var display: Display = Display()
+
 plugins {
 	base
 	java
 	idea
 	`maven-publish`
 	alias(libs.plugins.fabric.loom)
+	alias(libs.plugins.modpublisher)
 }
 
 group = libs.versions.maven.group.get()
-version = "${libs.versions.minecraft.get()}-${libs.versions.mod.get()}"
+version = "${libs.versions.mod.get()}-${libs.versions.loader.get()}${libs.versions.minecraft.get()}"
+
+display.name = libs.versions.display.name.get()
+display.loader = libs.versions.display.loader.get()
+display.version = libs.versions.display.version.get()
 
 base {
 	archivesName.set(libs.versions.archives.name)
@@ -37,10 +50,11 @@ java {
 
 tasks {
 	processResources {
-		inputs.property("version", libs.versions.mod.get())
-
 		filesMatching("fabric.mod.json") {
-			expand(mapOf("version" to libs.versions.mod.get()))
+			expand(mapOf(
+					"version" to libs.versions.mod.get(),
+					"display" to display
+			))
 		}
 	}
 
@@ -49,13 +63,33 @@ tasks {
 	}
 }
 
-publishing {
-	publications {
-		create<MavenPublication>("mavenJava") {
-			from(components["java"])
-		}
+publisher {
+	apiKeys {
+		modrinth(System.getenv("MODRINTH_TOKEN"))
+		curseforge(System.getenv("CURSEFORGE_TOKEN"))
 	}
 
-	repositories {
-	}
+	modrinthID.set(libs.versions.id.modrinth)
+	curseID.set(libs.versions.id.curseforge)
+
+	versionType.set("release")
+	projectVersion.set(project.version.toString())
+	gameVersions.set(listOf("1.20.4"))
+	loaders.set(listOf("fabric", "quilt"))
+	curseEnvironment.set("client")
+
+	modrinthDepends.required("fabric-api")
+	modrinthDepends.optional()
+	modrinthDepends.embedded()
+
+	curseDepends.required("fabric-api")
+	curseDepends.optional()
+	curseDepends.embedded()
+
+	displayName.set("${display.name} ${libs.versions.mod.get()} for ${display.loader} ${display.version}")
+
+	artifact.set(tasks.remapJar)
+	addAdditionalFile(tasks.remapSourcesJar)
+
+	changelog.set(file("CHANGELOG.md"))
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,16 +1,27 @@
 [versions]
-maven-group = "net.krlite"
+maven-group = "band.kessokuteatime"
 archives-name = "flash"
-mod = "2.0.4"
+mod = "2.1.0"
+loader = "fabric"
 
 minecraft = "1.20"
 yarn = "1.20+build.1"
-fabric-loader = "0.15.7"
+fabric-loader = "0.15.10"
 fabric-api = "0.83.0+1.20"
 fabric-loom = "1.5-SNAPSHOT"
+modpublisher = "2.1.0"
 
 equator = "2.6.4-mc1.20"
 
+# id
+id-modrinth = "Zmu8jXWA"
+id-curseforge = "998416"
+
+# display
+display-name = "Flash"
+display-loader = "Fabric"
+display-version = "1.20.x"
+
 [libraries]
 minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
 yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
@@ -23,6 +34,7 @@ equator-math = { group = "com.github.KrLite.Equator-v2", name = "Math", version.
 
 [plugins]
 fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
+modpublisher = { id = "com.hypherionmc.modutils.modpublisher", version.ref = "modpublisher" }
 
 [bundles]
 fabric = ["fabric-loader", "fabric-api"]

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -4,6 +4,7 @@ pluginManagement {
             name = "Fabric"
             url = uri("https://maven.fabricmc.net/")
         }
+        maven { url = uri("https://maven.firstdark.dev/releases") } // modpublisher
         mavenCentral()
         gradlePluginPortal()
     }

diff --git a/src/main/java/net/krlite/flash/Flash.java → ...java/band/kessokuteatime/flash/Flash.java b/src/main/java/net/krlite/flash/Flash.java → ...java/band/kessokuteatime/flash/Flash.java
@@ -1,5 +1,6 @@
-package net.krlite.flash;
+package band.kessokuteatime.flash;
 
+import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
@@ -30,7 +31,7 @@
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
 
-public class Flash implements ModInitializer {
+public class Flash implements ClientModInitializer {
 	public static final String NAME = "Flash", ID = "flash";
 	public static final Logger LOGGER = LoggerFactory.getLogger(ID);
 	public static final double MIN_WIDTH = 0.764, MIN_HEIGHT = 0.672, MIN_SCALAR = 0.875;
@@ -78,7 +79,7 @@ public static void playCameraShutter() {
 	private static int width, height;
 
 	@Override
-	public void onInitialize() {
+	public void onInitializeClient() {
 		ClientTickEvents.END_CLIENT_TICK.register(Input::listenInput);
 		Sounds.register();
 	}

diff --git a/.../java/net/krlite/flash/FlashRenderer.java → ...d/kessokuteatime/flash/FlashRenderer.java b/.../java/net/krlite/flash/FlashRenderer.java → ...d/kessokuteatime/flash/FlashRenderer.java
@@ -1,4 +1,4 @@
-package net.krlite.flash;
+package band.kessokuteatime.flash;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.krlite.equator.math.algebra.Theory;

diff --git a/...krlite/flash/mixin/GameRendererMixin.java → ...eatime/flash/mixin/GameRendererMixin.java b/...krlite/flash/mixin/GameRendererMixin.java → ...eatime/flash/mixin/GameRendererMixin.java
@@ -1,7 +1,7 @@
-package net.krlite.flash.mixin;
+package band.kessokuteatime.flash.mixin;
 
-import net.krlite.flash.Flash;
-import net.krlite.flash.FlashRenderer;
+import band.kessokuteatime.flash.FlashRenderer;
+import band.kessokuteatime.flash.Flash;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.GameRenderer;

diff --git a/.../flash/mixin/ScreenshotRecorderMixin.java → .../flash/mixin/ScreenshotRecorderMixin.java b/.../flash/mixin/ScreenshotRecorderMixin.java → .../flash/mixin/ScreenshotRecorderMixin.java
@@ -1,6 +1,6 @@
-package net.krlite.flash.mixin;
+package band.kessokuteatime.flash.mixin;
 
-import net.krlite.flash.Flash;
+import band.kessokuteatime.flash.Flash;
 import net.minecraft.client.gl.Framebuffer;
 import net.minecraft.client.util.ScreenshotRecorder;
 import net.minecraft.text.Text;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -3,24 +3,25 @@
   "id": "flash",
   "version": "${version}",
 
-  "name": "Flash",
+  "name": "${display.name}",
   "description": "Flashes as you take a screenshot.",
   "authors": [
+    "KessokuTeaTime",
     "KrLite"
   ],
   "contact": {
     "homepage": "https://modrinth.com/mod/flash",
-    "sources": "https://github.com/KrLite/Mod.Flash",
-    "issues": "https://github.com/KrLite/Mod.Flash/issues"
+    "sources": "https://github.com/KessokuTeaTime/Flash",
+    "issues": "https://github.com/KessokuTeaTime/Flash/issues"
   },
 
   "license": "GPL-3.0",
   "icon": "assets/flash/icon.png",
 
   "environment": "client",
   "entrypoints": {
-    "main": [
-      "net.krlite.flash.Flash"
+    "client": [
+      "band.kessokuteatime.flash.Flash"
     ]
   },
   "mixins": [

diff --git a/src/main/resources/flash.mixins.json b/src/main/resources/flash.mixins.json
@@ -1,13 +1,13 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "net.krlite.flash.mixin",
+  "package": "band.kessokuteatime.flash.mixin",
   "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],
   "client": [
-	"GameRendererMixin",
-	"ScreenshotRecorderMixin"
+	  "GameRendererMixin",
+	  "ScreenshotRecorderMixin"
   ],
   "injectors": {
 	"defaultRequire": 0