Initial Commit (x2)

src/main/java/dev/jonasjones/yadcl/YetAnotherDiscordChatLink.java

@@ -0,0 +1,34 @@
+package dev.jonasjones.yadcl;
+
+import dev.jonasjones.yadcl.config.ModConfigs;
+import dev.jonasjones.yadcl.dcbot.DiscordBot;
+import net.fabricmc.api.ModInitializer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import static dev.jonasjones.yadcl.dcbot.DiscordBot.sendToDiscord;
+
+public class YetAnotherDiscordChatLink implements ModInitializer {
+    // This logger is used to write text to the console and the log file.
+    // It is considered best practice to use your mod id as the logger's name.
+    // That way, it's clear which mod wrote info, warnings, and errors.
+    public static final String MOD_ID = "yadcl";
+    public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
+
+    @Override
+    public void onInitialize() {
+        // Register the config
+        ModConfigs.registerConfigs();
+
+        // Set the token and channel id
+        DiscordBot.setToken(ModConfigs.TOKEN);
+        DiscordBot.setTargetChannelId(ModConfigs.CHANNEL_ID);
+
+        // Start the bot
+        DiscordBot.startBot();
+        // send starting message
+        sendToDiscord("Server is starting up.");
+
+
+    }
+}

src/main/java/dev/jonasjones/yadcl/config/ModConfigProvider.java

@@ -0,0 +1,32 @@
+package dev.jonasjones.yadcl.config;
+
+import com.mojang.datafixers.util.Pair;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ModConfigProvider implements SimpleConfig.DefaultConfig {
+
+    private String configContents = "";
+
+    public List<Pair> getConfigsList() {
+        return configsList;
+    }
+
+    private final List<Pair> configsList = new ArrayList<>();
+
+    public void addKeyValuePair(Pair<String, ?> keyValuePair, String comment) {
+        configsList.add(keyValuePair);
+        configContents += keyValuePair.getFirst() + "=" + keyValuePair.getSecond() + " #"
+                + comment + " | default: " + keyValuePair.getSecond() + "\n";
+    }
+
+    public void addSingleLineComment(String comment) {
+        configContents += "# " + comment + "\n";
+    }
+
+    @Override
+    public String get(String namespace) {
+        return configContents;
+    }
+}

src/main/java/dev/jonasjones/yadcl/config/ModConfigs.java

@@ -0,0 +1,35 @@
+package dev.jonasjones.yadcl.config;
+
+
+import com.mojang.datafixers.util.Pair;
+import dev.jonasjones.yadcl.YetAnotherDiscordChatLink;
+
+public class ModConfigs {
+    public static SimpleConfig CONFIG;
+    private static ModConfigProvider configs;
+
+    public static String TOKEN;
+    public static String CHANNEL_ID;
+
+    public static void registerConfigs() {
+        configs = new ModConfigProvider();
+        createConfigs();
+
+        CONFIG = SimpleConfig.of(YetAnotherDiscordChatLink.MOD_ID + "config").provider(configs).request();
+
+        assignConfigs();
+    }
+
+    private static void createConfigs() {
+        configs.addKeyValuePair(new Pair<>("bot.token", "[Insert bot token here]"), "The Bot token from the discord developer dashboard");
+        configs.addKeyValuePair(new Pair<>("bot.channel", "1165690308185563216"), "The channel id of the channel the bot should listen and send to");
+    }
+
+    private static void assignConfigs() {
+        TOKEN = CONFIG.getOrDefault("bot.token", "default value");
+        CHANNEL_ID = CONFIG.getOrDefault("bot.channel", "1165690308185563216");
+
+
+        YetAnotherDiscordChatLink.LOGGER.info("All " + configs.getConfigsList().size() + " Configs have been set properly");
+    }
+}

src/main/java/dev/jonasjones/yadcl/config/SimpleConfig.java

