feat: add image upload support for 1.16.5

Author: acrylic-style

fabric-1.16/src/main/java/net/azisaba/interchatmod/fabric/Commands.java

@@ -1,17 +1,24 @@
 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.v1.ClientCommandManager;
 import net.fabricmc.fabric.api.client.command.v1.FabricClientCommandSource;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.command.CommandSource;
 import net.minecraft.text.*;
 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.Collectors;
@@ -21,6 +28,7 @@
 import static net.fabricmc.fabric.api.client.command.v1.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() {
@@ -197,6 +205,11 @@ public static LiteralArgumentBuilder<FabricClientCommandSource> builderGuild() {
                                 )
                         )
                 )
+                .then(literal("upload_image")
+                        .then(argument("uuid", StringArgumentType.string())
+                                .executes(ctx -> executeUploadImage(ctx.getSource(), StringArgumentType.getString(ctx, "uuid")))
+                        )
+                )
                 ;
     }
 
@@ -293,6 +306,31 @@ 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;
+        }
+        source.sendFeedback(new TranslatableText("generic.uploading").formatted(Formatting.GRAY));
+        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(new TranslatableText("generic.upload_image_failed", new LiteralText(obj.toString()).formatted(Formatting.RED))));
+                    return;
+                }
+                String imageUuid = obj.get("uuid").getAsString();
+                Mod.client.sendMessageToGuild(null, "https://" + ModConfig.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);
     }

fabric-1.16/src/main/java/net/azisaba/interchatmod/fabric/Mod.java

@@ -15,11 +15,11 @@
 import net.minecraft.server.integrated.IntegratedServer;
 import org.jetbrains.annotations.NotNull;
 
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
+import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -29,6 +29,7 @@ public class Mod implements ModInitializer, ModMenuApi {
     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
@@ -77,6 +78,17 @@ public void run() {
         return ByteStreams.readString(connection.getInputStream(), StandardCharsets.UTF_8);
     }
 
+    public static String uploadImage(byte[] data) throws IOException, URISyntaxException {
+        String url = "https://" + ModConfig.getEffectiveApiHost() + "/interchat/upload_image";
+        HttpURLConnection connection = (HttpURLConnection) new URI(url).toURL().openConnection();
+        connection.addRequestProperty("Authorization", "Bearer " + ModConfig.apiKey);
+        connection.setDoOutput(true);
+        connection.setRequestMethod("POST");
+        connection.setRequestProperty("Content-Type", "image/png");
+        connection.getOutputStream().write(data);
+        return new String(ByteStreams.readFully(connection.getInputStream()), StandardCharsets.UTF_8);
+    }
+
     public static void reconnect() {
         try {
             if (client != null) {

fabric-1.16/src/main/java/net/azisaba/interchatmod/fabric/mixin/MixinScreenshotUtils.java

@@ -0,0 +1,34 @@
+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.ScreenshotUtils;
+import net.minecraft.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(ScreenshotUtils.class)
+public class MixinScreenshotUtils {
+    @Inject(at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V"), method = "method_1661")
+    private static void onSaveScreenshot(NativeImage nativeImage, File file, Consumer<Text> consumer, CallbackInfo ci) {
+        UUID uuid = UUID.randomUUID();
+        MutableText text = new LiteralText("");
+        text.append("[↑");
+        text.append(new TranslatableText("generic.upload"));
+        text.append("↑]");
+        text.styled(style -> style
+                .withColor(Formatting.AQUA)
+                .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TranslatableText("generic.upload.tooltip")))
+                .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/cguild upload_image " + uuid)));
+        MinecraftClient.getInstance().execute(() -> consumer.accept(text));
+        Mod.images.put(uuid, file);
+    }
+}

fabric-1.16/src/main/resources/fabric.mod.json

@@ -24,7 +24,7 @@
 		"interchatmod.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.14",
+		"fabricloader": ">=0.13",
 		"fabric": ">=0.42",
 		"minecraft": ">=1.16",
 		"java": ">=8"

fabric-1.16/src/main/resources/interchatmod.mixins.json

@@ -1,12 +1,13 @@
 {
-	"required": true,
-	"package": "net.azisaba.interchatmod.fabric.mixin",
-	"compatibilityLevel": "JAVA_8",
-	"mixins": [
-		"MixinClientPlayerEntity",
-		"MixinMinecraftClient"
-	],
-	"injectors": {
-		"defaultRequire": 1
-	}
+  "required": true,
+  "package": "net.azisaba.interchatmod.fabric.mixin",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "MixinClientPlayerEntity",
+    "MixinMinecraftClient",
+    "MixinScreenshotUtils"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
 }