From 01716acee10dc8e1a9a8ad54c4f1908849d775c2 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Tue, 13 Aug 2024 15:08:47 +0100 Subject: [PATCH 01/20] Abstract plugin --- .gitignore | 8 + build.gradle | 38 +++ bukkit/build.gradle | 23 ++ .../bukkit/BukkitCSSMinecraftPlugin.java | 51 ++++ .../bukkit/CSSMinecraftLoader.java | 26 ++ .../adapter/BukkitServerChatAdapter.java | 14 + .../bukkit/listener/BukkitEventListener.java | 78 ++++++ .../bukkit/logger/BukkitLogger.java | 59 ++++ bukkit/src/main/resources/plugin.yml | 9 + common/build.gradle | 12 + .../common/AbstractCSSMinecraftPlugin.java | 65 +++++ .../common/CSSMinecraftPlugin.java | 10 + .../common/adapter/ServerChatAdapter.java | 9 + .../common/config/ConfigService.java | 32 +++ .../common/config/option/ConfigOption.java | 37 +++ .../common/config/option/ConfigValue.java | 30 +++ .../config/option/ConfigValueFactory.java | 15 ++ .../common/config/source/ConfigSource.java | 15 ++ .../config/source/StubConfigSource.java | 30 +++ .../config/source/YamlConfigSource.java | 97 +++++++ .../common/discord/DiscordClientService.java | 59 ++++ .../common/discord/client/DiscordClient.java | 13 + .../discord/client/JDADiscordClient.java | 78 ++++++ .../discord/webhook/DiscordWebHookClient.java | 44 +++ .../common/discord/webhook/WebHookClient.java | 11 + .../cssminecraft/common/event/Event.java | 5 + .../cssminecraft/common/event/EventBus.java | 9 + .../common/event/EventHandler.java | 7 + .../common/event/PlatformEventAdapter.java | 7 + .../common/event/SimpleEventBus.java | 28 ++ .../event/events/DiscordMessageEvent.java | 7 + .../common/event/events/PlayerJoinEvent.java | 9 + .../common/event/events/PlayerQuitEvent.java | 9 + .../event/events/ServerMessageEvent.java | 9 + .../handler/DiscordMessageEventHandler.java | 28 ++ .../handler/PlayerJoinEventHandler.java | 23 ++ .../handler/PlayerQuitEventHandler.java | 23 ++ .../handler/ServerMessageEventHandler.java | 21 ++ .../cssminecraft/common/logger/Logger.java | 44 +++ gradle/libs.versions.toml | 14 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43504 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ pom.xml | 103 ------- settings.gradle | 6 + .../cssbham/minecraftcore/MinecraftCore.java | 85 ------ .../commands/CommandMakeGreen.java | 51 ---- .../minecraftcore/discord/DiscordBridge.java | 116 -------- .../minecraftcore/util/MessageUtil.java | 27 -- src/main/resources/config.yml | 6 - src/main/resources/plugin.yml | 14 - 52 files changed, 1465 insertions(+), 402 deletions(-) create mode 100644 build.gradle create mode 100644 bukkit/build.gradle create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java create mode 100644 bukkit/src/main/resources/plugin.yml create mode 100644 common/build.gradle create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/source/StubConfigSource.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/EventHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle delete mode 100644 src/main/java/com/cssbham/minecraftcore/MinecraftCore.java delete mode 100644 src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java delete mode 100644 src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java delete mode 100644 src/main/java/com/cssbham/minecraftcore/util/MessageUtil.java delete mode 100644 src/main/resources/config.yml delete mode 100644 src/main/resources/plugin.yml diff --git a/.gitignore b/.gitignore index ffac74e..4bb6260 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,10 @@ target/ *.iml +.idea +.gradle +**/build/ +!src/**/build/ +gradle-app.setting +!gradle-wrapper.jar +!gradle-wrapper.properties +.gradletasknamecache diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1026825 --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'com.gradleup.shadow' version '8.3.0' +} + +subprojects { + apply plugin: 'java' + apply plugin: 'com.gradleup.shadow' + + group = 'com.cssbham' + version = '1.0.0' + + sourceCompatibility = 21 + targetCompatibility = 21 + + tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' + } + + tasks.withType(Javadoc) { + options.encoding = 'UTF-8' + } + + repositories { + mavenCentral() + } + + shadowJar { + // relocate 'club.minnced', 'com.cssbham.cssminecraft.lib.discordwebhook' + // relocate 'net.dv8tion.jda', 'com.cssbham.cssminecraft.lib.jda' + // relocate 'org.yaml.snakeyaml', 'com.cssbham.cssminecraft.lib.snakeyaml' + + minimize() + } + + assemble.dependsOn shadowJar +} + diff --git a/bukkit/build.gradle b/bukkit/build.gradle new file mode 100644 index 0000000..20f5ef6 --- /dev/null +++ b/bukkit/build.gradle @@ -0,0 +1,23 @@ +plugins { + id 'java' +} + +processResources { + duplicatesStrategy = duplicatesStrategy.INCLUDE + from(sourceSets.main.resources.srcDirs) { + include 'plugin.yml' + expand('version': project.version) + } +} + +repositories { + maven { url = 'https://repo.papermc.io/repository/maven-public/' } + + maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } +} + +dependencies { + implementation project(':common') + + compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT") +} diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java new file mode 100644 index 0000000..dbf0768 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java @@ -0,0 +1,51 @@ +package com.cssbham.cssminecraft.bukkit; + +import com.cssbham.cssminecraft.bukkit.adapter.BukkitServerChatAdapter; +import com.cssbham.cssminecraft.bukkit.listener.BukkitEventListener; +import com.cssbham.cssminecraft.bukkit.logger.BukkitLogger; +import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.logger.Logger; +import org.bukkit.plugin.java.JavaPlugin; + +import java.nio.file.Path; +import java.nio.file.Paths; + +/** + * Implementation of CSS Minecraft Plugin for Bukkit + */ +public class BukkitCSSMinecraftPlugin extends AbstractCSSMinecraftPlugin { + + private final JavaPlugin plugin; + private final BukkitLogger bukkitLogger; + private final BukkitServerChatAdapter serverChatAdapter; + + public BukkitCSSMinecraftPlugin(JavaPlugin plugin) { + this.plugin = plugin; + this.bukkitLogger = new BukkitLogger(plugin); + this.serverChatAdapter = new BukkitServerChatAdapter(); + } + + @Override + public void enable() { + super.enable(); + + BukkitEventListener eventListener = new BukkitEventListener(plugin); + eventListener.bindPlatformToEventBus(super.getEventBus()); + } + + @Override + public Logger getLogger() { + return bukkitLogger; + } + + @Override + public ServerChatAdapter provideServerChatAdapter() { + return serverChatAdapter; + } + + @Override + public Path provideConfigurationPath() { + return Paths.get(plugin.getDataFolder().getPath(), "config.yml"); + } +} diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java new file mode 100644 index 0000000..a724335 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java @@ -0,0 +1,26 @@ +package com.cssbham.cssminecraft.bukkit; + +import org.bukkit.plugin.java.JavaPlugin; + +/** + * Entrypoint for Bukkit API + */ +public class CSSMinecraftLoader extends JavaPlugin { + + private final BukkitCSSMinecraftPlugin plugin; + + public CSSMinecraftLoader() { + this.plugin = new BukkitCSSMinecraftPlugin(this); + } + + @Override + public void onEnable() { + plugin.enable(); + } + + @Override + public void onDisable() { + super.onDisable(); + } + +} diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java new file mode 100644 index 0000000..1cc0747 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java @@ -0,0 +1,14 @@ +package com.cssbham.cssminecraft.bukkit.adapter; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import net.kyori.adventure.text.Component; +import org.bukkit.Bukkit; + +public class BukkitServerChatAdapter implements ServerChatAdapter { + + @Override + public void broadcastMessage(Component message) { + Bukkit.broadcast(message); + } + +} diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java new file mode 100644 index 0000000..014e5c3 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java @@ -0,0 +1,78 @@ +package com.cssbham.cssminecraft.bukkit.listener; + +import com.cssbham.cssminecraft.common.event.Event; +import com.cssbham.cssminecraft.common.event.EventBus; +import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; +import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.Objects; + +public class BukkitEventListener implements Listener, PlatformEventAdapter { + + private final JavaPlugin plugin; + private EventBus eventBus; + + public BukkitEventListener(JavaPlugin plugin) { + this.plugin = plugin; + } + + @Override + public void bindPlatformToEventBus(EventBus eventBus) { + this.eventBus = eventBus; + + plugin.getServer().getPluginManager().registerEvents(this, plugin); + } + + private void dispatchEvent(Event event) { + Objects.requireNonNull(event, "event bus not bound"); + + plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> { + eventBus.dispatch(event); + }); + } + + @EventHandler + public void onPlayerChat(AsyncPlayerChatEvent event) { + Player player = event.getPlayer(); + + dispatchEvent(new ServerMessageEvent( + player.getUniqueId(), + player.getName(), + player.displayName().toString(), + event.getMessage() + )); + } + + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) { + Player player = event.getPlayer(); + + dispatchEvent(new com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent( + player.getUniqueId(), + player.getName(), + PlainTextComponentSerializer.plainText().serialize(player.displayName()), + plugin.getServer().getOnlinePlayers().size() + )); + } + + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + Player player = event.getPlayer(); + + dispatchEvent(new com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent( + player.getUniqueId(), + player.getName(), + PlainTextComponentSerializer.plainText().serialize(player.displayName()), + plugin.getServer().getOnlinePlayers().size() - 1 + )); + } + +} diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java new file mode 100644 index 0000000..38c1dc1 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java @@ -0,0 +1,59 @@ +package com.cssbham.cssminecraft.bukkit.logger; + +import com.cssbham.cssminecraft.common.logger.Logger; +import org.bukkit.plugin.java.JavaPlugin; + +public class BukkitLogger implements Logger { + + private final JavaPlugin plugin; + private LoggingLevel serverLoggingLevel; + + public BukkitLogger(JavaPlugin plugin) { + this.plugin = plugin; + serverLoggingLevel = LoggingLevel.INFO; + } + + @Override + public LoggingLevel getServerLoggingLevel() { + return serverLoggingLevel; + } + + @Override + public void setServerLoggingLevel(LoggingLevel serverLoggingLevel) { + this.serverLoggingLevel = serverLoggingLevel; + } + + @Override + public void log(String str, LoggingLevel level) { + if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { + return; + } + switch (level) { + case DEBUG -> plugin.getLogger().info("DEBUG: " + str); + case INFO -> plugin.getLogger().info(str); + case ERROR -> plugin.getLogger().severe(str); + case WARNING -> plugin.getLogger().warning(str); + } + } + + @Override + public void debug(String str) { + log(str, LoggingLevel.DEBUG); + } + + @Override + public void info(String str) { + log(str, LoggingLevel.INFO); + } + + @Override + public void warning(String str) { + log(str, LoggingLevel.WARNING); + } + + @Override + public void severe(String str) { + log(str, LoggingLevel.ERROR); + } + +} diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml new file mode 100644 index 0000000..ca47dec --- /dev/null +++ b/bukkit/src/main/resources/plugin.yml @@ -0,0 +1,9 @@ +name: CSSMinecraft +version: '${version}' +main: com.cssbham.cssminecraft.bukkit.CSSMinecraftLoader +api-version: 1.17 +prefix: CSS +authors: [ RaineTheBoosted, LMBishop ] +description: CSS' Minecraft plugin +website: https://github.com/CSSUoB/CSS-Minecraft +softdepend: [ LuckPerms ] diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..4b78d30 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,12 @@ +plugins { + id 'java' +} + +dependencies { + implementation 'net.dv8tion:JDA:5.0.2' + implementation 'club.minnced:discord-webhooks:0.8.4' + implementation 'org.yaml:snakeyaml:2.2' + implementation 'net.kyori:adventure-api:4.17.0' + implementation 'net.kyori:adventure-text-serializer-plain:4.17.0' +} + diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java new file mode 100644 index 0000000..5797bd2 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java @@ -0,0 +1,65 @@ +package com.cssbham.cssminecraft.common; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.config.ConfigService; +import com.cssbham.cssminecraft.common.config.source.ConfigSource; +import com.cssbham.cssminecraft.common.config.source.StubConfigSource; +import com.cssbham.cssminecraft.common.config.source.YamlConfigSource; +import com.cssbham.cssminecraft.common.discord.DiscordClientService; +import com.cssbham.cssminecraft.common.event.EventBus; +import com.cssbham.cssminecraft.common.event.SimpleEventBus; +import com.cssbham.cssminecraft.common.event.events.DiscordMessageEvent; +import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; +import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent; +import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import com.cssbham.cssminecraft.common.handler.DiscordMessageEventHandler; +import com.cssbham.cssminecraft.common.handler.PlayerJoinEventHandler; +import com.cssbham.cssminecraft.common.handler.PlayerQuitEventHandler; +import com.cssbham.cssminecraft.common.handler.ServerMessageEventHandler; +import com.cssbham.cssminecraft.common.logger.Logger; + +import java.nio.file.Path; + +public abstract class AbstractCSSMinecraftPlugin implements CSSMinecraftPlugin { + + private ConfigService configService; + private DiscordClientService discordClientService; + private EventBus eventBus; + + @Override + public void enable() { + ConfigSource configSource = new YamlConfigSource(provideConfigurationPath()); + + Logger logger = getLogger(); + + this.configService = new ConfigService(logger); + configService.useSource(configSource); + + this.eventBus = new SimpleEventBus(); + + this.discordClientService = new DiscordClientService(configService, eventBus, logger); + discordClientService.initialiseClients(); + + eventBus.subscribe(ServerMessageEvent.class, new ServerMessageEventHandler(discordClientService)); + eventBus.subscribe(PlayerJoinEvent.class, new PlayerJoinEventHandler(discordClientService)); + eventBus.subscribe(PlayerQuitEvent.class, new PlayerQuitEventHandler(discordClientService)); + eventBus.subscribe(DiscordMessageEvent.class, new DiscordMessageEventHandler(provideServerChatAdapter())); + } + + public ConfigService getConfigService() { + return configService; + } + + public DiscordClientService getDiscordClientService() { + return discordClientService; + } + + public EventBus getEventBus() { + return eventBus; + } + + public abstract ServerChatAdapter provideServerChatAdapter(); + + public abstract Path provideConfigurationPath(); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java new file mode 100644 index 0000000..be33d0b --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java @@ -0,0 +1,10 @@ +package com.cssbham.cssminecraft.common; + +import com.cssbham.cssminecraft.common.logger.Logger; + +public interface CSSMinecraftPlugin { + + void enable(); + + Logger getLogger(); +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java b/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java new file mode 100644 index 0000000..5fc024e --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java @@ -0,0 +1,9 @@ +package com.cssbham.cssminecraft.common.adapter; + +import net.kyori.adventure.text.Component; + +public interface ServerChatAdapter { + + void broadcastMessage(Component message); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java new file mode 100644 index 0000000..17b45c4 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java @@ -0,0 +1,32 @@ +package com.cssbham.cssminecraft.common.config; + +import com.cssbham.cssminecraft.common.config.option.ConfigValue; +import com.cssbham.cssminecraft.common.config.source.ConfigSource; +import com.cssbham.cssminecraft.common.logger.Logger; + +import java.util.Objects; + +public class ConfigService { + + private final Logger logger; + + private ConfigSource configSource; + + public ConfigService(Logger logger) { + this.logger = logger; + } + + public void useSource(ConfigSource configSource) { + this.configSource = configSource; + this.logger.info(String.format("Using config source: %s", configSource.getClass().getName())); + + configSource.initialise(); + } + + public T getValue(ConfigValue option) { + Objects.requireNonNull(configSource, "config source not initialised"); + + return option.get(configSource); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java new file mode 100644 index 0000000..cdb3b55 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java @@ -0,0 +1,37 @@ +package com.cssbham.cssminecraft.common.config.option; + +import java.lang.reflect.Modifier; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import static com.cssbham.cssminecraft.common.config.option.ConfigValueFactory.*; + +public class ConfigOption { + + public static final ConfigValue WEBHOOK_URL = buildString("webhook-url", ""); + + public static final ConfigValue AVATAR_SERVICE = buildString("avatar-service", ""); + + public static final ConfigValue BOT_TOKEN = buildString("bot-token", ""); + + public static final ConfigValue MEMBER_ROLE_ID = buildLong("member-role-id", 0); + + public static final ConfigValue BRIDGE_CHANNEL_ID = buildLong("bridge-channel-id", 0); + + public static final ConfigValue DISCORD_SERVER_ID = buildLong("discord-server-id", 0); + + public static List> allValues() { + return Arrays.stream(ConfigOption.class.getFields()) + .filter(f -> Modifier.isStatic(f.getModifiers())) + .filter(f -> ConfigValue.class.equals(f.getType())) + .map(f -> { + try { + return (ConfigValue) f.get(null); + } catch (IllegalAccessException e) { + throw new RuntimeException(e); + } + }) + .collect(Collectors.toUnmodifiableList()); + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java new file mode 100644 index 0000000..f6a99b5 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java @@ -0,0 +1,30 @@ +package com.cssbham.cssminecraft.common.config.option; + +import com.cssbham.cssminecraft.common.config.source.ConfigSource; + +import java.util.function.Function; + +public class ConfigValue { + + private final String path; + private final T def; + private final Function getter; + + public ConfigValue(String path, T def, Function getter) { + this.path = path; + this.def = def; + this.getter = getter; + } + + public T get(ConfigSource configSource) { + return this.getter.apply(configSource); + } + + public String getPath() { + return path; + } + + public T getDefault() { + return def; + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java new file mode 100644 index 0000000..597083e --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java @@ -0,0 +1,15 @@ +package com.cssbham.cssminecraft.common.config.option; + +public final class ConfigValueFactory { + + private ConfigValueFactory() {} + + public static ConfigValue buildString(String path, String def) { + return new ConfigValue<>(path, def, (configSource -> configSource.getString(path, def))); + } + + public static ConfigValue buildLong(String path, long def) { + return new ConfigValue<>(path, def, (configSource -> configSource.getLong(path, def))); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java new file mode 100644 index 0000000..0fbef45 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java @@ -0,0 +1,15 @@ +package com.cssbham.cssminecraft.common.config.source; + +public interface ConfigSource { + + int getInteger(String path, int def); + + long getLong(String path, long def); + + boolean getBoolean(String path, boolean def); + + String getString(String path, String def); + + void initialise(); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/StubConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/StubConfigSource.java new file mode 100644 index 0000000..ffe4a87 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/StubConfigSource.java @@ -0,0 +1,30 @@ +package com.cssbham.cssminecraft.common.config.source; + +public class StubConfigSource implements ConfigSource { + + @Override + public int getInteger(String path, int def) { + return 0; + } + + @Override + public long getLong(String path, long def) { + return 0; + } + + @Override + public boolean getBoolean(String path, boolean def) { + return false; + } + + @Override + public String getString(String path, String def) { + return "test"; + } + + @Override + public void initialise() { + + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java new file mode 100644 index 0000000..473b355 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java @@ -0,0 +1,97 @@ +package com.cssbham.cssminecraft.common.config.source; + +import com.cssbham.cssminecraft.common.config.option.ConfigOption; +import com.cssbham.cssminecraft.common.config.option.ConfigValue; +import org.yaml.snakeyaml.Yaml; +import org.yaml.snakeyaml.DumperOptions; + +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.HashMap; +import java.util.Map; + +public class YamlConfigSource implements ConfigSource { + + private final Path configurationPath; + + private Map data; + + public YamlConfigSource(Path configurationPath) { + this.configurationPath = configurationPath; + } + + @Override + public void initialise() { + try { + this.createDefaultIfNotExists(); + + try (InputStreamReader reader = new InputStreamReader(Files.newInputStream(configurationPath))) { + Yaml yaml = new Yaml(); + this.data = yaml.load(reader); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + private void createDefaultIfNotExists() throws IOException { + if (Files.exists(configurationPath)) { + return; + } + + Files.createDirectories(configurationPath.getParent()); + + Map configuration = new HashMap<>(); + for (ConfigValue configValue : ConfigOption.allValues()) { + configuration.put(configValue.getPath(), configValue.getDefault()); + } + DumperOptions options = new DumperOptions(); + options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); + options.setPrettyFlow(true); + Yaml yaml = new Yaml(options); + + try (OutputStreamWriter writer = new OutputStreamWriter( + Files.newOutputStream(configurationPath, StandardOpenOption.CREATE) + )) { + yaml.dump(configuration, writer); + } + } + + @Override + public int getInteger(String path, int def) { + if (null == data) return def; + Object val = data.getOrDefault(path, def); + if (!(val instanceof Number)) return def; + + return ((Number) val).intValue(); + } + + @Override + public long getLong(String path, long def) { + if (null == data) return def; + Object val = data.getOrDefault(path, def); + if (!(val instanceof Number)) return def; + + return ((Number) val).longValue(); + } + + @Override + public boolean getBoolean(String path, boolean def) { + if (null == data) return def; + Object val = data.getOrDefault(path, def); + if (!(val instanceof Boolean)) return def; + + return (boolean) val; + } + + @Override + public String getString(String path, String def) { + if (null == data) return def; + + return String.valueOf(data.getOrDefault(path, def)); + } + + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java new file mode 100644 index 0000000..35158bf --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java @@ -0,0 +1,59 @@ +package com.cssbham.cssminecraft.common.discord; + +import com.cssbham.cssminecraft.common.config.ConfigService; +import com.cssbham.cssminecraft.common.config.option.ConfigOption; +import com.cssbham.cssminecraft.common.discord.client.DiscordClient; +import com.cssbham.cssminecraft.common.discord.client.JDADiscordClient; +import com.cssbham.cssminecraft.common.discord.webhook.DiscordWebHookClient; +import com.cssbham.cssminecraft.common.discord.webhook.WebHookClient; +import com.cssbham.cssminecraft.common.event.EventBus; +import com.cssbham.cssminecraft.common.logger.Logger; + +import java.util.Objects; + +public class DiscordClientService { + + private final ConfigService configService; + private final EventBus eventBus; + private final Logger logger; + + private DiscordClient discordClient; + private WebHookClient webHookClient; + + public DiscordClientService(ConfigService configService, EventBus eventBus, Logger logger) { + this.configService = configService; + this.eventBus = eventBus; + this.logger = logger; + } + + public void initialiseClients() { + this.discordClient = new JDADiscordClient( + eventBus, + configService.getValue(ConfigOption.BOT_TOKEN), + configService.getValue(ConfigOption.DISCORD_SERVER_ID), + configService.getValue(ConfigOption.MEMBER_ROLE_ID), + configService.getValue(ConfigOption.BRIDGE_CHANNEL_ID) + ); + this.webHookClient = new DiscordWebHookClient( + configService.getValue(ConfigOption.WEBHOOK_URL), + configService.getValue(ConfigOption.AVATAR_SERVICE) + ); + + this.logger.info("Initialising Discord clients"); + + this.discordClient.initialise(); + this.webHookClient.initialise(); + } + + public DiscordClient getDiscordClient() { + Objects.requireNonNull(discordClient, "discord client not initialised"); + + return discordClient; + } + + public WebHookClient getWebHookClient() { + Objects.requireNonNull(webHookClient, "webhook client not initialised"); + + return webHookClient; + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java new file mode 100644 index 0000000..bbd5624 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java @@ -0,0 +1,13 @@ +package com.cssbham.cssminecraft.common.discord.client; + +import com.cssbham.cssminecraft.common.event.EventHandler; + +public interface DiscordClient { + + void initialise(); + + void shutdown(); + + boolean isMember(String identifier); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java new file mode 100644 index 0000000..286d2f1 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java @@ -0,0 +1,78 @@ +package com.cssbham.cssminecraft.common.discord.client; + +import com.cssbham.cssminecraft.common.event.EventBus; +import com.cssbham.cssminecraft.common.event.events.DiscordMessageEvent; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import net.dv8tion.jda.api.requests.GatewayIntent; +import net.dv8tion.jda.api.utils.ChunkingFilter; +import net.dv8tion.jda.api.utils.MemberCachePolicy; +import org.jetbrains.annotations.NotNull; + +public class JDADiscordClient extends ListenerAdapter implements DiscordClient { + + private final EventBus eventBus; + private final String botToken; + private final long discordServerId; + private final long memberRoleId; + private final long bridgeChannelId; + + private JDA jda; + + public JDADiscordClient(EventBus eventBus, String botToken, long discordServerId, long memberRoleId, long bridgeChannelId) { + this.eventBus = eventBus; + this.botToken = botToken; + this.discordServerId = discordServerId; + this.memberRoleId = memberRoleId; + this.bridgeChannelId = bridgeChannelId; + } + + @Override + public void initialise() { + this.jda = JDABuilder.createDefault( + botToken + ).setMemberCachePolicy(MemberCachePolicy.ALL) + .setChunkingFilter(ChunkingFilter.ALL) + .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT).addEventListeners(this).build(); + } + + @Override + public void onMessageReceived(@NotNull MessageReceivedEvent event) { + if (!event.isFromGuild() || event.getChannel().getIdLong() != bridgeChannelId || + event.isWebhookMessage() || + event.getMember() == null || + event.getAuthor().isBot() || + event.getMessage().isEdited()) { + return; + } + + eventBus.dispatch(new DiscordMessageEvent( + event.getMember().getEffectiveName(), + event.getMessage().getContentRaw(), + event.getMember().getColorRaw() + )); + } + + @Override + public boolean isMember(String identifier) { + Guild g = jda.getGuildById(discordServerId); + if (g == null) return false; + Member m = g.getMembers().stream() + .filter(mm -> + (mm.getUser().getName() + "#" + mm.getUser().getDiscriminator()).equalsIgnoreCase(identifier) || + mm.getUser().getName().equalsIgnoreCase(identifier) + ).findFirst().orElse(null); + if (m == null) return false; + return m.getRoles().stream().anyMatch(r -> r.getIdLong() == memberRoleId); + } + + @Override + public void shutdown() { + jda.shutdownNow(); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java new file mode 100644 index 0000000..d27de35 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java @@ -0,0 +1,44 @@ +package com.cssbham.cssminecraft.common.discord.webhook; + +import club.minnced.discord.webhook.send.WebhookMessageBuilder; +import com.cssbham.cssminecraft.common.event.EventHandler; + +import club.minnced.discord.webhook.WebhookClient; +import club.minnced.discord.webhook.WebhookClientBuilder; +import okhttp3.OkHttpClient; + +public class DiscordWebHookClient implements WebHookClient { + + private final String webHookUrl; + private final String avatarServiceUrl; + + private WebhookClient webhook = null; + + public DiscordWebHookClient(String webHookUrl, String avatarServiceUrl) { + this.webHookUrl = webHookUrl; + this.avatarServiceUrl = avatarServiceUrl; + } + + @Override + public void initialise() { + this.webhook = new WebhookClientBuilder(webHookUrl) + .setThreadFactory(Thread::new) + .setDaemon(true) + .setWait(true) + .setHttpClient(new OkHttpClient()) + .build(); + } + + @Override + public void sendMessageAsMinecraftUser(String avatarName, String displayName, String message) { + try { + webhook.send(new WebhookMessageBuilder() + .setAvatarUrl(String.format(avatarServiceUrl, avatarName)) + .setUsername(displayName) + .setContent(message) + .build()); + } catch (Exception ignored) { + } + // https://github.com/DV8FromTheWorld/JDA/issues/1761 + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java new file mode 100644 index 0000000..99727b6 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java @@ -0,0 +1,11 @@ +package com.cssbham.cssminecraft.common.discord.webhook; + +import com.cssbham.cssminecraft.common.event.EventHandler; + +public interface WebHookClient { + + void initialise(); + + void sendMessageAsMinecraftUser(String avatarName, String displayName, String message); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java new file mode 100644 index 0000000..fda9067 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java @@ -0,0 +1,5 @@ +package com.cssbham.cssminecraft.common.event; + +public interface Event { + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java new file mode 100644 index 0000000..1fc7215 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java @@ -0,0 +1,9 @@ +package com.cssbham.cssminecraft.common.event; + +public interface EventBus { + + void dispatch(Event event); + + void subscribe(Class event, EventHandler handler); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/EventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/EventHandler.java new file mode 100644 index 0000000..ae43007 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/EventHandler.java @@ -0,0 +1,7 @@ +package com.cssbham.cssminecraft.common.event; + +public abstract class EventHandler { + + public abstract void handle(E event); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java new file mode 100644 index 0000000..2dd24f3 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java @@ -0,0 +1,7 @@ +package com.cssbham.cssminecraft.common.event; + +public interface PlatformEventAdapter { + + void bindPlatformToEventBus(EventBus eventBus); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java new file mode 100644 index 0000000..a88e80d --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java @@ -0,0 +1,28 @@ +package com.cssbham.cssminecraft.common.event; + +import java.util.*; + +public class SimpleEventBus implements EventBus { + + private final Map, List>> handlers = new HashMap<>(); + + public void dispatch(Event event) { + var handlers = this.handlers.getOrDefault(event.getClass(), new ArrayList<>()); + + for (EventHandler handler : handlers) { + try { + handler.handle(event); + } catch (Exception e) { + // TODO handle + } + } + } + + public void subscribe(Class event, EventHandler handler) { + if (!this.handlers.containsKey(event)) { + this.handlers.put(event, new ArrayList<>()); + } + + this.handlers.get(event).add(handler); + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java new file mode 100644 index 0000000..c0b502e --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java @@ -0,0 +1,7 @@ +package com.cssbham.cssminecraft.common.event.events; + +import com.cssbham.cssminecraft.common.event.Event; + +public record DiscordMessageEvent(String sender, String message, int senderColour) implements Event { + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java new file mode 100644 index 0000000..dbe0930 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java @@ -0,0 +1,9 @@ +package com.cssbham.cssminecraft.common.event.events; + +import com.cssbham.cssminecraft.common.event.Event; + +import java.util.UUID; + +public record PlayerJoinEvent(UUID sender, String username, String displayName, int newPlayerCount) implements Event { + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java new file mode 100644 index 0000000..528ffa1 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java @@ -0,0 +1,9 @@ +package com.cssbham.cssminecraft.common.event.events; + +import com.cssbham.cssminecraft.common.event.Event; + +import java.util.UUID; + +public record PlayerQuitEvent(UUID sender, String username, String displayName, int newPlayerCount) implements Event { + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java new file mode 100644 index 0000000..0d5c65b --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java @@ -0,0 +1,9 @@ +package com.cssbham.cssminecraft.common.event.events; + +import com.cssbham.cssminecraft.common.event.Event; + +import java.util.UUID; + +public record ServerMessageEvent(UUID sender, String username, String displayName, String message) implements Event { + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java new file mode 100644 index 0000000..9cf2bcb --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java @@ -0,0 +1,28 @@ +package com.cssbham.cssminecraft.common.handler; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.event.EventHandler; +import com.cssbham.cssminecraft.common.event.events.DiscordMessageEvent; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.TextColor; + +public class DiscordMessageEventHandler extends EventHandler { + + private final ServerChatAdapter serverChatAdapter; + + public DiscordMessageEventHandler(ServerChatAdapter serverChatAdapter) { + this.serverChatAdapter = serverChatAdapter; + } + + @Override + public void handle(DiscordMessageEvent event) { + serverChatAdapter.broadcastMessage(buildMessageComponent(event.sender(), event.senderColour(), event.message())); + } + + private Component buildMessageComponent(String name, int colour, String message) { + return Component.text("[Discord] ").color(TextColor.color(115, 138, 189)) + .append(Component.text(name).color(TextColor.color(0xFFFFFF & colour))) + .append(Component.text(" > ").color(TextColor.color(255, 255, 255))) + .append(Component.text(message).color(TextColor.color(255, 255, 255))); + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java new file mode 100644 index 0000000..37085a8 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java @@ -0,0 +1,23 @@ +package com.cssbham.cssminecraft.common.handler; + +import com.cssbham.cssminecraft.common.discord.DiscordClientService; +import com.cssbham.cssminecraft.common.event.EventHandler; +import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; +import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; + +public class PlayerJoinEventHandler extends EventHandler { + + private final DiscordClientService discordClientService; + + public PlayerJoinEventHandler(DiscordClientService discordClientService) { + this.discordClientService = discordClientService; + } + + @Override + public void handle(PlayerJoinEvent event) { + String joinMessage = String.format("__*has joined the server, there are now %d players online*__", + event.newPlayerCount()); + this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), joinMessage); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java new file mode 100644 index 0000000..1b4f55b --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java @@ -0,0 +1,23 @@ +package com.cssbham.cssminecraft.common.handler; + +import com.cssbham.cssminecraft.common.discord.DiscordClientService; +import com.cssbham.cssminecraft.common.event.EventHandler; +import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; +import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent; + +public class PlayerQuitEventHandler extends EventHandler { + + private final DiscordClientService discordClientService; + + public PlayerQuitEventHandler(DiscordClientService discordClientService) { + this.discordClientService = discordClientService; + } + + @Override + public void handle(PlayerQuitEvent event) { + String joinMessage = String.format("__*has left the server, there are now %d players online*__", + event.newPlayerCount()); + this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), joinMessage); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java new file mode 100644 index 0000000..117c211 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java @@ -0,0 +1,21 @@ +package com.cssbham.cssminecraft.common.handler; + +import com.cssbham.cssminecraft.common.discord.DiscordClientService; +import com.cssbham.cssminecraft.common.event.Event; +import com.cssbham.cssminecraft.common.event.EventHandler; +import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; + +public class ServerMessageEventHandler extends EventHandler { + + private final DiscordClientService discordClientService; + + public ServerMessageEventHandler(DiscordClientService discordClientService) { + this.discordClientService = discordClientService; + } + + @Override + public void handle(ServerMessageEvent event) { + this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), event.message()); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java b/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java new file mode 100644 index 0000000..98db85c --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java @@ -0,0 +1,44 @@ +package com.cssbham.cssminecraft.common.logger; + +public interface Logger { + + LoggingLevel getServerLoggingLevel(); + + void setServerLoggingLevel(LoggingLevel serverLoggingLevel); + + void log(String str, LoggingLevel level); + + void debug(String str); + + void info(String str); + + void warning(String str); + + void severe(String str); + + enum LoggingLevel { + ERROR(0), + WARNING(1), + INFO(2), + DEBUG(3); + + private final int numericVerbosity; + + LoggingLevel(int number) { + numericVerbosity = number; + } + + public int getNumericVerbosity() { + return numericVerbosity; + } + + public static LoggingLevel fromNumber(int number) { + for (LoggingLevel level : LoggingLevel.values()) { + if (level.getNumericVerbosity() == number) { + return level; + } + } + return LoggingLevel.INFO; + } + } +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..d10ab19 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,14 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +club-minnced-discord-webhooks = "0.8.2" +net-dv8tion-jda = "5.0.0-beta.17" +net-luckperms-api = "5.4" +org-spigotmc-spigot-api = "1.20.2-R0.1-SNAPSHOT" + +[libraries] +club-minnced-discord-webhooks = { module = "club.minnced:discord-webhooks", version.ref = "club-minnced-discord-webhooks" } +net-dv8tion-jda = { module = "net.dv8tion:JDA", version.ref = "net-dv8tion-jda" } +net-luckperms-api = { module = "net.luckperms:api", version.ref = "net-luckperms-api" } +org-spigotmc-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "org-spigotmc-spigot-api" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..2c3521197d7c4586c843d1d3e9090525f1898cde GIT binary patch literal 43504 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 TZiJi*F`$tkWLn) literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..09523c0 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 920fc8e..0000000 --- a/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - 4.0.0 - - com.cssbham - CSS-Minecraft - 0.0.1 - jar - - CSS Minecraft - - The core plugin for CSS' Minecraft Server. - - 1.8 - UTF-8 - - https://github.com/CSSUoB/CSS-Minecraft - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - false - - - - - - - - src/main/resources - true - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - dv8tion - m2-dv8tion - https://m2.dv8tion.net/releases - - - - - - org.spigotmc - spigot-api - 1.20.2-R0.1-SNAPSHOT - provided - - - net.luckperms - api - 5.4 - provided - - - net.dv8tion - JDA - 5.0.0-beta.17 - - - club.minnced - opus-java - - - - - club.minnced - discord-webhooks - 0.8.2 - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..53e0e93 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,6 @@ +rootProject.name = 'css-minecraft' + +include( + 'common', + 'bukkit' +) \ No newline at end of file diff --git a/src/main/java/com/cssbham/minecraftcore/MinecraftCore.java b/src/main/java/com/cssbham/minecraftcore/MinecraftCore.java deleted file mode 100644 index a6c89d7..0000000 --- a/src/main/java/com/cssbham/minecraftcore/MinecraftCore.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.cssbham.minecraftcore; - -import com.cssbham.minecraftcore.commands.CommandMakeGreen; -import com.cssbham.minecraftcore.discord.DiscordBridge; -import org.bukkit.Server; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.plugin.java.JavaPlugin; - -public final class MinecraftCore extends JavaPlugin implements Listener { - - private DiscordBridge discordBridge; - - @Override - @SuppressWarnings("ConstantConditions") - public void onEnable() { - saveDefaultConfig(); - if (discordBridge != null) { - discordBridge.shutdown(); - } - try { - discordBridge = new DiscordBridge(this); - } catch (Exception e) { - return; - } - - this.getServer().getPluginManager().registerEvents(this, this); - this.getCommand("makegreen").setExecutor(new CommandMakeGreen(discordBridge)); - this.getLogger().info("Plugin has been enabled."); - - } - - @Override - public void onDisable() { - this.getLogger().warning("Plugin has been disabled."); - try { - discordBridge.shutdown(); - discordBridge = null; - } catch (Exception ignored) { - } - // Plugin shutdown logic - } - - @EventHandler - public void onPlayerChat(AsyncPlayerChatEvent event) { - discordBridge.sendSanitisedMessageToDiscord(event.getPlayer(), event.getMessage()); - } - - @EventHandler - public void onPlayerJoin(PlayerJoinEvent event) { - discordBridge.sendMessageToDiscord(event.getPlayer(), - "__*has joined the server, " + getOnlineMessage(event.getPlayer().getServer(), false) + "*__"); - } - - @EventHandler - public void onPlayerQuit(PlayerQuitEvent event) { - discordBridge.sendMessageToDiscord(event.getPlayer(), - "__*has left the server, " + getOnlineMessage(event.getPlayer().getServer(), true) + "*__"); - } - - private String getOnlineMessage(Server server, boolean leaving) { - int amount = server.getOnlinePlayers().size(); - if (leaving) { - amount--; - } - // This shouldn't? happen. - if (amount < 0) { - amount = 0; - } - switch (amount) { - case 0: { - return "there are now no players online."; - } - case 1: { - return "there is now 1 player online."; - } - default: { - return "there are now " + amount + " players online."; - } - } - } -} diff --git a/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java b/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java deleted file mode 100644 index dd355ff..0000000 --- a/src/main/java/com/cssbham/minecraftcore/commands/CommandMakeGreen.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.cssbham.minecraftcore.commands; - -import com.cssbham.minecraftcore.discord.DiscordBridge; -import com.cssbham.minecraftcore.util.MessageUtil; -import net.luckperms.api.LuckPerms; -import net.luckperms.api.LuckPermsProvider; -import net.luckperms.api.node.Node; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -public class CommandMakeGreen implements CommandExecutor { - - private final DiscordBridge discordBridge; - - public CommandMakeGreen(DiscordBridge discordBridge) { - this.discordBridge = discordBridge; - } - - @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, - @NotNull String label, @NotNull String[] args) { - if (!(sender instanceof Player)) { - sender.sendMessage("Only players can execute this command."); - return true; - } - String arg = String.join(" ", args); - if (!arg.matches("[a-z0-9._]{2,32}|.{2,32}#[0-9]{4}")) { - return false; - } - - if (discordBridge.isMember(arg)) { - LuckPerms perms = LuckPermsProvider.get(); - perms.getUserManager().modifyUser(((Player) sender).getUniqueId(), - user -> { - user.data().add(Node.builder("group.member").build()); - user.data().remove(Node.builder("group.guest").build()); - } - ); - sender.sendMessage(MessageUtil.getMemberGreen() + "Congratulations, you are now green!"); - } else { - sender.sendMessage(MessageUtil.getCSSPrefix() + - "§cIf you are a member, please link your account in Discord!\n" + - "Or you can buy membership at https://cssbham.com/join" - ); - } - return true; - } -} diff --git a/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java b/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java deleted file mode 100644 index 74f3ba6..0000000 --- a/src/main/java/com/cssbham/minecraftcore/discord/DiscordBridge.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.cssbham.minecraftcore.discord; - -import club.minnced.discord.webhook.WebhookClient; -import club.minnced.discord.webhook.WebhookClientBuilder; -import club.minnced.discord.webhook.send.WebhookMessageBuilder; -import com.cssbham.minecraftcore.MinecraftCore; -import com.cssbham.minecraftcore.util.MessageUtil; -import net.dv8tion.jda.api.JDA; -import net.dv8tion.jda.api.JDABuilder; -import net.dv8tion.jda.api.entities.Guild; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.events.message.MessageReceivedEvent; -import net.dv8tion.jda.api.hooks.ListenerAdapter; -import net.dv8tion.jda.api.requests.GatewayIntent; -import net.dv8tion.jda.api.utils.ChunkingFilter; -import net.dv8tion.jda.api.utils.MemberCachePolicy; -import okhttp3.OkHttpClient; -import org.bukkit.ChatColor; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; - -import javax.security.auth.login.LoginException; - -public class DiscordBridge extends ListenerAdapter { - - private final Long MEMBER_ROLE_ID; - private final Long BRIDGE_CHANNEL_ID; - private final Long DISCORD_SERVER_ID; - private final String AVATAR; - - private JDA jda = null; - private MinecraftCore core = null; - private WebhookClient webhook = null; - private boolean shutdown = false; - - public DiscordBridge(MinecraftCore core) throws LoginException, ClassCastException { - - FileConfiguration configuration = core.getConfig(); - core.reloadConfig(); - MEMBER_ROLE_ID = Long.parseLong(configuration.getString("MEMBER_ROLE_ID")); - BRIDGE_CHANNEL_ID = Long.parseLong(configuration.getString("BRIDGE_CHANNEL_ID")); - DISCORD_SERVER_ID = Long.parseLong(configuration.getString("DISCORD_SERVER_ID")); - AVATAR = configuration.getString("AVATAR_SERVICE"); - final String BOT_TOKEN = configuration.getString("BOT_TOKEN"); - final String WEBHOOK_URL = configuration.getString("WEBHOOK_URL"); - - this.core = core; - this.jda = JDABuilder.createDefault( - BOT_TOKEN - ).setMemberCachePolicy(MemberCachePolicy.ALL) - .setChunkingFilter(ChunkingFilter.ALL) - .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT).addEventListeners(this).build(); - this.webhook = new WebhookClientBuilder(WEBHOOK_URL) - .setThreadFactory(Thread::new) - .setDaemon(true) - .setWait(true) - .setHttpClient(new OkHttpClient()) - .build(); - } - - @Override - public void onMessageReceived(@NotNull MessageReceivedEvent event) { - if (!event.isFromGuild() || shutdown || event.getChannel().getIdLong() != BRIDGE_CHANNEL_ID || - event.isWebhookMessage() || - event.getMember() == null || - event.getAuthor().isBot() || - event.getMessage().isEdited()) { - return; - } - String hexColor = String.format("#%06X", (0xFFFFFF & event.getMember().getColorRaw())).toLowerCase(); - - String output = String.format("%s%s %s§r §7>§r %s", - MessageUtil.getDiscordPrefix(), - MessageUtil.getChatColor(hexColor), - event.getMember().getEffectiveName(), - MessageUtil.sanitise(event.getMessage().getContentRaw()) - ); - core.getServer().broadcastMessage(output); - } - - public void sendSanitisedMessageToDiscord(Player player, String message) { - this.sendMessageToDiscord(player, MessageUtil.sanitise(message)); - } - - public void sendMessageToDiscord(Player player, String message) { - if (shutdown) return; - try { - webhook.send(new WebhookMessageBuilder() - .setAvatarUrl(String.format(AVATAR, player.getName())) - .setUsername(ChatColor.stripColor(player.getDisplayName())) - .setContent(message) - .build()); - } catch (Exception ignored) { - } - // https://github.com/DV8FromTheWorld/JDA/issues/1761 - } - - public boolean isMember(String identifier) { - Guild g = jda.getGuildById(DISCORD_SERVER_ID); - if (g == null) return false; - Member m = g.getMembers().stream() - .filter(mm -> - (mm.getUser().getName() + "#" + mm.getUser().getDiscriminator()).equalsIgnoreCase(identifier) || - mm.getUser().getName().equalsIgnoreCase(identifier) - ).findFirst().orElse(null); - if (m == null) return false; - return m.getRoles().stream().anyMatch(r -> r.getIdLong() == MEMBER_ROLE_ID); - } - - public void shutdown() { - shutdown = true; - jda.shutdownNow(); - webhook.close(); - } -} diff --git a/src/main/java/com/cssbham/minecraftcore/util/MessageUtil.java b/src/main/java/com/cssbham/minecraftcore/util/MessageUtil.java deleted file mode 100644 index f992ecb..0000000 --- a/src/main/java/com/cssbham/minecraftcore/util/MessageUtil.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.cssbham.minecraftcore.util; - -import net.dv8tion.jda.api.utils.MarkdownSanitizer; -import net.md_5.bungee.api.ChatColor; - -public class MessageUtil { - - public static String getDiscordPrefix() { - return ChatColor.of("#738abd") + "[Discord]" + ChatColor.RESET; - } - - public static String getCSSPrefix() { - return ChatColor.of("#4a9efe") + "[CSS]" + ChatColor.RESET; - } - - public static String getMemberGreen() { - return MessageUtil.getChatColor("#03e421"); - } - - public static String getChatColor(String color) { - return ChatColor.of(color).toString(); - } - - public static String sanitise(String message) { - return ChatColor.stripColor(MarkdownSanitizer.sanitize(message).replace("@", "(at)")); - } -} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml deleted file mode 100644 index af18bf3..0000000 --- a/src/main/resources/config.yml +++ /dev/null @@ -1,6 +0,0 @@ -MEMBER_ROLE_ID: "000000000000000000" -BRIDGE_CHANNEL_ID: "000000000000000000" -DISCORD_SERVER_ID: "000000000000000000" -WEBHOOK_URL: "" -AVATAR_SERVICE: "" -BOT_TOKEN: "" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml deleted file mode 100644 index 750230d..0000000 --- a/src/main/resources/plugin.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: CSSMinecraft -version: '${project.version}' -main: com.cssbham.minecraftcore.MinecraftCore -api-version: 1.17 -prefix: CSS -authors: [ RaineTheBoosted ] -description: The core plugin for CSS' Minecraft Server. -website: https://github.com/CSSUoB/CSS-Minecraft -depend: [ LuckPerms ] -commands: - makegreen: - description: Make yourself green by verifying your CSS membership. - usage: / [Discord Username] - aliases: [ mg, green ] From 5b646481b5c4cb7982017a77748996e94126d20d Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Tue, 13 Aug 2024 19:10:35 +0100 Subject: [PATCH 02/20] Add fabric module --- build.gradle | 8 --- bukkit/build.gradle | 5 ++ .../bukkit/CSSMinecraftLoader.java | 2 +- .../bukkit/listener/BukkitEventListener.java | 11 +++- bukkit/src/main/resources/plugin.yml | 6 +- common/build.gradle | 13 ++-- .../common/AbstractCSSMinecraftPlugin.java | 7 +++ .../common/CSSMinecraftPlugin.java | 2 + .../common/discord/DiscordClientService.java | 7 +++ .../discord/client/JDADiscordClient.java | 24 ++++++-- .../discord/webhook/DiscordWebHookClient.java | 21 +++++++ .../common/discord/webhook/WebHookClient.java | 2 + .../handler/ServerMessageEventHandler.java | 1 + fabric/build.gradle | 50 ++++++++++++++++ .../fabric/CSSMinecraftLoader.java | 32 ++++++++++ .../fabric/FabricCSSMinecraftPlugin.java | 57 ++++++++++++++++++ .../adapter/FabricServerChatAdapter.java | 27 +++++++++ .../fabric/listener/FabricEventAdapter.java | 50 ++++++++++++++++ .../fabric/logger/FabricLogger.java | 59 +++++++++++++++++++ fabric/src/main/resources/fabric.mod.json | 22 +++++++ gradle.properties | 2 + settings.gradle | 13 +++- 22 files changed, 393 insertions(+), 28 deletions(-) create mode 100644 fabric/build.gradle create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 gradle.properties diff --git a/build.gradle b/build.gradle index 1026825..fee71b5 100644 --- a/build.gradle +++ b/build.gradle @@ -25,14 +25,6 @@ subprojects { mavenCentral() } - shadowJar { - // relocate 'club.minnced', 'com.cssbham.cssminecraft.lib.discordwebhook' - // relocate 'net.dv8tion.jda', 'com.cssbham.cssminecraft.lib.jda' - // relocate 'org.yaml.snakeyaml', 'com.cssbham.cssminecraft.lib.snakeyaml' - - minimize() - } - assemble.dependsOn shadowJar } diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 20f5ef6..bc4ec72 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -21,3 +21,8 @@ dependencies { compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT") } + +shadowJar { + archiveFileName = "cssminecraft-bukkit-${project.version}.jar" + //TODO unfuck relocating +} \ No newline at end of file diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java index a724335..4a5d727 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java @@ -20,7 +20,7 @@ public void onEnable() { @Override public void onDisable() { - super.onDisable(); + plugin.disable(); } } diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java index 014e5c3..e5baa3a 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java @@ -4,6 +4,7 @@ import com.cssbham.cssminecraft.common.event.EventBus; import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -46,7 +47,7 @@ public void onPlayerChat(AsyncPlayerChatEvent event) { dispatchEvent(new ServerMessageEvent( player.getUniqueId(), player.getName(), - player.displayName().toString(), + componentToString(player.displayName()), event.getMessage() )); } @@ -58,7 +59,7 @@ public void onPlayerJoin(PlayerJoinEvent event) { dispatchEvent(new com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent( player.getUniqueId(), player.getName(), - PlainTextComponentSerializer.plainText().serialize(player.displayName()), + componentToString(player.displayName()), plugin.getServer().getOnlinePlayers().size() )); } @@ -70,9 +71,13 @@ public void onPlayerQuit(PlayerQuitEvent event) { dispatchEvent(new com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent( player.getUniqueId(), player.getName(), - PlainTextComponentSerializer.plainText().serialize(player.displayName()), + componentToString(player.displayName()), plugin.getServer().getOnlinePlayers().size() - 1 )); } + private String componentToString(Component component) { + return PlainTextComponentSerializer.plainText().serialize(component); + } + } diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index ca47dec..d1a35c7 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,9 +1,9 @@ name: CSSMinecraft version: '${version}' main: com.cssbham.cssminecraft.bukkit.CSSMinecraftLoader -api-version: 1.17 -prefix: CSS +api-version: 1.21 # probably authors: [ RaineTheBoosted, LMBishop ] description: CSS' Minecraft plugin website: https://github.com/CSSUoB/CSS-Minecraft -softdepend: [ LuckPerms ] +softdepend: [ LuckPerms ] # TODO change back to depends +# TODO re-implement commands diff --git a/common/build.gradle b/common/build.gradle index 4b78d30..902c289 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,12 +1,13 @@ plugins { id 'java' + id 'java-library' } dependencies { - implementation 'net.dv8tion:JDA:5.0.2' - implementation 'club.minnced:discord-webhooks:0.8.4' - implementation 'org.yaml:snakeyaml:2.2' - implementation 'net.kyori:adventure-api:4.17.0' - implementation 'net.kyori:adventure-text-serializer-plain:4.17.0' + api 'net.dv8tion:JDA:5.0.2' + api 'club.minnced:discord-webhooks:0.8.4' + api 'org.yaml:snakeyaml:2.2' + api 'net.kyori:adventure-api:4.17.0' + api 'net.kyori:adventure-text-serializer-plain:4.17.0' + api 'net.kyori:adventure-text-serializer-gson:4.17.0' } - diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java index 5797bd2..61f8d1e 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java @@ -46,6 +46,13 @@ public void enable() { eventBus.subscribe(DiscordMessageEvent.class, new DiscordMessageEventHandler(provideServerChatAdapter())); } + @Override + public void disable() { + if (null != discordClientService) { + discordClientService.shutdownClients(); + } + } + public ConfigService getConfigService() { return configService; } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java index be33d0b..b7ae782 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java @@ -6,5 +6,7 @@ public interface CSSMinecraftPlugin { void enable(); + void disable(); + Logger getLogger(); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java index 35158bf..f616468 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java @@ -45,6 +45,13 @@ public void initialiseClients() { this.webHookClient.initialise(); } + public void shutdownClients() { + this.logger.info("Shutting down Discord clients"); + + this.discordClient.shutdown(); + this.webHookClient.shutdown(); + } + public DiscordClient getDiscordClient() { Objects.requireNonNull(discordClient, "discord client not initialised"); diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java index 286d2f1..5f8de00 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java @@ -33,11 +33,28 @@ public JDADiscordClient(EventBus eventBus, String botToken, long discordServerId @Override public void initialise() { + if (null != this.jda) { + return; + } + this.jda = JDABuilder.createDefault( botToken ).setMemberCachePolicy(MemberCachePolicy.ALL) .setChunkingFilter(ChunkingFilter.ALL) - .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT).addEventListeners(this).build(); + .enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.MESSAGE_CONTENT) + .addEventListeners(this) + .build(); + } + + + @Override + public void shutdown() { + if (null == this.jda) { + return; + } + + jda.shutdownNow(); + this.jda = null; } @Override @@ -70,9 +87,4 @@ public boolean isMember(String identifier) { return m.getRoles().stream().anyMatch(r -> r.getIdLong() == memberRoleId); } - @Override - public void shutdown() { - jda.shutdownNow(); - } - } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java index d27de35..88f65df 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/DiscordWebHookClient.java @@ -7,6 +7,8 @@ import club.minnced.discord.webhook.WebhookClientBuilder; import okhttp3.OkHttpClient; +import java.util.Objects; + public class DiscordWebHookClient implements WebHookClient { private final String webHookUrl; @@ -21,6 +23,10 @@ public DiscordWebHookClient(String webHookUrl, String avatarServiceUrl) { @Override public void initialise() { + if (null != this.webhook) { + return; + } + this.webhook = new WebhookClientBuilder(webHookUrl) .setThreadFactory(Thread::new) .setDaemon(true) @@ -29,6 +35,21 @@ public void initialise() { .build(); } + @Override + public void shutdown() { + if (null == this.webhook) { + return; + } + + if (this.webhook.isShutdown()) { + this.webhook = null; + return; + } + + this.webhook.close(); + this.webhook = null; + } + @Override public void sendMessageAsMinecraftUser(String avatarName, String displayName, String message) { try { diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java index 99727b6..f3dc5f1 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java @@ -6,6 +6,8 @@ public interface WebHookClient { void initialise(); + void shutdown(); + void sendMessageAsMinecraftUser(String avatarName, String displayName, String message); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java index 117c211..1f5c44f 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java @@ -15,6 +15,7 @@ public ServerMessageEventHandler(DiscordClientService discordClientService) { @Override public void handle(ServerMessageEvent event) { + //TODO sanitise this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), event.message()); } diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..fea2ba9 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,50 @@ +import net.fabricmc.loom.task.RemapJarTask + +plugins { + id 'fabric-loom' version '1.7-SNAPSHOT' + id 'java' +} + +processResources { + duplicatesStrategy = duplicatesStrategy.INCLUDE + from(sourceSets.main.resources.srcDirs) { + include 'fabric.mod.json' + expand('version': project.version) + } +} + +repositories { + maven { url = 'https://maven.fabricmc.net/' } +} + +dependencies { + minecraft "com.mojang:minecraft:1.21" + mappings "net.fabricmc:yarn:1.21.1+build.2:v2" + modImplementation "net.fabricmc:fabric-loader:0.15.11" + modImplementation "net.fabricmc.fabric-api:fabric-api:0.100.3+1.21" + + compileOnly 'net.kyori:adventure-text-serializer-gson:4.17.0' + implementation project(path: ':common', configuration: 'shadow') +} + +shadowJar { + dependencies { + include(project(':common')) + } + + archiveFileName = "cssminecraft-fabric-${project.version}-no-map.jar" +} + +tasks.register('remapShadowJar', RemapJarTask) { + dependsOn tasks.shadowJar + input = tasks.shadowJar.archiveFile + addNestedDependencies = true + archiveFileName = "cssminecraft-fabric-${project.version}.jar" +} + +tasks.assemble.dependsOn tasks.remapShadowJar + +artifacts { + archives remapShadowJar + shadow shadowJar +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java new file mode 100644 index 0000000..2c7c450 --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java @@ -0,0 +1,32 @@ +package com.cssbham.cssminecraft.fabric; + +import net.fabricmc.api.DedicatedServerModInitializer; +import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; +import net.minecraft.server.MinecraftServer; + +/** + * Entrypoint for Fabric + */ +public class CSSMinecraftLoader implements DedicatedServerModInitializer { + + private final FabricCSSMinecraftPlugin plugin; + + public CSSMinecraftLoader() { + this.plugin = new FabricCSSMinecraftPlugin(); + } + + @Override + public void onInitializeServer() { + ServerLifecycleEvents.SERVER_STARTING.register(this::onStart); + ServerLifecycleEvents.SERVER_STOPPING.register(this::onStop); + } + + private void onStart(MinecraftServer server) { + this.plugin.setServer(server); + this.plugin.enable(); + } + + private void onStop(MinecraftServer server) { + this.plugin.disable(); + } +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java new file mode 100644 index 0000000..b73b562 --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java @@ -0,0 +1,57 @@ +package com.cssbham.cssminecraft.fabric; + +import com.cssbham.cssminecraft.fabric.adapter.FabricServerChatAdapter; +import com.cssbham.cssminecraft.fabric.listener.FabricEventAdapter; +import com.cssbham.cssminecraft.fabric.logger.FabricLogger; +import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.logger.Logger; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.server.MinecraftServer; + +import java.nio.file.Path; + +/** + * Implementation of CSS Minecraft Plugin for Fabric + */ +public class FabricCSSMinecraftPlugin extends AbstractCSSMinecraftPlugin { + + public static final String MOD_ID = "cssminecraft"; + private final FabricLogger logger; + private FabricServerChatAdapter serverChatAdapter; + + private MinecraftServer server; + + public FabricCSSMinecraftPlugin() { + this.logger = new FabricLogger(MOD_ID); + } + + @Override + public void enable() { + this.serverChatAdapter = new FabricServerChatAdapter(server); + + super.enable(); + + FabricEventAdapter eventAdapter = new FabricEventAdapter(); + eventAdapter.bindPlatformToEventBus(super.getEventBus()); + } + + @Override + public Logger getLogger() { + return logger; + } + + @Override + public ServerChatAdapter provideServerChatAdapter() { + return serverChatAdapter; + } + + @Override + public Path provideConfigurationPath() { + return FabricLoader.getInstance().getConfigDir().resolve(MOD_ID).resolve("config.yml"); + } + + public void setServer(MinecraftServer server) { + this.server = server; + } +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java new file mode 100644 index 0000000..701df9a --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java @@ -0,0 +1,27 @@ +package com.cssbham.cssminecraft.fabric.adapter; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; +import net.minecraft.registry.DynamicRegistryManager; +import net.minecraft.server.MinecraftServer; +import net.minecraft.text.Text; + +public class FabricServerChatAdapter implements ServerChatAdapter { + + private final MinecraftServer server; + + public FabricServerChatAdapter(MinecraftServer server) { + this.server = server; + } + + @Override + public void broadcastMessage(Component message) { + server.getPlayerManager().broadcast(componentToText(message), false); + } + + public Text componentToText(Component component) { + return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component), DynamicRegistryManager.EMPTY); + } + +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java new file mode 100644 index 0000000..70178e7 --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java @@ -0,0 +1,50 @@ +package com.cssbham.cssminecraft.fabric.listener; + +import com.cssbham.cssminecraft.common.event.EventBus; +import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; +import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; +import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; +import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; +import net.minecraft.server.network.ServerPlayerEntity; + +public class FabricEventAdapter implements PlatformEventAdapter { + @Override + public void bindPlatformToEventBus(EventBus eventBus) { + //TODO dispatch from thread + ServerMessageEvents.CHAT_MESSAGE.register((message, player, parameters) -> { + String name = player.getName().getString(); + + eventBus.dispatch(new ServerMessageEvent( + player.getUuid(), + player.getName().getString(), + (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), + message.getSignedContent() + )); + }); + + ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> { + ServerPlayerEntity player = handler.getPlayer(); + String name = player.getName().getString(); + + eventBus.dispatch(new PlayerJoinEvent( + player.getUuid(), + player.getName().getString(), + (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), + server.getCurrentPlayerCount() + 1 + )); + }); + + ServerPlayConnectionEvents.DISCONNECT.register((handler, server) -> { + ServerPlayerEntity player = handler.getPlayer(); + String name = player.getName().getString(); + + eventBus.dispatch(new PlayerJoinEvent( + player.getUuid(), + player.getName().getString(), + (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), + server.getCurrentPlayerCount() - 1 + )); + }); + } +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java new file mode 100644 index 0000000..6cbe8e0 --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java @@ -0,0 +1,59 @@ +package com.cssbham.cssminecraft.fabric.logger; + +import com.cssbham.cssminecraft.common.logger.Logger; +import org.slf4j.LoggerFactory; + +public class FabricLogger implements Logger { + + private final org.slf4j.Logger logger; + private LoggingLevel serverLoggingLevel; + + public FabricLogger(String name) { + this.logger = LoggerFactory.getLogger(name); + serverLoggingLevel = LoggingLevel.INFO; + } + + @Override + public LoggingLevel getServerLoggingLevel() { + return serverLoggingLevel; + } + + @Override + public void setServerLoggingLevel(LoggingLevel serverLoggingLevel) { + this.serverLoggingLevel = serverLoggingLevel; + } + + @Override + public void log(String str, LoggingLevel level) { + if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { + return; + } + switch (level) { + case DEBUG -> logger.info("DEBUG: " + str); + case INFO -> logger.info(str); + case ERROR -> logger.error(str); + case WARNING -> logger.warn(str); + } + } + + @Override + public void debug(String str) { + log(str, LoggingLevel.DEBUG); + } + + @Override + public void info(String str) { + log(str, LoggingLevel.INFO); + } + + @Override + public void warning(String str) { + log(str, LoggingLevel.WARNING); + } + + @Override + public void severe(String str) { + log(str, LoggingLevel.ERROR); + } + +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..14ba0ac --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,22 @@ +{ + "schemaVersion": 1, + "id": "cssminecraft", + "version": "${version}", + "name": "CSSMinecraft", + "description": "CSS' Minecraft plugin", + "authors": [ + "LMBishop" + ], + "environment": "server", + "entrypoints": { + "server": [ + "com.cssbham.cssminecraft.fabric.CSSMinecraftLoader" + ] + }, + "depends": { + "fabricloader": ">=0.15.11", + "minecraft": "~1.21", + "java": ">=21", + "fabric-api": "*" + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..649cce1 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx2G +org.gradle.parallel=true \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 53e0e93..a2fd2b4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + } +} + rootProject.name = 'css-minecraft' include( 'common', - 'bukkit' + 'bukkit', + 'fabric' ) \ No newline at end of file From 348eeb0e0401d99e74606ef12286a52546a1f862 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 13:35:48 +0100 Subject: [PATCH 03/20] Add forge module --- common/build.gradle | 42 +++++++++++-- .../common/AbstractCSSMinecraftPlugin.java | 5 +- .../common/config/option/ConfigOption.java | 2 + .../config/option/ConfigValueFactory.java | 4 ++ .../common/discord/DiscordClientService.java | 1 + .../discord/client/JDADiscordClient.java | 12 +++- .../common/event/SimpleEventBus.java | 8 +++ forge/build.gradle | 35 +++++++++++ forge/gradle.properties | 2 + .../forge/CSSMinecraftLoader.java | 25 ++++++++ .../forge/ForgeCSSMinecraftPlugin.java | 57 ++++++++++++++++++ .../forge/adapter/ForgeServerChatAdapter.java | 26 ++++++++ .../forge/listener/ForgeEventAdapter.java | 43 ++++++++++++++ .../forge/logger/ForgeLogger.java | 59 +++++++++++++++++++ forge/src/main/resources/META-INF/mods.toml | 15 +++++ settings.gradle | 9 ++- 16 files changed, 332 insertions(+), 13 deletions(-) create mode 100644 forge/build.gradle create mode 100644 forge/gradle.properties create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java create mode 100644 forge/src/main/resources/META-INF/mods.toml diff --git a/common/build.gradle b/common/build.gradle index 902c289..4e7639f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -4,10 +4,40 @@ plugins { } dependencies { - api 'net.dv8tion:JDA:5.0.2' - api 'club.minnced:discord-webhooks:0.8.4' - api 'org.yaml:snakeyaml:2.2' - api 'net.kyori:adventure-api:4.17.0' - api 'net.kyori:adventure-text-serializer-plain:4.17.0' - api 'net.kyori:adventure-text-serializer-gson:4.17.0' + implementation ('net.dv8tion:JDA:5.0.2') { + exclude(module: 'opus-java') + exclude(module: 'annotations') + } + implementation 'club.minnced:discord-webhooks:0.8.4' + implementation 'org.yaml:snakeyaml:2.2' + + api ('net.kyori:adventure-api:4.17.0') { + exclude(module: 'adventure-bom') + exclude(module: 'annotations') + } + api ('net.kyori:adventure-text-serializer-plain:4.17.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') + } + api ('net.kyori:adventure-text-serializer-gson:4.17.0') { + exclude(module: 'adventure-bom') + exclude(module: 'adventure-api') + exclude(module: 'annotations') + exclude(module: 'gson') + } +} + +shadowJar { + relocate 'club.minnced', 'com.cssbham.cssminecraft.lib.discordwebhooks' + relocate 'com.iwebpp.crypto', 'com.cssbham.cssminecraft.lib.iwebppcrypto' + relocate 'com.neovisionaries.ws', 'com.cssbham.cssminecraft.lib.nvws' + relocate 'net.dv8tion.jda', 'com.cssbham.cssminecraft.lib.jda' + relocate 'okhttp3', 'com.cssbham.cssminecraft.lib.okhttp3' + relocate 'okio', 'com.cssbham.cssminecraft.lib.okio' + relocate 'org.apache.commons.collections4', 'com.cssbham.cssminecraft.lib.collections4' + relocate 'org.slf4j', 'com.cssbham.cssminecraft.lib.slf4j' + relocate 'org.yaml.snakeyaml', 'com.cssbham.cssminecraft.lib.snakeyaml' + relocate 'kotlin', 'com.cssbham.cssminecraft.lib.kotlin' + + minimize() } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java index 61f8d1e..ea90855 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java @@ -2,6 +2,7 @@ import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; import com.cssbham.cssminecraft.common.config.ConfigService; +import com.cssbham.cssminecraft.common.config.option.ConfigOption; import com.cssbham.cssminecraft.common.config.source.ConfigSource; import com.cssbham.cssminecraft.common.config.source.StubConfigSource; import com.cssbham.cssminecraft.common.config.source.YamlConfigSource; @@ -35,7 +36,9 @@ public void enable() { this.configService = new ConfigService(logger); configService.useSource(configSource); - this.eventBus = new SimpleEventBus(); + logger.setServerLoggingLevel(Logger.LoggingLevel.fromNumber(configService.getValue(ConfigOption.LOGGING_LEVEL))); + + this.eventBus = new SimpleEventBus(logger); this.discordClientService = new DiscordClientService(configService, eventBus, logger); discordClientService.initialiseClients(); diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java index cdb3b55..df03685 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java @@ -21,6 +21,8 @@ public class ConfigOption { public static final ConfigValue DISCORD_SERVER_ID = buildLong("discord-server-id", 0); + public static final ConfigValue LOGGING_LEVEL = buildInt("logging-level", 2); + public static List> allValues() { return Arrays.stream(ConfigOption.class.getFields()) .filter(f -> Modifier.isStatic(f.getModifiers())) diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java index 597083e..c35cdba 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java @@ -12,4 +12,8 @@ public static ConfigValue buildLong(String path, long def) { return new ConfigValue<>(path, def, (configSource -> configSource.getLong(path, def))); } + public static ConfigValue buildInt(String path, int def) { + return new ConfigValue<>(path, def, (configSource -> configSource.getInteger(path, def))); + } + } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java index f616468..5aed7d9 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java @@ -29,6 +29,7 @@ public DiscordClientService(ConfigService configService, EventBus eventBus, Logg public void initialiseClients() { this.discordClient = new JDADiscordClient( eventBus, + logger, configService.getValue(ConfigOption.BOT_TOKEN), configService.getValue(ConfigOption.DISCORD_SERVER_ID), configService.getValue(ConfigOption.MEMBER_ROLE_ID), diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java index 5f8de00..f4e4b14 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java @@ -2,6 +2,7 @@ import com.cssbham.cssminecraft.common.event.EventBus; import com.cssbham.cssminecraft.common.event.events.DiscordMessageEvent; +import com.cssbham.cssminecraft.common.logger.Logger; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.entities.Guild; @@ -16,6 +17,7 @@ public class JDADiscordClient extends ListenerAdapter implements DiscordClient { private final EventBus eventBus; + private final Logger logger; private final String botToken; private final long discordServerId; private final long memberRoleId; @@ -23,8 +25,9 @@ public class JDADiscordClient extends ListenerAdapter implements DiscordClient { private JDA jda; - public JDADiscordClient(EventBus eventBus, String botToken, long discordServerId, long memberRoleId, long bridgeChannelId) { + public JDADiscordClient(EventBus eventBus, Logger logger, String botToken, long discordServerId, long memberRoleId, long bridgeChannelId) { this.eventBus = eventBus; + this.logger = logger; this.botToken = botToken; this.discordServerId = discordServerId; this.memberRoleId = memberRoleId; @@ -34,9 +37,12 @@ public JDADiscordClient(EventBus eventBus, String botToken, long discordServerId @Override public void initialise() { if (null != this.jda) { + logger.debug("JDA already initialised, skipping initialisation request"); return; } + logger.debug("Initialising JDA"); + this.jda = JDABuilder.createDefault( botToken ).setMemberCachePolicy(MemberCachePolicy.ALL) @@ -50,15 +56,19 @@ public void initialise() { @Override public void shutdown() { if (null == this.jda) { + logger.debug("JDA already stopped, skipping stop request"); return; } + logger.debug("Shutting down JDA"); + jda.shutdownNow(); this.jda = null; } @Override public void onMessageReceived(@NotNull MessageReceivedEvent event) { + logger.debug(String.format("Message received from %s: %s", event.getAuthor().getName(), event.getMessage().getContentRaw())); if (!event.isFromGuild() || event.getChannel().getIdLong() != bridgeChannelId || event.isWebhookMessage() || event.getMember() == null || diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java index a88e80d..1addfaa 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java @@ -1,13 +1,21 @@ package com.cssbham.cssminecraft.common.event; +import com.cssbham.cssminecraft.common.logger.Logger; + import java.util.*; public class SimpleEventBus implements EventBus { private final Map, List>> handlers = new HashMap<>(); + private final Logger logger; + + public SimpleEventBus(Logger logger) { + this.logger = logger; + } public void dispatch(Event event) { var handlers = this.handlers.getOrDefault(event.getClass(), new ArrayList<>()); + logger.debug(String.format("Event dispatch: %s", event.getClass().getName())); for (EventHandler handler : handlers) { try { diff --git a/forge/build.gradle b/forge/build.gradle new file mode 100644 index 0000000..c8bad36 --- /dev/null +++ b/forge/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'net.minecraftforge.gradle' version '[6.0,6.2)' + id 'java' +} + +processResources { + duplicatesStrategy = duplicatesStrategy.INCLUDE + from(sourceSets.main.resources.srcDirs) { + include '**/mods.toml' + expand('version': project.version) + } +} + +minecraft { + mappings channel: 'official', version: minecraftVersion +} + +dependencies { + minecraft ("net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}") + + implementation project(path: ':common', configuration: 'shadow') +} + + +shadowJar { + dependencies { + include(project(':common')) + } + + relocate 'net.kyori', 'com.cssbham.cssminecraft.lib.adventure' + + archiveFileName = "cssminecraft-forge-${project.version}.jar" + + minimize() +} diff --git a/forge/gradle.properties b/forge/gradle.properties new file mode 100644 index 0000000..94b859e --- /dev/null +++ b/forge/gradle.properties @@ -0,0 +1,2 @@ +minecraftVersion=1.21.1 +forgeVersion=52.0.2 \ No newline at end of file diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java new file mode 100644 index 0000000..6534ec9 --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java @@ -0,0 +1,25 @@ +package com.cssbham.cssminecraft.forge; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.fml.common.Mod; + +/** + * Entrypoint for Forge + */ +@Mod(value = "cssminecraft") +public class CSSMinecraftLoader { + + private final ForgeCSSMinecraftPlugin plugin; + + public CSSMinecraftLoader() { + this.plugin = new ForgeCSSMinecraftPlugin(); + MinecraftForge.EVENT_BUS.addListener(this::onServerStarted); + } + + public void onServerStarted(ServerStartedEvent event) { + this.plugin.setServer(event.getServer()); + this.plugin.enable(); + } + +} diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java new file mode 100644 index 0000000..381577c --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java @@ -0,0 +1,57 @@ +package com.cssbham.cssminecraft.forge; + +import com.cssbham.cssminecraft.forge.adapter.ForgeServerChatAdapter; +import com.cssbham.cssminecraft.forge.listener.ForgeEventAdapter; +import com.cssbham.cssminecraft.forge.logger.ForgeLogger; +import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.logger.Logger; +import net.minecraft.server.MinecraftServer; +import net.minecraftforge.fml.loading.FMLPaths; + +import java.nio.file.Path; + +/** + * Implementation of CSS Minecraft Plugin for Forge + */ +public class ForgeCSSMinecraftPlugin extends AbstractCSSMinecraftPlugin { + + public static final String MOD_ID = "cssminecraft"; + private final ForgeLogger logger; + private ForgeServerChatAdapter serverChatAdapter; + + private MinecraftServer server; + + public ForgeCSSMinecraftPlugin() { + this.logger = new ForgeLogger(MOD_ID); + } + + @Override + public void enable() { + this.serverChatAdapter = new ForgeServerChatAdapter(server); + + super.enable(); + + ForgeEventAdapter eventAdapter = new ForgeEventAdapter(); + eventAdapter.bindPlatformToEventBus(super.getEventBus()); + } + + @Override + public Logger getLogger() { + return logger; + } + + @Override + public ServerChatAdapter provideServerChatAdapter() { + return serverChatAdapter; + } + + @Override + public Path provideConfigurationPath() { + return FMLPaths.CONFIGDIR.get().resolve(MOD_ID).resolve("config.yml"); + } + + public void setServer(MinecraftServer server) { + this.server = server; + } +} diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java new file mode 100644 index 0000000..85b065a --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java @@ -0,0 +1,26 @@ +package com.cssbham.cssminecraft.forge.adapter; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; +import net.minecraft.core.RegistryAccess; +import net.minecraft.server.MinecraftServer; + +public class ForgeServerChatAdapter implements ServerChatAdapter { + + private final MinecraftServer server; + + public ForgeServerChatAdapter(MinecraftServer server) { + this.server = server; + } + + @Override + public void broadcastMessage(Component message) { + server.getPlayerList().broadcastSystemMessage(componentToMinecraftComponent(message), false); + } + + public net.minecraft.network.chat.Component componentToMinecraftComponent(Component component) { + return net.minecraft.network.chat.Component.Serializer.fromJson(GsonComponentSerializer.gson().serializeToTree(component), RegistryAccess.EMPTY); + } + +} diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java new file mode 100644 index 0000000..115c51e --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java @@ -0,0 +1,43 @@ +package com.cssbham.cssminecraft.forge.listener; + +import com.cssbham.cssminecraft.common.event.Event; +import com.cssbham.cssminecraft.common.event.EventBus; +import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; +import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import net.minecraft.server.level.ServerPlayer; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; + +import java.util.Objects; + +public class ForgeEventAdapter implements PlatformEventAdapter { + + private EventBus eventBus; + + @Override + public void bindPlatformToEventBus(EventBus eventBus) { + this.eventBus = eventBus; + + MinecraftForge.EVENT_BUS.register(this); + } + + private void dispatchEvent(Event event) { + Objects.requireNonNull(event, "event bus not bound"); + + eventBus.dispatch(event); + } + + @SubscribeEvent + public void onChat(ServerChatEvent event) { + ServerPlayer player = event.getPlayer(); + String name = event.getUsername(); + + dispatchEvent(new ServerMessageEvent( + player.getUUID(), + name, + (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), + event.getRawText() + )); + } +} diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java new file mode 100644 index 0000000..00f53eb --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java @@ -0,0 +1,59 @@ +package com.cssbham.cssminecraft.forge.logger; + +import com.cssbham.cssminecraft.common.logger.Logger; +import org.apache.logging.log4j.LogManager; + +public class ForgeLogger implements Logger { + + private final org.apache.logging.log4j.Logger logger; + private LoggingLevel serverLoggingLevel; + + public ForgeLogger(String name) { + this.logger = LogManager.getLogger(name); + serverLoggingLevel = LoggingLevel.INFO; + } + + @Override + public LoggingLevel getServerLoggingLevel() { + return serverLoggingLevel; + } + + @Override + public void setServerLoggingLevel(LoggingLevel serverLoggingLevel) { + this.serverLoggingLevel = serverLoggingLevel; + } + + @Override + public void log(String str, LoggingLevel level) { + if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { + return; + } + switch (level) { + case DEBUG -> logger.info("DEBUG: " + str); + case INFO -> logger.info(str); + case ERROR -> logger.error(str); + case WARNING -> logger.warn(str); + } + } + + @Override + public void debug(String str) { + log(str, LoggingLevel.DEBUG); + } + + @Override + public void info(String str) { + log(str, LoggingLevel.INFO); + } + + @Override + public void warning(String str) { + log(str, LoggingLevel.WARNING); + } + + @Override + public void severe(String str) { + log(str, LoggingLevel.ERROR); + } + +} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..39d1fc2 --- /dev/null +++ b/forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,15 @@ +# https://docs.minecraftforge.net/en/latest/gettingstarted/modfiles/ +modLoader="javafml" +loaderVersion="[46,)" +license="todo" +showAsResourcePack=false + +[[mods]] +modId="cssminecraft" +version="${version}" +displayName="CSS Minecraft" +logoFile="logo.png" +authors="LMBishop" +description=''' + CSS' Minecraft plugin + ''' \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a2fd2b4..02c5a9f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,8 @@ pluginManagement { repositories { gradlePluginPortal() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } + maven { url = 'https://maven.fabricmc.net/' } + maven { url = 'https://maven.minecraftforge.net/' } } } @@ -13,5 +11,6 @@ rootProject.name = 'css-minecraft' include( 'common', 'bukkit', - 'fabric' + 'fabric', + 'forge' ) \ No newline at end of file From e390a59a16207feace4cdef925bbecbc0192588b Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 13:40:34 +0100 Subject: [PATCH 04/20] Add better abstraction for logger --- .../bukkit/logger/BukkitLogger.java | 46 +++------------- .../common/logger/AbstractLogger.java | 55 +++++++++++++++++++ .../fabric/logger/FabricLogger.java | 46 +++------------- .../forge/logger/ForgeLogger.java | 46 +++------------- 4 files changed, 79 insertions(+), 114 deletions(-) create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java index 38c1dc1..1985d97 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/logger/BukkitLogger.java @@ -1,59 +1,29 @@ package com.cssbham.cssminecraft.bukkit.logger; -import com.cssbham.cssminecraft.common.logger.Logger; +import com.cssbham.cssminecraft.common.logger.AbstractLogger; import org.bukkit.plugin.java.JavaPlugin; -public class BukkitLogger implements Logger { +public class BukkitLogger extends AbstractLogger { private final JavaPlugin plugin; - private LoggingLevel serverLoggingLevel; public BukkitLogger(JavaPlugin plugin) { this.plugin = plugin; - serverLoggingLevel = LoggingLevel.INFO; } @Override - public LoggingLevel getServerLoggingLevel() { - return serverLoggingLevel; + protected void logInfo(String string) { + plugin.getLogger().info(string); } @Override - public void setServerLoggingLevel(LoggingLevel serverLoggingLevel) { - this.serverLoggingLevel = serverLoggingLevel; + protected void logError(String string) { + plugin.getLogger().severe(string); } @Override - public void log(String str, LoggingLevel level) { - if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { - return; - } - switch (level) { - case DEBUG -> plugin.getLogger().info("DEBUG: " + str); - case INFO -> plugin.getLogger().info(str); - case ERROR -> plugin.getLogger().severe(str); - case WARNING -> plugin.getLogger().warning(str); - } - } - - @Override - public void debug(String str) { - log(str, LoggingLevel.DEBUG); - } - - @Override - public void info(String str) { - log(str, LoggingLevel.INFO); - } - - @Override - public void warning(String str) { - log(str, LoggingLevel.WARNING); - } - - @Override - public void severe(String str) { - log(str, LoggingLevel.ERROR); + protected void logWarning(String string) { + plugin.getLogger().warning(string); } } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java b/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java new file mode 100644 index 0000000..1c29e58 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java @@ -0,0 +1,55 @@ +package com.cssbham.cssminecraft.common.logger; + +public abstract class AbstractLogger implements Logger { + + private Logger.LoggingLevel serverLoggingLevel = LoggingLevel.INFO; + + @Override + public Logger.LoggingLevel getServerLoggingLevel() { + return serverLoggingLevel; + } + + @Override + public void setServerLoggingLevel(Logger.LoggingLevel serverLoggingLevel) { + this.serverLoggingLevel = serverLoggingLevel; + } + + @Override + public void log(String str, Logger.LoggingLevel level) { + if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { + return; + } + switch (level) { + case DEBUG -> logInfo("DEBUG: " + str); + case INFO -> logInfo(str); + case ERROR -> logError(str); + case WARNING -> logWarning(str); + } + } + + @Override + public void debug(String str) { + log(str, Logger.LoggingLevel.DEBUG); + } + + @Override + public void info(String str) { + log(str, Logger.LoggingLevel.INFO); + } + + @Override + public void warning(String str) { + log(str, Logger.LoggingLevel.WARNING); + } + + @Override + public void severe(String str) { + log(str, Logger.LoggingLevel.ERROR); + } + + protected abstract void logInfo(String string); + + protected abstract void logError(String string); + + protected abstract void logWarning(String string); +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java index 6cbe8e0..8adf4ae 100644 --- a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/logger/FabricLogger.java @@ -1,59 +1,29 @@ package com.cssbham.cssminecraft.fabric.logger; -import com.cssbham.cssminecraft.common.logger.Logger; +import com.cssbham.cssminecraft.common.logger.AbstractLogger; import org.slf4j.LoggerFactory; -public class FabricLogger implements Logger { +public class FabricLogger extends AbstractLogger { private final org.slf4j.Logger logger; - private LoggingLevel serverLoggingLevel; public FabricLogger(String name) { this.logger = LoggerFactory.getLogger(name); - serverLoggingLevel = LoggingLevel.INFO; } @Override - public LoggingLevel getServerLoggingLevel() { - return serverLoggingLevel; + protected void logInfo(String string) { + logger.info(string); } @Override - public void setServerLoggingLevel(LoggingLevel serverLoggingLevel) { - this.serverLoggingLevel = serverLoggingLevel; + protected void logError(String string) { + logger.error(string); } @Override - public void log(String str, LoggingLevel level) { - if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { - return; - } - switch (level) { - case DEBUG -> logger.info("DEBUG: " + str); - case INFO -> logger.info(str); - case ERROR -> logger.error(str); - case WARNING -> logger.warn(str); - } - } - - @Override - public void debug(String str) { - log(str, LoggingLevel.DEBUG); - } - - @Override - public void info(String str) { - log(str, LoggingLevel.INFO); - } - - @Override - public void warning(String str) { - log(str, LoggingLevel.WARNING); - } - - @Override - public void severe(String str) { - log(str, LoggingLevel.ERROR); + protected void logWarning(String string) { + logger.warn(string); } } diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java index 00f53eb..959989c 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/logger/ForgeLogger.java @@ -1,59 +1,29 @@ package com.cssbham.cssminecraft.forge.logger; -import com.cssbham.cssminecraft.common.logger.Logger; +import com.cssbham.cssminecraft.common.logger.AbstractLogger; import org.apache.logging.log4j.LogManager; -public class ForgeLogger implements Logger { +public class ForgeLogger extends AbstractLogger { private final org.apache.logging.log4j.Logger logger; - private LoggingLevel serverLoggingLevel; public ForgeLogger(String name) { this.logger = LogManager.getLogger(name); - serverLoggingLevel = LoggingLevel.INFO; } @Override - public LoggingLevel getServerLoggingLevel() { - return serverLoggingLevel; + protected void logInfo(String string) { + logger.info(string); } @Override - public void setServerLoggingLevel(LoggingLevel serverLoggingLevel) { - this.serverLoggingLevel = serverLoggingLevel; + protected void logError(String string) { + logger.error(string); } @Override - public void log(String str, LoggingLevel level) { - if (serverLoggingLevel.getNumericVerbosity() < level.getNumericVerbosity()) { - return; - } - switch (level) { - case DEBUG -> logger.info("DEBUG: " + str); - case INFO -> logger.info(str); - case ERROR -> logger.error(str); - case WARNING -> logger.warn(str); - } - } - - @Override - public void debug(String str) { - log(str, LoggingLevel.DEBUG); - } - - @Override - public void info(String str) { - log(str, LoggingLevel.INFO); - } - - @Override - public void warning(String str) { - log(str, LoggingLevel.WARNING); - } - - @Override - public void severe(String str) { - log(str, LoggingLevel.ERROR); + protected void logWarning(String string) { + logger.warn(string); } } From 834bd47e674ac7970d4c2a5a8625eea60db76e40 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 14:59:10 +0100 Subject: [PATCH 05/20] Improve package relocation --- build.gradle | 17 +++---- bukkit/build.gradle | 21 ++++---- common/build.gradle | 54 +++++++++------------ fabric/build.gradle | 27 ++++++----- fabric/gradle.properties | 4 ++ forge/build.gradle | 29 ++++++++--- forge/src/main/resources/META-INF/mods.toml | 2 +- gradle/libs.versions.toml | 14 ------ settings.gradle | 14 +++--- 9 files changed, 90 insertions(+), 92 deletions(-) create mode 100644 fabric/gradle.properties delete mode 100644 gradle/libs.versions.toml diff --git a/build.gradle b/build.gradle index fee71b5..4f38adf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,24 +1,24 @@ plugins { - id 'java' - id 'com.gradleup.shadow' version '8.3.0' + id "java" + id "com.gradleup.shadow" version "8.3.0" } subprojects { - apply plugin: 'java' - apply plugin: 'com.gradleup.shadow' + apply plugin: "java" + apply plugin: "com.gradleup.shadow" - group = 'com.cssbham' - version = '1.0.0' + group = "com.cssbham" + version = "1.0.0" sourceCompatibility = 21 targetCompatibility = 21 tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' + options.encoding = "UTF-8" } tasks.withType(Javadoc) { - options.encoding = 'UTF-8' + options.encoding = "UTF-8" } repositories { @@ -27,4 +27,3 @@ subprojects { assemble.dependsOn shadowJar } - diff --git a/bukkit/build.gradle b/bukkit/build.gradle index bc4ec72..64c6534 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,28 +1,31 @@ plugins { - id 'java' + id "java" } processResources { duplicatesStrategy = duplicatesStrategy.INCLUDE from(sourceSets.main.resources.srcDirs) { - include 'plugin.yml' - expand('version': project.version) + include "plugin.yml" + expand("version": project.version) } } repositories { - maven { url = 'https://repo.papermc.io/repository/maven-public/' } - - maven { url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } + maven { url = "https://repo.papermc.io/repository/maven-public/" } } dependencies { - implementation project(':common') + compileOnly "io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT" - compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT") + implementation project(path: ":common", configuration: "shadow") } shadowJar { + dependencies { + include(project(":common")) + } + archiveFileName = "cssminecraft-bukkit-${project.version}.jar" - //TODO unfuck relocating + + minimize() } \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 4e7639f..656a375 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,43 +1,35 @@ plugins { - id 'java' - id 'java-library' + id "java" + id "java-library" } dependencies { - implementation ('net.dv8tion:JDA:5.0.2') { - exclude(module: 'opus-java') - exclude(module: 'annotations') + implementation ("net.dv8tion:JDA:5.0.2") { + exclude(module: "opus-java") + exclude(module: "annotations") } - implementation 'club.minnced:discord-webhooks:0.8.4' - implementation 'org.yaml:snakeyaml:2.2' + implementation "club.minnced:discord-webhooks:0.8.4" + implementation "org.yaml:snakeyaml:2.2" - api ('net.kyori:adventure-api:4.17.0') { - exclude(module: 'adventure-bom') - exclude(module: 'annotations') - } - api ('net.kyori:adventure-text-serializer-plain:4.17.0') { - exclude(module: 'adventure-bom') - exclude(module: 'adventure-api') - } - api ('net.kyori:adventure-text-serializer-gson:4.17.0') { - exclude(module: 'adventure-bom') - exclude(module: 'adventure-api') - exclude(module: 'annotations') - exclude(module: 'gson') - } + compileOnly "net.kyori:adventure-api:4.17.0" } shadowJar { - relocate 'club.minnced', 'com.cssbham.cssminecraft.lib.discordwebhooks' - relocate 'com.iwebpp.crypto', 'com.cssbham.cssminecraft.lib.iwebppcrypto' - relocate 'com.neovisionaries.ws', 'com.cssbham.cssminecraft.lib.nvws' - relocate 'net.dv8tion.jda', 'com.cssbham.cssminecraft.lib.jda' - relocate 'okhttp3', 'com.cssbham.cssminecraft.lib.okhttp3' - relocate 'okio', 'com.cssbham.cssminecraft.lib.okio' - relocate 'org.apache.commons.collections4', 'com.cssbham.cssminecraft.lib.collections4' - relocate 'org.slf4j', 'com.cssbham.cssminecraft.lib.slf4j' - relocate 'org.yaml.snakeyaml', 'com.cssbham.cssminecraft.lib.snakeyaml' - relocate 'kotlin', 'com.cssbham.cssminecraft.lib.kotlin' + relocate "club.minnced", "com.cssbham.cssminecraft.lib.discordwebhooks" + relocate "com.fasterxml.jackson", "com.cssbham.cssminecraft.lib.jackson" + relocate "com.iwebpp.crypto", "com.cssbham.cssminecraft.lib.iwebppcrypto" + relocate "com.neovisionaries.ws", "com.cssbham.cssminecraft.lib.nvws" + relocate "gnu.trove", "com.cssbham.cssminecraft.lib.trove" + relocate "net.dv8tion.jda", "com.cssbham.cssminecraft.lib.jda" + relocate "okhttp3", "com.cssbham.cssminecraft.lib.okhttp3" + relocate "okio", "com.cssbham.cssminecraft.lib.okio" + relocate "org.apache.commons.collections4", "com.cssbham.cssminecraft.lib.collections4" + relocate "org.slf4j", "com.cssbham.cssminecraft.lib.slf4j" + relocate "org.yaml.snakeyaml", "com.cssbham.cssminecraft.lib.snakeyaml" + relocate "org.intellij.lang.annotations", "com.cssbham.cssminecraft.lib.annotations.intellij" + relocate "org.jetbrains.annotations", "com.cssbham.cssminecraft.lib.annotations.jetbrains" + relocate "org.json", "com.cssbham.cssminecraft.lib.json" + relocate "kotlin", "com.cssbham.cssminecraft.lib.kotlin" minimize() } diff --git a/fabric/build.gradle b/fabric/build.gradle index fea2ba9..095a14d 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -1,41 +1,42 @@ import net.fabricmc.loom.task.RemapJarTask plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' - id 'java' + id "fabric-loom" version "1.7-SNAPSHOT" + id "java" } processResources { duplicatesStrategy = duplicatesStrategy.INCLUDE from(sourceSets.main.resources.srcDirs) { - include 'fabric.mod.json' - expand('version': project.version) + include "fabric.mod.json" + expand("version": project.version) } } repositories { - maven { url = 'https://maven.fabricmc.net/' } + maven { url = "https://maven.fabricmc.net/" } } dependencies { - minecraft "com.mojang:minecraft:1.21" - mappings "net.fabricmc:yarn:1.21.1+build.2:v2" - modImplementation "net.fabricmc:fabric-loader:0.15.11" - modImplementation "net.fabricmc.fabric-api:fabric-api:0.100.3+1.21" + minecraft "com.mojang:minecraft:${minecraft_version}" + mappings "net.fabricmc:yarn:${yarn_mappings}" + modImplementation "net.fabricmc:fabric-loader:${loader_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - compileOnly 'net.kyori:adventure-text-serializer-gson:4.17.0' - implementation project(path: ':common', configuration: 'shadow') + compileOnly "net.kyori:adventure-text-serializer-gson:4.17.0" + + implementation project(path: ":common", configuration: "shadow") } shadowJar { dependencies { - include(project(':common')) + include(project(":common")) } archiveFileName = "cssminecraft-fabric-${project.version}-no-map.jar" } -tasks.register('remapShadowJar', RemapJarTask) { +tasks.register("remapShadowJar", RemapJarTask) { dependsOn tasks.shadowJar input = tasks.shadowJar.archiveFile addNestedDependencies = true diff --git a/fabric/gradle.properties b/fabric/gradle.properties new file mode 100644 index 0000000..5b783a3 --- /dev/null +++ b/fabric/gradle.properties @@ -0,0 +1,4 @@ +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.15.11 +fabric_version=0.102.1+1.21.1 diff --git a/forge/build.gradle b/forge/build.gradle index c8bad36..180f41c 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -1,33 +1,46 @@ plugins { - id 'net.minecraftforge.gradle' version '[6.0,6.2)' - id 'java' + id "net.minecraftforge.gradle" version "[6.0,6.2)" + id "java" } processResources { duplicatesStrategy = duplicatesStrategy.INCLUDE from(sourceSets.main.resources.srcDirs) { - include '**/mods.toml' - expand('version': project.version) + include "**/mods.toml" + expand("version": project.version) } } minecraft { - mappings channel: 'official', version: minecraftVersion + mappings channel: "official", version: minecraftVersion } dependencies { minecraft ("net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}") - implementation project(path: ':common', configuration: 'shadow') + implementation ("net.kyori:adventure-api:4.17.0") { + exclude(module: "adventure-bom") + exclude(module: "annotations") + } + implementation ("net.kyori:adventure-text-serializer-gson:4.17.0") { + exclude(module: "adventure-bom") + exclude(module: "adventure-api") + exclude(module: "annotations") + exclude(module: "auto-service-annotations") + exclude(module: "gson") + } + + implementation project(path: ":common", configuration: "shadow") } shadowJar { dependencies { - include(project(':common')) + include(project(":common")) + include(dependency("net.kyori:.*")) } - relocate 'net.kyori', 'com.cssbham.cssminecraft.lib.adventure' + relocate "net.kyori", "com.cssbham.cssminecraft.lib.adventure" archiveFileName = "cssminecraft-forge-${project.version}.jar" diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 39d1fc2..d5f96d6 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -7,7 +7,7 @@ showAsResourcePack=false [[mods]] modId="cssminecraft" version="${version}" -displayName="CSS Minecraft" +displayName="CSSMinecraft" logoFile="logo.png" authors="LMBishop" description=''' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml deleted file mode 100644 index d10ab19..0000000 --- a/gradle/libs.versions.toml +++ /dev/null @@ -1,14 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format - -[versions] -club-minnced-discord-webhooks = "0.8.2" -net-dv8tion-jda = "5.0.0-beta.17" -net-luckperms-api = "5.4" -org-spigotmc-spigot-api = "1.20.2-R0.1-SNAPSHOT" - -[libraries] -club-minnced-discord-webhooks = { module = "club.minnced:discord-webhooks", version.ref = "club-minnced-discord-webhooks" } -net-dv8tion-jda = { module = "net.dv8tion:JDA", version.ref = "net-dv8tion-jda" } -net-luckperms-api = { module = "net.luckperms:api", version.ref = "net-luckperms-api" } -org-spigotmc-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "org-spigotmc-spigot-api" } diff --git a/settings.gradle b/settings.gradle index 02c5a9f..b9d5520 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,16 +1,16 @@ pluginManagement { repositories { gradlePluginPortal() - maven { url = 'https://maven.fabricmc.net/' } - maven { url = 'https://maven.minecraftforge.net/' } + maven { url = "https://maven.fabricmc.net/" } + maven { url = "https://maven.minecraftforge.net/" } } } -rootProject.name = 'css-minecraft' +rootProject.name = "css-minecraft" include( - 'common', - 'bukkit', - 'fabric', - 'forge' + "common", + "bukkit", + "fabric", + "forge" ) \ No newline at end of file From 56edf7a5ae7f8e2acbedab8bdeabb4be95cf87a6 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 15:20:24 +0100 Subject: [PATCH 06/20] Update workflows --- .github/CODEOWNERS | 2 +- .github/workflows/build.yml | 59 ++++++++++++++++--------------- .github/workflows/pullrequest.yml | 42 ---------------------- 3 files changed, 32 insertions(+), 71 deletions(-) delete mode 100644 .github/workflows/pullrequest.yml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e3cb313..759a226 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @Thatsmusic99 @MattyTheHacker +* @Thatsmusic99 @MattyTheHacker @LMBishop diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c1aee4..6c8e614 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,39 +3,42 @@ name: "Build" on: push: branches: [ "master" ] + pull_request: + branches: [ "master" ] jobs: build: - name: Build - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - security-events: write - strategy: fail-fast: false matrix: - language: [ 'java' ] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 + target: [ bukkit, fabric, forge ] - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - - - name: Setup Java and Maven - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: maven - - - name: Build with Maven - run: mvn -B package --file pom.xml + name: Build target ${{ matrix.target }} + runs-on: ubuntu-latest + if: "!startsWith(github.event.commits[0].message, '[ci-skip]')" - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Setup JDK + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: temurin + cache: gradle + cache-dependency-path: | + **/*.gradle* + **/gradle-wrapper.properties + + - name: Build with Gradle + run: "./gradlew :${{matrix.target}}:build" + + - name: Upload builds + uses: actions/upload-artifact@v4 + with: + name: "cssminecraft-${{matrix.target}}.jar" + path: | + ${{matrix.target}}/build/libs/cssminecraft-${{matrix.target}}-*.jar + !**/*-no-map.jar + if-no-files-found: error diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml deleted file mode 100644 index 19da554..0000000 --- a/.github/workflows/pullrequest.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: "Build Pull Request" - -on: - pull_request: - # The branches below must be a subset of the branches above - branches: [ "master" ] - -jobs: - build: - name: Build - runs-on: ubuntu-latest - permissions: - actions: read - contents: write - security-events: write - - strategy: - fail-fast: false - matrix: - language: [ 'java' ] - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Initialize CodeQL - uses: github/codeql-action/init@v2 - with: - languages: ${{ matrix.language }} - - - name: Setup Java and Maven - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - cache: maven - - - name: Build with Maven - run: mvn -B package --file pom.xml - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 From cfb133c352e3ee1f2acb200d4eb3cf774783b231 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 15:31:35 +0100 Subject: [PATCH 07/20] Exclude mappings from fabric jar --- .github/workflows/build.yml | 2 +- fabric/build.gradle | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c8e614..2b67a99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: matrix: target: [ bukkit, fabric, forge ] - name: Build target ${{ matrix.target }} + name: Build ${{ matrix.target }} runs-on: ubuntu-latest if: "!startsWith(github.event.commits[0].message, '[ci-skip]')" diff --git a/fabric/build.gradle b/fabric/build.gradle index 095a14d..fa06087 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -33,6 +33,8 @@ shadowJar { include(project(":common")) } + exclude "/mappings/*" + archiveFileName = "cssminecraft-fabric-${project.version}-no-map.jar" } From c26707ef60ba367e8826ea7ab79448e5e54873fa Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 15:33:54 +0100 Subject: [PATCH 08/20] Upgrade actions/checkout to v4 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b67a99..04c2b2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup JDK uses: actions/setup-java@v4 From 24037fdf131f92d12574f22eeac77abc974612f3 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 20:51:44 +0100 Subject: [PATCH 09/20] Add commands abstraction & javadoc --- .../bukkit/BukkitCSSMinecraftPlugin.java | 27 +++++++- .../adapter/BukkitServerChatAdapter.java | 16 +++++ .../bukkit/command/BukkitCommandService.java | 50 +++++++++++++++ .../bukkit/executor/BukkitServerExecutor.java | 21 +++++++ bukkit/src/main/resources/plugin.yml | 6 +- .../common/AbstractCSSMinecraftPlugin.java | 38 +++++++++++- .../common/CSSMinecraftPlugin.java | 14 +++++ .../common/adapter/ServerChatAdapter.java | 26 ++++++++ .../command/AbstractCommandService.java | 62 +++++++++++++++++++ .../common/command/CommandContext.java | 4 ++ .../common/command/CommandHandler.java | 7 +++ .../common/command/CommandSender.java | 44 +++++++++++++ .../common/command/CommandService.java | 26 ++++++++ .../handler/MakeGreenCommandHandler.java | 48 ++++++++++++++ .../common/config/ConfigService.java | 16 +++++ .../common/config/option/ConfigOption.java | 3 + .../common/config/option/ConfigValue.java | 21 +++++++ .../config/option/ConfigValueFactory.java | 3 + .../common/config/source/ConfigSource.java | 7 +++ .../config/source/YamlConfigSource.java | 3 + .../common/discord/DiscordClientService.java | 9 +++ .../common/discord/client/DiscordClient.java | 11 +++- .../common/discord/webhook/WebHookClient.java | 12 +++- .../cssminecraft/common/event/Event.java | 3 + .../cssminecraft/common/event/EventBus.java | 14 +++++ .../common/event/PlatformEventAdapter.java | 4 ++ .../common/event/SimpleEventBus.java | 5 +- .../event/events/DiscordMessageEvent.java | 8 +++ .../common/event/events/PlayerJoinEvent.java | 8 +++ .../common/event/events/PlayerQuitEvent.java | 8 +++ .../event/events/ServerMessageEvent.java | 8 +++ .../common/executor/AsyncServerExecutor.java | 42 +++++++++++++ .../common/executor/ServerExecutor.java | 27 ++++++++ .../handler/DiscordMessageEventHandler.java | 5 +- .../common/logger/AbstractLogger.java | 5 ++ .../cssminecraft/common/logger/Logger.java | 44 +++++++++++++ 36 files changed, 643 insertions(+), 12 deletions(-) create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/command/BukkitCommandService.java create mode 100644 bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/executor/BukkitServerExecutor.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/command/AbstractCommandService.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/command/CommandContext.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/command/CommandHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/command/CommandSender.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/command/CommandService.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/executor/AsyncServerExecutor.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/executor/ServerExecutor.java diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java index dbf0768..57d312b 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java @@ -1,10 +1,15 @@ package com.cssbham.cssminecraft.bukkit; import com.cssbham.cssminecraft.bukkit.adapter.BukkitServerChatAdapter; +import com.cssbham.cssminecraft.bukkit.command.BukkitCommandService; +import com.cssbham.cssminecraft.bukkit.executor.BukkitServerExecutor; import com.cssbham.cssminecraft.bukkit.listener.BukkitEventListener; import com.cssbham.cssminecraft.bukkit.logger.BukkitLogger; import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.command.CommandSender; +import com.cssbham.cssminecraft.common.command.CommandService; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; import com.cssbham.cssminecraft.common.logger.Logger; import org.bukkit.plugin.java.JavaPlugin; @@ -17,13 +22,17 @@ public class BukkitCSSMinecraftPlugin extends AbstractCSSMinecraftPlugin { private final JavaPlugin plugin; - private final BukkitLogger bukkitLogger; + private final BukkitLogger logger; private final BukkitServerChatAdapter serverChatAdapter; + private final BukkitServerExecutor executor; + private final BukkitCommandService commandService; public BukkitCSSMinecraftPlugin(JavaPlugin plugin) { this.plugin = plugin; - this.bukkitLogger = new BukkitLogger(plugin); + this.logger = new BukkitLogger(plugin); this.serverChatAdapter = new BukkitServerChatAdapter(); + this.executor = new BukkitServerExecutor(logger, plugin); + this.commandService = new BukkitCommandService(logger, executor, serverChatAdapter); } @Override @@ -32,11 +41,13 @@ public void enable() { BukkitEventListener eventListener = new BukkitEventListener(plugin); eventListener.bindPlatformToEventBus(super.getEventBus()); + + plugin.getCommand("makegreen").setExecutor(commandService); } @Override public Logger getLogger() { - return bukkitLogger; + return logger; } @Override @@ -48,4 +59,14 @@ public ServerChatAdapter provideServerChatAdapter() { public Path provideConfigurationPath() { return Paths.get(plugin.getDataFolder().getPath(), "config.yml"); } + + @Override + public ServerExecutor provideServerExecutor() { + return executor; + } + + @Override + public CommandService provideCommandService() { + return commandService; + } } diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java index 1cc0747..2ae374b 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/adapter/BukkitServerChatAdapter.java @@ -3,6 +3,9 @@ import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; +import org.bukkit.entity.Player; + +import java.util.UUID; public class BukkitServerChatAdapter implements ServerChatAdapter { @@ -11,4 +14,17 @@ public void broadcastMessage(Component message) { Bukkit.broadcast(message); } + @Override + public void sendMessageToPlayer(UUID user, Component component) { + Player player = Bukkit.getPlayer(user); + if (null != player) { + player.sendMessage(component); + } + } + + @Override + public void sendMessageToConsole(Component component) { + Bukkit.getConsoleSender().sendMessage(component); + } + } diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/command/BukkitCommandService.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/command/BukkitCommandService.java new file mode 100644 index 0000000..4081680 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/command/BukkitCommandService.java @@ -0,0 +1,50 @@ +package com.cssbham.cssminecraft.bukkit.command; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.command.AbstractCommandService; +import com.cssbham.cssminecraft.common.command.CommandContext; +import com.cssbham.cssminecraft.common.command.CommandSender; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; + +import java.util.UUID; + +public class BukkitCommandService extends AbstractCommandService implements CommandExecutor { + + private ServerChatAdapter chatAdapter; + + public BukkitCommandService(Logger logger, ServerExecutor executor, ServerChatAdapter chatAdapter) { + super(logger, executor); + + this.chatAdapter = chatAdapter; + } + + @Override + public boolean onCommand(@NotNull org.bukkit.command.CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { + CommandSender commandSender; + if (sender instanceof Player player) { + commandSender = new CommandSender( + chatAdapter, + player.getUniqueId(), + player.getName(), + false + ); + } else { + commandSender = new CommandSender( + chatAdapter, + new UUID(0, 0), + sender.getName(), + true + ); + } + + CommandContext context = new CommandContext(label, args); + + super.execute(commandSender, context); + return true; + } +} diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/executor/BukkitServerExecutor.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/executor/BukkitServerExecutor.java new file mode 100644 index 0000000..2756de5 --- /dev/null +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/executor/BukkitServerExecutor.java @@ -0,0 +1,21 @@ +package com.cssbham.cssminecraft.bukkit.executor; + +import com.cssbham.cssminecraft.common.executor.AsyncServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; +import org.bukkit.plugin.java.JavaPlugin; + +public class BukkitServerExecutor extends AsyncServerExecutor { + + private final JavaPlugin plugin; + + public BukkitServerExecutor(Logger logger, JavaPlugin plugin) { + super(logger); + this.plugin = plugin; + } + + @Override + public void doSync(Runnable runnable) { + plugin.getServer().getScheduler().runTask(plugin, runnable); + } + +} diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index d1a35c7..7ec3913 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -6,4 +6,8 @@ authors: [ RaineTheBoosted, LMBishop ] description: CSS' Minecraft plugin website: https://github.com/CSSUoB/CSS-Minecraft softdepend: [ LuckPerms ] # TODO change back to depends -# TODO re-implement commands +commands: + makegreen: + description: Make yourself green by verifying your CSS membership. + usage: / [Discord Username] + aliases: [ mg, green ] \ No newline at end of file diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java index ea90855..44513d6 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java @@ -1,10 +1,11 @@ package com.cssbham.cssminecraft.common; import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.command.CommandService; +import com.cssbham.cssminecraft.common.command.handler.MakeGreenCommandHandler; import com.cssbham.cssminecraft.common.config.ConfigService; import com.cssbham.cssminecraft.common.config.option.ConfigOption; import com.cssbham.cssminecraft.common.config.source.ConfigSource; -import com.cssbham.cssminecraft.common.config.source.StubConfigSource; import com.cssbham.cssminecraft.common.config.source.YamlConfigSource; import com.cssbham.cssminecraft.common.discord.DiscordClientService; import com.cssbham.cssminecraft.common.event.EventBus; @@ -13,6 +14,7 @@ import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; import com.cssbham.cssminecraft.common.handler.DiscordMessageEventHandler; import com.cssbham.cssminecraft.common.handler.PlayerJoinEventHandler; import com.cssbham.cssminecraft.common.handler.PlayerQuitEventHandler; @@ -21,6 +23,10 @@ import java.nio.file.Path; +/** + * Abstract implementation of the CSS Minecraft plugin, to be extended by + * platforms. + */ public abstract class AbstractCSSMinecraftPlugin implements CSSMinecraftPlugin { private ConfigService configService; @@ -47,6 +53,10 @@ public void enable() { eventBus.subscribe(PlayerJoinEvent.class, new PlayerJoinEventHandler(discordClientService)); eventBus.subscribe(PlayerQuitEvent.class, new PlayerQuitEventHandler(discordClientService)); eventBus.subscribe(DiscordMessageEvent.class, new DiscordMessageEventHandler(provideServerChatAdapter())); + + CommandService commandService = provideCommandService(); + + commandService.register("makegreen", new MakeGreenCommandHandler(discordClientService), "mg", "green"); } @Override @@ -54,6 +64,8 @@ public void disable() { if (null != discordClientService) { discordClientService.shutdownClients(); } + + provideServerExecutor().shutdown(); } public ConfigService getConfigService() { @@ -68,8 +80,32 @@ public EventBus getEventBus() { return eventBus; } + /** + * Provide platform-specific {@link ServerChatAdapter} + * + * @return a server chat adapter wrapping platform chat functions + */ public abstract ServerChatAdapter provideServerChatAdapter(); + /** + * Provide configuration path + * + * @return path to config file + */ public abstract Path provideConfigurationPath(); + /** + * Provide platform-specific {@link ServerExecutor} + * + * @return a server executor wrapping the platform main thread + */ + public abstract ServerExecutor provideServerExecutor(); + + /** + * Provide platform-specific {@link CommandService} + * + * @return a command service + */ + public abstract CommandService provideCommandService(); + } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java index b7ae782..d1cc2aa 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/CSSMinecraftPlugin.java @@ -2,11 +2,25 @@ import com.cssbham.cssminecraft.common.logger.Logger; +/** + * Base interface for the CSS Minecraft plugin. + */ public interface CSSMinecraftPlugin { + /** + * Enable the plugin. Should be called during the enable + * phase of the plugin lifecycle. + */ void enable(); + /** + * Disable the plugin. Should be called during the disable + * phase of the plugin lifecycle, or during server shutdown. + */ void disable(); + /** + * Get the plugin logger + */ Logger getLogger(); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java b/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java index 5fc024e..8b5c590 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/adapter/ServerChatAdapter.java @@ -2,8 +2,34 @@ import net.kyori.adventure.text.Component; +import java.util.UUID; + +/** + * Abstraction for platform-specific server chat functions. + */ public interface ServerChatAdapter { + /** + * Broadcast a message to every player online and the server + * console. + * + * @param message the message to broadcast + */ void broadcastMessage(Component message); + /** + * Send a message to a specific player. + * + * @param user the user to send to + * @param component the message to send + */ + void sendMessageToPlayer(UUID user, Component component); + + /** + * Send a message to console. + * + * @param component the message to send + */ + void sendMessageToConsole(Component component); + } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/AbstractCommandService.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/AbstractCommandService.java new file mode 100644 index 0000000..c5b8211 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/AbstractCommandService.java @@ -0,0 +1,62 @@ +package com.cssbham.cssminecraft.common.command; + +import com.cssbham.cssminecraft.common.executor.ServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; + +import java.util.HashMap; +import java.util.Map; + +/** + * Abstract implementation of command service. Platform implementations should + * bind their platform-specific command framework to this. + */ +public abstract class AbstractCommandService implements CommandService { + + private final Map commands; + private final Logger logger; + private final ServerExecutor executor; + + public AbstractCommandService(Logger logger, ServerExecutor executor) { + this.commands = new HashMap<>(); + this.logger = logger; + this.executor = executor; + } + + @Override + public final void register(String label, CommandHandler handler, String... aliases) { + commands.put(label, handler); + for (String alias : aliases) { + commands.put(alias, handler) ; + } + } + + @Override + public final void execute(CommandSender sender, CommandContext context) { + CommandHandler handler = commands.get(context.label()); + + logger.debug(String.format("Handler for /%s executed by %s (%s): %s", + context.label(), + sender.getName(), + sender.getUuid(), + (null == handler) ? null : handler.getClass().getName() + )); + + if (null == handler) { + return; + } + + executor.doAsync(() -> { + try { + handler.handle(sender, context); + } catch (Exception e) { + logger.severe(String.format("Exception handling command /%s for %s: %s", + context.label(), + sender.getName(), + e.getMessage() + )); + e.printStackTrace(); + } + }); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandContext.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandContext.java new file mode 100644 index 0000000..c34e612 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandContext.java @@ -0,0 +1,4 @@ +package com.cssbham.cssminecraft.common.command; + +public record CommandContext (String label, String[] args) { +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandHandler.java new file mode 100644 index 0000000..a94e5a1 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandHandler.java @@ -0,0 +1,7 @@ +package com.cssbham.cssminecraft.common.command; + +public interface CommandHandler { + + void handle(CommandSender sender, CommandContext context); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandSender.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandSender.java new file mode 100644 index 0000000..9a54d72 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandSender.java @@ -0,0 +1,44 @@ +package com.cssbham.cssminecraft.common.command; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import net.kyori.adventure.text.Component; + +import java.util.UUID; + +/** + * A wrapper for command senders. + */ +public class CommandSender { + + private final UUID uuid; + private final String name; + private final boolean console; + private final ServerChatAdapter chatAdapter; + + public CommandSender(ServerChatAdapter chatAdapter, UUID uuid, String name, boolean console) { + this.uuid = uuid; + this.name = name; + this.console = console; + this.chatAdapter = chatAdapter; + } + + public UUID getUuid() { + return uuid; + } + + public String getName() { + return name; + } + + public boolean isConsole() { + return console; + } + + public void sendMessage(Component message) { + if (console) { + chatAdapter.sendMessageToConsole(message); + } else { + chatAdapter.sendMessageToPlayer(uuid, message); + } + } +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandService.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandService.java new file mode 100644 index 0000000..3f71f12 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/CommandService.java @@ -0,0 +1,26 @@ +package com.cssbham.cssminecraft.common.command; + +/** + * Abstraction for command service, which manages command registration and + * execution. + */ +public interface CommandService { + + /** + * Register a command for execution with the service. + * + * @param label the command label + * @param handler the command executor + * @param aliases command aliases + */ + void register(String label, CommandHandler handler, String... aliases); + + /** + * Execute a command with a given command context. + * + * @param sender command sender + * @param context command context + */ + void execute(CommandSender sender, CommandContext context); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java new file mode 100644 index 0000000..7f24092 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java @@ -0,0 +1,48 @@ +package com.cssbham.cssminecraft.common.command.handler; + +import com.cssbham.cssminecraft.common.command.CommandContext; +import com.cssbham.cssminecraft.common.command.CommandHandler; +import com.cssbham.cssminecraft.common.command.CommandSender; +import com.cssbham.cssminecraft.common.discord.DiscordClientService; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.event.ClickEvent; +import net.kyori.adventure.text.format.NamedTextColor; +import net.kyori.adventure.text.format.TextDecoration; + +public class MakeGreenCommandHandler implements CommandHandler { + + private final DiscordClientService discordClientService; + + public MakeGreenCommandHandler(DiscordClientService discordClientService) { + this.discordClientService = discordClientService; + } + + @Override + public void handle(CommandSender sender, CommandContext context) { + if (sender.isConsole()) { + sender.sendMessage(Component.text("Only players may use this command.").color(NamedTextColor.RED)); + return; + } + + String arg = String.join(" ", context.args()); + if (!arg.matches("[a-z0-9._]{2,32}|.{2,32}#[0-9]{4}")) { + sender.sendMessage(Component.text("Invalid Discord tag format.").color(NamedTextColor.RED)); + return; + } + + if (discordClientService.getDiscordClient().isMember(arg)) { + //TODO the luckperms stuff + sender.sendMessage(Component.text("Congratulations, you are now green!").color(NamedTextColor.GREEN)); + } else { + sender.sendMessage(Component.text("You don't appear to be a ").color(NamedTextColor.RED).append( + Component.text("Member").color(NamedTextColor.GREEN) + ).append(Component.text(" on Discord! If you are, please link your account first and try again. " + + "Otherwise, you can get membership at ").color(NamedTextColor.RED) + ).append(Component.text("https://cssbham.com/join") + .clickEvent(ClickEvent.openUrl("https://cssbham.com/join")) + .color(NamedTextColor.AQUA) + .decorate(TextDecoration.UNDERLINED))); + } + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java index 17b45c4..7034012 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/ConfigService.java @@ -6,6 +6,10 @@ import java.util.Objects; +/** + * Configuration service to create plugin config, and retrieve config + * values. + */ public class ConfigService { private final Logger logger; @@ -16,6 +20,11 @@ public ConfigService(Logger logger) { this.logger = logger; } + /** + * Initialise a config source and associate it with this service. + * + * @param configSource the config source + */ public void useSource(ConfigSource configSource) { this.configSource = configSource; this.logger.info(String.format("Using config source: %s", configSource.getClass().getName())); @@ -23,6 +32,13 @@ public void useSource(ConfigSource configSource) { configSource.initialise(); } + /** + * Get the value of a {@link ConfigValue}. + * + * @param option the option to retrieve + * @return the value + * @param the type of config value + */ public T getValue(ConfigValue option) { Objects.requireNonNull(configSource, "config source not initialised"); diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java index df03685..556be72 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigOption.java @@ -7,6 +7,9 @@ import static com.cssbham.cssminecraft.common.config.option.ConfigValueFactory.*; +/** + * A list of all config options. + */ public class ConfigOption { public static final ConfigValue WEBHOOK_URL = buildString("webhook-url", ""); diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java index f6a99b5..4a69429 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValue.java @@ -4,6 +4,11 @@ import java.util.function.Function; +/** + * Abstraction for config values. + * + * @param the type + */ public class ConfigValue { private final String path; @@ -16,14 +21,30 @@ public ConfigValue(String path, T def, Function getter) this.getter = getter; } + /** + * Get this value from the config source. + * + * @param configSource the config source + * @return the value + */ public T get(ConfigSource configSource) { return this.getter.apply(configSource); } + /** + * Get the path for this value. + * + * @return path + */ public String getPath() { return path; } + /** + * Get the default value for this value. + * + * @return the default value + */ public T getDefault() { return def; } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java index c35cdba..bea3b86 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/option/ConfigValueFactory.java @@ -1,5 +1,8 @@ package com.cssbham.cssminecraft.common.config.option; +/** + * Factory methods for creating config values. + */ public final class ConfigValueFactory { private ConfigValueFactory() {} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java index 0fbef45..4cfd40e 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/ConfigSource.java @@ -1,5 +1,8 @@ package com.cssbham.cssminecraft.common.config.source; +/** + * Abstraction for configuration sources. + */ public interface ConfigSource { int getInteger(String path, int def); @@ -10,6 +13,10 @@ public interface ConfigSource { String getString(String path, String def); + /** + * Initialise this configuration source and create default + * configuration. + */ void initialise(); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java index 473b355..cb88865 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java @@ -12,6 +12,9 @@ import java.util.HashMap; import java.util.Map; +/** + * Config source implementation for SnakeYAML. + */ public class YamlConfigSource implements ConfigSource { private final Path configurationPath; diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java index 5aed7d9..134f588 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/DiscordClientService.java @@ -11,6 +11,9 @@ import java.util.Objects; +/** + * A service to manage Discord clients. + */ public class DiscordClientService { private final ConfigService configService; @@ -26,6 +29,9 @@ public DiscordClientService(ConfigService configService, EventBus eventBus, Logg this.logger = logger; } + /** + * Initialise Discord clients. Will throw if underlying clients throw. + */ public void initialiseClients() { this.discordClient = new JDADiscordClient( eventBus, @@ -46,6 +52,9 @@ public void initialiseClients() { this.webHookClient.initialise(); } + /** + * Shutdown Discord clients. + */ public void shutdownClients() { this.logger.info("Shutting down Discord clients"); diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java index bbd5624..a504790 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/DiscordClient.java @@ -1,13 +1,20 @@ package com.cssbham.cssminecraft.common.discord.client; -import com.cssbham.cssminecraft.common.event.EventHandler; - +/** + * Abstraction for Discord clients. + */ public interface DiscordClient { void initialise(); void shutdown(); + /** + * Get whether a discord tag has the Member role + * + * @param identifier discord tag + * @return true if they have the role, false otherwise + */ boolean isMember(String identifier); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java index f3dc5f1..de2dffc 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/webhook/WebHookClient.java @@ -1,13 +1,21 @@ package com.cssbham.cssminecraft.common.discord.webhook; -import com.cssbham.cssminecraft.common.event.EventHandler; - +/** + * Abstraction for webhook clients. + */ public interface WebHookClient { void initialise(); void shutdown(); + /** + * Send a message to the endpoint as a Minecraft player. + * + * @param avatarName the name of the Minecraft avatar + * @param displayName senders display name + * @param message message content + */ void sendMessageAsMinecraftUser(String avatarName, String displayName, String message); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java index fda9067..4b81492 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/Event.java @@ -1,5 +1,8 @@ package com.cssbham.cssminecraft.common.event; +/** + * An event. + */ public interface Event { } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java index 1fc7215..aa4f83e 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/EventBus.java @@ -1,9 +1,23 @@ package com.cssbham.cssminecraft.common.event; +/** + * Base interface for an event bus. + */ public interface EventBus { + /** + * Dispatch an event. + * + * @param event the event to dispatch + */ void dispatch(Event event); + /** + * Subscribe to an event. + * + * @param event the event to subscribe to + * @param handler the event handler + */ void subscribe(Class event, EventHandler handler); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java index 2dd24f3..db14002 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/PlatformEventAdapter.java @@ -1,5 +1,9 @@ package com.cssbham.cssminecraft.common.event; +/** + * Interface for platforms to map platform-specific events to the + * common {@link EventBus} + */ public interface PlatformEventAdapter { void bindPlatformToEventBus(EventBus eventBus); diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java index 1addfaa..065c0d3 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/SimpleEventBus.java @@ -4,6 +4,9 @@ import java.util.*; +/** + * A simple event bus implementation. + */ public class SimpleEventBus implements EventBus { private final Map, List>> handlers = new HashMap<>(); @@ -21,7 +24,7 @@ public void dispatch(Event event) { try { handler.handle(event); } catch (Exception e) { - // TODO handle + logger.severe(String.format("Error in handler %s", handler.getClass().getName())); } } } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java index c0b502e..cc04102 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/DiscordMessageEvent.java @@ -2,6 +2,14 @@ import com.cssbham.cssminecraft.common.event.Event; +/** + * An event which should be dispatched when a discord message is received. + * This event SHOULD be dispatched async. + * + * @param sender name of sender + * @param message message content + * @param senderColour the senders role colour on discord + */ public record DiscordMessageEvent(String sender, String message, int senderColour) implements Event { } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java index dbe0930..9ceb9dd 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerJoinEvent.java @@ -4,6 +4,14 @@ import java.util.UUID; +/** + * An event which should be dispatched when a player joins. + * + * @param sender UUID of joining player + * @param username username of joining player + * @param displayName display name of joining player + * @param newPlayerCount new player count + */ public record PlayerJoinEvent(UUID sender, String username, String displayName, int newPlayerCount) implements Event { } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java index 528ffa1..6ca0918 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/PlayerQuitEvent.java @@ -4,6 +4,14 @@ import java.util.UUID; +/** + * An event which should be dispatched when a player quits. + * + * @param sender UUID of leaving player + * @param username username of leaving player + * @param displayName display name of leaving player + * @param newPlayerCount new player count + */ public record PlayerQuitEvent(UUID sender, String username, String displayName, int newPlayerCount) implements Event { } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java index 0d5c65b..4634a39 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/event/events/ServerMessageEvent.java @@ -4,6 +4,14 @@ import java.util.UUID; +/** + * An event which should be dispatched when a chat message is sent. + * + * @param sender UUID of sender + * @param username username of sender + * @param displayName display name of sender + * @param message message content + */ public record ServerMessageEvent(UUID sender, String username, String displayName, String message) implements Event { } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/executor/AsyncServerExecutor.java b/common/src/main/java/com/cssbham/cssminecraft/common/executor/AsyncServerExecutor.java new file mode 100644 index 0000000..c4d1960 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/executor/AsyncServerExecutor.java @@ -0,0 +1,42 @@ +package com.cssbham.cssminecraft.common.executor; + +import com.cssbham.cssminecraft.common.logger.Logger; + +import java.util.concurrent.Executors; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +/** + * Abstract implementation of server executor with a thread pool for + * async tasks. Subclasses should implement the sync method around the + * server scheduler. + */ +public abstract class AsyncServerExecutor implements ServerExecutor { + + private final ThreadPoolExecutor executor; + private final Logger logger; + + public AsyncServerExecutor(Logger logger) { + this.executor = (ThreadPoolExecutor) Executors.newCachedThreadPool(); + this.logger = logger; + } + + @Override + public void doAsync(Runnable runnable) { + executor.submit(runnable); + } + + @Override + public void shutdown() { + this.executor.shutdown(); + try { + if (!this.executor.awaitTermination(30, TimeUnit.SECONDS)) { + logger.severe("Async executor timed out while awaiting shutdown!"); + } + } catch (InterruptedException e) { + logger.warning("Interrupted while awaiting async executor termination"); + e.printStackTrace(); + } + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/executor/ServerExecutor.java b/common/src/main/java/com/cssbham/cssminecraft/common/executor/ServerExecutor.java new file mode 100644 index 0000000..d780add --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/executor/ServerExecutor.java @@ -0,0 +1,27 @@ +package com.cssbham.cssminecraft.common.executor; + +/** + * An executor which can interface with the server main thread. + */ +public interface ServerExecutor { + + /** + * Run synchronously on main thread + * + * @param runnable task to run + */ + void doSync(Runnable runnable); + + /** + * Run asynchronously outside the main thread + * + * @param runnable task tp run + */ + void doAsync(Runnable runnable); + + /** + * Shut down thread pool for asynchronous tasks + */ + void shutdown(); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java index 9cf2bcb..c703ef0 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/DiscordMessageEventHandler.java @@ -4,6 +4,7 @@ import com.cssbham.cssminecraft.common.event.EventHandler; import com.cssbham.cssminecraft.common.event.events.DiscordMessageEvent; import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextColor; public class DiscordMessageEventHandler extends EventHandler { @@ -22,7 +23,7 @@ public void handle(DiscordMessageEvent event) { private Component buildMessageComponent(String name, int colour, String message) { return Component.text("[Discord] ").color(TextColor.color(115, 138, 189)) .append(Component.text(name).color(TextColor.color(0xFFFFFF & colour))) - .append(Component.text(" > ").color(TextColor.color(255, 255, 255))) - .append(Component.text(message).color(TextColor.color(255, 255, 255))); + .append(Component.text(" > ").color(NamedTextColor.WHITE)) + .append(Component.text(message).color(NamedTextColor.WHITE)); } } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java b/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java index 1c29e58..9257dee 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/logger/AbstractLogger.java @@ -1,5 +1,10 @@ package com.cssbham.cssminecraft.common.logger; +/** + * Abstract implementation of logger, implementing the server logging + * level logic. Platform-specific implementations should wrap the server + * logger. + */ public abstract class AbstractLogger implements Logger { private Logger.LoggingLevel serverLoggingLevel = LoggingLevel.INFO; diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java b/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java index 98db85c..9034037 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/logger/Logger.java @@ -1,21 +1,65 @@ package com.cssbham.cssminecraft.common.logger; +/** + * Base interface for plugin logger. Implementations should + * wrap the server or plugin specific logger. + */ public interface Logger { + /** + * Get the logging level. + * + * @return logging level + */ LoggingLevel getServerLoggingLevel(); + /** + * Set the logging level. + * + * @param serverLoggingLevel the new logging level + */ void setServerLoggingLevel(LoggingLevel serverLoggingLevel); + /** + * Log a message. + * + * @param str the message to log + * @param level the severity of the message + */ void log(String str, LoggingLevel level); + /** + * Log a debug message. + * + * @param str the message to log + */ void debug(String str); + /** + * Log an informational message. + * + * @param str the message to log + */ void info(String str); + /** + * Log a warning message. + * + * @param str the message to log + */ void warning(String str); + /** + * Log an error message. + * + * @param str the message to log + */ void severe(String str); + /** + * Represents a numeric logging level, where lower values are more + * severe. + */ enum LoggingLevel { ERROR(0), WARNING(1), From ffa00a4539603d6aa2ea526aa6a1cceb8edb30d2 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 22:52:05 +0100 Subject: [PATCH 10/20] Add makegreen commands to forge and fabric --- .../cssminecraft/common/util/CommandUtil.java | 12 ++++ fabric/build.gradle | 15 +++- .../fabric/FabricCSSMinecraftPlugin.java | 18 +++++ .../adapter/FabricServerChatAdapter.java | 16 +++++ .../fabric/command/FabricCommandService.java | 67 ++++++++++++++++++ .../fabric/executor/FabricServerExecutor.java | 21 ++++++ .../forge/ForgeCSSMinecraftPlugin.java | 18 +++++ .../forge/adapter/ForgeServerChatAdapter.java | 16 +++++ .../forge/command/ForgeCommandService.java | 68 +++++++++++++++++++ .../forge/executor/ForgeServerExecutor.java | 21 ++++++ 10 files changed, 271 insertions(+), 1 deletion(-) create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/util/CommandUtil.java create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/command/FabricCommandService.java create mode 100644 fabric/src/main/java/com/cssbham/cssminecraft/fabric/executor/FabricServerExecutor.java create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/command/ForgeCommandService.java create mode 100644 forge/src/main/java/com/cssbham/cssminecraft/forge/executor/ForgeServerExecutor.java diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/util/CommandUtil.java b/common/src/main/java/com/cssbham/cssminecraft/common/util/CommandUtil.java new file mode 100644 index 0000000..9588cc1 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/util/CommandUtil.java @@ -0,0 +1,12 @@ +package com.cssbham.cssminecraft.common.util; + +public final class CommandUtil { + + /** + * A list of all command labels. + */ + // figure out a better way for this + public static final String[] ALL_COMMANDS = new String[]{ "makegreen", "mg", "green" }; + + private CommandUtil() { } +} diff --git a/fabric/build.gradle b/fabric/build.gradle index fa06087..c65cb1d 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -23,7 +23,17 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${loader_version}" modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}" - compileOnly "net.kyori:adventure-text-serializer-gson:4.17.0" + implementation ("net.kyori:adventure-api:4.17.0") { + exclude(module: "adventure-bom") + exclude(module: "annotations") + } + implementation ("net.kyori:adventure-text-serializer-gson:4.17.0") { + exclude(module: "adventure-bom") + exclude(module: "adventure-api") + exclude(module: "annotations") + exclude(module: "auto-service-annotations") + exclude(module: "gson") + } implementation project(path: ":common", configuration: "shadow") } @@ -31,8 +41,11 @@ dependencies { shadowJar { dependencies { include(project(":common")) + include(dependency("net.kyori:.*")) } + relocate "net.kyori", "com.cssbham.cssminecraft.lib.adventure" + exclude "/mappings/*" archiveFileName = "cssminecraft-fabric-${project.version}-no-map.jar" diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java index b73b562..6c84ba5 100644 --- a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java @@ -1,6 +1,10 @@ package com.cssbham.cssminecraft.fabric; +import com.cssbham.cssminecraft.common.command.CommandService; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; import com.cssbham.cssminecraft.fabric.adapter.FabricServerChatAdapter; +import com.cssbham.cssminecraft.fabric.command.FabricCommandService; +import com.cssbham.cssminecraft.fabric.executor.FabricServerExecutor; import com.cssbham.cssminecraft.fabric.listener.FabricEventAdapter; import com.cssbham.cssminecraft.fabric.logger.FabricLogger; import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; @@ -19,6 +23,8 @@ public class FabricCSSMinecraftPlugin extends AbstractCSSMinecraftPlugin { public static final String MOD_ID = "cssminecraft"; private final FabricLogger logger; private FabricServerChatAdapter serverChatAdapter; + private FabricServerExecutor executor; + private FabricCommandService commandService; private MinecraftServer server; @@ -29,6 +35,8 @@ public FabricCSSMinecraftPlugin() { @Override public void enable() { this.serverChatAdapter = new FabricServerChatAdapter(server); + this.executor = new FabricServerExecutor(logger, server); + this.commandService = new FabricCommandService(logger, executor, serverChatAdapter, server); super.enable(); @@ -51,6 +59,16 @@ public Path provideConfigurationPath() { return FabricLoader.getInstance().getConfigDir().resolve(MOD_ID).resolve("config.yml"); } + @Override + public ServerExecutor provideServerExecutor() { + return executor; + } + + @Override + public CommandService provideCommandService() { + return commandService; + } + public void setServer(MinecraftServer server) { this.server = server; } diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java index 701df9a..6eb5c20 100644 --- a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/adapter/FabricServerChatAdapter.java @@ -5,8 +5,11 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.text.Text; +import java.util.UUID; + public class FabricServerChatAdapter implements ServerChatAdapter { private final MinecraftServer server; @@ -20,6 +23,19 @@ public void broadcastMessage(Component message) { server.getPlayerManager().broadcast(componentToText(message), false); } + @Override + public void sendMessageToPlayer(UUID user, Component component) { + ServerPlayerEntity player = server.getPlayerManager().getPlayer(user); + if (null != player) { + player.sendMessage(componentToText(component)); + } + } + + @Override + public void sendMessageToConsole(Component component) { + server.getCommandSource().sendMessage(componentToText(component)); + } + public Text componentToText(Component component) { return Text.Serialization.fromJsonTree(GsonComponentSerializer.gson().serializeToTree(component), DynamicRegistryManager.EMPTY); } diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/command/FabricCommandService.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/command/FabricCommandService.java new file mode 100644 index 0000000..5bf4499 --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/command/FabricCommandService.java @@ -0,0 +1,67 @@ +package com.cssbham.cssminecraft.fabric.command; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.command.AbstractCommandService; +import com.cssbham.cssminecraft.common.command.CommandContext; +import com.cssbham.cssminecraft.common.command.CommandSender; +import com.cssbham.cssminecraft.common.command.CommandService; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; +import com.cssbham.cssminecraft.common.util.CommandUtil; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.command.ServerCommandSource; +import net.minecraft.server.network.ServerPlayerEntity; + +import static net.minecraft.server.command.CommandManager.*; +import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; +import static com.mojang.brigadier.arguments.StringArgumentType.getString; + +import java.util.UUID; + +public class FabricCommandService extends AbstractCommandService { + + private final ServerChatAdapter chatAdapter; + + public FabricCommandService(Logger logger, ServerExecutor executor, ServerChatAdapter chatAdapter, MinecraftServer server) { + super(logger, executor); + + this.chatAdapter = chatAdapter; + + for (String label : CommandUtil.ALL_COMMANDS) { + server.getCommandManager().getDispatcher().register(literal(label) + .executes(context -> { + super.execute( + getCommandSenderForSource(context.getSource()), + new CommandContext(label, new String[0]) + ); + return 1; + }) + .then(argument("args", greedyString()) + .executes(context -> { + super.execute( + getCommandSenderForSource(context.getSource()), + new CommandContext(label, getString(context, "args").split(" ")) + ); + return 1; + }))); + } + } + + private CommandSender getCommandSenderForSource(ServerCommandSource source) { + if (source.isExecutedByPlayer()) { + return new CommandSender( + chatAdapter, + source.getPlayer().getUuid(), + source.getName(), + false + ); + } else { + return new CommandSender( + chatAdapter, + new UUID(0, 0), + source.getName(), + true + ); + } + } +} diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/executor/FabricServerExecutor.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/executor/FabricServerExecutor.java new file mode 100644 index 0000000..1530466 --- /dev/null +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/executor/FabricServerExecutor.java @@ -0,0 +1,21 @@ +package com.cssbham.cssminecraft.fabric.executor; + +import com.cssbham.cssminecraft.common.executor.AsyncServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; +import net.minecraft.server.MinecraftServer; + +public class FabricServerExecutor extends AsyncServerExecutor { + + private final MinecraftServer server; + + public FabricServerExecutor(Logger logger, MinecraftServer server) { + super(logger); + this.server = server; + } + + @Override + public void doSync(Runnable runnable) { + server.executeSync(runnable); + } + +} diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java index 381577c..c260b8d 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java @@ -1,6 +1,10 @@ package com.cssbham.cssminecraft.forge; +import com.cssbham.cssminecraft.common.command.CommandService; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; import com.cssbham.cssminecraft.forge.adapter.ForgeServerChatAdapter; +import com.cssbham.cssminecraft.forge.command.ForgeCommandService; +import com.cssbham.cssminecraft.forge.executor.ForgeServerExecutor; import com.cssbham.cssminecraft.forge.listener.ForgeEventAdapter; import com.cssbham.cssminecraft.forge.logger.ForgeLogger; import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; @@ -21,6 +25,8 @@ public class ForgeCSSMinecraftPlugin extends AbstractCSSMinecraftPlugin { private ForgeServerChatAdapter serverChatAdapter; private MinecraftServer server; + private ForgeServerExecutor executor; + private ForgeCommandService commandService; public ForgeCSSMinecraftPlugin() { this.logger = new ForgeLogger(MOD_ID); @@ -29,6 +35,8 @@ public ForgeCSSMinecraftPlugin() { @Override public void enable() { this.serverChatAdapter = new ForgeServerChatAdapter(server); + this.executor = new ForgeServerExecutor(logger, server); + this.commandService = new ForgeCommandService(logger, executor, serverChatAdapter, server); super.enable(); @@ -51,6 +59,16 @@ public Path provideConfigurationPath() { return FMLPaths.CONFIGDIR.get().resolve(MOD_ID).resolve("config.yml"); } + @Override + public ServerExecutor provideServerExecutor() { + return executor; + } + + @Override + public CommandService provideCommandService() { + return commandService; + } + public void setServer(MinecraftServer server) { this.server = server; } diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java index 85b065a..dd7860b 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/adapter/ForgeServerChatAdapter.java @@ -5,6 +5,9 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.core.RegistryAccess; import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerPlayer; + +import java.util.UUID; public class ForgeServerChatAdapter implements ServerChatAdapter { @@ -19,6 +22,19 @@ public void broadcastMessage(Component message) { server.getPlayerList().broadcastSystemMessage(componentToMinecraftComponent(message), false); } + @Override + public void sendMessageToPlayer(UUID user, Component component) { + ServerPlayer player = server.getPlayerList().getPlayer(user); + if (null != player) { + player.sendSystemMessage(componentToMinecraftComponent(component)); + } + } + + @Override + public void sendMessageToConsole(Component component) { + server.sendSystemMessage(componentToMinecraftComponent(component)); + } + public net.minecraft.network.chat.Component componentToMinecraftComponent(Component component) { return net.minecraft.network.chat.Component.Serializer.fromJson(GsonComponentSerializer.gson().serializeToTree(component), RegistryAccess.EMPTY); } diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/command/ForgeCommandService.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/command/ForgeCommandService.java new file mode 100644 index 0000000..d64b01e --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/command/ForgeCommandService.java @@ -0,0 +1,68 @@ +package com.cssbham.cssminecraft.forge.command; + +import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; +import com.cssbham.cssminecraft.common.command.AbstractCommandService; +import com.cssbham.cssminecraft.common.command.CommandContext; +import com.cssbham.cssminecraft.common.command.CommandSender; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; +import com.cssbham.cssminecraft.common.util.CommandUtil; +import com.mojang.brigadier.builder.LiteralArgumentBuilder; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.server.MinecraftServer; + +import java.util.UUID; + +import static com.mojang.brigadier.arguments.StringArgumentType.getString; +import static com.mojang.brigadier.arguments.StringArgumentType.greedyString; +import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal; +import static com.mojang.brigadier.builder.RequiredArgumentBuilder.argument; + +public class ForgeCommandService extends AbstractCommandService { + + private final ServerChatAdapter chatAdapter; + + public ForgeCommandService(Logger logger, ServerExecutor executor, ServerChatAdapter chatAdapter, MinecraftServer server) { + super(logger, executor); + + this.chatAdapter = chatAdapter; + + for (String label : CommandUtil.ALL_COMMANDS) { + // this is "unsafe" only because brigadier is not obfuscated + server.getCommands().getDispatcher().register((LiteralArgumentBuilder) literal(label) + .executes(context -> { + super.execute( + getCommandSenderForSource((CommandSourceStack) context.getSource()), + new CommandContext(label, new String[0]) + ); + return 1; + }) + .then(argument("args", greedyString()) + .executes(context -> { + super.execute( + getCommandSenderForSource((CommandSourceStack) context.getSource()), + new CommandContext(label, getString(context, "args").split(" ")) + ); + return 1; + }))); + } + } + + private CommandSender getCommandSenderForSource(CommandSourceStack source) { + if (source.isPlayer()) { + return new CommandSender( + chatAdapter, + source.getPlayer().getUUID(), + source.getTextName(), + false + ); + } else { + return new CommandSender( + chatAdapter, + new UUID(0, 0), + source.getTextName(), + true + ); + } + } +} diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/executor/ForgeServerExecutor.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/executor/ForgeServerExecutor.java new file mode 100644 index 0000000..76a1416 --- /dev/null +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/executor/ForgeServerExecutor.java @@ -0,0 +1,21 @@ +package com.cssbham.cssminecraft.forge.executor; + +import com.cssbham.cssminecraft.common.executor.AsyncServerExecutor; +import com.cssbham.cssminecraft.common.logger.Logger; +import net.minecraft.server.MinecraftServer; + +public class ForgeServerExecutor extends AsyncServerExecutor { + + private final MinecraftServer server; + + public ForgeServerExecutor(Logger logger, MinecraftServer server) { + super(logger); + this.server = server; + } + + @Override + public void doSync(Runnable runnable) { + server.executeIfPossible(runnable); + } + +} From c5ca12e997dd49c4799ec1144d02aa7888ca03d2 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Wed, 14 Aug 2024 23:22:36 +0100 Subject: [PATCH 11/20] Update README with gradle details --- README.md | 62 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index f846f4f..4334eb1 100644 --- a/README.md +++ b/README.md @@ -1,40 +1,68 @@ -## CSS-Minecraft -This is the source code for CSS' Minecraft plugin. +# CSS Minecraft +This is the source code for CSS' Minecraft plugin/mod. ## Building -Ensure that you have maven installed. -Then: +To compile, run the `build` Gradle task. + ``` -maven clean package +./gradlew build ``` -This will automatically execute the shadow-jar goal in the package cycle. - -There will now be a .jar file located in /target - -You can now put this .jar file in the /plugins folder in a Spigot/CraftBukkit 1.17.1 server and run the server. +Jars will be output to `**/build/libs/cssminecraft-*.jar`. ## Configuration +The configuration file will be located in the server configuration directory, which depends on the platform. +Typically, this will be at: -MEMBER_ROLE_ID: The ID of the role that the plugin checks against when someone runs the /makegreen command. +* **bukkit**: `plugins/CSSMinecraft/config.yml` +* **fabric**: `config/cssminecraft/config.yml` +* **forge**: `config/cssminecraft/config.yml` -BRIDGE_CHANNEL_ID: The ID of the channel to send bridged messages to Minecraft. +```yaml +# The ID of the role that the plugin checks against when someone runs the /makegreen command. +member-role-id: 0 -DISCORD_SERVER_ID: The ID of the guild to interact with. +# The ID of the channel to send bridged messages to Minecraft. +bridge-channel-id: 0 -WEBHOOK_URL: The URL of the Discord webhook to send bridged messages from Minecraft. +# The ID of the guild to interact with. +discord-server-id: 0 -AVATAR_SERVICE: A link to an avatar service, with %s as a placeholder of the user's minecraft username. +# The URL of the Discord webhook to send bridged messages from Minecraft. +webhook-url: "" -BOT_TOKEN: The token of the Discord bot that will be detecting messages to send to Minecraft, as well as Member roles. +# The token of the Discord bot that will be detecting messages to send to Minecraft, as well as Member roles. +bot-token: "" +# A link to an avatar service, with %s as a placeholder of the user's minecraft username. +# This is used as the profile picture URL in webhook messages. +# We'd recommend the following value: https://cravatar.eu/helmhead/%s/190.png +avatar-service: "" + +# The verbosity of logging (0 = error only, 1 = +warnings, 2 = +info, 3 = +debug) +logging-level: 2 +``` ## Dependencies -This plugin depends on [LuckPerms](https://www.spigotmc.org/resources/luckperms.28140/), which needs to be placed alongside this in the /plugins folder. +This plugin optionally depends on [LuckPerms](https://luckperms.net/) to grant the member role. + +Without it, only the Discord message bridge will be functional. ## Development PR's welcome, feel free to do whatever. + +The project is written mostly in an abstract fashion to help re-use code across +different platforms. + +Each Gradle subproject has the following purpose: +* `/common`: platform-independent interfaces and implementations which houses most logic - the +following subprojects depend on this +* `/bukkit`: specific implementation for Bukkit / Spigot / Paper etc. +* `/fabric`: specific implementation for Fabric servers +* `/forge`: specific implementation for Forge servers + +Note that this is a server only mod, and will not work on clients. From d46b74e0ee39c1fc377405c0494fb1c40c41c1a4 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 00:58:16 +0100 Subject: [PATCH 12/20] Sanitise outgoing chat messages --- .../common/handler/ServerMessageEventHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java index 1f5c44f..2b8c5b2 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/ServerMessageEventHandler.java @@ -4,6 +4,7 @@ import com.cssbham.cssminecraft.common.event.Event; import com.cssbham.cssminecraft.common.event.EventHandler; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import net.dv8tion.jda.api.utils.MarkdownSanitizer; public class ServerMessageEventHandler extends EventHandler { @@ -15,8 +16,8 @@ public ServerMessageEventHandler(DiscordClientService discordClientService) { @Override public void handle(ServerMessageEvent event) { - //TODO sanitise - this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), event.message()); + String sanitisedMessage = MarkdownSanitizer.sanitize(event.message()).replace("@", "@\u200B"); + this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), sanitisedMessage); } } From fea324d7dc07583d771299d6c5974c2885177dcb Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 01:08:40 +0100 Subject: [PATCH 13/20] Dispatch events asynchronously --- .../bukkit/BukkitCSSMinecraftPlugin.java | 3 +- .../bukkit/listener/BukkitEventListener.java | 9 ++-- .../fabric/FabricCSSMinecraftPlugin.java | 2 +- .../fabric/listener/FabricEventAdapter.java | 21 ++++++++-- .../forge/ForgeCSSMinecraftPlugin.java | 2 +- .../forge/listener/ForgeEventAdapter.java | 42 ++++++++++++++++++- 6 files changed, 66 insertions(+), 13 deletions(-) diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java index 57d312b..8394771 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/BukkitCSSMinecraftPlugin.java @@ -7,7 +7,6 @@ import com.cssbham.cssminecraft.bukkit.logger.BukkitLogger; import com.cssbham.cssminecraft.common.AbstractCSSMinecraftPlugin; import com.cssbham.cssminecraft.common.adapter.ServerChatAdapter; -import com.cssbham.cssminecraft.common.command.CommandSender; import com.cssbham.cssminecraft.common.command.CommandService; import com.cssbham.cssminecraft.common.executor.ServerExecutor; import com.cssbham.cssminecraft.common.logger.Logger; @@ -39,7 +38,7 @@ public BukkitCSSMinecraftPlugin(JavaPlugin plugin) { public void enable() { super.enable(); - BukkitEventListener eventListener = new BukkitEventListener(plugin); + BukkitEventListener eventListener = new BukkitEventListener(plugin, executor); eventListener.bindPlatformToEventBus(super.getEventBus()); plugin.getCommand("makegreen").setExecutor(commandService); diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java index e5baa3a..2c5a137 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/listener/BukkitEventListener.java @@ -4,6 +4,7 @@ import com.cssbham.cssminecraft.common.event.EventBus; import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; import org.bukkit.entity.Player; @@ -19,10 +20,12 @@ public class BukkitEventListener implements Listener, PlatformEventAdapter { private final JavaPlugin plugin; + private final ServerExecutor executor; private EventBus eventBus; - public BukkitEventListener(JavaPlugin plugin) { + public BukkitEventListener(JavaPlugin plugin, ServerExecutor executor) { this.plugin = plugin; + this.executor = executor; } @Override @@ -35,9 +38,7 @@ public void bindPlatformToEventBus(EventBus eventBus) { private void dispatchEvent(Event event) { Objects.requireNonNull(event, "event bus not bound"); - plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> { - eventBus.dispatch(event); - }); + executor.doAsync(() -> eventBus.dispatch(event)); } @EventHandler diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java index 6c84ba5..dea7b8e 100644 --- a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/FabricCSSMinecraftPlugin.java @@ -40,7 +40,7 @@ public void enable() { super.enable(); - FabricEventAdapter eventAdapter = new FabricEventAdapter(); + FabricEventAdapter eventAdapter = new FabricEventAdapter(executor); eventAdapter.bindPlatformToEventBus(super.getEventBus()); } diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java index 70178e7..4ff3f02 100644 --- a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/listener/FabricEventAdapter.java @@ -1,21 +1,30 @@ package com.cssbham.cssminecraft.fabric.listener; +import com.cssbham.cssminecraft.common.event.Event; import com.cssbham.cssminecraft.common.event.EventBus; import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; +import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; import net.fabricmc.fabric.api.message.v1.ServerMessageEvents; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; import net.minecraft.server.network.ServerPlayerEntity; public class FabricEventAdapter implements PlatformEventAdapter { + + private final ServerExecutor executor; + + public FabricEventAdapter(ServerExecutor executor) { + this.executor = executor; + } + @Override public void bindPlatformToEventBus(EventBus eventBus) { - //TODO dispatch from thread ServerMessageEvents.CHAT_MESSAGE.register((message, player, parameters) -> { String name = player.getName().getString(); - eventBus.dispatch(new ServerMessageEvent( + dispatchEvent(eventBus, new ServerMessageEvent( player.getUuid(), player.getName().getString(), (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), @@ -27,7 +36,7 @@ public void bindPlatformToEventBus(EventBus eventBus) { ServerPlayerEntity player = handler.getPlayer(); String name = player.getName().getString(); - eventBus.dispatch(new PlayerJoinEvent( + dispatchEvent(eventBus, new PlayerJoinEvent( player.getUuid(), player.getName().getString(), (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), @@ -39,7 +48,7 @@ public void bindPlatformToEventBus(EventBus eventBus) { ServerPlayerEntity player = handler.getPlayer(); String name = player.getName().getString(); - eventBus.dispatch(new PlayerJoinEvent( + dispatchEvent(eventBus, new PlayerQuitEvent( player.getUuid(), player.getName().getString(), (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), @@ -47,4 +56,8 @@ public void bindPlatformToEventBus(EventBus eventBus) { )); }); } + + private void dispatchEvent(EventBus eventBus, Event event) { + executor.doAsync(() -> eventBus.dispatch(event)); + } } diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java index c260b8d..ad48b2d 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/ForgeCSSMinecraftPlugin.java @@ -40,7 +40,7 @@ public void enable() { super.enable(); - ForgeEventAdapter eventAdapter = new ForgeEventAdapter(); + ForgeEventAdapter eventAdapter = new ForgeEventAdapter(server, executor); eventAdapter.bindPlatformToEventBus(super.getEventBus()); } diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java index 115c51e..df8576e 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java @@ -3,16 +3,30 @@ import com.cssbham.cssminecraft.common.event.Event; import com.cssbham.cssminecraft.common.event.EventBus; import com.cssbham.cssminecraft.common.event.PlatformEventAdapter; +import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; +import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; +import com.cssbham.cssminecraft.common.executor.ServerExecutor; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.player.Player; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ServerChatEvent; +import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import java.util.Objects; public class ForgeEventAdapter implements PlatformEventAdapter { + private final MinecraftServer server; + private final ServerExecutor executor; + + public ForgeEventAdapter(MinecraftServer server, ServerExecutor executor) { + this.server = server; + this.executor = executor; + } + private EventBus eventBus; @Override @@ -25,7 +39,7 @@ public void bindPlatformToEventBus(EventBus eventBus) { private void dispatchEvent(Event event) { Objects.requireNonNull(event, "event bus not bound"); - eventBus.dispatch(event); + executor.doAsync(() -> eventBus.dispatch(event)); } @SubscribeEvent @@ -40,4 +54,30 @@ public void onChat(ServerChatEvent event) { event.getRawText() )); } + + @SubscribeEvent + public void onLogin(PlayerEvent.PlayerLoggedInEvent event) { + Player player = event.getEntity(); + String name = player.getName().getString(); + + dispatchEvent(new PlayerJoinEvent( + player.getUUID(), + name, + (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), + server.getPlayerCount() + 1 + )); + } + + @SubscribeEvent + public void onLogout(PlayerEvent.PlayerLoggedOutEvent event) { + Player player = event.getEntity(); + String name = player.getName().getString(); + + dispatchEvent(new PlayerQuitEvent( + player.getUUID(), + name, + (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), + server.getPlayerCount() - 1 + )); + } } From b4346bee2e69f7d16d9096be7940ea89a50e37fd Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 01:29:20 +0100 Subject: [PATCH 14/20] Fix server crashing if mod throws exception during initialisation --- .../cssminecraft/bukkit/CSSMinecraftLoader.java | 8 +++++++- .../common/AbstractCSSMinecraftPlugin.java | 7 ++++++- .../cssminecraft/fabric/CSSMinecraftLoader.java | 7 ++++++- .../cssminecraft/forge/CSSMinecraftLoader.java | 16 +++++++++++++--- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java index 4a5d727..c4d419d 100644 --- a/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java +++ b/bukkit/src/main/java/com/cssbham/cssminecraft/bukkit/CSSMinecraftLoader.java @@ -1,5 +1,6 @@ package com.cssbham.cssminecraft.bukkit; +import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; /** @@ -15,7 +16,12 @@ public CSSMinecraftLoader() { @Override public void onEnable() { - plugin.enable(); + try { + plugin.enable(); + } catch (Exception e) { + plugin.getLogger().severe("Plugin initialisation failed - disabling"); + Bukkit.getPluginManager().disablePlugin(this); + } } @Override diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java index 44513d6..6f20a53 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java @@ -47,7 +47,12 @@ public void enable() { this.eventBus = new SimpleEventBus(logger); this.discordClientService = new DiscordClientService(configService, eventBus, logger); - discordClientService.initialiseClients(); + try { + discordClientService.initialiseClients(); + } catch (Exception e) { + logger.severe(String.format("Failed to initialise Discord clients: %s", e.getMessage())); + throw e; + } eventBus.subscribe(ServerMessageEvent.class, new ServerMessageEventHandler(discordClientService)); eventBus.subscribe(PlayerJoinEvent.class, new PlayerJoinEventHandler(discordClientService)); diff --git a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java index 2c7c450..bede6c2 100644 --- a/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java +++ b/fabric/src/main/java/com/cssbham/cssminecraft/fabric/CSSMinecraftLoader.java @@ -23,7 +23,12 @@ public void onInitializeServer() { private void onStart(MinecraftServer server) { this.plugin.setServer(server); - this.plugin.enable(); + try { + this.plugin.enable(); + } catch (Exception e) { + this.plugin.getLogger().severe("Mod initialisation failed - disabling"); + this.plugin.disable(); + } } private void onStop(MinecraftServer server) { diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java index 6534ec9..2c97f44 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/CSSMinecraftLoader.java @@ -1,7 +1,8 @@ package com.cssbham.cssminecraft.forge; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.server.ServerStartedEvent; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.event.server.ServerStoppingEvent; import net.minecraftforge.fml.common.Mod; /** @@ -17,9 +18,18 @@ public CSSMinecraftLoader() { MinecraftForge.EVENT_BUS.addListener(this::onServerStarted); } - public void onServerStarted(ServerStartedEvent event) { + public void onServerStarted(ServerStartingEvent event) { this.plugin.setServer(event.getServer()); - this.plugin.enable(); + try { + this.plugin.enable(); + } catch (Exception e) { + this.plugin.getLogger().severe("Mod initialisation failed - disabling"); + this.plugin.disable(); + } + } + + public void onServerStopping(ServerStoppingEvent event) { + this.plugin.disable(); } } From 24fbcec0d52ece98eb1e513728ac1dc6fa9a8e6a Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 13:36:39 +0100 Subject: [PATCH 15/20] Add LuckPerms hook --- common/build.gradle | 1 + .../common/AbstractCSSMinecraftPlugin.java | 5 ++- .../handler/MakeGreenCommandHandler.java | 21 +++++++++- .../LuckPermsPermissionPluginService.java | 31 +++++++++++++++ .../permission/PermissionPluginService.java | 27 +++++++++++++ .../PermissionPluginServiceFactory.java | 38 +++++++++++++++++++ .../StubPermissionPluginService.java | 21 ++++++++++ 7 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/permission/LuckPermsPermissionPluginService.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginService.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginServiceFactory.java create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/permission/StubPermissionPluginService.java diff --git a/common/build.gradle b/common/build.gradle index 656a375..8cb6aff 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -12,6 +12,7 @@ dependencies { implementation "org.yaml:snakeyaml:2.2" compileOnly "net.kyori:adventure-api:4.17.0" + compileOnly "net.luckperms:api:5.4" } shadowJar { diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java index 6f20a53..867d777 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/AbstractCSSMinecraftPlugin.java @@ -20,6 +20,8 @@ import com.cssbham.cssminecraft.common.handler.PlayerQuitEventHandler; import com.cssbham.cssminecraft.common.handler.ServerMessageEventHandler; import com.cssbham.cssminecraft.common.logger.Logger; +import com.cssbham.cssminecraft.common.permission.PermissionPluginService; +import com.cssbham.cssminecraft.common.permission.PermissionPluginServiceFactory; import java.nio.file.Path; @@ -59,9 +61,10 @@ public void enable() { eventBus.subscribe(PlayerQuitEvent.class, new PlayerQuitEventHandler(discordClientService)); eventBus.subscribe(DiscordMessageEvent.class, new DiscordMessageEventHandler(provideServerChatAdapter())); + PermissionPluginService permissionPluginService = PermissionPluginServiceFactory.any(); CommandService commandService = provideCommandService(); - commandService.register("makegreen", new MakeGreenCommandHandler(discordClientService), "mg", "green"); + commandService.register("makegreen", new MakeGreenCommandHandler(discordClientService, permissionPluginService), "mg", "green"); } @Override diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java index 7f24092..959f0af 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java @@ -4,21 +4,31 @@ import com.cssbham.cssminecraft.common.command.CommandHandler; import com.cssbham.cssminecraft.common.command.CommandSender; import com.cssbham.cssminecraft.common.discord.DiscordClientService; +import com.cssbham.cssminecraft.common.permission.PermissionPluginService; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.TextDecoration; +import java.util.concurrent.ExecutionException; + public class MakeGreenCommandHandler implements CommandHandler { private final DiscordClientService discordClientService; + private final PermissionPluginService permissionPluginService; - public MakeGreenCommandHandler(DiscordClientService discordClientService) { + public MakeGreenCommandHandler(DiscordClientService discordClientService, PermissionPluginService permissionPluginService) { this.discordClientService = discordClientService; + this.permissionPluginService = permissionPluginService; } @Override public void handle(CommandSender sender, CommandContext context) { + if (!permissionPluginService.isAvailable()) { + sender.sendMessage(Component.text("There is no permissions plugin available.").color(NamedTextColor.RED)); + return; + } + if (sender.isConsole()) { sender.sendMessage(Component.text("Only players may use this command.").color(NamedTextColor.RED)); return; @@ -31,7 +41,14 @@ public void handle(CommandSender sender, CommandContext context) { } if (discordClientService.getDiscordClient().isMember(arg)) { - //TODO the luckperms stuff + sender.sendMessage(Component.text("Making you green...").color(NamedTextColor.GRAY)); + try { + permissionPluginService.grantMemberRole(sender.getUuid()).get(); + } catch (InterruptedException | ExecutionException e) { + sender.sendMessage(Component.text("There was a problem making you green. Try again later.") + .color(NamedTextColor.RED)); + throw new RuntimeException(e); + } sender.sendMessage(Component.text("Congratulations, you are now green!").color(NamedTextColor.GREEN)); } else { sender.sendMessage(Component.text("You don't appear to be a ").color(NamedTextColor.RED).append( diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/permission/LuckPermsPermissionPluginService.java b/common/src/main/java/com/cssbham/cssminecraft/common/permission/LuckPermsPermissionPluginService.java new file mode 100644 index 0000000..d77e783 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/permission/LuckPermsPermissionPluginService.java @@ -0,0 +1,31 @@ +package com.cssbham.cssminecraft.common.permission; + +import net.luckperms.api.LuckPerms; +import net.luckperms.api.LuckPermsProvider; +import net.luckperms.api.node.Node; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; + +/** + * {@link PermissionPluginService} implementation for LuckPerms + */ +public class LuckPermsPermissionPluginService implements PermissionPluginService { + + @Override + public CompletableFuture grantMemberRole(UUID player) { + LuckPerms perms = LuckPermsProvider.get(); + return perms.getUserManager().modifyUser(player, + user -> { + user.data().add(Node.builder("group.member").build()); + user.data().remove(Node.builder("group.guest").build()); + } + ); + } + + @Override + public boolean isAvailable() { + return true; + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginService.java b/common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginService.java new file mode 100644 index 0000000..dcf874b --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginService.java @@ -0,0 +1,27 @@ +package com.cssbham.cssminecraft.common.permission; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; + +/** + * A permission plugin service. This service wraps the function calls + * of a permissions plugin. + */ +public interface PermissionPluginService { + + /** + * Grant the Member role to a player + * + * @param player the player uuid + * @return a future + */ + CompletableFuture grantMemberRole(UUID player); + + /** + * Get whether the service is usable + * + * @return true if it can be used, false otherwise + */ + boolean isAvailable(); + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginServiceFactory.java b/common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginServiceFactory.java new file mode 100644 index 0000000..01e4cdd --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/permission/PermissionPluginServiceFactory.java @@ -0,0 +1,38 @@ +package com.cssbham.cssminecraft.common.permission; + +import java.lang.reflect.InvocationTargetException; + +/** + * Factory methods for getting a {@link PermissionPluginService} + */ +public class PermissionPluginServiceFactory { + + public static PermissionPluginService any() { + String[] plugins = new String[]{ "LuckPerms" }; + for (String plugin : plugins) { + try { + return forPlugin(plugin); + } catch (RuntimeException ignored) { } + } + return new StubPermissionPluginService(); + } + + public static PermissionPluginService forPlugin(String plugin) { + try { + return switch (plugin) { + case "LuckPerms" -> checkClassAndBuild("net.luckperms.api.LuckPermsProvider", LuckPermsPermissionPluginService.class); + default -> new StubPermissionPluginService(); + }; + } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | NoSuchMethodException | + InvocationTargetException e) { + throw new RuntimeException(String.format("Permission plugin %s is not available", plugin)); + } + } + + private static PermissionPluginService checkClassAndBuild(String className, Class clazz) + throws ClassNotFoundException, InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException { + Class.forName(className); + return clazz.getDeclaredConstructor().newInstance(); + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/permission/StubPermissionPluginService.java b/common/src/main/java/com/cssbham/cssminecraft/common/permission/StubPermissionPluginService.java new file mode 100644 index 0000000..bc2f5cc --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/permission/StubPermissionPluginService.java @@ -0,0 +1,21 @@ +package com.cssbham.cssminecraft.common.permission; + +import java.util.UUID; +import java.util.concurrent.CompletableFuture; + +/** + * A stub permission plugin service, for when no plugin is available + */ +public class StubPermissionPluginService implements PermissionPluginService { + + @Override + public CompletableFuture grantMemberRole(UUID player) { + throw new UnsupportedOperationException("No permission plugin available!"); + } + + @Override + public boolean isAvailable() { + return false; + } + +} From d3d93a5513c552038f982016a08fa41c80a0ebd4 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 14:06:43 +0100 Subject: [PATCH 16/20] Add LuckPerms dependency to mod/plugin manifests --- bukkit/src/main/resources/plugin.yml | 2 +- fabric/src/main/resources/fabric.mod.json | 3 +++ .../cssminecraft/forge/listener/ForgeEventAdapter.java | 2 +- forge/src/main/resources/META-INF/mods.toml | 9 ++++++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 7ec3913..b5a953c 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -5,7 +5,7 @@ api-version: 1.21 # probably authors: [ RaineTheBoosted, LMBishop ] description: CSS' Minecraft plugin website: https://github.com/CSSUoB/CSS-Minecraft -softdepend: [ LuckPerms ] # TODO change back to depends +softdepend: [ LuckPerms ] commands: makegreen: description: Make yourself green by verifying your CSS membership. diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 14ba0ac..590ab9f 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -18,5 +18,8 @@ "minecraft": "~1.21", "java": ">=21", "fabric-api": "*" + }, + "recommends": { + "luckperms": "*" } } \ No newline at end of file diff --git a/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java b/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java index df8576e..51ec243 100644 --- a/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java +++ b/forge/src/main/java/com/cssbham/cssminecraft/forge/listener/ForgeEventAdapter.java @@ -64,7 +64,7 @@ public void onLogin(PlayerEvent.PlayerLoggedInEvent event) { player.getUUID(), name, (null == player.getDisplayName()) ? name : player.getDisplayName().getString(), - server.getPlayerCount() + 1 + server.getPlayerCount() )); } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index d5f96d6..193bf52 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -12,4 +12,11 @@ logoFile="logo.png" authors="LMBishop" description=''' CSS' Minecraft plugin - ''' \ No newline at end of file + ''' + +[[dependencies.luckperms]] +modId="luckperms" +mandatory=false +versionRange="" +ordering="AFTER" +side="SERVER" From 39bc710fae3d024a7d5dad546b25cb4e209b082a Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 17:38:54 +0100 Subject: [PATCH 17/20] Make player join and leave messages more gramatically correct --- .../AbstractPlayerJoinLeaveEventHandler.java | 16 ++++++++++++++++ .../common/handler/PlayerJoinEventHandler.java | 5 ++--- .../common/handler/PlayerQuitEventHandler.java | 5 ++--- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 common/src/main/java/com/cssbham/cssminecraft/common/handler/AbstractPlayerJoinLeaveEventHandler.java diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/AbstractPlayerJoinLeaveEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/AbstractPlayerJoinLeaveEventHandler.java new file mode 100644 index 0000000..2408f21 --- /dev/null +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/AbstractPlayerJoinLeaveEventHandler.java @@ -0,0 +1,16 @@ +package com.cssbham.cssminecraft.common.handler; + +import com.cssbham.cssminecraft.common.event.Event; +import com.cssbham.cssminecraft.common.event.EventHandler; + +public abstract class AbstractPlayerJoinLeaveEventHandler extends EventHandler { + + protected String getPlayerCountMessage(int count) { + return switch (count) { + case 0 -> "there are now no players online"; + case 1 -> "there is now 1 player online"; + default -> "there are now " + count + " players online"; + }; + } + +} diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java index 37085a8..7edb2fb 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerJoinEventHandler.java @@ -5,7 +5,7 @@ import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; import com.cssbham.cssminecraft.common.event.events.ServerMessageEvent; -public class PlayerJoinEventHandler extends EventHandler { +public class PlayerJoinEventHandler extends AbstractPlayerJoinLeaveEventHandler { private final DiscordClientService discordClientService; @@ -15,8 +15,7 @@ public PlayerJoinEventHandler(DiscordClientService discordClientService) { @Override public void handle(PlayerJoinEvent event) { - String joinMessage = String.format("__*has joined the server, there are now %d players online*__", - event.newPlayerCount()); + String joinMessage = String.format("__*has joined the server, %s*__", getPlayerCountMessage(event.newPlayerCount())); this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), joinMessage); } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java index 1b4f55b..c7938d5 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/handler/PlayerQuitEventHandler.java @@ -5,7 +5,7 @@ import com.cssbham.cssminecraft.common.event.events.PlayerJoinEvent; import com.cssbham.cssminecraft.common.event.events.PlayerQuitEvent; -public class PlayerQuitEventHandler extends EventHandler { +public class PlayerQuitEventHandler extends AbstractPlayerJoinLeaveEventHandler { private final DiscordClientService discordClientService; @@ -15,8 +15,7 @@ public PlayerQuitEventHandler(DiscordClientService discordClientService) { @Override public void handle(PlayerQuitEvent event) { - String joinMessage = String.format("__*has left the server, there are now %d players online*__", - event.newPlayerCount()); + String joinMessage = String.format("__*has left the server, %s*__", getPlayerCountMessage(event.newPlayerCount())); this.discordClientService.getWebHookClient().sendMessageAsMinecraftUser(event.username(), event.displayName(), joinMessage); } From 4ea0b36b208596676fc6d907b1073f226e0c738d Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Thu, 15 Aug 2024 17:40:30 +0100 Subject: [PATCH 18/20] Fix incorrect dependency in forge manifest --- forge/src/main/resources/META-INF/mods.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 193bf52..2dcbc73 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -14,7 +14,7 @@ description=''' CSS' Minecraft plugin ''' -[[dependencies.luckperms]] +[[dependencies.cssminecraft]] modId="luckperms" mandatory=false versionRange="" From 7e0ccfd5ec0c088cea583e5f7aa6eeb9ab8df31e Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Tue, 27 Aug 2024 19:32:24 +0100 Subject: [PATCH 19/20] Add version matrix to README.md --- README.md | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/README.md b/README.md index 4334eb1..6b5de71 100644 --- a/README.md +++ b/README.md @@ -66,3 +66,45 @@ following subprojects depend on this * `/forge`: specific implementation for Forge servers Note that this is a server only mod, and will not work on clients. + +## Version matrix + +The following table documents mod compatibility for older versions of Minecraft and their platforms. +Any versions prior to 1.12.1 are backports. + +If a Minecraft version is not listed here, then no version of the mod exists for it. + +All version branches will follow the name `minecraft/`. + +| Minecraft | Java | Bukkit | Forge | Fabric | Links | +|-----------|------|--------|-------|--------|-------------------------------------------------------------------------| +| 1.21.1 | 21 | ✅ | ✅ | ✅ | (master) | +| 1.18.2 | 17 | ❌ | ❌ | ✅ | [Branch](https://github.com/CSSUoB/CSS-Minecraft/tree/minecraft/1.18.2) | +| 1.12.2 | 8 | ❌ | ✅ | ❌ | [Branch](https://github.com/CSSUoB/CSS-Minecraft/tree/minecraft/1.12.2) | + +**Never merge `minecraft/*` branches into master.** Build features/fixes in master and cherry-pick backwards. + +### Upgrading to future versions + +The `master` branch should always target the latest version. +Before upgrading, create a new release branch for the current version using the naming +scheme `minecraft/`. + +Then, make the necessary changes to upgrade Minecraft version. Bukkit / Spigot / Paper +has a stable enough API where not many changes will be needed (if any at all), but +other platforms will likely break. + +Once changes are done, update the version matrix and open a new PR to `master`. + +### Backporting to older versions + +This mod was originally made for Minecraft 1.21, thus +it will require backporting to work on older modpacks. + +Create a branch from the nearest Minecraft version and name it `minecraft/`. +You may be required to change the Java version, or upgrade/downgrade Gradle. +It should be noted that Fabric does not exist prior to Minecraft 1.14. + +Once finished, push the branch to GitHub and update this version matrix with the platform +and version you have backported. + From 99c1df586c98e4f951bff2f27488a6592370b6be Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Sat, 31 Aug 2024 18:14:40 +0100 Subject: [PATCH 20/20] De-mattify variable names and update Discord username regex --- .../handler/MakeGreenCommandHandler.java | 4 +++- .../config/source/YamlConfigSource.java | 18 +++++++++--------- .../discord/client/JDADiscordClient.java | 19 ++++++++++--------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java b/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java index 959f0af..b9ba9dd 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/command/handler/MakeGreenCommandHandler.java @@ -14,6 +14,8 @@ public class MakeGreenCommandHandler implements CommandHandler { + private static final String DISCORD_USERNAME_PATTERN = "[a-z0-9._]{2,32}"; + private final DiscordClientService discordClientService; private final PermissionPluginService permissionPluginService; @@ -35,7 +37,7 @@ public void handle(CommandSender sender, CommandContext context) { } String arg = String.join(" ", context.args()); - if (!arg.matches("[a-z0-9._]{2,32}|.{2,32}#[0-9]{4}")) { + if (!arg.matches(DISCORD_USERNAME_PATTERN)) { sender.sendMessage(Component.text("Invalid Discord tag format.").color(NamedTextColor.RED)); return; } diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java index cb88865..18042fe 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/config/source/YamlConfigSource.java @@ -65,28 +65,28 @@ private void createDefaultIfNotExists() throws IOException { @Override public int getInteger(String path, int def) { if (null == data) return def; - Object val = data.getOrDefault(path, def); - if (!(val instanceof Number)) return def; + Object object = data.getOrDefault(path, def); + if (!(object instanceof Number value)) return def; - return ((Number) val).intValue(); + return value.intValue(); } @Override public long getLong(String path, long def) { if (null == data) return def; - Object val = data.getOrDefault(path, def); - if (!(val instanceof Number)) return def; + Object object = data.getOrDefault(path, def); + if (!(object instanceof Number value)) return def; - return ((Number) val).longValue(); + return value.longValue(); } @Override public boolean getBoolean(String path, boolean def) { if (null == data) return def; - Object val = data.getOrDefault(path, def); - if (!(val instanceof Boolean)) return def; + Object object = data.getOrDefault(path, def); + if (!(object instanceof Boolean value)) return def; - return (boolean) val; + return value; } @Override diff --git a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java index f4e4b14..49814b7 100644 --- a/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java +++ b/common/src/main/java/com/cssbham/cssminecraft/common/discord/client/JDADiscordClient.java @@ -86,15 +86,16 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) { @Override public boolean isMember(String identifier) { - Guild g = jda.getGuildById(discordServerId); - if (g == null) return false; - Member m = g.getMembers().stream() - .filter(mm -> - (mm.getUser().getName() + "#" + mm.getUser().getDiscriminator()).equalsIgnoreCase(identifier) || - mm.getUser().getName().equalsIgnoreCase(identifier) - ).findFirst().orElse(null); - if (m == null) return false; - return m.getRoles().stream().anyMatch(r -> r.getIdLong() == memberRoleId); + Guild guild = jda.getGuildById(discordServerId); + if (null == guild) return false; + + Member member = guild.getMembers().stream() + .filter(m -> m.getUser().getName().equalsIgnoreCase(identifier)) + .findFirst() + .orElse(null); + if (null == member) return false; + + return member.getRoles().stream().anyMatch(r -> r.getIdLong() == memberRoleId); } }