feat: add Modrinth integration and implement image upload functionality on fabric-1.21.11

acrylic-style · acrylic-style · commit 9cc815b4a447 · 2026-04-12T02:17:41.000+09:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,18 +1,19 @@
+import com.modrinth.minotaur.ModrinthExtension
+
 plugins {
     java
     `java-library`
-    id("com.modrinth.minotaur") version "2.+"
+    id("com.modrinth.minotaur") version "2.+" apply false
 }
 
 allprojects {
     apply {
         plugin("java")
         plugin("java-library")
-        plugin("com.modrinth.minotaur")
     }
 
     group = "net.azisaba.interchatmod"
-    version = "0.7.0"
+    version = "0.7.1-alpha.2"
 
     repositories {
         // mavenLocal()
@@ -32,3 +33,26 @@ allprojects {
         }
     }
 }
+
+subprojects {
+    if (name == "common") return@subprojects
+
+    apply {
+        plugin("com.modrinth.minotaur")
+    }
+
+    extensions.configure<ModrinthExtension>("modrinth") {
+        fun getVersionType(): String {
+            return if (project.version.toString().contains("alpha")) {
+                "alpha"
+            } else if (project.version.toString().contains("beta")) {
+                "beta"
+            } else {
+                "release"
+            }
+        }
+
+        projectId.set("interchat")
+        versionType.set(getVersionType())
+    }
+}
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -8,3 +8,9 @@ dependencies {
     api("net.kyori:adventure-text-serializer-gson:$adventureVersion")
     api("org.java-websocket:Java-WebSocket:1.5.4")
 }
+
+plugins.withId("com.modrinth.minotaur") {
+    tasks.named("modrinth") {
+        enabled = false
+    }
+}
diff --git a/common/src/main/resources/assets/interchatmod/lang/en_us.json b/common/src/main/resources/assets/interchatmod/lang/en_us.json
@@ -27,5 +27,8 @@
   "generic.disconnected": "Disconnected from InterChat. Will try to reconnect in 5 seconds.",
   "generic.disconnected_check_api_key": "Disconnected from InterChat. Please check your API key and do /reconnectinterchat [apikey] to reconnect.",
   "generic.error_from_server": "Error was returned from the server: %s",
-  "generic.error_in_connection": "Error in WebSocket connection: %s"
+  "generic.error_in_connection": "Error in WebSocket connection: %s",
+  "generic.upload": "Upload",
+  "generic.upload.tooltip": "Upload screenshot to the guild",
+  "generic.upload_image_failed": "Failed to upload image: %s"
 }
diff --git a/common/src/main/resources/assets/interchatmod/lang/ja_jp.json b/common/src/main/resources/assets/interchatmod/lang/ja_jp.json
@@ -27,5 +27,8 @@
   "generic.disconnected": "ギルドチャットから切断されました。5秒後に再接続を試みます。",
   "generic.disconnected_check_api_key": "ギルドチャットから切断されました。APIキーを確認して、/reconnectinterchat [apikey]を実行してください。",
   "generic.error_from_server": "サーバーからエラーが返されました: %s",
-  "generic.error_in_connection": "WebSocket接続でエラーが発生しました: %s"
+  "generic.error_in_connection": "WebSocket接続でエラーが発生しました: %s",
+  "generic.upload": "アップロード",
+  "generic.upload.tooltip": "スクリーンショットをギルドにアップロードする",
+  "generic.upload_image_failed": "画像のアップロードに失敗しました: %s"
 }