@@ -0,0 +1,253 @@
+package dev.jonasjones.yadcl.config;
+/*
+ * Copyright (c) 2021 magistermaks
+ * Modified by Jonas_Jones 2022
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+import net.fabricmc.loader.api.FabricLoader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Scanner;
+
+public class SimpleConfig {
+
+    private static final Logger LOGGER = LogManager.getLogger("BetterSimpleConfig");
+    private final HashMap<String, String> config = new HashMap<>();
+    private final ConfigRequest request;
+    private boolean broken = false;
+
+    public interface DefaultConfig {
+        String get( String namespace );
+
+        static String empty( String namespace ) {
+            return "";
+        }
+    }
+
+    public static class ConfigRequest {
+
+        private final File file;
+        private final String filename;
+        private DefaultConfig provider;
+
+        private ConfigRequest(File file, String filename ) {
+            this.file = file;
+            this.filename = filename;
+            this.provider = DefaultConfig::empty;
+        }
+
+        /**
+         * Sets the default config provider, used to generate the
+         * config if it's missing.
+         *
+         * @param provider default config provider
+         * @return current config request object
+         * @see DefaultConfig
+         */
+        public ConfigRequest provider( DefaultConfig provider ) {
+            this.provider = provider;
+            return this;
+        }
+
+        /**
+         * Loads the config from the filesystem.
+         *
+         * @return config object
+         * @see SimpleConfig
+         */
+        public SimpleConfig request() {
+            return new SimpleConfig( this );
+        }
+
+        private String getConfig() {
+            return provider.get( filename ) + "\n";
+        }
+
+    }
+
+    /**
+     * Creates new config request object, ideally `namespace`
+     * should be the name of the mod id of the requesting mod
+     *
+     * @param filename - name of the config file
+     * @return new config request object
+     */
+    public static ConfigRequest of( String filename ) {
+        Path path = FabricLoader.getInstance().getConfigDir();
+        return new ConfigRequest( path.resolve( filename + ".properties" ).toFile(), filename );
+    }
+
+    private void createConfig() throws IOException {
+
+        // try creating missing files
+        request.file.getParentFile().mkdirs();
+        Files.createFile( request.file.toPath() );
+
+        // write default config data
+        PrintWriter writer = new PrintWriter(request.file, "UTF-8");
+        writer.write( request.getConfig() );
+        writer.close();
+
+    }
+
+    private void loadConfig() throws IOException {
+        Scanner reader = new Scanner( request.file );
+        for( int line = 1; reader.hasNextLine(); line ++ ) {
+            parseConfigEntry( reader.nextLine(), line );
+        }
+    }
+
+    private void parseConfigEntry( String entry, int line ) {
+        if( !entry.isEmpty() && !entry.startsWith( "#" ) ) {
+            String[] parts = entry.split("=", 2);
+            if( parts.length == 2 ) {
+                //Recognise comments after a value
+                String temp = parts[1].split(" #")[0];
+                config.put( parts[0], temp);
+            }else{
+                throw new RuntimeException("Syntax error in config file on line " + line + "!");
+            }
+        }
+    }
+
+    private SimpleConfig( ConfigRequest request ) {
+        this.request = request;
+        String identifier = "Config '" + request.filename + "'";
+
+        if( !request.file.exists() ) {
+            LOGGER.info( identifier + " is missing, generating default one..." );
+
+            try {
+                createConfig();
+            } catch (IOException e) {
+                LOGGER.error( identifier + " failed to generate!" );
+                LOGGER.trace( e );
+                broken = true;
+            }
+        }
+
+        if( !broken ) {
+            try {
+                loadConfig();
+            } catch (Exception e) {
+                LOGGER.error( identifier + " failed to load!" );
+                LOGGER.trace( e );
+                broken = true;
+            }
+        }
+
+    }
+
+    /**
+     * Queries a value from config, returns `null` if the
+     * key does not exist.
+     *
+     * @return  value corresponding to the given key
+     * @see     SimpleConfig#getOrDefault
+     */
+    @Deprecated
+    public String get( String key ) {
+        return config.get( key );
+    }
+
+    /**
+     * Returns string value from config corresponding to the given
+     * key, or the default string if the key is missing.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public String getOrDefault( String key, String def ) {
+        String val = get(key);
+        return val == null ? def : val;
+    }
+
+    /**
+     * Returns integer value from config corresponding to the given
+     * key, or the default integer if the key is missing or invalid.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public int getOrDefault( String key, int def ) {
+        try {
+            return Integer.parseInt( get(key) );
+        } catch (Exception e) {
+            return def;
+        }
+    }
+
+    /**
+     * Returns boolean value from config corresponding to the given
+     * key, or the default boolean if the key is missing.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public boolean getOrDefault( String key, boolean def ) {
+        String val = get(key);
+        if( val != null ) {
+            return val.equalsIgnoreCase("true");
+        }
+
+        return def;
+    }
+
+    /**
+     * Returns double value from config corresponding to the given
+     * key, or the default string if the key is missing or invalid.
+     *
+     * @return  value corresponding to the given key, or the default value
+     */
+    public double getOrDefault( String key, double def ) {
+        try {
+            return Double.parseDouble( get(key) );
+        } catch (Exception e) {
+            return def;
+        }
+    }
+
+    /**
+     * If any error occurred during loading or reading from the config
+     * a 'broken' flag is set, indicating that the config's state
+     * is undefined and should be discarded using `delete()`
+     *
+     * @return the 'broken' flag of the configuration
+     */
+    public boolean isBroken() {
+        return broken;
+    }
+
+    /**
+     * deletes the config file from the filesystem
+     *
+     * @return true if the operation was successful
+     */
+    public boolean delete() {
+        LOGGER.warn( "Config '" + request.filename + "' was removed from existence! Restart the game to regenerate it." );
+        return request.file.delete();
+    }
+
+}

