diff --git a/ansible/build.gradle.kts b/ansible/build.gradle.kts index c90314905..54523c236 100644 --- a/ansible/build.gradle.kts +++ b/ansible/build.gradle.kts @@ -66,6 +66,7 @@ dependencies { pvpPlugin(project(path = ":plugins:namecolors-paper")) proxyPlugin(project(path = ":plugins:civproxy-velocity")) + proxyPlugin(project(path = ":plugins:announcements-velocity", configuration = "shadow")) } val copyPaperPlugins = tasks.register("copyPaperPlugins") { diff --git a/build.gradle.kts b/build.gradle.kts index 9472d0b6c..e385c3b9d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,5 +31,6 @@ allprojects { maven("https://repo.infernalsuite.com/repository/maven-snapshots/") maven("https://repo.rapture.pw/repository/maven-releases/") maven("https://jitpack.io") + maven("https://repo.ajg0702.us/releases") } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 46627e020..8eaf3b652 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,6 +2,8 @@ paper = "1.21.8-R0.1-SNAPSHOT" junit = "5.8.2" nuotifier = "2.7.2" +velocity = "3.4.0-SNAPSHOT" +configurate = "4.2.0" [plugins] paper-userdev = { id = "io.papermc.paperweight.userdev", version = "2.0.0-beta.17" } @@ -10,6 +12,7 @@ runpaper = { id = "xyz.jpenilla.run-paper", version = "2.3.1" } [libraries] paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } +velocity-api = { group = "com.velocitypowered", name = "velocity-api", version.ref = "velocity"} aikar-acf = { group = "co.aikar", name = "acf-paper", version = "0.5.1-SNAPSHOT" } aikar-taskchain = { group = "co.aikar", name = "taskchain-bukkit", version = "3.7.2" } @@ -18,6 +21,10 @@ commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version commons-collections4 = { group = "org.apache.commons", name = "commons-collections4", version = "4.4" } commons-math3 = { group = "org.apache.commons", name = "commons-math3", version = "3.6.1" } +cron-utils = { group = "com.cronutils", name = "cron-utils", version = "9.2.1" } + +configurate-yaml = { group = "org.spongepowered", name = "configurate-yaml", version.ref = "configurate" } + rabbitmq-client = { group = "com.rabbitmq", name = "amqp-client", version = "5.17.1" } nuvotifier-api = { group = "com.github.NuVotifier.NuVotifier", name = "nuvotifier-api", version.ref = "nuotifier" } diff --git a/plugins/announcements-velocity/build.gradle.kts b/plugins/announcements-velocity/build.gradle.kts new file mode 100644 index 000000000..9a5da4709 --- /dev/null +++ b/plugins/announcements-velocity/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + alias(libs.plugins.shadow) +} + +version = "1.0.0" + +dependencies { + compileOnly(libs.velocity.api) + annotationProcessor(libs.velocity.api) + + implementation(libs.cron.utils) + implementation(libs.configurate.yaml) +} diff --git a/plugins/announcements-velocity/src/main/java/net/civmc/announcements/AnnouncementsPlugin.java b/plugins/announcements-velocity/src/main/java/net/civmc/announcements/AnnouncementsPlugin.java new file mode 100644 index 000000000..5448fe10c --- /dev/null +++ b/plugins/announcements-velocity/src/main/java/net/civmc/announcements/AnnouncementsPlugin.java @@ -0,0 +1,155 @@ +package net.civmc.announcements; + +import com.cronutils.model.Cron; +import com.cronutils.model.CronType; +import com.cronutils.model.definition.CronDefinitionBuilder; +import com.cronutils.model.time.ExecutionTime; +import com.cronutils.parser.CronParser; +import com.google.inject.Inject; +import com.velocitypowered.api.event.Subscribe; +import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; +import com.velocitypowered.api.plugin.Plugin; +import com.velocitypowered.api.plugin.annotation.DataDirectory; +import com.velocitypowered.api.proxy.ProxyServer; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.ZonedDateTime; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; +import net.kyori.adventure.title.Title; +import org.jetbrains.annotations.Nullable; +import org.slf4j.Logger; +import org.spongepowered.configurate.CommentedConfigurationNode; +import org.spongepowered.configurate.ConfigurationNode; +import org.spongepowered.configurate.yaml.YamlConfigurationLoader; + +@Plugin(id = "civannouncements", name = "Civ Announcements", version = "1.0.0", + url = "https://civmc.net", description = "Sends various announcements", authors = {"Huskydog9988"}) +public class AnnouncementsPlugin { + + private final CronParser cronParser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.UNIX)); + + private final ProxyServer server; + private final Logger logger; + private final Path dataDirectory; + + private record Announcement(Component message, Boolean showTitle) {} + + private final Map scheduledAnnouncements = new ConcurrentHashMap<>(); + private final Map lastExecutionTimes = new ConcurrentHashMap<>(); + private @Nullable CommentedConfigurationNode config; + + @Inject + public AnnouncementsPlugin(ProxyServer server, Logger logger, @DataDirectory Path dataDirectory) { + this.server = server; + this.logger = logger; + this.dataDirectory = dataDirectory; + } + + @Subscribe + public void onProxyInitialization(ProxyInitializeEvent event) { + logger.info("Initializing Announcements plugin"); + + loadConfig(); + scheduleTasks(); + + // task to check if a scheduled announcement should be sent + server.getScheduler().buildTask(this, this::sendScheduledMessages).repeat(5, TimeUnit.SECONDS).schedule(); + } + + private void scheduleTasks() { + var minimessageSerializer = MiniMessage.miniMessage(); + + // ensure config exists + if (config == null) { + logger.info("Config is null"); + return; + } + + // read scheduled announcements from config + List announcements = config.node("scheduledAnnouncements").childrenList(); + for (ConfigurationNode announcement : announcements) { + Cron cron = cronParser.parse(Objects.requireNonNull(announcement.node("cron").getString())); + // convert message to Component + Component formatedMsg = minimessageSerializer.deserialize(Objects.requireNonNull(announcement.node("message").getString())); + Boolean showTitle = announcement.node("showTitle").getBoolean(); + scheduledAnnouncements.put(cron, new Announcement(formatedMsg, showTitle)); + } + } + + /** + * Checks if a scheduled message needs to be sent, and sends them if so + */ + private void sendScheduledMessages() { + ZonedDateTime now = ZonedDateTime.now().withNano(0); + + for (Cron cron : scheduledAnnouncements.keySet()) { + var executionTime = ExecutionTime.forCron(cron); + + // get last time a cron *should* have run + executionTime.lastExecution(now).ifPresent(lastExecution -> { + // Check if we should execute, and if con already executed at that time + if (executionTime.isMatch(now) && !lastExecution.equals(lastExecutionTimes.get(cron))) { + // Execute and update the last execution time + var announcement = scheduledAnnouncements.get(cron); + server.sendMessage(announcement.message); + lastExecutionTimes.put(cron, lastExecution); + if (announcement.showTitle) { + // send title to all players + var title = Title.title(announcement.message, Component.empty()); + server.getAllPlayers().parallelStream().forEach(player -> + player.showTitle(title) + ); + } + + logger.info("Announcement sent: {}", announcement.message); + } + }); + } + } + + /** + * Loads the config from disk, and creates it if necessary + */ + private void loadConfig() { + try { + // ensure data directory exists + if (!Files.exists(dataDirectory)) { + Files.createDirectories(dataDirectory); + } + } catch (IOException e) { + logger.error("Could not create data directory: {}", dataDirectory, e); + return; + } + + // create config file if it doesn't exist + Path configFile = dataDirectory.resolve("config.yml"); + if (!Files.exists(configFile)) { + try (InputStream in = getClass().getResourceAsStream("/config.yml")) { + if (in != null) { + Files.copy(in, configFile); + logger.info("Default configuration file created."); + } else { + logger.error("Default configuration file is missing in resources!"); + return; + } + } catch (IOException e) { + logger.error("Could not create default configuration file: {}", configFile, e); + } + } + + YamlConfigurationLoader loader = YamlConfigurationLoader.builder().path(configFile).build(); + try { + config = loader.load(); + } catch (IOException e) { + throw new RuntimeException("Could not load configuration file: " + configFile, e); + } + } +} diff --git a/plugins/announcements-velocity/src/main/resources/config.yml b/plugins/announcements-velocity/src/main/resources/config.yml new file mode 100644 index 000000000..e4fa6968a --- /dev/null +++ b/plugins/announcements-velocity/src/main/resources/config.yml @@ -0,0 +1,15 @@ + +# messages must be in minimessage format +# https://webui.advntr.dev/ +scheduledAnnouncements: + - cron: "0 1 * * *" + message: "Restart in 1 hour" + - cron: "45 1 * * *" + message: "Restart in 15 minutes" + showTitle: false + - cron: "55 1 * * *" + message: "Restart in 5 minutes" + showTitle: true + - cron: "59 1 * * *" + message: "Restart in 1 minute" + showTitle: true diff --git a/plugins/banstick-paper/build.gradle.kts b/plugins/banstick-paper/build.gradle.kts index 78cc5e9da..0f52f7dcc 100644 --- a/plugins/banstick-paper/build.gradle.kts +++ b/plugins/banstick-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.shadow) } version = "2.0.1" diff --git a/plugins/bastion-paper/build.gradle.kts b/plugins/bastion-paper/build.gradle.kts index 37c8ed89a..360c479c3 100644 --- a/plugins/bastion-paper/build.gradle.kts +++ b/plugins/bastion-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "3.0.1" diff --git a/plugins/castlegates-paper/build.gradle.kts b/plugins/castlegates-paper/build.gradle.kts index 8c4d23298..d2c7cff82 100644 --- a/plugins/castlegates-paper/build.gradle.kts +++ b/plugins/castlegates-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.0.2" diff --git a/plugins/citadel-paper/build.gradle.kts b/plugins/citadel-paper/build.gradle.kts index 3035765c7..96052f0ea 100644 --- a/plugins/citadel-paper/build.gradle.kts +++ b/plugins/citadel-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "5.2.4" diff --git a/plugins/civchat2-paper/build.gradle.kts b/plugins/civchat2-paper/build.gradle.kts index 7f74daa1f..c0ee8cbaf 100644 --- a/plugins/civchat2-paper/build.gradle.kts +++ b/plugins/civchat2-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.2.2" diff --git a/plugins/civduties-paper/build.gradle.kts b/plugins/civduties-paper/build.gradle.kts index 2263e7fb0..56031b19f 100644 --- a/plugins/civduties-paper/build.gradle.kts +++ b/plugins/civduties-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "1.5.0-SNAPSHOT" diff --git a/plugins/civmodcore-paper/build.gradle.kts b/plugins/civmodcore-paper/build.gradle.kts index 0b612f9fc..5e6859b53 100644 --- a/plugins/civmodcore-paper/build.gradle.kts +++ b/plugins/civmodcore-paper/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") - id("xyz.jpenilla.run-paper") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.shadow) + alias(libs.plugins.runpaper) } version = "3.0.6" diff --git a/plugins/civproxy-velocity/build.gradle.kts b/plugins/civproxy-velocity/build.gradle.kts index 2c5b57157..d62eefe8b 100644 --- a/plugins/civproxy-velocity/build.gradle.kts +++ b/plugins/civproxy-velocity/build.gradle.kts @@ -1,11 +1,5 @@ version = "1.0.0" -repositories { - maven { - url = uri("https://repo.ajg0702.us/releases") - } -} - dependencies { compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT") compileOnly("us.ajg0702.queue.api:api:2.8.0") diff --git a/plugins/combattagplus-paper/build.gradle.kts b/plugins/combattagplus-paper/build.gradle.kts index 78587a87f..7847d5a94 100644 --- a/plugins/combattagplus-paper/build.gradle.kts +++ b/plugins/combattagplus-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("xyz.jpenilla.run-paper") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.runpaper) } version = "2.0.1" diff --git a/plugins/essenceglue-paper/build.gradle.kts b/plugins/essenceglue-paper/build.gradle.kts index 54ee29144..340775fda 100644 --- a/plugins/essenceglue-paper/build.gradle.kts +++ b/plugins/essenceglue-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.0.0-SNAPSHOT" diff --git a/plugins/exilepearl-paper/build.gradle.kts b/plugins/exilepearl-paper/build.gradle.kts index 0938d56c1..eb6928273 100644 --- a/plugins/exilepearl-paper/build.gradle.kts +++ b/plugins/exilepearl-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.1.6" diff --git a/plugins/factorymod-paper/build.gradle.kts b/plugins/factorymod-paper/build.gradle.kts index 77053c962..a0af4c9ae 100644 --- a/plugins/factorymod-paper/build.gradle.kts +++ b/plugins/factorymod-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "3.1.0" diff --git a/plugins/finale-paper/build.gradle.kts b/plugins/finale-paper/build.gradle.kts index 374d9b3c4..967894b2a 100644 --- a/plugins/finale-paper/build.gradle.kts +++ b/plugins/finale-paper/build.gradle.kts @@ -1,9 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") -} - -repositories { - maven("https://repo.dmulloy2.net/repository/public") + alias(libs.plugins.paper.userdev) } version = "2.1.0" diff --git a/plugins/heliodor-paper/build.gradle.kts b/plugins/heliodor-paper/build.gradle.kts index f3ded5a51..1521a452b 100644 --- a/plugins/heliodor-paper/build.gradle.kts +++ b/plugins/heliodor-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "1.0.0" diff --git a/plugins/hiddenore-paper/build.gradle.kts b/plugins/hiddenore-paper/build.gradle.kts index fd5a358cc..287545ff8 100644 --- a/plugins/hiddenore-paper/build.gradle.kts +++ b/plugins/hiddenore-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.0.0-SNAPSHOT" diff --git a/plugins/itemexchange-paper/build.gradle.kts b/plugins/itemexchange-paper/build.gradle.kts index 5fe6095b1..d2e56285a 100644 --- a/plugins/itemexchange-paper/build.gradle.kts +++ b/plugins/itemexchange-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.0.2" diff --git a/plugins/jukealert-paper/build.gradle.kts b/plugins/jukealert-paper/build.gradle.kts index 3fec7dbc8..638687488 100644 --- a/plugins/jukealert-paper/build.gradle.kts +++ b/plugins/jukealert-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.shadow) } version = "3.0.8" diff --git a/plugins/kirabukkitgateway-paper/build.gradle.kts b/plugins/kirabukkitgateway-paper/build.gradle.kts index b829debf3..a4fa7d830 100644 --- a/plugins/kirabukkitgateway-paper/build.gradle.kts +++ b/plugins/kirabukkitgateway-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.shadow) } version = "2.0.3" diff --git a/plugins/kitpvp-paper/build.gradle.kts b/plugins/kitpvp-paper/build.gradle.kts index 8a3ce398d..4e1546852 100644 --- a/plugins/kitpvp-paper/build.gradle.kts +++ b/plugins/kitpvp-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("com.gradleup.shadow") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.shadow) } version = "1.0.0" diff --git a/plugins/namecolors-paper/build.gradle.kts b/plugins/namecolors-paper/build.gradle.kts index ddc9d2aad..8b3cb90d4 100644 --- a/plugins/namecolors-paper/build.gradle.kts +++ b/plugins/namecolors-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.0.0-SNAPSHOT" diff --git a/plugins/namelayer-paper/build.gradle.kts b/plugins/namelayer-paper/build.gradle.kts index cb2f1612d..95c3e8372 100644 --- a/plugins/namelayer-paper/build.gradle.kts +++ b/plugins/namelayer-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "3.0.6" diff --git a/plugins/railswitch-paper/build.gradle.kts b/plugins/railswitch-paper/build.gradle.kts index dd8441e83..699fbacf8 100644 --- a/plugins/railswitch-paper/build.gradle.kts +++ b/plugins/railswitch-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.0.0-SNAPSHOT" diff --git a/plugins/randomspawn-paper/build.gradle.kts b/plugins/randomspawn-paper/build.gradle.kts index 6a92fb9c8..46f5d2ff4 100644 --- a/plugins/randomspawn-paper/build.gradle.kts +++ b/plugins/randomspawn-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "3.0.4" diff --git a/plugins/realisticbiomes-paper/build.gradle.kts b/plugins/realisticbiomes-paper/build.gradle.kts index 34acfb202..e3a5b57bb 100644 --- a/plugins/realisticbiomes-paper/build.gradle.kts +++ b/plugins/realisticbiomes-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("xyz.jpenilla.run-paper") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.runpaper) } version = "3.2.3" diff --git a/plugins/realisticbiomes2-paper/build.gradle.kts b/plugins/realisticbiomes2-paper/build.gradle.kts index 34acfb202..e3a5b57bb 100644 --- a/plugins/realisticbiomes2-paper/build.gradle.kts +++ b/plugins/realisticbiomes2-paper/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - id("io.papermc.paperweight.userdev") - id("xyz.jpenilla.run-paper") + alias(libs.plugins.paper.userdev) + alias(libs.plugins.runpaper) } version = "3.2.3" diff --git a/plugins/simpleadminhacks-paper/build.gradle.kts b/plugins/simpleadminhacks-paper/build.gradle.kts index 79464ee17..dc4276170 100644 --- a/plugins/simpleadminhacks-paper/build.gradle.kts +++ b/plugins/simpleadminhacks-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "2.3.2" diff --git a/plugins/voidworld-paper/build.gradle.kts b/plugins/voidworld-paper/build.gradle.kts index 4b3f82978..435c1ff42 100644 --- a/plugins/voidworld-paper/build.gradle.kts +++ b/plugins/voidworld-paper/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("io.papermc.paperweight.userdev") + alias(libs.plugins.paper.userdev) } version = "1.0.0" diff --git a/settings.gradle.kts b/settings.gradle.kts index 096f8e0c2..4ae9c051a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -13,6 +13,7 @@ plugins { include(":ansible") +include(":plugins:announcements-velocity") include(":plugins:banstick-paper") include(":plugins:bastion-paper") include(":plugins:castlegates-paper")