diff --git a/fabric-1.16/build.gradle.kts b/fabric-1.16/build.gradle.kts
@@ -95,3 +95,14 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.16.5-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.16.5")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "modmenu")
+    }
+}
diff --git a/fabric-1.17/build.gradle.kts b/fabric-1.17/build.gradle.kts
@@ -93,3 +93,14 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.17.1-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.17.1")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "modmenu")
+    }
+}
diff --git a/fabric-1.18/build.gradle.kts b/fabric-1.18/build.gradle.kts
@@ -93,3 +93,14 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.18.2-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.18.2")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "modmenu")
+    }
+}
diff --git a/fabric-1.19/build.gradle.kts b/fabric-1.19/build.gradle.kts
@@ -94,3 +94,15 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.19.4-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.19.4")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "owo-lib")
+        optional.project("modmenu")
+    }
+}
diff --git a/fabric-1.20/build.gradle.kts b/fabric-1.20/build.gradle.kts
@@ -94,3 +94,15 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.20.2-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.20.2")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "owo-lib")
+        optional.project("modmenu")
+    }
+}
diff --git a/fabric-1.21.11/build.gradle.kts b/fabric-1.21.11/build.gradle.kts
@@ -95,3 +95,15 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.21.11-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.21.11")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "cloth-config")
+        optional.project("modmenu")
+    }
+}
diff --git a/fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/Commands.java b/fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/Commands.java
@@ -1,11 +1,14 @@
 package net.azisaba.interchatmod.fabric;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.azisaba.interchatmod.common.model.Guild;
 import net.azisaba.interchatmod.common.model.GuildMember;
 import net.azisaba.interchatmod.common.util.Constants;
 import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.HoverEvent;
@@ -14,6 +17,10 @@
 import net.minecraft.util.Formatting;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.file.Files;
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -22,6 +29,7 @@
 import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
 
 public class Commands {
+    private static final Gson GSON = new Gson();
     public static final @NotNull Set<String> KNOWN_PLAYERS = new HashSet<>();
 
     public static LiteralArgumentBuilder<FabricClientCommandSource> builderGTell() {
@@ -199,6 +207,11 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> builderGuild() {
                                 )
                         )
                 )
+                .then(literal("upload_image")
+                        .then(argument("uuid", StringArgumentType.string())
+                                .executes(ctx -> executeUploadImage(ctx.getSource(), StringArgumentType.getString(ctx, "uuid")))
+                        )
+                )
                 ;
     }
 
@@ -294,6 +307,30 @@ private static int executeChat(FabricClientCommandSource source, String guildNam
         return 1;
     }
 