src/main/java/dev/jonasjones/yadcl/dcbot/DiscordBot.java

@@ -0,0 +1,79 @@
+package dev.jonasjones.yadcl.dcbot;
+
+import lombok.Setter;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.text.Text;
+import org.javacord.api.DiscordApi;
+import org.javacord.api.DiscordApiBuilder;
+import org.javacord.api.entity.channel.TextChannel;
+
+import static dev.jonasjones.yadcl.YetAnotherDiscordChatLink.LOGGER;
+
+public class DiscordBot {
+    @Setter
+    private static String token;
+    @Setter
+    private static String targetChannelId;
+    private static DiscordApi api;
+    private static MinecraftServer minecraftServer;
+    private static Boolean isBotRunning = false;
+
+    public static void startBot() {
+        if (isBotRunning) {
+            return;
+        }
+
+        try {
+            registerServerTickEvent();
+            api = new DiscordApiBuilder().setToken(token).setAllIntents().login().join();
+            api.addMessageCreateListener(event -> {
+                // Check if the message is from the specific channel by comparing channel IDs
+                if (String.valueOf(event.getChannel().getId()).equals(targetChannelId)) {
+                    //check if message author is the bot
+                    if (event.getMessageAuthor().isBotUser()) {
+                        return;
+                    }
+                    String discordMessage = "[" + event.getMessageAuthor().getDisplayName() + "] " + event.getMessageContent();
+                    // Broadcast the message to Minecraft chat
+                    // You can implement a method to broadcast messages to Minecraft players
+                    minecraftServer.getPlayerManager().broadcast(Text.of(discordMessage), false);
+                }
+            });
+        } catch (Exception e) {
+            LOGGER.error("Failed to start Discord bot. Check the provided discord token in the config file.");
+        }
+        isBotRunning = true;
+    }
+
+    public static void stopBot() {
+        if (!isBotRunning) {
+            return;
+        }
+        api.disconnect();
+        isBotRunning = false;
+    }
+
+    public static void sendToDiscord(String message) {
+        if (!isBotRunning) {
+            return;
+        }
+        // Get the text channel by its ID
+        TextChannel channel = api.getTextChannelById(targetChannelId).orElse(null);
+
+        // Check if the channel exists and send the message
+        if (channel != null) {
+            channel.sendMessage(message);
+        } else {
+            // Handle the case where the channel does not exist
+            LOGGER.error("Discord Channel does not exist!");
+        }
+    }
+
+    private static void registerServerTickEvent() {
+        ServerTickEvents.START_SERVER_TICK.register(server -> {
+            // This code is executed on every server tick
+            minecraftServer = server;
+        });
+    }
+}

src/main/java/dev/jonasjones/yadcl/mixin/MixinServerPlayNetworkHandler.java

