CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-15 23:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

update namecolors and civchat and protocollib

Browse Source
This commit is contained in:
okx-code
2024-05-10 19:21:45 +01:00
parent 19cf8b4157
commit c64d50e63a
8 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
ansible/files/paper-plugins/ProtocolLib-679.jar → ansible/files/paper-plugins/ProtocolLib.jar
View File

BIN
ansible/files/paper-plugins/civchat2-paper-2.2.2.jar
View File

Binary file not shown.

BIN
ansible/files/paper-plugins/namecolors-paper-2.0.0-SNAPSHOT.jar
View File

Binary file not shown.

1
build.gradle.kts
View File

@@ -34,6 +34,7 @@ allprojects {
maven("https://libraries.minecraft.net")
maven("https://repo.codemc.io/repository/maven-public/")
maven("https://repo.kryptonmc.org/releases")
maven("https://repo.dmulloy2.net/repository/public")
maven("https://jitpack.io")
}

3
plugins/civchat2-paper/src/main/java/vg/civcraft/mc/civchat2/listeners/CivChat2Listener.java
View File

@@ -77,7 +77,8 @@ public class CivChat2Listener implements Listener {
}
}
if (Bukkit.getPlayer(chatman.getChannel(playerJoinEvent.getPlayer())) == null) {
UUID player = chatman.getChannel(playerJoinEvent.getPlayer());
if (player != null && Bukkit.getPlayer(player) == null) {
chatman.removeChannel(playerJoinEvent.getPlayer());
}

2
plugins/namecolors-paper/build.gradle.kts
View File

@@ -12,5 +12,5 @@ dependencies {
compileOnly(project(":plugins:civmodcore-paper"))
compileOnly(project(":plugins:namelayer-paper"))
compileOnly(project(":plugins:civchat2-paper"))
compileOnly("me.neznamy:tab-api:3.0.2")
compileOnly("me.neznamy:tab-api:4.0.2")
}

28
plugins/namecolors-paper/src/main/java/com/biggestnerd/namecolors/NameColors.java
View File

@@ -3,6 +3,7 @@ package com.biggestnerd.namecolors;
import me.neznamy.tab.api.TabAPI;
import me.neznamy.tab.api.TabPlayer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
@@ -54,8 +55,13 @@ 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, () -> TabAPI.getInstance().getTablistFormatManager().resetName(TabAPI.getInstance()
.getPlayer(player.getUniqueId())), 20l );
Bukkit.getScheduler().runTaskLater(this, () -> {
TabPlayer tabPlayer = TabAPI.getInstance()
.getPlayer(player.getUniqueId());
if (tabPlayer != null) {
TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, null);
}
}, 20l );
}
} else {
if (color == NameColorSetting.RAINBOW_COLOR) {
@@ -64,8 +70,13 @@ 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, () -> TabAPI.getInstance().getTablistFormatManager().setName(TabAPI.getInstance()
.getPlayer(player.getUniqueId()), rainbowify(player.getName())), 20);
Bukkit.getScheduler().runTaskLater(this, () -> {
TabPlayer tabPlayer = TabAPI.getInstance()
.getPlayer(player.getUniqueId());
if (tabPlayer != null) {
TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, rainbowify(player.getName()));
}
}, 20);
}
return;
}
@@ -74,8 +85,13 @@ 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, () -> TabAPI.getInstance().getTablistFormatManager().setName(TabAPI.getInstance()
.getPlayer(player.getUniqueId()),color + player.getName() + ChatColor.RESET), 20);
Bukkit.getScheduler().runTaskLater(this, () -> {
TabPlayer tabPlayer = TabAPI.getInstance()
.getPlayer(player.getUniqueId());
if (tabPlayer != null) {
TabAPI.getInstance().getTabListFormatManager().setName(tabPlayer, color + player.getName() + ChatColor.RESET);
}
}, 20);
}
}
}

2
plugins/simpleadminhacks-paper/build.gradle.kts
View File

@@ -17,5 +17,5 @@ dependencies {
compileOnly(project(":plugins:bastion-paper"))
compileOnly(project(":plugins:exilepearl-paper"))
compileOnly("com.comphenix.protocol:ProtocolLib:4.8.0")
compileOnly("com.comphenix.protocol:ProtocolLib:5.2.0-SNAPSHOT")
}