From 74c4e7b9f219d33ae9e6cd4d47867d56b4e4886e Mon Sep 17 00:00:00 2001 From: Cola Date: Wed, 18 May 2022 16:04:54 +0100 Subject: [PATCH] 1.18.2 --- plugins/namecolors-paper/build.gradle.kts | 114 +++++++----------- .../namecolors-paper/paper/build.gradle.kts | 20 +++ .../namecolors/NameColorSetting.java | 2 +- .../biggestnerd/namecolors/NameColors.java | 12 +- .../{ => paper}/src/main/resources/plugin.yml | 4 +- plugins/namecolors-paper/settings.gradle.kts | 15 ++- 6 files changed, 81 insertions(+), 86 deletions(-) create mode 100644 plugins/namecolors-paper/paper/build.gradle.kts rename plugins/namecolors-paper/{ => paper}/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java (99%) rename plugins/namecolors-paper/{ => paper}/src/main/java/com/biggestnerd/namecolors/NameColors.java (80%) rename plugins/namecolors-paper/{ => paper}/src/main/resources/plugin.yml (91%) diff --git a/plugins/namecolors-paper/build.gradle.kts b/plugins/namecolors-paper/build.gradle.kts index ee56e7753..13b52f959 100644 --- a/plugins/namecolors-paper/build.gradle.kts +++ b/plugins/namecolors-paper/build.gradle.kts @@ -1,87 +1,55 @@ -/* - * This file was generated by the Gradle 'init' task. - */ +import net.civmc.civgradle.common.util.civRepo plugins { - `java-library` - `maven-publish` - id("io.papermc.paperweight.userdev") version "1.3.1" + `java-library` + `maven-publish` + id("net.civmc.civgradle.plugin") version "1.0.0-SNAPSHOT" } -group = "net.civmc" -version = "1.3.0-SNAPSHOT" -description = "NameColors" - -repositories { - fun civRepo(name: String) { - maven { - url = uri("https://maven.pkg.github.com/CivMC/${name}") - credentials { - // These need to be set in the user environment variables - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - mavenCentral() - civRepo("CivModCore") - civRepo("NameLayer") - civRepo("CivChat2") - - maven("https://repo.kryptonmc.org/releases") +allprojects { + group = "net.civmc.namecolors" + version = "1.3.0-SNAPSHOT" + description = "NameColors" } -dependencies { - paperDevBundle("1.18-R0.1-SNAPSHOT") +subprojects { + apply(plugin = "net.civmc.civgradle.plugin") + apply(plugin = "java-library") + apply(plugin = "maven-publish") - implementation("net.civmc:civmodcore:2.0.0-SNAPSHOT:dev-all") - implementation("net.civmc:namelayer-spigot:3.0.0-SNAPSHOT:dev") - implementation("net.civmc:civchat2:2.0.0-SNAPSHOT:dev") - compileOnly("me.neznamy:tab-api:3.0.1") -} - -java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) -} - -tasks { - build { - dependsOn(reobfJar) + java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } } - compileJava { - options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything - - // Set the release flag. This configures what version bytecode the compiler will emit, as well as what JDK APIs are usable. - // See https://openjdk.java.net/jeps/247 for more information. - options.release.set(17) - } - javadoc { - options.encoding = Charsets.UTF_8.name() // We want UTF-8 for everything - } - processResources { - filteringCharset = Charsets.UTF_8.name() // We want UTF-8 for everything - } - - test { - useJUnitPlatform() - } -} - -publishing { repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/CivMC/Citadel") - credentials { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") + mavenCentral() + + maven("https://papermc.io/repo/repository/maven-public/") + maven("https://repo.codemc.io/repository/maven-public/") + maven("https://repo.kryptonmc.org/releases") + + civRepo("CivMC/CivModCore") + civRepo("CivMC/NameLayer") + civRepo("CivMC/CivChat2") + } + + publishing { + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/CivMC/NameColors") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { + register("gpr") { + from(components["java"]) } } } - publications { - register("gpr") { - from(components["java"]) - } - } } diff --git a/plugins/namecolors-paper/paper/build.gradle.kts b/plugins/namecolors-paper/paper/build.gradle.kts new file mode 100644 index 000000000..8bb90a621 --- /dev/null +++ b/plugins/namecolors-paper/paper/build.gradle.kts @@ -0,0 +1,20 @@ +plugins { + `java-library` + id("net.civmc.civgradle.plugin") + id("io.papermc.paperweight.userdev") version "1.3.1" +} + +civGradle { + paper { + pluginName = "NameColors" + } +} + +dependencies { + paperDevBundle("1.18.2-R0.1-SNAPSHOT") + + compileOnly("net.civmc:civmodcore:2.0.0-SNAPSHOT:dev-all") + compileOnly("net.civmc:namelayer-spigot:3.0.0-SNAPSHOT:dev") + compileOnly("net.civmc:civchat2:2.0.0-SNAPSHOT:dev") + compileOnly("me.neznamy:tab-api:3.0.2") +} diff --git a/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java b/plugins/namecolors-paper/paper/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java similarity index 99% rename from plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java rename to plugins/namecolors-paper/paper/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java index d53e0ba9a..48bb337d5 100644 --- a/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java +++ b/plugins/namecolors-paper/paper/src/main/java/com/biggestnerd/namecolors/NameColorSetting.java @@ -88,7 +88,7 @@ public class NameColorSetting extends PlayerSetting { @Override public void clicked(Player p) { player.sendMessage( - "The color of your name was changed to " + entry.getValue() + entry.getValue().name()); + "The color of your name was changed to " + entry.getValue().name()); setValue(player, entry.getKey()); } }); diff --git a/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java b/plugins/namecolors-paper/paper/src/main/java/com/biggestnerd/namecolors/NameColors.java similarity index 80% rename from plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java rename to plugins/namecolors-paper/paper/src/main/java/com/biggestnerd/namecolors/NameColors.java index 457816460..78c418cf0 100644 --- a/plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java +++ b/plugins/namecolors-paper/paper/src/main/java/com/biggestnerd/namecolors/NameColors.java @@ -1,9 +1,8 @@ package com.biggestnerd.namecolors; -import static me.neznamy.tab.api.TABAPI.getPlayer; -import me.neznamy.tab.api.EnumProperty; +import me.neznamy.tab.api.TabAPI; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -55,7 +54,8 @@ public class NameColors extends ACivMod implements Listener { CivChat2.getInstance().getCivChat2Manager().removeCustomName(player.getUniqueId()); if(getServer().getPluginManager().isPluginEnabled("TAB")) { //TAB is enabled, so lets reset the player name. - Bukkit.getScheduler().runTaskLater(this, () -> getPlayer(player.getUniqueId()).removeTemporaryValue(EnumProperty.CUSTOMTABNAME), 20l ); + Bukkit.getScheduler().runTaskLater(this, () -> TabAPI.getInstance().getTablistFormatManager().resetName(TabAPI.getInstance() + .getPlayer(player.getUniqueId())), 20l ); } } else { if (color == NameColorSetting.RAINBOW_COLOR) { @@ -64,7 +64,8 @@ public class NameColors extends ACivMod implements Listener { if(getServer().getPluginManager().isPluginEnabled("TAB")) { //TAB enabled, so now we need to re-apply this name as a "custom name" //Side note: we do this temporarily so players if they lose their permission don't keep their colored name in TAB. - Bukkit.getScheduler().runTaskLater(this, () -> getPlayer(player.getUniqueId()).setValueTemporarily(EnumProperty.CUSTOMTABNAME, rainbowify(player.getName())), 20); + Bukkit.getScheduler().runTaskLater(this, () -> TabAPI.getInstance().getTablistFormatManager().setName(TabAPI.getInstance() + .getPlayer(player.getUniqueId()), rainbowify(player.getName())), 20); } return; } @@ -73,7 +74,8 @@ public class NameColors extends ACivMod implements Listener { //Same deal as for rainbow if(getServer().getPluginManager().isPluginEnabled("TAB")) { //We delay just in-case TAB hasn't loaded the player into memory yet. - Bukkit.getScheduler().runTaskLater(this, () -> getPlayer(player.getUniqueId()).setValueTemporarily(EnumProperty.CUSTOMTABNAME, color + player.getName() + ChatColor.RESET), 20); + Bukkit.getScheduler().runTaskLater(this, () -> TabAPI.getInstance().getTablistFormatManager().setName(TabAPI.getInstance() + .getPlayer(player.getUniqueId()),color + player.getName() + ChatColor.RESET), 20); } } } diff --git a/plugins/namecolors-paper/src/main/resources/plugin.yml b/plugins/namecolors-paper/paper/src/main/resources/plugin.yml similarity index 91% rename from plugins/namecolors-paper/src/main/resources/plugin.yml rename to plugins/namecolors-paper/paper/src/main/resources/plugin.yml index 670eb1b1a..bee24e125 100644 --- a/plugins/namecolors-paper/src/main/resources/plugin.yml +++ b/plugins/namecolors-paper/paper/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ -name: NameColors +name: ${name} main: com.biggestnerd.namecolors.NameColors -version: ${project.version} +version: ${version} authors: [biggestnerd, Maxopoly] depend: [CivModCore, CivChat2] softdepend: diff --git a/plugins/namecolors-paper/settings.gradle.kts b/plugins/namecolors-paper/settings.gradle.kts index 0bce33f74..8e25fc25b 100644 --- a/plugins/namecolors-paper/settings.gradle.kts +++ b/plugins/namecolors-paper/settings.gradle.kts @@ -1,12 +1,17 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - rootProject.name = "namecolors" pluginManagement { repositories { gradlePluginPortal() maven("https://papermc.io/repo/repository/maven-public/") + maven { + url = uri("https://maven.pkg.github.com/CivMC/CivGradle") + credentials { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } } -} \ No newline at end of file +} + +include(":paper")