@@ -0,0 +1,24 @@
+package dev.jonasjones.yadcl.mixin;
+
+import net.minecraft.network.packet.c2s.play.ChatMessageC2SPacket;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.network.ServerPlayNetworkHandler;
+import net.minecraft.server.network.ServerPlayerEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import static dev.jonasjones.yadcl.dcbot.DiscordBot.sendToDiscord;
+
+@Mixin(ServerPlayNetworkHandler.class)
+public abstract class MixinServerPlayNetworkHandler {
+	@Shadow public ServerPlayerEntity player;
+
+	@Inject(method = "onChatMessage", at = @At("HEAD"), cancellable = true)
+	private void onChatMessage(ChatMessageC2SPacket packet, CallbackInfo ci) {
+		String messageContent = packet.chatMessage(); // Get the content of the chat message
+		sendToDiscord("<" + this.player.getDisplayName().getString() + "> " + messageContent);
+	}
+}

src/main/java/dev/jonasjones/yadcl/mixin/PlayerManagerMixin.java

@@ -0,0 +1,25 @@
+package dev.jonasjones.yadcl.mixin;
+
+import net.minecraft.network.ClientConnection;
+import net.minecraft.server.PlayerManager;
+import net.minecraft.server.network.ConnectedClientData;
+import net.minecraft.server.network.ServerPlayerEntity;
+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 static dev.jonasjones.yadcl.dcbot.DiscordBot.sendToDiscord;
+
+@Mixin(PlayerManager.class)
+public class PlayerManagerMixin {
+    @Inject(at = @At("HEAD"), method = "onPlayerConnect")
+    public void onPlayerConnect​(ClientConnection connection, ServerPlayerEntity player, ConnectedClientData clientData, CallbackInfo ci) {
+        sendToDiscord(player.getDisplayName().getString() + " joined the game.");
+    }
+
+    @Inject(at = @At("HEAD"), method = "remove")
+    public void remove(ServerPlayerEntity player, CallbackInfo ci) {
+        sendToDiscord(player.getDisplayName().getString() + " left the game.");
+    }
+}

src/main/java/dev/jonasjones/yadcl/mixin/ServerStopMixin.java

@@ -0,0 +1,25 @@
+package dev.jonasjones.yadcl.mixin;
+
+import net.minecraft.server.MinecraftServer;
+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 static dev.jonasjones.yadcl.dcbot.DiscordBot.sendToDiscord;
+import static dev.jonasjones.yadcl.dcbot.DiscordBot.stopBot;
+
+@Mixin(MinecraftServer.class)
+public class ServerStopMixin {
+    @Inject(at = @At("HEAD"), method = "shutdown")
+    private void init(CallbackInfo info) {
+        sendToDiscord("Server is shutting down.");
+        //wait 2 seconds for the message to send
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        stopBot();
+    }
+}

src/main/resources/fabric.mod.json

@@ -0,0 +1,38 @@
+{
+	"schemaVersion": 1,
+	"id": "yadcl",
+	"version": "${version}",
+	"name": "Yet Another Discord Chat Link",
+	"description": "A mod that allows you to link your Minecraft chat to a Discord channel.",
+	"authors": [
+		"Me!"
+	],
+	"contact": {
+		"homepage": "https://jonasjones.dev/",
+		"sources": "https://github.com/J-onasJones/YetAnotherDiscordChatLink"
+	},
+	"license": "CC0-1.0",
+	"icon": "assets/yadcl/icon.png",
+	"environment": "*",
+	"entrypoints": {
+		"main": [
+			"dev.jonasjones.yadcl.YetAnotherDiscordChatLink"
+		]
+	},
+	"mixins": [
+      "yadcl.mixins.json",
+		{
+			"config": "modid.client.mixins.json",
+			"environment": "client"
+		}
+	],
+	"depends": {
+		"fabricloader": ">=0.14.22",
+		"minecraft": "~1.20.2",
+		"java": ">=17",
+		"fabric-api": "*"
+	},
+	"suggests": {
+		"another-mod": "*"
+	}
+}

src/main/resources/yadcl.mixins.json

@@ -0,0 +1,13 @@
+{
+	"required": true,
+	"package": "dev.jonasjones.yadcl.mixin",
+	"compatibilityLevel": "JAVA_17",
+	"mixins": [
+		"MixinServerPlayNetworkHandler",
+		"PlayerManagerMixin",
+		"ServerStopMixin"
+	],
+	"injectors": {
+		"defaultRequire": 1
+	}
+}