+    private static int executeUploadImage(FabricClientCommandSource source, String uuid) {
+        File image = Mod.images.get(UUID.fromString(uuid));
+        if (image == null) {
+            return 0;
+        }
+        Thread thread = new Thread(() -> {
+            try {
+                byte[] data = Files.readAllBytes(image.toPath());
+                JsonObject obj = GSON.fromJson(Mod.uploadImage(data), JsonObject.class);
+                if (!obj.has("uuid")) {
+                    MinecraftClient.getInstance().execute(() -> source.sendError(Text.translatable("generic.upload_image_failed", Text.literal(obj.toString()).formatted(Formatting.RED))));
+                    return;
+                }
+                String imageUuid = obj.get("uuid").getAsString();
+                Mod.client.sendMessageToGuild(null, "https://" + Mod.CONFIG.getEffectiveApiHost() + "/interchat/image?key=" + imageUuid);
+            } catch (IOException | URISyntaxException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        thread.setName("InterChat Upload Image Thread");
+        thread.start();
+        return 1;
+    }
+
     private static String roleTranslationKey(String role) {
         return "generic.guild_role." + role.toLowerCase(Locale.ROOT);
     }
diff --git a/fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/Mod.java b/fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/Mod.java
@@ -6,6 +6,7 @@
 import com.google.gson.JsonObject;
 import net.azisaba.interchatmod.common.model.Guild;
 import net.azisaba.interchatmod.common.model.GuildMember;
+import net.azisaba.interchatmod.common.util.Constants;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
 import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
@@ -18,6 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
@@ -32,6 +34,7 @@ public class Mod implements ModInitializer {
     public static final Timer TIMER = new Timer(true);
     public static final Set<Guild> GUILDS = Collections.synchronizedSet(new HashSet<>());
     public static final Map<Long, Set<GuildMember>> guildMembers = new ConcurrentHashMap<>();
+    public static final Map<UUID, File> images = new ConcurrentHashMap<>();
     public static WebSocketChatClient client;
 
     @Override
@@ -118,6 +121,17 @@ private static String makeRequest(String path) throws IOException, URISyntaxExce
         return new String(connection.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
     }
 
+    public static String uploadImage(byte[] data) throws IOException, URISyntaxException {
+        String url = "https://" + Constants.DEFAULT_API_HOST + "/interchat/upload_image";
+        HttpURLConnection connection = (HttpURLConnection) new URI(url).toURL().openConnection();
+        connection.addRequestProperty("Authorization", "Bearer " + CONFIG.apiKey);
+        connection.setDoOutput(true);
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "image/png");
+        connection.getOutputStream().write(data);
+        return new String(connection.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+    }
+
     public static void reconnect() {
         try {
             if (client != null) {
diff --git a/fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinScreenshotRecorder.java b/fabric-1.21.11/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinScreenshotRecorder.java
@@ -0,0 +1,37 @@
+package net.azisaba.interchatmod.fabric.mixin;
+
+import net.azisaba.interchatmod.fabric.Mod;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.util.ScreenshotRecorder;
+import net.minecraft.text.ClickEvent;
+import net.minecraft.text.HoverEvent;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.io.File;
+import java.util.UUID;
+import java.util.function.Consumer;
+
+@Mixin(ScreenshotRecorder.class)
+public class MixinScreenshotRecorder {
+    @Inject(at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V"), method = "method_22691")
+    private static void onSaveScreenshot(NativeImage nativeImage, File file, Consumer<Text> consumer, CallbackInfo ci) {
+        UUID uuid = UUID.randomUUID();
+        MutableText text = Text.empty();
+        text.append("[↑");
+        text.append(Text.translatable("generic.upload"));
+        text.append("↑]");
+        text.styled(style -> style
+                .withColor(Formatting.AQUA)
+                .withHoverEvent(new HoverEvent.ShowText(Text.translatable("generic.upload.tooltip")))
+                .withClickEvent(new ClickEvent.RunCommand("/cguild upload_image " + uuid)));
+        MinecraftClient.getInstance().execute(() -> consumer.accept(text));
+        Mod.images.put(uuid, file);
+    }
+}
diff --git a/fabric-1.21.11/src/main/resources/fabric.mod.json b/fabric-1.21.11/src/main/resources/fabric.mod.json
@@ -28,5 +28,8 @@
 		"java": ">=21",
 		"fabric-api": "*",
 		"cloth-config": "*"
-	}
+	},
+	"mixins": [
+		"interchatmod.mixins.json"
+	]
 }
diff --git a/fabric-1.21.11/src/main/resources/interchatmod.mixins.json b/fabric-1.21.11/src/main/resources/interchatmod.mixins.json
@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "minVersion": "0.8",
+  "package": "net.azisaba.interchatmod.fabric.mixin",
+  "injectors": {
+    "defaultRequire": 1
+  },
+  "client": [
+    "MixinScreenshotRecorder"
+  ]
+}
diff --git a/fabric-1.21.8/build.gradle.kts b/fabric-1.21.8/build.gradle.kts
@@ -94,3 +94,15 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.21.8-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.21.7", "1.21.8")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "owo-lib")
+        optional.project("modmenu")
+    }
+}
diff --git a/fabric-1.21/build.gradle.kts b/fabric-1.21/build.gradle.kts
@@ -94,3 +94,15 @@ java {
     // If you remove this line, sources will not be generated.
     withSourcesJar()
 }
+
+modrinth {
+    versionNumber.set("${project.version}+1.21.6-fabric")
+    uploadFile.set(tasks.remapJar)
+    file.set { tasks.remapJar.get().outputs.files.singleFile }
+    gameVersions.addAll("1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6")
+    loaders.add("fabric")
+    dependencies {
+        required.project("fabric-api", "owo-lib")
+        optional.project("modmenu")
+    }
+}
diff --git a/forge-1.15/build.gradle b/forge-1.15/build.gradle
