Compare commits

..
71 Commits
Author SHA1 Message Date
Elikill58 05ce1fb059 Upgrade to 2.1 2022-01-11 12:30:30 +01:00
Elikill58 3dcd31807f Fix #15 2022-01-11 12:15:31 +01:00
Elikill58 d026aeea41 Make v2 show tooltip for hand 2022-01-11 12:07:35 +01:00
Elikill58 5ab5ce9e95 Fix error for 1.18 2022-01-11 11:56:47 +01:00
Elikill58 cf5b5feb9c Edit action's config 2022-01-11 10:20:53 +01:00
Elikill58 d579eb8e4a Fix amount items 2022-01-11 10:12:12 +01:00
Elikill58 fec31fe4bb Fix possible reload issue 2022-01-11 10:09:13 +01:00
Elikill58 b6d25866c1 Add tab 2022-01-11 09:59:24 +01:00
Elikill58 58fe4a2aeb Add item in inventory 2022-01-11 09:56:33 +01:00
Elikill58 37e9359b1f Introduce message system 2022-01-10 16:52:53 +01:00
Elikill58 78adf1c9d0 Create inventory 2022-01-10 15:54:17 +01:00
Elikill58 19ad0c362c Introduce /chatitem command 2022-01-10 15:45:38 +01:00
Elikill58 3785534b0e Re-add warn message 2022-01-10 15:11:51 +01:00
Elikill58 8e8fa85ec3 Fix some plugin compatibility with 1.18 2022-01-10 14:52:16 +01:00
Elikill58 ad340f239e Make changes for 1.16+ 2022-01-09 23:17:21 +01:00
Elikill58 3e53c370ec Remove unused code 2022-01-09 21:56:36 +01:00
Elikill58 dff6d30e78 Fix 1.18 support 2022-01-09 21:03:15 +01:00
Elikill58 275a7bb773 Fix error while reloading with packets 2022-01-08 22:43:20 +01:00
Elikill58 26ec7ec819 Allow reload for manager and begin of 'both' manager 2022-01-08 22:28:02 +01:00
Elikill58 592981a678 Fix error with bungee serializer 2022-01-08 21:37:52 +01:00
Elikill58 fbe286ded5 Update chat v2 2022-01-08 19:12:46 +01:00
Elikill58 7780e8a406 Prevent translated item without space 2022-01-08 19:05:25 +01:00
Elikill58 b70bc7ee51 Remove unecessary mvn config 2022-01-08 18:53:37 +01:00
Elikill58 57baf6675a Use HexNicks for chat manager 2022-01-08 18:51:41 +01:00
Elikill58 8998498383 Make possible to change for API 2022-01-08 18:38:01 +01:00
Elikill58 94a7c549d7 add PlayerNamer 2022-01-08 18:37:25 +01:00
Elikill58 988b0e8080 Add HexNicks to dep 2022-01-08 18:06:53 +01:00
Elikill58 22e51bf668 Merge branch 'v2' of https://github.com/dadus33-plugins/ChatItem into v2 2021-12-31 13:10:06 +01:00
Elikill58 1f70b0048e Fix https repo 2021-12-30 11:13:49 +01:00
Elikill58 e18ef8a927 Fix chat spam 2021-12-30 08:31:08 +01:00
Elikill58 86078e7869 Add config for maven 2021-12-27 14:59:32 +01:00
Elikill58 212bf7174e Merge branch 'v2' of https://github.com/dadus33-plugins/ChatItem into v2 2021-12-27 14:39:16 +01:00
Elikill58 284396ea28 Use own repo 2021-12-27 14:39:07 +01:00
Elikill58 0bd697cbd4 Add workflow 2021-12-27 14:04:34 +01:00
Elikill58 72be8e243e Update starting messages 2021-12-27 14:00:45 +01:00
Elikill58 445fb84a40 Fix own packet system 2021-12-27 13:54:41 +01:00
Elikill58 1ebf5b4edb Add soft depend 2021-12-27 13:47:52 +01:00
Elikill58 8869bc88d1 Rename chat packet validator 2021-12-27 13:18:25 +01:00
Elikill58 aae9708647 Make protocol version general 2021-12-27 11:56:46 +01:00
Elikill58 e9736c4031 Rename packet listener 2021-12-26 23:56:17 +01:00
Elikill58 28199b5e0b Fix limit 2021-12-26 23:54:14 +01:00
Elikill58 fe743d8302 Add chat event for v1 2021-12-26 23:52:03 +01:00
Elikill58 2f08ea9509 Fix log 2021-12-26 23:30:44 +01:00
Elikill58 854dcca6ee Update config keys 2021-12-26 23:25:17 +01:00
Elikill58 9072db7c1b Add auto mode 2021-12-26 23:19:06 +01:00
Elikill58 2b0ca413b4 Add both manager 2021-12-26 23:11:50 +01:00
Elikill58 0f1ce81a31 Update dependencies 2021-12-26 20:31:12 +01:00
Elikill58 1b714f25b8 Upgrading to v13 for config 2021-12-26 20:20:29 +01:00
Elikill58 c03b8b4810 Remove some useless comments 2021-12-26 20:15:29 +01:00
Elikill58 5f0744dd0e Use recipients 2021-12-26 20:11:49 +01:00
Elikill58 fe1676620f Fix multiple message type 2021-11-25 17:06:39 +01:00
Elikill58 ec5b2fe509 Fix event not working 2021-11-25 16:12:49 +01:00
Elikill58 3efe63bb49 Add default values for config 2021-11-25 15:30:36 +01:00
Elikill58 48a1dfbc26 Fix messages not well parsed 2021-11-25 15:17:43 +01:00
Elikill58 0a604cf83d Upgrade to 2.0 2021-11-24 19:56:18 +01:00
Elikill58 4bc657ab63 Don't include LangUtils's code 2021-11-24 19:55:44 +01:00
Elikill58 165e8f4474 Clean dependencies 2021-11-24 19:54:23 +01:00
Elikill58 a4ca8611f4 Remove unused code 2021-11-24 19:46:58 +01:00
Elikill58 0f354e2dd9 Fix class not found for 1.17 2021-11-24 19:43:25 +01:00
Elikill58 c9bd62dc47 Add LanguageUtils support #27 2021-11-24 19:25:18 +01:00
Elikill58 f8304aeb28 Add namer feature 2021-11-24 18:48:37 +01:00
Elikill58 1fdf1312a0 Remove unused class event 2021-11-24 15:56:12 +01:00
Elikill58 295a7c406c Merge pull request #28 from dadus33-plugins/v2-without-packet
Removing all packet system and fix for thermos
2021-11-24 15:54:03 +01:00
Elikill58 78fbeed7d2 Fix for all versions 2021-11-24 15:52:14 +01:00
Elikill58 446127f7bb Fix for thermos 2021-11-23 18:59:41 +01:00
Elikill58 9dd172447c Clean code 2021-11-23 18:22:17 +01:00
Elikill58 38cb530993 Fix possible issue with 1.17 2021-11-20 23:11:14 +01:00
Elikill58 6bfd45727f Prevent cancellation when not using ChatItem 2021-11-09 18:03:29 +01:00
Elikill58 9f69f078fc Use hand disabled and amount management from config 2021-11-09 15:00:52 +01:00
Elikill58 2050c6c044 Make config reloadable 2021-11-09 00:16:04 +01:00
Elikill58 26d57460d5 Use new system 2021-11-08 22:33:33 +01:00
71 changed files with 3606 additions and 2520 deletions

No files matched your search

+26
View File
@@ -0,0 +1,26 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
name: Build v2
on:
push:
branches: [ v2 ]
pull_request:
branches: [ v2 ]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
with:
java-version: '11'
distribution: 'adopt'
cache: maven
- name: Build with Maven
run: mvn install --file pom.xml
+56 -42
View File
@@ -6,17 +6,13 @@
<groupId>me.dadus33</groupId>
<artifactId>chatitem</artifactId>
<version>1.4</version>
<version>2.1</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<repositories>
<repository>
<id>dmulloy2-repo</id>
<url>http://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>
<repository>
<id>Bungeecord</id>
<url>https://repo.md-5.net/content/groups/public/</url>
@@ -29,14 +25,26 @@
<id>sonatype</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<repository>
<id>lang-utils-repo</id>
<url>https://raw.github.com/MascusJeoraly/LanguageUtils/mvn-repo/</url>
</repository>
<repository>
<id>protocollib-repo</id>
<url>https://repo.dmulloy2.net/nexus/repository/public/</url>
</repository>
<repository>
<id>viaversion-repo</id>
<url>https://repo.viaversion.com</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
<id>elikill-repo</id>
<url>https://repo.eliapp.fr:8081/repository/internal/</url>
</repository>
</repositories>
@@ -54,27 +62,27 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.7</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.17.0</version>
<version>2.17.1</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.0</version>
<version>2.17.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.meowj</groupId>
<artifactId>LangUtils</artifactId>
<version>1.9</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.comphenix.protocol</groupId>
<artifactId>ProtocolLib</artifactId>
<version>4.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -88,12 +96,6 @@
<artifactId>ProtocolSupport</artifactId>
<version>f34959c331</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.github.GeyserMC</groupId>
<artifactId>opennbt</artifactId>
<version>1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -101,6 +103,24 @@
<version>4.1.53.Final</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.github.GeyserMC</groupId>
<artifactId>opennbt</artifactId>
<version>1.4</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>dev.majek</groupId>
<artifactId>HexNicks</artifactId>
<version>2.2.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-api</artifactId>
<version>4.9.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
@@ -148,24 +168,18 @@
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>me.dadus33.libs.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.gson</pattern>
<shadedPattern>me.dadus33.libs.gson</shadedPattern>
</relocation>
<relocation>
<pattern>com.github.GeyserMC</pattern>
<shadedPattern>me.dadus33.libs.opennbt</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<configuration>
<outputDirectory>${export_dir}</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
+117 -93
View File
@@ -1,53 +1,90 @@
package me.dadus33.chatitem;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.ServicePriority;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.TabCompleter;
import org.bukkit.plugin.java.JavaPlugin;
import me.dadus33.chatitem.api.APIImplementation;
import me.dadus33.chatitem.api.ChatItemAPI;
import me.dadus33.chatitem.commands.CIReload;
import com.google.common.base.Strings;
import me.dadus33.chatitem.chatmanager.ChatManager;
import me.dadus33.chatitem.chatmanager.v1.PacketEditingChatManager;
import me.dadus33.chatitem.chatmanager.v2.ChatListenerChatManager;
import me.dadus33.chatitem.commands.CIReloadCommand;
import me.dadus33.chatitem.commands.ChatItemCommand;
import me.dadus33.chatitem.filters.Log4jFilter;
import me.dadus33.chatitem.json.JSONManipulator;
import me.dadus33.chatitem.json.JSONManipulatorCurrent;
import me.dadus33.chatitem.listeners.ChatEventListener;
import me.dadus33.chatitem.listeners.ChatPacketListenerV2;
import me.dadus33.chatitem.listeners.ChatPacketValidatorV2;
import me.dadus33.chatitem.packets.ChatItemPacketManager;
import me.dadus33.chatitem.playerversion.IPlayerVersion;
import me.dadus33.chatitem.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.playerversion.hooks.ProtocolSupportHook;
import me.dadus33.chatitem.playerversion.hooks.ViaVersionHook;
import me.dadus33.chatitem.itemnamer.NamerManager;
import me.dadus33.chatitem.listeners.InventoryListener;
import me.dadus33.chatitem.listeners.JoinListener;
import me.dadus33.chatitem.playernamer.PlayerNamerManager;
import me.dadus33.chatitem.utils.Storage;
import me.dadus33.chatitem.utils.Utils;
import me.dadus33.chatitem.utils.Version;
public class ChatItem extends JavaPlugin {
public final static int CFG_VER = 12;
public final static int CFG_VER = 13;
private static ChatItem instance;
private ChatEventListener chatEventListener;
private Log4jFilter filter;
private Storage storage;
private static boolean baseComponentAvailable = true;
private IPlayerVersion playerVersionAdapter;
private ChatItemPacketManager packetManager;
private boolean hasNewVersion = false;
private List<ChatManager> chatManager = new ArrayList<>();
private void chooseManagers() {
this.chatManager.forEach((cm) -> cm.unload(this));
this.chatManager.clear();
String managerName = getStorage().MANAGER;
if(managerName.equalsIgnoreCase("both")) {
this.chatManager.add(new PacketEditingChatManager(this));
this.chatManager.add(new ChatListenerChatManager(this));
getLogger().info("Manager automatically choosed: " + getVisualChatManagers());
} else if(managerName.equalsIgnoreCase("auto")) {
if(getServer().getPluginManager().getPlugin("DeluxeChat") != null && Version.getVersion().isNewerThan(Version.V1_7))
this.chatManager.add(new PacketEditingChatManager(this));
else
this.chatManager.add(new ChatListenerChatManager(this));
getLogger().info("Manager automatically choosed: " + getVisualChatManagers());
} else {
if(managerName.equalsIgnoreCase("packet")) {
this.chatManager.add(new PacketEditingChatManager(this));
getLogger().info("Manager choosed: " + getVisualChatManagers());
} else if(managerName.equalsIgnoreCase("chat")) {
this.chatManager.add(new ChatListenerChatManager(this));
getLogger().info("Manager choosed: " + getVisualChatManagers());
} else {
getLogger().severe("----- WARN -----");
getLogger().severe("Failed to find manager: " + managerName + ".");
getLogger().severe("Please reset your config and/or check wiki for more informations");
getLogger().severe("Using default manager: chat.");
getLogger().severe("----- WARN -----");
this.chatManager.add(new ChatListenerChatManager(this));
}
}
this.chatManager.forEach((cm) -> cm.load(this, getStorage()));
NamerManager.load(this);
PlayerNamerManager.load(this);
}
public static void reload(CommandSender sender) {
ChatItem obj = getInstance();
//obj.pm = ProtocolLibrary.getProtocolManager();
obj.saveDefaultConfig();
obj.reloadConfig();
obj.storage = new Storage(obj.getConfig());
//obj.packetListener.setStorage(obj.storage);
//obj.packetValidator.setStorage(obj.storage);
obj.chatEventListener.setStorage(obj.storage);
obj.filter.setStorage(obj.storage);
APIImplementation api = (APIImplementation) Bukkit.getServicesManager().getRegistration(ChatItemAPI.class).getProvider();
api.setStorage(obj.storage);
api.updateLogger();
if (!obj.storage.RELOAD_MESSAGE.isEmpty())
sender.sendMessage(obj.storage.RELOAD_MESSAGE);
ChatItem pl = getInstance();
if(pl.getConfig() == null || pl.getConfig().getKeys(false).isEmpty())
pl.saveDefaultConfig();
pl.reloadConfig();
String oldChatManager = pl.storage.MANAGER;
pl.storage = new Storage(pl.getConfig());
pl.chooseManagers();
pl.filter.setStorage(pl.storage);
if (!pl.storage.RELOAD_MESSAGE.isEmpty())
sender.sendMessage(pl.storage.RELOAD_MESSAGE);
if(!oldChatManager.equalsIgnoreCase(pl.storage.MANAGER))
sender.sendMessage(ChatColor.GOLD + "Changing the manager with command reloading CAN produce issue. It's mostly suggested to restart after finding the better manager for you.");
}
public static ChatItem getInstance() {
@@ -65,28 +102,7 @@ public class ChatItem extends JavaPlugin {
//Load config
saveDefaultConfig();
storage = new Storage(getConfig());
//Load API
APIImplementation api = new APIImplementation(storage);
Bukkit.getServicesManager().register(ChatItemAPI.class, api, this, ServicePriority.Highest);
//Packet listeners
packetManager = new ChatItemPacketManager(this);
packetManager.getPacketManager().addHandler(new ChatPacketValidatorV2(storage));
packetManager.getPacketManager().addHandler(new ChatPacketListenerV2(storage));
/*packetListener = new ChatPacketListener(this, ListenerPriority.LOW, storage, PacketType.Play.Server.CHAT);
packetValidator = new ChatPacketValidator(this, ListenerPriority.LOWEST, storage, PacketType.Play.Server.CHAT);
pm.addPacketListener(packetValidator);
pm.addPacketListener(packetListener);*/
if(Bukkit.getPluginManager().getPlugin("ViaVersion") != null){
playerVersionAdapter = new ViaVersionHook();
} else if(Bukkit.getPluginManager().getPlugin("ProtocolSupport") != null){
playerVersionAdapter = new ProtocolSupportHook();
} else {
playerVersionAdapter = new DefaultVersionHook();
}
//We halt the use of this system for now, until we can solve the infamous getProtocolVersion issue
//Till then, users of both ViaVersion and ProtocolSupport should do just fine
/*if(!protocolSupport && !viaVersion) {
@@ -95,51 +111,59 @@ public class ChatItem extends JavaPlugin {
}*/
//Commands
CIReload rld = new CIReload();
Bukkit.getPluginCommand("cireload").setExecutor(rld);
//Bukkit API listeners
chatEventListener = new ChatEventListener(storage);
Bukkit.getPluginManager().registerEvents(chatEventListener, this);
//Check for existence of BaseComponent class (only on spigot)
try {
Class.forName("net.md_5.bungee.api.chat.BaseComponent");
} catch (ClassNotFoundException e) {
baseComponentAvailable = false;
}
loadCommand(getCommand("cireload"), new CIReloadCommand());
loadCommand(getCommand("chatitem"), new ChatItemCommand());
// events
getServer().getPluginManager().registerEvents(new JoinListener(), this);
getServer().getPluginManager().registerEvents(new InventoryListener(), this);
chooseManagers();
//Initialize Log4J filter (remove ugly console messages)
filter = new Log4jFilter(storage);
if(storage.CHECK_UPDATE) {
getServer().getScheduler().runTaskAsynchronously(this, () -> {
String urlName = "https://api.spigotmc.org/legacy/update.php?resource=19064";
String content = Utils.getFromURL(urlName);
if(!Strings.isNullOrEmpty(content)) {
hasNewVersion = !content.equalsIgnoreCase(getDescription().getVersion());
if(hasNewVersion) {
getLogger().info(storage.JOIN_UPDATE_MESSAGE);
}
}
});
}
}
public IPlayerVersion getPlayerVersionAdapter() {
return playerVersionAdapter;
public void loadCommand(PluginCommand cmd, Object obj) {
if(obj instanceof CommandExecutor)
cmd.setExecutor((CommandExecutor) obj);
if(obj instanceof TabCompleter)
cmd.setTabCompleter((TabCompleter) obj);
}
public ChatItemPacketManager getPacketManager() {
return packetManager;
public Storage getStorage() {
return storage;
}
public static String getVersion(Server server) {
final String packageName = server.getClass().getPackage().getName();
return packageName.substring(packageName.lastIndexOf('.') + 1);
}
public static boolean supportsChatComponentApi(){
return baseComponentAvailable;
}
public static JSONManipulator getManipulator(){
/*
We used to have 2 kinds of JSONManipulators because of my bad understanding of the 1.7 way of parsing JSON chat
The interface should however stay as there might be great changes in future versions in JSON parsing (most likely 1.13)
*/
return new JSONManipulatorCurrent();
//We just return a new one whenever requested for the moment, should implement a cache of some sort some time though
public List<ChatManager> getChatManager() {
return chatManager;
}
public String getVisualChatManagers() {
StringJoiner sj = new StringJoiner(", ");
for(ChatManager cm : chatManager) {
sj.add(cm.getName() + " (" + cm.getId() + ")");
}
return sj.toString();
}
public boolean isHasNewVersion() {
return hasNewVersion;
}
public static void debug(String msg) {
if(getInstance().getConfig().getBoolean("debug", false))
getInstance().getLogger().info(msg);
@@ -1,184 +0,0 @@
package me.dadus33.chatitem.api;
import java.util.Collections;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.json.JSONManipulator;
import me.dadus33.chatitem.json.Translator;
import me.dadus33.chatitem.listeners.ChatPacketListenerV2;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.Storage;
public class APIImplementation implements ChatItemAPI {
private final static String DEFAULT_JSON = "{\"extra\":[{\"text\":\"i\"}]}";
private final static String BASE_JSON = "{\"text\":\"\", \"extra\":[]}";
private final static List<String> DEFAULT_REPLACEMENT = Collections.singletonList("i");
private Storage c;
private Logger logger;
public APIImplementation(Storage st){
this.c = st;
this.logger = ChatItem.getInstance().getLogger();
}
public void updateLogger(){
this.logger = ChatItem.getInstance().getLogger();
}
public void setStorage(Storage newStorage){
this.c = newStorage;
}
@Override
public String getJSONFromItem(ItemStack item) {
JSONManipulator manipulator = ChatItem.getManipulator();
try {
return manipulator.parse(DEFAULT_JSON, DEFAULT_REPLACEMENT, item, ChatPacketListenerV2.styleItem(item, c), ProtocolVersion.getServerVersion().MAX_VER);
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
@Override
public String getJSONFromItem(ItemStack item, String customReplacement) {
JSONManipulator manipulator = ChatItem.getManipulator();
try {
return manipulator.parse(DEFAULT_JSON, DEFAULT_REPLACEMENT, item, customReplacement, ProtocolVersion.getServerVersion().MAX_VER);
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
@Override
public String getJSONFromItem(ItemStack item, Player client) {
JSONManipulator manipulator = ChatItem.getManipulator();
try {
return manipulator.parse(DEFAULT_JSON, DEFAULT_REPLACEMENT, item, ChatPacketListenerV2.styleItem(item, c), ProtocolVersion.getClientVersion(client));
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
@Override
public String getJSONFromItem(ItemStack item, String customReplacement, Player client) {
JSONManipulator manipulator = ChatItem.getManipulator();
try {
return manipulator.parse(DEFAULT_JSON, DEFAULT_REPLACEMENT, item, customReplacement, ProtocolVersion.getClientVersion(client));
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
@Override
public String getJSONFromInlineItem(String text, ItemStack... items) {
JsonParser parser = new JsonParser();
JsonObject obj = parser.parse(BASE_JSON).getAsJsonObject();
obj.add("extra", Translator.toJson(text));
String main = obj.toString();
int version = ProtocolVersion.getServerVersion().MAX_VER;
for(int i = 0; i < items.length; ++i){
JSONManipulator manipulator = ChatItem.getManipulator();
ItemStack item = items[i];
String style = ChatPacketListenerV2.styleItem(item, c);
List<String> replacements = Collections.singletonList("%_"+i);
try {
main = manipulator.parse(main, replacements, item, style, version);
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
return main;
}
@Override
public String getJSONFromInlineItem(String text, String[] customReplacements, ItemStack... items) {
JsonObject wrapper = new JsonObject();
wrapper.add("extra", Translator.toJson(text));
String main = wrapper.toString();
int version = ProtocolVersion.getServerVersion().MAX_VER;
for(int i = 0; i < items.length; ++i){
JSONManipulator manipulator = ChatItem.getManipulator();
ItemStack item = items[i];
String style = Translator.toJson(customReplacements[i]).toString();
List<String> replacements = Collections.singletonList("%_"+i);
try {
main = manipulator.parse(main, replacements, item, style, version);
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
return main;
}
@Override
public String getJSONFromInlineItem(String text, Player client, ItemStack... items) {
JsonParser parser = new JsonParser();
JsonObject obj = parser.parse(BASE_JSON).getAsJsonObject();
obj.add("extra", Translator.toJson(text));
String main = obj.toString();
int version = ProtocolVersion.getClientVersion(client);
for(int i = 0; i < items.length; ++i){
JSONManipulator manipulator = ChatItem.getManipulator();
ItemStack item = items[i];
String style = ChatPacketListenerV2.styleItem(item, c);
List<String> replacements = Collections.singletonList("%_"+i);
try {
main = manipulator.parse(main, replacements, item, style, version);
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
return main;
}
@Override
public String getJSONFromInlineItem(String text, Player client, String[] customReplacements, ItemStack... items) {
JsonParser parser = new JsonParser();
JsonObject obj = parser.parse(BASE_JSON).getAsJsonObject();
obj.add("extra", Translator.toJson(text));
String main = obj.toString();
int version = ProtocolVersion.getClientVersion(client);
for(int i = 0; i < items.length; ++i){
JSONManipulator manipulator = ChatItem.getManipulator();
ItemStack item = items[i];
String style = Translator.toJson(customReplacements[i]).toString();
List<String> replacements = Collections.singletonList("%_"+i);
try {
main = manipulator.parse(main, replacements, item, style, version);
} catch (Exception e){
logger.log(Level.SEVERE, "An unexpected exception was caught while running an API method from ChatItem. Please contact the developer immediately, providing him with the following stack-trace:");
e.printStackTrace();
return null;
}
}
return main;
}
}
@@ -1,22 +0,0 @@
package me.dadus33.chatitem.api;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public interface ChatItemAPI {
String getJSONFromItem(ItemStack item);
String getJSONFromItem(ItemStack item, String customReplacement);
String getJSONFromItem(ItemStack item, Player client);
String getJSONFromItem(ItemStack item, String customReplacement, Player client);
String getJSONFromInlineItem(String text, ItemStack... items);
String getJSONFromInlineItem(String text, String[] customReplacements, ItemStack... items);
String getJSONFromInlineItem(String text, Player client, ItemStack... items);
String getJSONFromInlineItem(String text, Player client, String[] customReplacements, ItemStack... items);
}
@@ -0,0 +1,29 @@
package me.dadus33.chatitem.chatmanager;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.utils.Storage;
public abstract class ChatManager {
public final static char SEPARATOR = ((char) 0x0007);
protected Storage s;
public ChatManager() {
}
public abstract String getName();
public abstract String getId();
public Storage getStorage() {
return s;
}
public void load(ChatItem pl, Storage s) {
this.s = s;
}
public abstract void unload(ChatItem pl);
}
@@ -0,0 +1,103 @@
package me.dadus33.chatitem.chatmanager.v1;
import org.bukkit.Bukkit;
import org.bukkit.event.HandlerList;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.ChatManager;
import me.dadus33.chatitem.chatmanager.v1.json.JSONManipulator;
import me.dadus33.chatitem.chatmanager.v1.json.JSONManipulatorCurrent;
import me.dadus33.chatitem.chatmanager.v1.listeners.v15lower.ChatEventListener;
import me.dadus33.chatitem.chatmanager.v1.listeners.v15lower.ChatPacket15Manager;
import me.dadus33.chatitem.chatmanager.v1.listeners.v16upper.ChatPacket16Manager;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacketManager;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketHandler;
import me.dadus33.chatitem.chatmanager.v1.playerversion.IPlayerVersion;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.ProtocolSupportHook;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.ViaVersionHook;
import me.dadus33.chatitem.utils.Storage;
import me.dadus33.chatitem.utils.Version;
public class PacketEditingChatManager extends ChatManager {
private final JSONManipulatorCurrent jsonManipulator;
private boolean baseComponentAvailable = true;
private final ChatItemPacketManager packetManager;
private final ChatEventListener chatEventListener;
private final PacketHandler chatPacketManager;
private IPlayerVersion playerVersionAdapter;
public PacketEditingChatManager(ChatItem pl) {
jsonManipulator = new JSONManipulatorCurrent();
packetManager = new ChatItemPacketManager(pl);
if(Version.getVersion().isNewerOrEquals(Version.V1_16)) {
chatPacketManager = new ChatPacket16Manager(this);
chatEventListener = null;
} else {
chatEventListener = new ChatEventListener(this);
chatPacketManager = new ChatPacket15Manager(this);
}
//Check for existence of BaseComponent class (only on spigot)
try {
Class.forName("net.md_5.bungee.api.chat.BaseComponent");
} catch (ClassNotFoundException e) {
baseComponentAvailable = false;
}
}
@Override
public String getName() {
return "PacketEditing";
}
@Override
public String getId() {
return "packet";
}
@Override
public void load(ChatItem pl, Storage s) {
super.load(pl, s);
if(chatEventListener != null)
Bukkit.getPluginManager().registerEvents(chatEventListener, pl);
packetManager.getPacketManager().addHandler(chatPacketManager);
if(Bukkit.getPluginManager().getPlugin("ViaVersion") != null){
playerVersionAdapter = new ViaVersionHook();
pl.getLogger().info("Loading ViaVersion support ...");
} else if(Bukkit.getPluginManager().getPlugin("ProtocolSupport") != null){
playerVersionAdapter = new ProtocolSupportHook();
pl.getLogger().info("Loading ProtocolSupport support ...");
} else {
playerVersionAdapter = new DefaultVersionHook();
}
}
@Override
public void unload(ChatItem pl) {
if(chatEventListener != null)
HandlerList.unregisterAll(chatEventListener);
packetManager.getPacketManager().removeHandler(chatPacketManager);
packetManager.getPacketManager().stop();
}
public JSONManipulator getManipulator(){
/*
We used to have 2 kinds of JSONManipulators because of my bad understanding of the 1.7 way of parsing JSON chat
The interface should however stay as there might be great changes in future versions in JSON parsing (most likely 1.13)
*/
return jsonManipulator;
//We just return a new one whenever requested for the moment, should implement a cache of some sort some time though
}
public IPlayerVersion getPlayerVersionAdapter() {
return playerVersionAdapter;
}
public boolean supportsChatComponentApi(){
return baseComponentAvailable;
}
}
@@ -1,13 +1,14 @@
package me.dadus33.chatitem.json;
package me.dadus33.chatitem.chatmanager.v1.json;
import java.util.List;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
public interface JSONManipulator {
String parse(String json, List<String> replacements, ItemStack item, String repl, int protocol) throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchFieldException, NoSuchMethodException;
String parse(String json, List<String> replacements, ItemStack item, String repl, int protocol) throws Exception;
String parseEmpty(String json, List<String> replacements, String repl, List<String> tooltip, Player sender);
}
@@ -0,0 +1,936 @@
package me.dadus33.chatitem.chatmanager.v1.json;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import com.github.steveice10.opennbt.tag.builtin.ByteArrayTag;
import com.github.steveice10.opennbt.tag.builtin.ByteTag;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.DoubleTag;
import com.github.steveice10.opennbt.tag.builtin.FloatTag;
import com.github.steveice10.opennbt.tag.builtin.IntArrayTag;
import com.github.steveice10.opennbt.tag.builtin.IntTag;
import com.github.steveice10.opennbt.tag.builtin.ListTag;
import com.github.steveice10.opennbt.tag.builtin.LongTag;
import com.github.steveice10.opennbt.tag.builtin.ShortTag;
import com.github.steveice10.opennbt.tag.builtin.StringTag;
import com.github.steveice10.opennbt.tag.builtin.Tag;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.JsonPrimitive;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.v1.utils.Item;
import me.dadus33.chatitem.chatmanager.v1.utils.ItemRewriter;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.Reflect;
import me.dadus33.chatitem.utils.Version;
@SuppressWarnings("unchecked")
public class JSONManipulatorCurrent implements JSONManipulator {
private static final Class<?> CRAFT_ITEM_STACK_CLASS = PacketUtils.getObcClass("inventory.CraftItemStack");
private static final Class<?> NBT_STRING = PacketUtils.getNmsClass("NBTTagString", "nbt.");
private static final Class<?> NBT_LIST = PacketUtils.getNmsClass("NBTTagList", "nbt.");
private static final Map<Class<?>, BiFunction<String, Object, Tag>> TYPES_TO_MC_NBT_TAGS = new HashMap<>();
private static final Map<Class<?>, Function<String, Tag>> TYPES_TO_OPEN_NBT_TAGS = new HashMap<>();
private static final List<Class<?>> NBT_BASE_CLASSES = new ArrayList<>();
private static final List<Field> NBT_BASE_DATA_FIELD = new ArrayList<>();
private static final Class<?> NMS_ITEM_STACK_CLASS = PacketUtils.getNmsClass("ItemStack", "world.item.");
private static final Method AS_NMS_COPY = Reflect.getMethod(CRAFT_ITEM_STACK_CLASS, "asNMSCopy", ItemStack.class);
private static final Class<?> NBT_TAG_COMPOUND = PacketUtils.getNmsClass("NBTTagCompound", "nbt.");
private static final Method SAVE_NMS_ITEM_STACK_METHOD = Reflect.getMethod(NMS_ITEM_STACK_CLASS, NBT_TAG_COMPOUND,
NBT_TAG_COMPOUND);
private static final Field MAP = Reflect.getField(NBT_TAG_COMPOUND, "map", "x");
private static final Field LIST_FIELD = Reflect.getField(NBT_LIST, "list", "c");
// Tags to be ignored. Currently it only contains tags from PortableHorses, but
// feel free to submit a pull request to add tags from your plugins
private static final List<String> IGNORED = Arrays.asList("horsetag", "phorse", "iscnameviz", "cname");
private static final ConcurrentHashMap<Map.Entry<Version, ItemStack>, JsonObject> STACKS = new ConcurrentHashMap<>();
static {
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagByte", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagByteArray", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagDouble", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagFloat", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagInt", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagIntArray", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagLong", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagShort", "nbt."));
for (Class<?> NBT_BASE_CLASS : NBT_BASE_CLASSES) {
NBT_BASE_DATA_FIELD.add(Reflect.getField(NBT_BASE_CLASS, "data", "c", "x"));
}
// include NBT tags
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagByte", "nbt."), (name, obj) -> new ByteTag(name, NBTUtils.get(obj, "h")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagByteArray", "nbt."), (name, obj) -> new ByteArrayTag(name, NBTUtils.get(obj, "d")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagDouble", "nbt."), (name, obj) -> new DoubleTag(name, NBTUtils.get(obj, "i")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagFloat", "nbt."), (name, obj) -> new FloatTag(name, NBTUtils.get(obj, "j")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagInt", "nbt."), (name, obj) -> new IntTag(name, NBTUtils.get(obj, "f")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagIntArray", "nbt."), (name, obj) -> new IntArrayTag(name, NBTUtils.get(obj, "c")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagLong", "nbt."), (name, obj) -> new LongTag(name, NBTUtils.get(obj, "e")));
TYPES_TO_MC_NBT_TAGS.put(PacketUtils.getNmsClass("NBTTagShort", "nbt."), (name, obj) -> new ShortTag(name, NBTUtils.get(obj, "g")));
// now basic types
TYPES_TO_OPEN_NBT_TAGS.put(Byte.class, ByteTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Byte[].class, ByteArrayTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Double.class, DoubleTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Float.class, FloatTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Integer.class, IntTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Integer[].class, IntArrayTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Long.class, LongTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(Short.class, ShortTag::new);
// Add the primitive types too, just in case
TYPES_TO_OPEN_NBT_TAGS.put(byte.class, ByteTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(byte[].class, ByteArrayTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(double.class, DoubleTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(float.class, FloatTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(int.class, IntTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(int[].class, IntArrayTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(long.class, LongTag::new);
TYPES_TO_OPEN_NBT_TAGS.put(short.class, ShortTag::new);
}
private List<String> replaces;
private String rgx;
private Version protocolVersion;
private JsonObject itemTooltip;
private JsonArray classicTooltip;
private final JsonParser PARSER = new JsonParser();
public String parse(String json, List<String> replacements, ItemStack item, String replacement, int protocol)
throws Exception {
JsonObject obj = PARSER.parse(json).getAsJsonObject();
JsonArray array = obj.getAsJsonArray("extra");
replaces = replacements;
String regex = "";
for (int i = 0; i < replacements.size(); ++i) {
if (replacements.size() == 1) {
regex = Pattern.quote(replacements.get(0));
break;
}
if (i == 0 || i + 1 == replacements.size()) {
if (i == 0) {
regex = "(" + Pattern.quote(replacements.get(i));
} else {
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i))).concat(")");
}
continue;
}
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i)));
}
rgx = regex;
JsonArray rep = new JsonArray();
final AbstractMap.SimpleEntry<Version, ItemStack> p = new AbstractMap.SimpleEntry<>(
protocolVersion = Version.getVersion(protocol), item);
if ((itemTooltip = STACKS.get(p)) == null) {
JsonArray use = Translator.toJson(replacement); // We get the json representation of the old color
// formatting method
// There's no public clone method for JSONObjects so we need to parse them every time
JsonObject hover = PARSER.parse("{\"action\":\"show_item\", \"value\": \"\"}").getAsJsonObject();
String jsonRep = stringifyItem(item); // Get the JSON representation of the item (well, not really JSON, but
// rather a string representation of NBT data)
hover.addProperty("value", jsonRep);
JsonObject wrapper = new JsonObject(); // Create a wrapper object for the whole array
wrapper.addProperty("text", ""); // The text field is compulsory, even if it's empty
wrapper.add("extra", use);
wrapper.add("hoverEvent", hover);
itemTooltip = wrapper; // Save the tooltip for later use when we encounter a placeholder
STACKS.put(p, itemTooltip); // Save it in the cache too so when parsing other packets with the same item
// (and client version) we no longer have to create it again
// We remove it later when no longer needed to save memory
Bukkit.getScheduler().runTaskLaterAsynchronously(ChatItem.getInstance(), () -> STACKS.remove(p), 100L);
}
for (int i = 0; i < array.size(); ++i) {
if (array.get(i).isJsonObject()) {
JsonObject o = array.get(i).getAsJsonObject();
boolean inside = false;
for (String replace : replacements)
if (o.toString().contains(replace)) {
if (inside) {
break;
}
inside = true;
}
JsonElement text = o.get("text");
if (text == null) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if (jar.size() != 0) {
jar = parseArray(jar);
o.add("extra", jar);
} else {
o.remove("extra");
}
}
continue;
} else {
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if (jar.size() != 0) {
jar = parseArray(jar);
o.add("extra", jar);
} else {
o.remove("extra");
}
}
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.add(itemTooltip);
}
}
if (!fnd) {
rep.add(o);
}
} else {
if (array.get(i).isJsonNull()) {
continue;
} else {
if (array.get(i).isJsonArray()) {
JsonArray jar = array.get(i).getAsJsonArray();
if (jar.size() != 0) {
jar = parseArray(array.get(i).getAsJsonArray());
rep.set(i, jar);
}
} else {
String msg = array.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.add(itemTooltip);
}
}
if (!fnd) {
rep.add(array.get(i));
}
}
}
}
}
obj.add("extra", rep);
if (!obj.has("text")) {
obj.addProperty("text", "");
}
return obj.toString();
}
@Override
public String parseEmpty(String json, List<String> replacements, String repl, List<String> tooltip, Player sender) {
JsonObject obj = PARSER.parse(json).getAsJsonObject();
JsonArray array = obj.getAsJsonArray("extra");
replaces = replacements;
String regex = "";
for (int i = 0; i < replacements.size(); ++i) {
if (replacements.size() == 1) {
regex = Pattern.quote(replacements.get(0));
break;
}
if (i == 0 || i + 1 == replacements.size()) {
if (i == 0) {
regex = "(" + Pattern.quote(replacements.get(i));
} else {
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i))).concat(")");
}
continue;
}
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i)));
}
rgx = regex;
JsonArray rep = new JsonArray();
JsonArray use = Translator
.toJson(repl.replace("{name}", sender.getName()).replace("{display-name}", sender.getDisplayName()));
JsonObject hover = PARSER.parse("{\"action\":\"show_text\", \"value\": \"\"}").getAsJsonObject();
StringBuilder oneLineTooltip = new StringBuilder("");
int index = 0;
for (String m : tooltip) {
oneLineTooltip
.append(m.replace("{name}", sender.getName()).replace("{display-name}", sender.getDisplayName()));
++index;
if (index != tooltip.size()) {
oneLineTooltip.append('\n');
}
}
hover.add("value", new JsonPrimitive(oneLineTooltip.toString()));
for (JsonElement ob : use)
ob.getAsJsonObject().add("hoverEvent", hover);
classicTooltip = use;
for (int i = 0; i < array.size(); ++i) {
if (array.get(i).isJsonObject()) {
JsonObject o = array.get(i).getAsJsonObject();
boolean inside = false;
for (String replace : replacements)
if (o.toString().contains(replace)) {
if (inside) {
break;
}
inside = true;
}
JsonElement text = o.get("text");
if (text == null) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if (jar.size() != 0) {
jar = parseNoItemArray(jar);
o.add("extra", jar);
} else {
o.remove("extra");
}
}
continue;
} else {
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if (jar.size() != 0) {
jar = parseNoItemArray(jar);
o.add("extra", jar);
} else {
o.remove("extra");
}
}
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.addAll(use);
}
}
if (!fnd) {
rep.add(o);
}
} else {
if (array.get(i).isJsonNull()) {
continue;
} else {
if (array.get(i).isJsonArray()) {
JsonArray jar = array.get(i).getAsJsonArray();
if (jar.size() != 0) {
jar = parseNoItemArray(array.get(i).getAsJsonArray());
rep.set(i, jar);
}
} else {
String msg = array.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.addAll(use);
}
}
if (!fnd) {
rep.add(array.get(i));
}
}
}
}
}
obj.add("extra", rep);
return obj.toString();
}
private JsonArray parseNoItemArray(JsonArray arr) {
JsonArray replacer = new JsonArray();
for (int i = 0; i < arr.size(); ++i) {
if (arr.get(i).isJsonObject()) {
JsonObject o = arr.get(i).getAsJsonObject();
boolean inside = false;
for (String replacement : replaces)
if (o.toString().contains(replacement)) {
if (inside) {
break;
}
inside = true;
}
if (!inside) { // the placeholder we're looking for is not inside this element, so we continue
// searching
replacer.add(o);
continue;
}
JsonElement text = o.get("text");
if (text == null) {
continue;
}
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el == null) {
continue;
}
JsonArray jar = el.getAsJsonArray();
if (jar.size() != 0) {
jar = parseNoItemArray(jar);
o.add("extra", jar);
} else {
o.remove("extra");
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.addAll(classicTooltip);
}
}
if (!fnd) {
replacer.add(o);
}
} else {
if (arr.get(i).isJsonNull()) {
continue;
} else {
if (arr.get(i).isJsonArray()) {
JsonArray jar = arr.get(i).getAsJsonArray();
if (jar.size() != 0) {
jar = parseNoItemArray(arr.get(i).getAsJsonArray());
replacer.set(i, jar);
}
} else {
String msg = arr.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.addAll(classicTooltip);
}
}
if (!fnd) {
replacer.add(arr.get(i));
}
}
}
}
}
return replacer;
}
private JsonArray parseArray(JsonArray arr) {
JsonArray replacer = new JsonArray();
for (int i = 0; i < arr.size(); ++i) {
if (arr.get(i).isJsonObject()) {
JsonObject o = arr.get(i).getAsJsonObject();
boolean inside = false;
for (String replacement : replaces)
if (o.toString().contains(replacement)) {
if (inside) {
break;
}
inside = true;
}
if (!inside) { // the placeholder we're looking for is not inside this element, so we continue
// searching
replacer.add(o);
continue;
}
JsonElement text = o.get("text");
if (text == null) {
continue;
}
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el == null) {
continue;
}
JsonArray jar = el.getAsJsonArray();
if (jar.size() != 0) {
jar = parseArray(jar);
o.add("extra", jar);
} else {
o.remove("extra");
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.add(itemTooltip);
}
}
if (!fnd) {
replacer.add(o);
}
} else {
if (arr.get(i).isJsonNull()) {
continue;
} else {
if (arr.get(i).isJsonArray()) {
JsonArray jar = arr.get(i).getAsJsonArray();
if (jar.size() != 0) {
jar = parseArray(arr.get(i).getAsJsonArray());
replacer.set(i, jar);
}
} else {
String msg = arr.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.add(itemTooltip);
}
}
if (!fnd) {
replacer.add(arr.get(i));
}
}
}
}
}
return replacer;
}
@SuppressWarnings("deprecation")
private Item toItem(ItemStack is) throws Exception {
CompoundTag tag = new CompoundTag("tag");
Object nmsStack = AS_NMS_COPY.invoke(null, is);
Object nmsTag = NBT_TAG_COMPOUND.newInstance();
SAVE_NMS_ITEM_STACK_METHOD.invoke(nmsStack, nmsTag);
Map<String, Object> nmsMap = (Map<String, Object>) MAP.get(nmsTag);
String id = nmsMap.get("id").toString().replace("\"", "");
Object realTag = nmsMap.get("tag");
if (NBT_TAG_COMPOUND.isInstance(realTag)) { // We need to make sure this is indeed an NBTTagCompound
Map<String, Object> realMap = (Map<String, Object>) MAP.get(realTag);
Set<Map.Entry<String, Object>> entrySet = realMap.entrySet();
Map<String, Tag> map = tag.getValue();
for (Map.Entry<String, Object> entry : entrySet) {
map.put(entry.getKey(), toOpenTag(entry.getValue(), entry.getKey()));
}
tag.setValue(map);
}
Item item = new Item();
item.setAmount((byte) is.getAmount());
item.setData(is.getDurability());
item.setId(id);
item.setTag(tag);
return item;
}
private Tag toOpenTag(Object nmsTag, String name) throws Exception {
if (NBT_TAG_COMPOUND.isInstance(nmsTag)) {
CompoundTag tag = new CompoundTag(name);
Map<String, Tag> tagMap = tag.getValue();
Map<String, Object> nmsMap = (Map<String, Object>) MAP.get(nmsTag);
Set<Map.Entry<String, Object>> entrySet = nmsMap.entrySet();
for (Map.Entry<String, Object> entry : entrySet) {
Tag value = toOpenTag(entry.getValue(), entry.getKey());
tagMap.put(entry.getKey(), value);
}
tag.setValue(tagMap);
return tag;
} else {
// Strings are a special case as they need proper escaping
if (NBT_STRING.isInstance(nmsTag)) {
String toString = nmsTag.toString();
if (toString.startsWith("\"") && toString.endsWith("\"")) {
toString = toString.substring(1, toString.length() - 1);
// toString = escapeSpecials(toString);
return new StringTag(name, toString);
}
}
// NBTTag Lists are also special, as they are a sort of compound themselves and
// need to be parsed recursively
if (NBT_LIST.isInstance(nmsTag)) {
List<Object> nmsNBTBaseList = (List<Object>) LIST_FIELD.get(nmsTag);
List<Tag> list = new ArrayList<>();
int i = 0;
for (Object baseTag : nmsNBTBaseList) {
list.add(toOpenTag(baseTag, String.valueOf(i)));
++i;
}
return new ListTag(name, list);
}
for (int i = 0; i < NBT_BASE_CLASSES.size(); ++i) {
Class<?> c = NBT_BASE_CLASSES.get(i);
if (c.isInstance(nmsTag)) {
Object value = NBT_BASE_DATA_FIELD.get(i).get(nmsTag);
if(value.getClass().getSimpleName().startsWith("NBTTag")) {
if(!TYPES_TO_MC_NBT_TAGS.containsKey(value.getClass())) {
ChatItem.getInstance().getLogger().warning("Failed to find NBT tag for class: " + value.getClass().getSimpleName());
continue;
}
return TYPES_TO_MC_NBT_TAGS.get(value.getClass()).apply(name, value);
} else {
Tag t = TYPES_TO_OPEN_NBT_TAGS.get(value.getClass()).apply(name);
if (t instanceof ByteTag) {
((ByteTag) t).setValue((byte) value);
((ByteTag) t).setValue((byte) value);
} else if (t instanceof ByteArrayTag)
((ByteArrayTag) t).setValue((byte[]) value);
else if (t instanceof DoubleTag)
((DoubleTag) t).setValue((double) value);
else if (t instanceof FloatTag)
((FloatTag) t).setValue((float) value);
else if (t instanceof IntTag)
((IntTag) t).setValue((int) value);
else if (t instanceof IntArrayTag)
((IntArrayTag) t).setValue((int[]) value);
else if (t instanceof LongTag)
((LongTag) t).setValue((long) value);
else if (t instanceof ShortTag)
((ShortTag) t).setValue((short) value);
else
ChatItem.getInstance().getLogger().warning("Failed to find Open tag for class: " + t.getClass().getSimpleName());
return t; // Should never happen
}
}
}
return null; // Should never happen
}
}
private String stringifyItem(ItemStack stack) throws Exception {
Item item = toItem(stack);
ItemRewriter.remapIds(Version.getVersion().MAX_VER, protocolVersion.MAX_VER, item);
StringBuilder sb = new StringBuilder("{id:");
sb.append("\"").append(item.getId()).append("\"").append(","); // Append the id
sb.append("Count:").append(item.getAmount()).append("b,"); // Append the amount
sb.append("Damage:").append(item.getData()).append("s"); // Append the durability data
Map<String, Tag> tagMap = item.getTag().getValue();
if (tagMap.isEmpty()) {
sb.append("}");
return sb.toString();
}
Set<Map.Entry<String, Tag>> entrySet = tagMap.entrySet();
boolean first = true;
sb.append(",tag:{"); // Start of the tag
for (Map.Entry<String, Tag> entry : entrySet) {
String key = entry.getKey();
if (IGNORED.contains(key)) {
continue;
}
Pattern pattern = Pattern.compile("[{}\\[\\],\":\\\\/]");
Matcher matcher = pattern.matcher(key);
if (matcher.find()) {
continue; // Skip invalid keys, as they can cause exceptions client-side
}
String value = stringifyTag(entry.getValue());
if (!first) {
sb.append(",");
}
sb.append(key).append(":").append(value);
first = false;
}
sb.append("}}"); // End of tag and end of item
return sb.toString();
}
private String stringifyTag(Tag normalTag) {
if (normalTag instanceof CompoundTag) {
StringBuilder sb = new StringBuilder("{");
CompoundTag tagCompound = (CompoundTag) normalTag;
Map<String, Tag> tagMap = tagCompound.getValue();
Set<Map.Entry<String, Tag>> entrySet = tagMap.entrySet();
for (Map.Entry<String, Tag> entry : entrySet) {
String value = stringifyTag(entry.getValue());
if (value == null) {
continue;
}
if (sb.length() > 1) {
sb.append(",");
}
sb.append(entry.getKey()).append(":").append(value);
}
sb.append("}");
return sb.toString();
} else {
if (normalTag instanceof StringTag) {
return "\"" + ((StringTag) normalTag).getValue() + "\""; // Should be already escaped
}
if (normalTag instanceof ListTag) {
List<Tag> list = ((ListTag) normalTag).getValue();
StringBuilder sb = new StringBuilder("[");
boolean first = true;
for (Tag tag : list) {
String index = tag.getName();
String value = stringifyTag(tag);
if (value == null) {
continue;
}
if (!first) {
sb.append(",");
}
if (protocolVersion.MAX_VER <= Version.V1_11.MAX_VER) { // it's before 1.12
sb.append(index).append(":").append(value);
} else {
sb.append(value);
}
first = false;
}
sb.append("]");
return sb.toString();
}
if (normalTag instanceof ByteTag) {
return normalTag.getValue() + "b";
}
if (normalTag instanceof ByteArrayTag) {
return "[" + ((byte[]) normalTag.getValue()).length + " bytes]";
}
if (normalTag instanceof DoubleTag) {
return (double) normalTag.getValue() + "d";
}
if (normalTag instanceof FloatTag) {
return (float) normalTag.getValue() + "f";
}
if (normalTag instanceof IntTag) {
return String.valueOf((int) normalTag.getValue());
}
if (normalTag instanceof IntArrayTag) {
int[] array = (int[]) normalTag.getValue();
if (array.length == 0) {
return null;
}
StringBuilder sb = new StringBuilder("[");
boolean first = true;
for (int i : array) {
if (!first) {
sb.append(",");
}
sb.append(i);
first = false;
}
sb.append("]");
return sb.toString();
}
if (normalTag instanceof LongTag) {
return (long) normalTag.getValue() + "L";
}
if (normalTag instanceof ShortTag) {
return (short) normalTag.getValue() + "s";
}
return null; // Should never happen
}
}
}
@@ -0,0 +1,14 @@
package me.dadus33.chatitem.chatmanager.v1.json;
public class NBTUtils {
@SuppressWarnings("unchecked")
public static <T> T get(Object obj, String methodName){
try {
return (T) obj.getClass().getDeclaredMethod(methodName).invoke(obj);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
}
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.json;
package me.dadus33.chatitem.chatmanager.v1.json;
import com.google.gson.JsonArray;
@@ -1,5 +1,4 @@
package me.dadus33.chatitem.listeners;
package me.dadus33.chatitem.chatmanager.v1.listeners;
import org.bukkit.Bukkit;
@@ -9,17 +8,19 @@ import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.utils.Version;
public class HandshakeListener extends PacketAdapter{
public class HandshakeListener extends PacketAdapter {
public HandshakeListener() {
super(ChatItem.getInstance(), ListenerPriority.MONITOR, PacketType.Handshake.Client.SET_PROTOCOL);
public HandshakeListener(ChatItem pl) {
super(pl, ListenerPriority.MONITOR, PacketType.Handshake.Client.SET_PROTOCOL);
}
@Override
public void onPacketReceiving(final PacketEvent e){
if(e.isPlayerTemporary() || e.getPlayer() == null)
return;
PacketType.Protocol p = e.getPacket().getProtocols().read(0);
if(p == PacketType.Protocol.STATUS || p == PacketType.Protocol.LEGACY){
return;
@@ -27,6 +28,6 @@ public class HandshakeListener extends PacketAdapter{
final int version = e.getPacket().getIntegers().readSafely(0);
//Delay the mapping to make sure the true address of the player was received when using bungeecord or other types of proxies
Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(), () ->
DefaultVersionHook.PROTOCOL_PER_ADDRESS.put(ProtocolVersion.stringifyAdress(e.getPlayer().getAddress()), version), 10L);
DefaultVersionHook.PROTOCOL_PER_ADDRESS.put(Version.stringifyAdress(e.getPlayer().getAddress()), version), 10L);
}
}
@@ -0,0 +1,270 @@
package me.dadus33.chatitem.chatmanager.v1.listeners.v15lower;
import static me.dadus33.chatitem.chatmanager.ChatManager.SEPARATOR;
import java.util.HashMap;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.v1.PacketEditingChatManager;
import me.dadus33.chatitem.utils.Storage;
public class ChatEventListener implements Listener {
private final static String LEFT = "{remaining}";
private final HashMap<String, Long> COOLDOWNS = new HashMap<>();
private final PacketEditingChatManager manage;
public ChatEventListener(PacketEditingChatManager manage) {
this.manage = manage;
}
public Storage getStorage() {
return this.manage.getStorage();
}
private String calculateTime(long seconds) {
if (seconds < 60) {
return seconds + getStorage().SECONDS;
}
if (seconds < 3600) {
StringBuilder builder = new StringBuilder();
int minutes = (int) seconds / 60;
builder.append(minutes).append(getStorage().MINUTES);
int secs = (int) seconds - minutes * 60;
if (secs != 0) {
builder.append(" ").append(secs).append(getStorage().SECONDS);
}
return builder.toString();
}
StringBuilder builder = new StringBuilder();
int hours = (int) seconds / 3600;
builder.append(hours).append(getStorage().HOURS);
int minutes = (int) (seconds / 60) - (hours * 60);
if (minutes != 0) {
builder.append(" ").append(minutes).append(getStorage().MINUTES);
}
int secs = (int) (seconds - ((seconds / 60) * 60));
if (secs != 0) {
builder.append(" ").append(secs).append(getStorage().SECONDS);
}
return builder.toString();
}
private int countOccurrences(String findStr, String str) {
int lastIndex = 0;
int count = 0;
while (lastIndex != -1) {
lastIndex = str.indexOf(findStr, lastIndex);
if (lastIndex != -1) {
count++;
lastIndex += findStr.length();
}
}
return count;
}
@SuppressWarnings("deprecation")
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) // We need to have lowest priority in order
// to get to the event before DeluxeChat or
// other plugins do
public void onChat(final AsyncPlayerChatEvent e) {
ChatItem.debug("(v1) Check for v1 system. Cancelled: " + e.isCancelled());
if (e.getMessage().indexOf(SEPARATOR) != -1) { // If the BELL character is found, we have to remove it
String msg = e.getMessage().replace(Character.toString(SEPARATOR), "");
ChatItem.debug("Already bell in message: " + e.getMessage());
e.setMessage(msg);
}
boolean found = false;
for (String rep : getStorage().PLACEHOLDERS)
if (e.getMessage().contains(rep)) {
found = true;
break;
}
if (!found) {
ChatItem.debug("(v1) not found placeholders in: " + e.getMessage());
return;
}
Player p = e.getPlayer();
if (!p.hasPermission("chatitem.use")) {
if (!getStorage().LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if (!getStorage().NO_PERMISSION_MESSAGE.isEmpty() && getStorage().SHOW_NO_PERM_NORMAL) {
p.sendMessage(getStorage().NO_PERMISSION_MESSAGE);
}
ChatItem.debug("(v1) Don't have permission");
return;
}
if (p.getItemInHand().getType().equals(Material.AIR)) {
if (getStorage().DENY_IF_NO_ITEM) {
e.setCancelled(true);
if (!getStorage().DENY_MESSAGE.isEmpty())
e.getPlayer().sendMessage(getStorage().DENY_MESSAGE);
ChatItem.debug("(v1) No item and must deny");
return;
}
if (getStorage().HAND_DISABLED) {
ChatItem.debug("(v1) Hand disabled");
return;
}
}
if (getStorage().COOLDOWN > 0 && !p.hasPermission("chatitem.ignore-cooldown")) {
if (COOLDOWNS.containsKey(p.getName())) {
long start = COOLDOWNS.get(p.getName());
long current = System.currentTimeMillis() / 1000;
long elapsed = current - start;
if (elapsed >= getStorage().COOLDOWN) {
COOLDOWNS.remove(p.getName());
} else {
if (!getStorage().LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if (!getStorage().COOLDOWN_MESSAGE.isEmpty()) {
long left = (start + getStorage().COOLDOWN) - current;
p.sendMessage(getStorage().COOLDOWN_MESSAGE.replace(LEFT, calculateTime(left)));
}
ChatItem.debug("(v1) Cooldown");
return;
}
}
}
String s = e.getMessage();
for (String placeholder : getStorage().PLACEHOLDERS) {
s = s.replace(placeholder, getStorage().PLACEHOLDERS.get(0));
}
int occurrences = countOccurrences(getStorage().PLACEHOLDERS.get(0), s);
if (occurrences > getStorage().LIMIT) {
e.setCancelled(true);
ChatItem.debug("(v1) Reach message limit");
if (getStorage().LIMIT_MESSAGE.isEmpty()) {
return;
}
e.getPlayer().sendMessage(getStorage().LIMIT_MESSAGE);
return;
}
String oldmsg = e.getMessage();
StringBuilder sb = new StringBuilder(oldmsg);
sb.append(SEPARATOR).append(e.getPlayer().getName());
e.setMessage(sb.toString());
ChatItem.debug("(v1) Set placeholder: " + e.getMessage());
if (!p.hasPermission("chatitem.ignore-cooldown")) {
COOLDOWNS.put(p.getName(), System.currentTimeMillis() / 1000);
}
}
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.LOWEST)
public void onCommand(final PlayerCommandPreprocessEvent e) {
if (e.getMessage().indexOf(SEPARATOR) != -1) { // If the BELL character is found, we have to remove it
String msg = e.getMessage().replace(Character.toString(SEPARATOR), "");
e.setMessage(msg);
}
String commandString = e.getMessage().split(" ")[0].replaceAll("^/+", ""); // First part of the command, without
// leading slashes and without
// arguments
Command cmd = Bukkit.getPluginCommand(commandString);
if (cmd == null) { // not a plugin command
if (!getStorage().ALLOWED_DEFAULT_COMMANDS.contains(commandString)) {
return;
}
} else {
if (!getStorage().ALLOWED_PLUGIN_COMMANDS.contains(cmd)) {
return;
}
}
Player p = e.getPlayer();
boolean found = false;
for (String rep : getStorage().PLACEHOLDERS) {
if (e.getMessage().contains(rep)) {
found = true;
break;
}
}
if (!found) {
return;
}
if (!p.hasPermission("chatitem.use")) {
if (!getStorage().NO_PERMISSION_MESSAGE.isEmpty() && getStorage().SHOW_NO_PERM_COMMAND) {
p.sendMessage(getStorage().NO_PERMISSION_MESSAGE);
}
e.setCancelled(true);
return;
}
if (e.getPlayer().getItemInHand().getType().equals(Material.AIR)) {
if (getStorage().DENY_IF_NO_ITEM) {
e.setCancelled(true);
if (!getStorage().DENY_MESSAGE.isEmpty()) {
e.getPlayer().sendMessage(getStorage().DENY_MESSAGE);
}
}
if (getStorage().HAND_DISABLED) {
return;
}
}
if (getStorage().COOLDOWN > 0 && !p.hasPermission("chatitem.ignore-cooldown")) {
if (COOLDOWNS.containsKey(p.getName())) {
long start = COOLDOWNS.get(p.getName());
long current = System.currentTimeMillis() / 1000;
long elapsed = current - start;
if (elapsed >= getStorage().COOLDOWN) {
COOLDOWNS.remove(p.getName());
} else {
if (!getStorage().LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if (!getStorage().COOLDOWN_MESSAGE.isEmpty()) {
long left = (start + getStorage().COOLDOWN) - current;
p.sendMessage(getStorage().COOLDOWN_MESSAGE.replace(LEFT, calculateTime(left)));
}
return;
}
}
}
String s = e.getMessage();
for (String placeholder : getStorage().PLACEHOLDERS) {
s = s.replace(placeholder, getStorage().PLACEHOLDERS.get(0));
}
int occurrences = countOccurrences(getStorage().PLACEHOLDERS.get(0), s);
if (occurrences > getStorage().LIMIT) {
e.setCancelled(true);
if (getStorage().LIMIT_MESSAGE.isEmpty()) {
return;
}
e.getPlayer().sendMessage(getStorage().LIMIT_MESSAGE);
return;
}
StringBuilder sb = new StringBuilder(e.getMessage());
sb.append(SEPARATOR).append(e.getPlayer().getName());
e.setMessage(sb.toString());
if (!p.hasPermission("chatitem.ignore-cooldown")) {
COOLDOWNS.put(p.getName(), System.currentTimeMillis() / 1000);
}
}
}
@@ -1,7 +1,11 @@
package me.dadus33.chatitem.listeners;
package me.dadus33.chatitem.chatmanager.v1.listeners.v15lower;
import static me.dadus33.chatitem.chatmanager.ChatManager.SEPARATOR;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -14,118 +18,139 @@ import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.ItemMeta;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketContent;
import me.dadus33.chatitem.packets.PacketHandler;
import me.dadus33.chatitem.packets.PacketMetadata;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.chatmanager.v1.PacketEditingChatManager;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketContent;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketHandler;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.Storage;
import me.dadus33.chatitem.utils.Version;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.ComponentSerializer;
public class ChatPacketListenerV2 extends PacketHandler {
public class ChatPacket15Manager extends PacketHandler {
private final static String NAME = "{name}";
private final static String AMOUNT = "{amount}";
private final static String TIMES = "{times}";
private Method serializerGetJson;
private PacketEditingChatManager manager;
private Storage c;
public ChatPacketListenerV2(Storage s) {
c = s;
}
private static String materialToName(Material m) {
if (m.equals(Material.TNT)) {
return "TNT";
public ChatPacket15Manager(PacketEditingChatManager manager) {
this.manager = manager;
try {
for (Method m : PacketUtils.CHAT_SERIALIZER.getDeclaredMethods()) {
if (m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(PacketUtils.COMPONENT_CLASS)
&& m.getReturnType().equals(String.class)) {
serializerGetJson = m;
break;
}
}
if (serializerGetJson == null)
ChatItem.getInstance().getLogger().warning(
"Failed to find JSON serializer in class: " + PacketUtils.CHAT_SERIALIZER.getCanonicalName());
} catch (Exception e) {
e.printStackTrace();
}
String orig = m.toString().toLowerCase();
String[] splits = orig.split("_");
StringBuilder sb = new StringBuilder(orig.length());
int pos = 0;
for (String split : splits) {
sb.append(split);
int loc = sb.lastIndexOf(split);
char charLoc = sb.charAt(loc);
if (!(split.equalsIgnoreCase("of") || split.equalsIgnoreCase("and") || split.equalsIgnoreCase("with")
|| split.equalsIgnoreCase("on")))
sb.setCharAt(loc, Character.toUpperCase(charLoc));
if (pos != splits.length - 1)
sb.append(' ');
++pos;
}
return sb.toString();
}
private void stripData(ItemStack i) {
if (i == null) {
return;
}
if (i.getType().equals(Material.AIR)) {
return;
}
if (!i.hasItemMeta()) {
return;
}
ItemMeta im = Bukkit.getItemFactory().getItemMeta(i.getType());
ItemMeta original = i.getItemMeta();
if (original.hasDisplayName()) {
im.setDisplayName(original.getDisplayName());
}
i.setItemMeta(im);
}
@SuppressWarnings("deprecation")
@Override
public void onSend(ChatItemPacket e) {
if(!e.hasPlayer() || !e.getPacketType().equals(PacketType.Server.CHAT)) {
return;
}
final PacketContent packet = e.getContent();
final PacketMetadata meta = e.getMetaData();
if (!meta.hasMeta("parse")) { // First we check if the packet validator has validated this packet to be parsed
// by us
ChatItem.debug("Can't parse : " + e.getPacket());
meta.getMetas().forEach((s, o) -> ChatItem.debug("metaData: " + s + " > " + o));
if (!e.hasPlayer() || !e.getPacketType().equals(PacketType.Server.CHAT)) {
return;
}
meta.removeMeta("parse");
boolean usesBaseComponents = meta.getMeta("base-component", false); // The packet validator should also tell if this
// packet uses base
// components
Version version = Version.getVersion();
if (version.isNewerOrEquals(Version.V1_8)) { // only if action bar messages are supported in this
// version of minecraft
if (version.isNewerOrEquals(Version.V1_12)) {
try {
if (((Enum<?>) e.getContent()
.getSpecificModifier(PacketUtils.getNmsClass("ChatMessageType", "network.chat.")).read(0))
.name().equals("GAME_INFO")) {
return; // It means it's an actionbar message, and we ain't intercepting those
}
} catch (Exception exc) {
exc.printStackTrace();
}
} else if (e.getContent().getBytes().readSafely(0) == (byte) 2) {
return; // It means it's an actionbar message, and we ain't intercepting those
}
}
ChatItem.debug("UUID: " + e.getContent().getSpecificModifier(UUID.class).readSafely(0, null));
boolean usesBaseComponents = false;
PacketContent packet = e.getContent();
String json;
if (packet.getChatComponents().readSafely(0) == null) { // null check for some cases of messages sent using
// spigot's Chat Component API or other means
if (!manager.supportsChatComponentApi()) // only if the API is supported in this server distribution
return;// We don't know how to deal with anything else. Most probably some mod message
// we shouldn't mess with anyways
BaseComponent[] components = packet.getSpecificModifier(BaseComponent[].class).readSafely(0);
if (components == null) {
ChatItem.debug("No base components");
return;
}
json = ComponentSerializer.toString(components);
usesBaseComponents = true;
} else {
try {
json = (String) serializerGetJson.invoke(null, packet.getChatComponents().readSafely(0));
} catch (Exception exc) {
exc.printStackTrace();
json = "{}";
}
}
boolean found = false;
for (String rep : getStorage().PLACEHOLDERS) {
if (json.contains(rep)) {
found = true;
break;
}
}
if (!found) {
ChatItem.debug("No placeholders founded");
return; // then it's just a normal message without placeholders, so we leave it alone
}
if (json.lastIndexOf(SEPARATOR) == -1) { // if the message doesn't contain the BELL separator, then it's
// certainly NOT a message we want to parse
ChatItem.debug("Not contains bell " + json);
return;
}
ChatItem.debug("Add packet meta");
String fjson = json;
boolean bUsesBaseComponents = usesBaseComponents;
e.setCancelled(true); // We cancel the packet as we're going to resend it anyways (ignoring listeners
// this time)
// this time)
Bukkit.getScheduler().runTaskAsynchronously(ChatItem.getInstance(), () -> {
String json = (String) meta.getMeta("json", ""); // The packet validator got the json for us, so no need to
// get it again
int topIndex = -1;
String name = null;
for (Player p : Bukkit.getOnlinePlayers()) {
String pname = "\\u0007" + p.getName();
if (!json.contains(pname)) {
String pname = SEPARATOR + p.getName();
if (!fjson.contains(pname)) {
continue;
}
int index = json.lastIndexOf(pname) + pname.length();
int index = fjson.lastIndexOf(pname) + pname.length();
if (index > topIndex) {
topIndex = index;
name = pname.replace("\\u0007", "");
name = pname.replace(SEPARATOR + "", "");
}
}
if (name == null) { // something went really bad, so we run away and hide (AKA the player left or is
// on another server)
ChatItem.debug("Name null for " + json);
// on another server)
ChatItem.debug("Name null for " + fjson);
return;
}
Player p = Bukkit.getPlayer(name);
StringBuilder builder = new StringBuilder(json);
StringBuilder builder = new StringBuilder(fjson);
builder.replace(topIndex - (name.length() + 6), topIndex, ""); // we remove both the name and the separator
// from the json string
json = builder.toString();
// from the json string
String localJson = builder.toString();
String message = null;
try {
@@ -150,28 +175,27 @@ public class ChatPacketListenerV2 extends PacketHandler {
}
}
}
message = ChatItem.getManipulator().parse(json, c.PLACEHOLDERS, copy, styleItem(copy, c),
ProtocolVersion.getClientVersion(e.getPlayer()));
message = manager.getManipulator().parse(localJson, getStorage().PLACEHOLDERS, copy,
styleItem(copy, getStorage()), manager.getPlayerVersionAdapter().getProtocolVersion(p));
} else {
if (!c.HAND_DISABLED) {
message = ChatItem.getManipulator().parseEmpty(json, c.PLACEHOLDERS, c.HAND_NAME,
c.HAND_TOOLTIP, p);
if (!getStorage().HAND_DISABLED) {
message = manager.getManipulator().parseEmpty(localJson, getStorage().PLACEHOLDERS,
getStorage().HAND_NAME, getStorage().HAND_TOOLTIP, p);
}
}
} catch (Exception e1) {
e1.printStackTrace();
}
if (message != null) {
if (!usesBaseComponents) {
if (!bUsesBaseComponents) {
packet.getChatComponents().write(0, jsonToChatComponent(message));
} else {
packet.getSpecificModifier(BaseComponent[].class).write(0, ComponentSerializer.parse(message));
}
}
PacketUtils.sendPacket(p, e.getPacket());
PacketUtils.sendPacket(e.getPlayer(), e.getPacket());
});
}
private Object jsonToChatComponent(String json) {
try {
return PacketUtils.CHAT_SERIALIZER.getMethod("a", String.class).invoke(null, json);
@@ -181,10 +205,6 @@ public class ChatPacketListenerV2 extends PacketHandler {
return null;
}
public void setStorage(Storage st) {
c = st;
}
public static String styleItem(ItemStack item, Storage c) {
String replacer = c.NAME_FORMAT;
String amount = c.AMOUNT_FORMAT;
@@ -226,4 +246,49 @@ public class ChatPacketListenerV2 extends PacketHandler {
return replacer;
}
private static String materialToName(Material m) {
if (m.equals(Material.TNT)) {
return "TNT";
}
String orig = m.toString().toLowerCase();
String[] splits = orig.split("_");
StringBuilder sb = new StringBuilder(orig.length());
int pos = 0;
for (String split : splits) {
sb.append(split);
int loc = sb.lastIndexOf(split);
char charLoc = sb.charAt(loc);
if (!(split.equalsIgnoreCase("of") || split.equalsIgnoreCase("and") || split.equalsIgnoreCase("with")
|| split.equalsIgnoreCase("on")))
sb.setCharAt(loc, Character.toUpperCase(charLoc));
if (pos != splits.length - 1)
sb.append(' ');
++pos;
}
return sb.toString();
}
private void stripData(ItemStack i) {
if (i == null) {
return;
}
if (i.getType().equals(Material.AIR)) {
return;
}
if (!i.hasItemMeta()) {
return;
}
ItemMeta im = Bukkit.getItemFactory().getItemMeta(i.getType());
ItemMeta original = i.getItemMeta();
if (original.hasDisplayName()) {
im.setDisplayName(original.getDisplayName());
}
i.setItemMeta(im);
}
public Storage getStorage() {
return manager.getStorage();
}
}
@@ -0,0 +1,234 @@
package me.dadus33.chatitem.chatmanager.v1.listeners.v16upper;
import java.lang.reflect.Method;
import java.util.Collections;
import java.util.HashMap;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.ItemMeta;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.v1.PacketEditingChatManager;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketContent;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketHandler;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.Storage;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.ComponentSerializer;
public class ChatPacket16Manager extends PacketHandler {
private final static String NAME = "{name}";
private final static String AMOUNT = "{amount}";
private final static String TIMES = "{times}";
private Method serializerGetJson;
private PacketEditingChatManager manager;
public ChatPacket16Manager(PacketEditingChatManager manager) {
this.manager = manager;
try {
for (Method m : PacketUtils.CHAT_SERIALIZER.getDeclaredMethods()) {
if (m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(PacketUtils.COMPONENT_CLASS)
&& m.getReturnType().equals(String.class)) {
serializerGetJson = m;
break;
}
}
if (serializerGetJson == null)
ChatItem.getInstance().getLogger().warning(
"Failed to find JSON serializer in class: " + PacketUtils.CHAT_SERIALIZER.getCanonicalName());
} catch (Exception e) {
e.printStackTrace();
}
}
@SuppressWarnings("deprecation")
@Override
public void onSend(ChatItemPacket e) {
if (!e.hasPlayer() || !e.getPacketType().equals(PacketType.Server.CHAT)) {
return;
}
UUID sender = e.getContent().getSpecificModifier(UUID.class).readSafely(0, null);
if(sender.equals(UUID.fromString("00000000-0000-0000-0000-000000000000"))) // not chat message
return;
ChatItem.debug("UUID: " + sender);
PacketContent packet = e.getContent();
String nfJson;
Object possibleChatComponent = packet.getChatComponents().readSafely(0);
if (possibleChatComponent == null) {
BaseComponent[] components = packet.getSpecificModifier(BaseComponent[].class).readSafely(0);
if (components == null) {
ChatItem.debug("No base components");
return;
}
nfJson = ComponentSerializer.toString(components);
} else {
try {
nfJson = (String) serializerGetJson.invoke(null, possibleChatComponent);
} catch (Exception exc) {
exc.printStackTrace();
nfJson = "{}";
}
}
String json = nfJson;
boolean found = false;
for (String rep : getStorage().PLACEHOLDERS) {
if (json.contains(rep)) {
found = true;
break;
}
}
if (!found) {
ChatItem.debug("No placeholders founded");
return; // then it's just a normal message without placeholders, so we leave it alone
}
Player p = Bukkit.getPlayer(sender);
String message = null;
try {
if (!p.getItemInHand().getType().equals(Material.AIR)) {
ItemStack copy = p.getItemInHand().clone();
if (copy.getType().name().contains("_BOOK")) { // filtering written books
BookMeta bm = (BookMeta) copy.getItemMeta();
bm.setPages(Collections.emptyList());
copy.setItemMeta(bm);
} else {
if (copy.getType().name().contains("SHULKER_BOX")) { // if it's shulker
if (copy.hasItemMeta()) {
BlockStateMeta bsm = (BlockStateMeta) copy.getItemMeta();
if (bsm.hasBlockState()) {
ShulkerBox sb = (ShulkerBox) bsm.getBlockState();
for (ItemStack item : sb.getInventory()) {
stripData(item);
}
bsm.setBlockState(sb);
}
copy.setItemMeta(bsm);
}
}
}
message = manager.getManipulator().parse(json, getStorage().PLACEHOLDERS, copy,
styleItem(copy, getStorage()), manager.getPlayerVersionAdapter().getProtocolVersion(p));
} else {
if (!getStorage().HAND_DISABLED) {
message = manager.getManipulator().parseEmpty(json, getStorage().PLACEHOLDERS,
getStorage().HAND_NAME, getStorage().HAND_TOOLTIP, p);
}
}
} catch (Exception e1) {
e1.printStackTrace();
}
if (message != null) {
if (json.equalsIgnoreCase("{}")) {
packet.getChatComponents().write(0, jsonToChatComponent(message));
} else {
packet.getSpecificModifier(BaseComponent[].class).write(0, ComponentSerializer.parse(message));
}
}
}
private Object jsonToChatComponent(String json) {
try {
return PacketUtils.CHAT_SERIALIZER.getMethod("a", String.class).invoke(null, json);
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
public static String styleItem(ItemStack item, Storage c) {
String replacer = c.NAME_FORMAT;
String amount = c.AMOUNT_FORMAT;
boolean dname = item.hasItemMeta() ? item.getItemMeta().hasDisplayName() : false;
if (item.getAmount() == 1) {
if (c.FORCE_ADD_AMOUNT) {
amount = amount.replace(TIMES, "1");
replacer = replacer.replace(AMOUNT, amount);
} else {
replacer = replacer.replace(AMOUNT, "");
}
} else {
amount = amount.replace(TIMES, String.valueOf(item.getAmount()));
replacer = replacer.replace(AMOUNT, amount);
}
if (dname) {
String trp = item.getItemMeta().getDisplayName();
if (c.COLOR_IF_ALREADY_COLORED) {
replacer = replacer.replace(NAME, ChatColor.stripColor(trp));
} else {
replacer = replacer.replace(NAME, trp);
}
} else {
HashMap<Short, String> translationSection = c.TRANSLATIONS.get(item.getType().name());
if (translationSection == null) {
String trp = materialToName(item.getType());
replacer = replacer.replace(NAME, trp);
} else {
@SuppressWarnings("deprecation")
String translated = translationSection.get(item.getDurability());
if (translated != null) {
replacer = replacer.replace(NAME, translated);
} else {
replacer = replacer.replace(NAME, materialToName(item.getType()));
}
}
}
return replacer;
}
private static String materialToName(Material m) {
if (m.equals(Material.TNT)) {
return "TNT";
}
String orig = m.toString().toLowerCase();
String[] splits = orig.split("_");
StringBuilder sb = new StringBuilder(orig.length());
int pos = 0;
for (String split : splits) {
sb.append(split);
int loc = sb.lastIndexOf(split);
char charLoc = sb.charAt(loc);
if (!(split.equalsIgnoreCase("of") || split.equalsIgnoreCase("and") || split.equalsIgnoreCase("with")
|| split.equalsIgnoreCase("on")))
sb.setCharAt(loc, Character.toUpperCase(charLoc));
if (pos != splits.length - 1)
sb.append(' ');
++pos;
}
return sb.toString();
}
private void stripData(ItemStack i) {
if (i == null) {
return;
}
if (i.getType().equals(Material.AIR)) {
return;
}
if (!i.hasItemMeta()) {
return;
}
ItemMeta im = Bukkit.getItemFactory().getItemMeta(i.getType());
ItemMeta original = i.getItemMeta();
if (original.hasDisplayName()) {
im.setDisplayName(original.getDisplayName());
}
i.setItemMeta(im);
}
public Storage getStorage() {
return manager.getStorage();
}
}
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
import org.bukkit.entity.Player;
@@ -1,11 +1,11 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.packets.protocollib.ProtocollibPacketManager;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.chatmanager.v1.packets.protocollib.ProtocollibPacketManager;
public class ChatItemPacketManager {
@@ -22,8 +22,10 @@ public class ChatItemPacketManager {
pl.getLogger().warning("Fallback to default Packet system ...");
packetManager = new CustomPacketManager(pl);
}
} else
} else {
pl.getLogger().info("Loading own packet system.");
packetManager = new CustomPacketManager(pl);
}
}
public PacketManager getPacketManager() {
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
import java.lang.reflect.Field;
import java.util.HashMap;
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
public abstract class PacketHandler {
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
import java.util.ArrayList;
@@ -6,9 +6,9 @@ import org.bukkit.entity.Player;
public abstract class PacketManager {
public abstract void addPlayer(Player p);
public abstract void removePlayer(Player p);
public abstract void clear();
public void addPlayer(Player p) {}
public void removePlayer(Player p) {}
public abstract void stop();
private final ArrayList<PacketHandler> handlers = new ArrayList<>();
public boolean addHandler(PacketHandler handler) {
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
import java.util.HashMap;
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets;
package me.dadus33.chatitem.chatmanager.v1.packets;
import java.util.ArrayList;
import java.util.List;
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets.custom;
package me.dadus33.chatitem.chatmanager.v1.packets.custom;
import java.util.HashMap;
@@ -10,15 +10,15 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.Plugin;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketManager;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.packets.custom.channel.ChannelAbstract;
import me.dadus33.chatitem.packets.custom.channel.INC2Channel;
import me.dadus33.chatitem.packets.custom.channel.INCChannel;
import me.dadus33.chatitem.packets.custom.channel.NMUChannel;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketManager;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.channel.ChannelAbstract;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.channel.INC2Channel;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.channel.INCChannel;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.channel.NMUChannel;
import me.dadus33.chatitem.utils.Utils;
import me.dadus33.chatitem.utils.Version;
public class CustomPacketManager extends PacketManager implements Listener {
@@ -29,24 +29,21 @@ public class CustomPacketManager extends PacketManager implements Listener {
public CustomPacketManager(Plugin pl) {
this.pl = pl;
ProtocolVersion version = ProtocolVersion.getServerVersion();
if (version.isNewerOrEquals(ProtocolVersion.V1_17))
Version version = Version.getVersion();
if (version.isNewerOrEquals(Version.V1_17))
channel = new INC2Channel(this);
else if (version.equals(ProtocolVersion.V1_7))
else if (version.equals(Version.V1_7))
channel = new NMUChannel(this);
else
channel = new INCChannel(this);
pl.getServer().getPluginManager().registerEvents(this, pl);
// we wait the start server
Bukkit.getScheduler().runTaskLater(pl, new Runnable() {
@Override
public void run() {
isStarted = true;
for(Player p : Utils.getOnlinePlayers())
addPlayer(p);
}
}, 40);
Bukkit.getScheduler().runTaskLater(pl, () -> {
isStarted = true;
for(Player p : Utils.getOnlinePlayers())
addPlayer(p);
}, 20);
}
public Plugin getPlugin() {
@@ -75,7 +72,7 @@ public class CustomPacketManager extends PacketManager implements Listener {
}
@Override
public void clear() {
public void stop() {
for(Player player : Utils.getOnlinePlayers())
removePlayer(player);
if(channel.getAddChannelExecutor() != null)
@@ -85,8 +82,10 @@ public class CustomPacketManager extends PacketManager implements Listener {
}
public ChatItemPacket onPacketSent(PacketType type, Player sender, Object packet) {
if(type == null)
if(type == null) {
//ChatItem.debug("Failed to find packet type for " + packet.getClass().getSimpleName());
return null;
}
ChatItemPacket customPacket = new ChatItemPacket(type, packet, sender);
notifyHandlersSent(customPacket);
return customPacket;
@@ -1,19 +1,21 @@
package me.dadus33.chatitem.packets.custom.channel;
package me.dadus33.chatitem.chatmanager.v1.packets.custom.channel;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.DefaultVersionHook;
public abstract class ChannelAbstract {
private ExecutorService addChannelExecutor, removeChannelExecutor;
static final String KEY_HANDSHAKE = "packet_handshake_negativity", KEY_HANDLER_SERVER = "packet_handler", KEY_SERVER = "packet_server_negativity";
static final String KEY_HANDSHAKE = "packet_handshake_chatitem", KEY_HANDLER_SERVER = "packet_handler", KEY_SERVER = "packet_server_chatitem";
private CustomPacketManager customPacketManager;
private HashSet<UUID> players = new HashSet<>();
@@ -31,7 +33,7 @@ public abstract class ChannelAbstract {
}
public ExecutorService getOrCreateAddChannelExecutor() {
if(addChannelExecutor == null)
if(addChannelExecutor == null || addChannelExecutor.isTerminated())
addChannelExecutor = Executors.newSingleThreadExecutor();
return addChannelExecutor;
}
@@ -41,7 +43,7 @@ public abstract class ChannelAbstract {
}
public ExecutorService getOrCreateRemoveChannelExecutor() {
if(removeChannelExecutor == null)
if(removeChannelExecutor == null || removeChannelExecutor.isTerminated())
removeChannelExecutor = Executors.newSingleThreadExecutor();
return removeChannelExecutor;
}
@@ -64,6 +66,17 @@ public abstract class ChannelAbstract {
removeChannel(p, p.getUniqueId().toString());
}
public void removeAllPlayers() {
new ArrayList<>(players).forEach((uuid) -> {
Player p = Bukkit.getPlayer(uuid);
if(p != null) // player don't left
removeChannel(Bukkit.getPlayer(uuid), uuid.toString());
});
players.clear();
}
protected abstract void stopPipelines();
public abstract void addChannel(Player player, String endChannelName);
public abstract void removeChannel(Player player, String endChannelName);
@@ -1,6 +1,8 @@
package me.dadus33.chatitem.packets.custom.channel;
package me.dadus33.chatitem.chatmanager.v1.packets.custom.channel;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.logging.Level;
import io.netty.channel.Channel;
@@ -8,24 +10,33 @@ import io.netty.channel.ChannelHandler;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.ChannelInitializer;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketContent;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.packets.custom.CustomPacketManager;
import io.netty.channel.ChannelPipeline;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketContent;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.CustomPacketManager;
public class ChannelInboundHandler extends ChannelInboundHandlerAdapter {
public static final HashMap<Channel, ChatItemPacket> TMP = new HashMap<>();
private CustomPacketManager packetManager;
private List<ChannelPipeline> pipelines = new ArrayList<>();
public ChannelInboundHandler(CustomPacketManager packetManager) {
this.packetManager = packetManager;
}
public void clean() {
pipelines.forEach(ChannelPipeline::removeFirst);
pipelines.clear();
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
ctx.fireChannelRead(msg);
((Channel) msg).pipeline().addFirst(new ChannelInitializer<Channel>() {
ChannelPipeline pipe = ((Channel) msg).pipeline();
pipelines.add(pipe);
pipe.addFirst(new ChannelInitializer<Channel>() {
@Override
protected void initChannel(Channel channel) {
try {
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets.custom.channel;
package me.dadus33.chatitem.chatmanager.v1.packets.custom.channel;
import static me.dadus33.chatitem.utils.PacketUtils.getPlayerConnection;
@@ -11,31 +11,43 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.ReflectionUtils;
import me.dadus33.chatitem.utils.Version;
public class INC2Channel extends ChannelAbstract {
private final ChannelInboundHandler boundHandler;
private ChannelPipeline pipeline;
@SuppressWarnings("unchecked")
public INC2Channel(CustomPacketManager customPacketManager) {
super(customPacketManager);
boundHandler = new ChannelInboundHandler(customPacketManager);
try {
Object mcServer = ReflectionUtils.callMethod(PacketUtils.getCraftServer(), "getServer");
Object mcServer = ReflectionUtils.callMethod(PacketUtils.getCraftServer(), Version.getVersion().equals(Version.V1_17) ? "getServer" : "b");
Object co = ReflectionUtils.getFirstWith(mcServer, PacketUtils.getNmsClass("MinecraftServer", "server."), PacketUtils.getNmsClass("ServerConnection", "server.network."));
((List<ChannelFuture>) ReflectionUtils.getField(co, "f")).forEach((channelFuture) -> {
channelFuture.channel().pipeline().addFirst(new ChannelInboundHandler(customPacketManager));
pipeline = channelFuture.channel().pipeline();
pipeline.addFirst(boundHandler);
});
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
protected void stopPipelines() {
pipeline.remove(boundHandler);
boundHandler.clean();
}
@Override
public void addChannel(final Player player, String endChannelName) {
@@ -49,7 +61,7 @@ public class INC2Channel extends ChannelAbstract {
ChatItemPacket pa = ChannelInboundHandler.TMP.remove(channel);
if(pa != null)
DefaultVersionHook.PROTOCOL_PER_UUID.put(player.getUniqueId(), pa.getContent().getIntegers().readSafely(0, ProtocolVersion.getServerVersion().MAX_VER));
DefaultVersionHook.PROTOCOL_PER_UUID.put(player.getUniqueId(), pa.getContent().getIntegers().readSafely(0, Version.getVersion().MAX_VER));
} catch (NoSuchElementException e) {
// appear when the player's channel isn't accessible because of reload.
getPacketManager().getPlugin().getLogger().warning("Please, don't use reload, this can produce some problem. Currently, " + player.getName() + " isn't fully checked because of that. More details: " + e.getMessage() + " (NoSuchElementException)");
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets.custom.channel;
package me.dadus33.chatitem.chatmanager.v1.packets.custom.channel;
import static me.dadus33.chatitem.utils.PacketUtils.getPlayerConnection;
@@ -12,24 +12,30 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelOutboundHandlerAdapter;
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketContent;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketContent;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.chatmanager.v1.playerversion.hooks.DefaultVersionHook;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.ReflectionUtils;
import me.dadus33.chatitem.utils.Version;
@SuppressWarnings("unchecked")
public class INCChannel extends ChannelAbstract {
private final ChannelInboundHandler boundHandler;
private ChannelPipeline pipeline;
public INCChannel(CustomPacketManager customPacketManager) {
super(customPacketManager);
boundHandler = new ChannelInboundHandler(customPacketManager);
getFuturChannel().forEach((channelFuture) -> {
channelFuture.channel().pipeline().addFirst(new ChannelInboundHandler(customPacketManager));
pipeline = channelFuture.channel().pipeline();
pipeline.addFirst(boundHandler);
});
}
@@ -48,6 +54,12 @@ public class INCChannel extends ChannelAbstract {
return new ArrayList<>();
}
}
@Override
protected void stopPipelines() {
pipeline.remove(boundHandler);
boundHandler.clean();
}
@Override
public void addChannel(final Player player, String endChannelName) {
@@ -58,10 +70,10 @@ public class INCChannel extends ChannelAbstract {
Channel channel = getChannel(player);
// Managing outgoing packet (to the player)
channel.pipeline().addAfter(KEY_HANDLER_SERVER, KEY_SERVER + endChannelName, new ChannelHandlerSent(player));
ChatItemPacket pa = ChannelInboundHandler.TMP.remove(channel);
if(pa != null)
DefaultVersionHook.PROTOCOL_PER_UUID.put(player.getUniqueId(), pa.getContent().getIntegers().readSafely(0, ProtocolVersion.getServerVersion().MAX_VER));
DefaultVersionHook.PROTOCOL_PER_UUID.put(player.getUniqueId(), pa.getContent().getIntegers().readSafely(0, Version.getVersion().MAX_VER));
} catch (NoSuchElementException e) {
// appear when the player's channel isn't accessible because of reload.
getPacketManager().getPlugin().getLogger().warning("Please, don't use reload, this can produce some problem. Currently, " + player.getName() + " isn't fully checked because of that. More details: " + e.getMessage() + " (NoSuchElementException)");
@@ -108,15 +120,10 @@ public class INCChannel extends ChannelAbstract {
@Override
public void write(ChannelHandlerContext ctx, Object packet, ChannelPromise promise) throws Exception {
try {
ChatItemPacket nextPacket = getPacketManager().onPacketSent(PacketType.getType(packet.getClass().getSimpleName()), owner, packet);
if(nextPacket != null && nextPacket.isCancelled())
return;
super.write(ctx, packet, promise);
} catch (Exception e) {
e.printStackTrace();
super.write(ctx, packet, promise);
}
ChatItemPacket nextPacket = getPacketManager().onPacketSent(PacketType.getType(packet.getClass().getSimpleName()), owner, packet);
if(nextPacket != null && nextPacket.isCancelled())
return;
super.write(ctx, packet, promise);
}
}
}
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.packets.custom.channel;
package me.dadus33.chatitem.chatmanager.v1.packets.custom.channel;
import static me.dadus33.chatitem.utils.PacketUtils.getPlayerConnection;
@@ -9,10 +9,10 @@ import java.util.logging.Level;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketContent;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketContent;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
import me.dadus33.chatitem.chatmanager.v1.packets.custom.CustomPacketManager;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.ReflectionUtils;
import net.minecraft.util.io.netty.channel.Channel;
@@ -22,10 +22,14 @@ import net.minecraft.util.io.netty.channel.ChannelHandlerContext;
import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
import net.minecraft.util.io.netty.channel.ChannelInitializer;
import net.minecraft.util.io.netty.channel.ChannelOutboundHandlerAdapter;
import net.minecraft.util.io.netty.channel.ChannelPipeline;
import net.minecraft.util.io.netty.channel.ChannelPromise;
public class NMUChannel extends ChannelAbstract {
private ChannelInboundHandlerAdapter boundHandler;
private ChannelPipeline pipeline;
public NMUChannel(CustomPacketManager customPacketManager) {
super(customPacketManager);
try {
@@ -35,7 +39,8 @@ public class NMUChannel extends ChannelAbstract {
@SuppressWarnings("unchecked")
List<ChannelFuture> g = (List<ChannelFuture>) ReflectionUtils.getField(co, "g");
g.forEach((channelFuture) -> {
channelFuture.channel().pipeline().addFirst(new ChannelInboundHandlerAdapter() {
pipeline = channelFuture.channel().pipeline();
pipeline.addFirst(boundHandler = new ChannelInboundHandlerAdapter() {
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
((Channel) msg).pipeline().addFirst(new ChannelInitializer<Channel>() {
@@ -69,6 +74,11 @@ public class NMUChannel extends ChannelAbstract {
e.printStackTrace();
}
}
@Override
protected void stopPipelines() {
pipeline.remove(boundHandler);
}
@Override
public void addChannel(final Player player, String endChannelName) {
@@ -1,9 +1,8 @@
package me.dadus33.chatitem.packets.protocollib;
package me.dadus33.chatitem.chatmanager.v1.packets.protocollib;
import java.util.Arrays;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import com.comphenix.protocol.PacketType.Play;
import com.comphenix.protocol.ProtocolLibrary;
@@ -12,16 +11,17 @@ import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import me.dadus33.chatitem.listeners.HandshakeListener;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketManager;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.v1.listeners.HandshakeListener;
import me.dadus33.chatitem.chatmanager.v1.packets.ChatItemPacket;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketManager;
import me.dadus33.chatitem.chatmanager.v1.packets.PacketType;
public class ProtocollibPacketManager extends PacketManager {
private final ProtocolManager protocolManager;
public ProtocollibPacketManager(Plugin pl) {
public ProtocollibPacketManager(ChatItem pl) {
protocolManager = ProtocolLibrary.getProtocolManager();
protocolManager.addPacketListener(new PacketAdapter(pl, ListenerPriority.LOWEST, Arrays.asList(Play.Server.CHAT)) {
@Override
@@ -37,17 +37,13 @@ public class ProtocollibPacketManager extends PacketManager {
e.setCancelled(packet.isCancelled());
}
});
protocolManager.addPacketListener(new HandshakeListener());
protocolManager.addPacketListener(new HandshakeListener(pl));
}
@Override
public void addPlayer(Player p) {}
@Override
public void removePlayer(Player p) {}
@Override
public void clear() {}
public void stop() {
protocolManager.removePacketListeners(ChatItem.getInstance());
}
public ChatItemPacket onPacketSent(PacketType type, Player sender, Object packet) {
if(type == null)
@@ -0,0 +1,14 @@
package me.dadus33.chatitem.chatmanager.v1.playerversion;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.utils.Version;
public interface IPlayerVersion {
public int getProtocolVersion(Player p);
default Version getPlayerVersion(Player p) {
return Version.getVersion(getProtocolVersion(p));
}
}
@@ -1,12 +1,12 @@
package me.dadus33.chatitem.playerversion.hooks;
package me.dadus33.chatitem.chatmanager.v1.playerversion.hooks;
import java.util.HashMap;
import java.util.UUID;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.playerversion.IPlayerVersion;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.chatmanager.v1.playerversion.IPlayerVersion;
import me.dadus33.chatitem.utils.Version;
public class DefaultVersionHook implements IPlayerVersion {
@@ -17,6 +17,6 @@ public class DefaultVersionHook implements IPlayerVersion {
public int getProtocolVersion(Player p) {
if(PROTOCOL_PER_UUID.containsKey(p.getUniqueId()))
return PROTOCOL_PER_UUID.get(p.getUniqueId());
return PROTOCOL_PER_ADDRESS.getOrDefault(ProtocolVersion.stringifyAdress(p.getAddress()), ProtocolVersion.getServerVersion().MAX_VER);
return PROTOCOL_PER_ADDRESS.getOrDefault(Version.stringifyAdress(p.getAddress()), Version.getVersion().MAX_VER);
}
}
@@ -1,8 +1,8 @@
package me.dadus33.chatitem.playerversion.hooks;
package me.dadus33.chatitem.chatmanager.v1.playerversion.hooks;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.playerversion.IPlayerVersion;
import me.dadus33.chatitem.chatmanager.v1.playerversion.IPlayerVersion;
import protocolsupport.api.ProtocolSupportAPI;
public class ProtocolSupportHook implements IPlayerVersion {
@@ -1,8 +1,8 @@
package me.dadus33.chatitem.playerversion.hooks;
package me.dadus33.chatitem.chatmanager.v1.playerversion.hooks;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.playerversion.IPlayerVersion;
import me.dadus33.chatitem.chatmanager.v1.playerversion.IPlayerVersion;
import us.myles.ViaVersion.api.Via;
public class ViaVersionHook implements IPlayerVersion {
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.utils;
package me.dadus33.chatitem.chatmanager.v1.utils;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -0,0 +1,43 @@
package me.dadus33.chatitem.chatmanager.v1.utils;
import static me.dadus33.chatitem.utils.Version.V1_10;
import static me.dadus33.chatitem.utils.Version.V1_11;
import static me.dadus33.chatitem.utils.Version.V1_8;
import static me.dadus33.chatitem.utils.Version.V1_9;
public class ItemRewriter {
public static void remapIds(int server, int player, Item item) {
if (areIdsCompatible(server, player)) {
return;
}
if ((server >= V1_9.MIN_VER && player <= V1_8.MAX_VER) || (player >= V1_9.MIN_VER && server <= V1_8.MAX_VER)) {
if ((server >= V1_9.MIN_VER && player <= V1_8.MAX_VER)) {
ItemRewriter_1_9_TO_1_8.reversedToClient(item);
return;
}
ItemRewriter_1_9_TO_1_8.toClient(item);
return;
}
if ((server <= V1_10.MAX_VER && player >= V1_11.MIN_VER)
|| (player <= V1_10.MAX_VER && server >= V1_11.MIN_VER)) {
if (server <= V1_10.MAX_VER && player >= V1_11.MIN_VER) {
ItemRewriter_1_11_TO_1_10.toClient(item);
} else {
ItemRewriter_1_11_TO_1_10.reverseToClient(item);
}
}
}
public static boolean areIdsCompatible(int version1, int version2) {
if ((version1 >= V1_9.MIN_VER && version2 <= V1_8.MAX_VER)
|| (version2 >= V1_9.MIN_VER && version1 <= V1_8.MAX_VER)) {
return false;
}
if ((version1 <= V1_10.MAX_VER && version2 >= V1_11.MIN_VER)
|| (version1 <= V1_10.MAX_VER && version2 >= V1_11.MIN_VER)) {
return false;
}
return true;
}
}
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.utils;
package me.dadus33.chatitem.chatmanager.v1.utils;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -1,4 +1,4 @@
package me.dadus33.chatitem.utils;
package me.dadus33.chatitem.chatmanager.v1.utils;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
@@ -0,0 +1,288 @@
package me.dadus33.chatitem.chatmanager.v2;
import java.lang.reflect.Method;
import java.util.HashMap;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.ChatManager;
import me.dadus33.chatitem.itemnamer.NamerManager;
import me.dadus33.chatitem.playernamer.PlayerNamerManager;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.Storage;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.HoverEvent.Action;
import net.md_5.bungee.api.chat.TextComponent;
public class ChatListener implements Listener {
public final static char SEPARATOR = ((char)0x0007);
private final static String NAME = "{name}";
private final static String AMOUNT = "{amount}";
private final static String TIMES = "{times}";
private final static String LEFT = "{remaining}";
private final HashMap<String, Long> COOLDOWNS = new HashMap<>();
private ChatListenerChatManager manage;
private Method saveMethod;
public ChatListener(ChatListenerChatManager manage) {
this.manage = manage;
try {
Class<?> nbtTag = PacketUtils.getNmsClass("NBTTagCompound", "nbt.");
Class<?> itemClass = PacketUtils.getNmsClass("ItemStack", "world.item.");
for(Method m : itemClass.getDeclaredMethods()) {
if(m.getParameterTypes().length == 1) {
if(m.getParameterTypes()[0].equals(nbtTag) && m.getReturnType().equals(nbtTag)) {
saveMethod = m;
}
}
}
} catch (Exception e) {
}
if(saveMethod == null)
ChatItem.getInstance().getLogger().info("Failed to find save method. Using default system...");
else
ChatItem.getInstance().getLogger().info("Save method founded: " + saveMethod.getName() + ".");
}
public Storage getStorage() {
return manage.getStorage();
}
private String calculateTime(long seconds){
if(seconds < 60){
return seconds+getStorage().SECONDS;
}
if(seconds < 3600){
StringBuilder builder = new StringBuilder();
int minutes = (int) seconds / 60;
builder.append(minutes).append(getStorage().MINUTES);
int secs = (int) seconds - minutes*60;
if(secs != 0){
builder.append(" ").append(secs).append(getStorage().SECONDS);
}
return builder.toString();
}
StringBuilder builder = new StringBuilder();
int hours = (int) seconds / 3600;
builder.append(hours).append(getStorage().HOURS);
int minutes = (int) (seconds/60) - (hours*60);
if(minutes != 0){
builder.append(" ").append(minutes).append(getStorage().MINUTES);
}
int secs = (int) (seconds - ((seconds/60)*60));
if(secs != 0){
builder.append(" ").append(secs).append(getStorage().SECONDS);
}
return builder.toString();
}
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.MONITOR)
public void onChat(AsyncPlayerChatEvent e) {
if(e.isCancelled())
return;
Player p = e.getPlayer();
for (String rep : getStorage().PLACEHOLDERS) {
if (e.getMessage().contains(rep + ChatManager.SEPARATOR + p.getName())) { // already managed by v1
return;
}
}
boolean found = false;
for(String key : e.getMessage().split(" ")) {
if(found)
break;
for (String rep : getStorage().PLACEHOLDERS) {
if (key.equalsIgnoreCase(rep)) {
found = true;
break;
}
}
}
if (!found) {
return;
}
if (!p.hasPermission("chatitem.use")) {
if(!getStorage().LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if(!getStorage().NO_PERMISSION_MESSAGE.isEmpty() && getStorage().SHOW_NO_PERM_NORMAL){
p.sendMessage(getStorage().NO_PERMISSION_MESSAGE);
}
return;
}
if (p.getItemInHand().getType().equals(Material.AIR)) {
if (getStorage().DENY_IF_NO_ITEM) {
e.setCancelled(true);
if (!getStorage().DENY_MESSAGE.isEmpty())
e.getPlayer().sendMessage(getStorage().DENY_MESSAGE);
return;
}
if(getStorage().HAND_DISABLED) {
return;
}
}
if(getStorage().COOLDOWN > 0 && !p.hasPermission("chatitem.ignore-cooldown")){
if(COOLDOWNS.containsKey(p.getName())){
long start = COOLDOWNS.get(p.getName());
long current = System.currentTimeMillis()/1000;
long elapsed = current - start;
if(elapsed >= getStorage().COOLDOWN){
COOLDOWNS.remove(p.getName());
} else {
if(!getStorage().LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if(!getStorage().COOLDOWN_MESSAGE.isEmpty()){
long left = (start + getStorage().COOLDOWN) - current;
p.sendMessage(getStorage().COOLDOWN_MESSAGE.replace(LEFT, calculateTime(left)));
}
return;
}
}
}
e.setCancelled(true);
String format = e.getFormat(), defMsg = e.getMessage();
Bukkit.getConsoleSender().sendMessage(String.format(e.getFormat(), e.getPlayer().getDisplayName(), defMsg)); // show in log
boolean isAlreadyParsed = false;
if(format.contains("%1$s") && format.contains("%2$s")) // message not parsed but not default way
isAlreadyParsed = false;
if(format.equalsIgnoreCase(defMsg)) // is message already parsed
isAlreadyParsed = true;
if(format.equalsIgnoreCase("<%1$s> %2$s")) // default MC message
isAlreadyParsed = false;
String msg = isAlreadyParsed ? format : String.format(format, p.getDisplayName(), defMsg);
ItemStack item = p.getItemInHand();
ItemMeta meta = item == null ? null : item.getItemMeta();
e.getRecipients().forEach((pl) -> {
TextComponent component = new TextComponent("");
ChatColor color = ChatColor.getByChar(getColorChat(e.getFormat()));
for (String args : msg.split(" ")) {
if (getStorage().PLACEHOLDERS.contains(args)) {
if(meta != null) {
TextComponent itemComponent = new TextComponent(ChatListener.styleItem(pl, item, getStorage()));
String itemJson = convertItemStackToJson(item);
itemComponent.setHoverEvent(
new HoverEvent(Action.SHOW_ITEM, new BaseComponent[] { new TextComponent(itemJson) }));
component.addExtra(itemComponent);
} else {
if(getStorage().HAND_DISABLED)
component.addExtra(color + args);
else {
String handName = getStorage().HAND_NAME;
TextComponent handComp = new TextComponent("");
ComponentBuilder handTooltip = new ComponentBuilder();
int stay = getStorage().HAND_TOOLTIP.size();
for(String line : getStorage().HAND_TOOLTIP) {
stay--;
handTooltip.append(line.replace("{name}", p.getName()).replace("{display-name}", p.getDisplayName()));
if(stay > 0)
handTooltip.append("\n");
}
handComp.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,handTooltip.create()));
if(handName.contains("{name}")) {
String[] splitted = handName.split("{name}");
for(int i = 0; i < (splitted.length - 1); i++) {
handComp.addExtra(new TextComponent(splitted[i]));
handComp.addExtra(PlayerNamerManager.getPlayerNamer().getName(p));
}
handComp.addExtra(new TextComponent(splitted[splitted.length - 1]));
} else
handComp.addExtra(handName.replace("{display-name}", p.getDisplayName()));
component.addExtra(handComp);
}
}
} else {
component.addExtra(color + args);
}
component.addExtra(" ");
char maybeNextCode = getColorChat(args);
if(maybeNextCode != 'r') {
color = ChatColor.getByChar(maybeNextCode);
}
}
pl.spigot().sendMessage(component);
});
//Utils.getOnlinePlayers().forEach((pl) -> pl.spigot().sendMessage(component));
}
/**
* Converts an {@link org.bukkit.inventory.ItemStack} to a Json string for
* sending with {@link net.md_5.bungee.api.chat.BaseComponent}'s.
*
* @param itemStack
* the item to convert
* @return the Json string representation of the item
*/
public String convertItemStackToJson(ItemStack itemStack) {
try {
Class<?> nbtTag = PacketUtils.getNmsClass("NBTTagCompound", "nbt.");
Class<?> craftItemClass = PacketUtils.getObcClass("inventory.CraftItemStack");
Object nmsNbtTagCompoundObj = nbtTag.newInstance();
if(saveMethod == null) {
Object nmsItemStackObj = craftItemClass.getMethod("asNMSCopy", ItemStack.class).invoke(null, itemStack);
return nmsItemStackObj.getClass().getMethod("save", nbtTag).invoke(nmsItemStackObj, nmsNbtTagCompoundObj).toString();
} else {
Object nmsItemStackObj = craftItemClass.getMethod("asNMSCopy", ItemStack.class).invoke(null, itemStack);
return saveMethod.invoke(nmsItemStackObj, nmsNbtTagCompoundObj).toString();
}
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
/**
* Get the latest color chat
*
* @param msg the message that contains color
* @return the char of the color or 'r' if nothing found
*/
private char getColorChat(String msg) {
if(msg.length() < 2)
return 'r';
for(int i = msg.length() - 2; i > 0; i--) {
char s = msg.charAt(i);
if(ChatColor.COLOR_CHAR == s) {
return msg.charAt(i + 1);
}
}
return 'r';
}
public static String styleItem(Player p, ItemStack item, Storage c) {
String replacer = c.NAME_FORMAT;
String amount = c.AMOUNT_FORMAT;
if (item.getAmount() == 1) {
if (c.FORCE_ADD_AMOUNT) {
amount = amount.replace(TIMES, "1");
replacer = replacer.replace(AMOUNT, amount);
} else {
replacer = replacer.replace(AMOUNT, "");
}
} else {
amount = amount.replace(TIMES, String.valueOf(item.getAmount()));
replacer = replacer.replace(AMOUNT, amount);
}
replacer = replacer.replace(NAME, NamerManager.getName(p, item, c));
return replacer;
}
}
@@ -0,0 +1,64 @@
package me.dadus33.chatitem.chatmanager.v2;
import org.bukkit.Bukkit;
import org.bukkit.event.HandlerList;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.chatmanager.ChatManager;
import me.dadus33.chatitem.chatmanager.v1.json.JSONManipulator;
import me.dadus33.chatitem.chatmanager.v1.json.JSONManipulatorCurrent;
import me.dadus33.chatitem.utils.Storage;
public class ChatListenerChatManager extends ChatManager {
private final JSONManipulatorCurrent jsonManipulator;
private final ChatListener chatListener;
private boolean baseComponentAvailable = true;
public ChatListenerChatManager(ChatItem pl) {
jsonManipulator = new JSONManipulatorCurrent();
chatListener = new ChatListener(this);
//Check for existence of BaseComponent class (only on spigot)
try {
Class.forName("net.md_5.bungee.api.chat.BaseComponent");
} catch (ClassNotFoundException e) {
baseComponentAvailable = false;
}
}
@Override
public String getName() {
return "ChatListener";
}
@Override
public String getId() {
return "chat";
}
@Override
public void load(ChatItem pl, Storage s) {
super.load(pl, s);
Bukkit.getPluginManager().registerEvents(chatListener, pl);
}
@Override
public void unload(ChatItem pl) {
HandlerList.unregisterAll(chatListener);
}
public JSONManipulator getManipulator(){
/*
We used to have 2 kinds of JSONManipulators because of my bad understanding of the 1.7 way of parsing JSON chat
The interface should however stay as there might be great changes in future versions in JSON parsing (most likely 1.13)
*/
return jsonManipulator;
//We just return a new one whenever requested for the moment, should implement a cache of some sort some time though
}
public boolean supportsChatComponentApi(){
return baseComponentAvailable;
}
}
@@ -1,16 +1,16 @@
package me.dadus33.chatitem.commands;
import me.dadus33.chatitem.ChatItem;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import me.dadus33.chatitem.ChatItem;
public class CIReload implements CommandExecutor {
public class CIReloadCommand implements CommandExecutor {
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
ChatItem.reload(sender);
ChatItem.reload(sender);
return false;
}
}
@@ -0,0 +1,70 @@
package me.dadus33.chatitem.commands;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.listeners.InventoryListener;
import me.dadus33.chatitem.utils.Messages;
import me.dadus33.chatitem.utils.Storage;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
public class ChatItemCommand implements CommandExecutor, TabExecutor {
@SuppressWarnings("deprecation")
@Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if(!(sender instanceof Player)) {
Messages.sendMessage(sender, "only-players");
return false;
}
Player p = (Player) sender;
if(args.length == 0) {
Messages.sendMessage(p, "chatitem-cmd.help");
} else if(args[0].equalsIgnoreCase("admin")) {
InventoryListener.open(p);
} else if(args[0].equalsIgnoreCase("reload")) {
ChatItem.reload(sender);
} else if(args[0].equalsIgnoreCase("link") || args[0].equalsIgnoreCase("links")) {
ConfigurationSection config = ChatItem.getInstance().getConfig().getConfigurationSection("messages.chatitem-cmd.links");
TextComponent text = new TextComponent(Storage.color(config.getString("begin")));
for(String key : config.getConfigurationSection("list").getKeys(false)) {
ConfigurationSection linkConfig = config.getConfigurationSection("list." + key);
TextComponent linkComp = new TextComponent(Storage.color(linkConfig.getString("message")));
String hover = Storage.color(linkConfig.getString("hover"));
if(hover != null)
linkComp.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(hover).create()));
String link = linkConfig.getString("link");
if(link != null)
linkComp.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, link));
text.addExtra(linkComp);
}
p.spigot().sendMessage(text);
} else {
Messages.sendMessage(p, "chatitem-cmd.help");
}
return false;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] arg) {
List<String> list = new ArrayList<>();
String prefix = arg[arg.length - 1].toLowerCase(Locale.ROOT);
for(String s : Arrays.asList("help", "admin", "reload"))
if(prefix.isEmpty() || s.startsWith(prefix))
list.add(s);
return list.isEmpty() ? null : list;
}
}
@@ -1,7 +1,7 @@
package me.dadus33.chatitem.filters;
import me.dadus33.chatitem.listeners.ChatEventListener;
import me.dadus33.chatitem.utils.Storage;
import static org.apache.logging.log4j.core.Filter.Result.NEUTRAL;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Marker;
@@ -12,7 +12,8 @@ import org.apache.logging.log4j.message.Message;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import static org.apache.logging.log4j.core.Filter.Result.NEUTRAL;
import me.dadus33.chatitem.chatmanager.v2.ChatListener;
import me.dadus33.chatitem.utils.Storage;
public class Log4jFilter implements Filter {
@@ -54,6 +55,10 @@ public class Log4jFilter implements Filter {
public Result filter(LogEvent logEvent) {
return checkMessage(logEvent.getMessage().getFormattedMessage());
}
public void stop() {
// seems to be required
}
private Result checkMessage(String msg){
if(msg==null){
@@ -62,7 +67,7 @@ public class Log4jFilter implements Filter {
for(String placeholder : c.PLACEHOLDERS){
if(msg.contains(placeholder)){
for(Player p : Bukkit.getOnlinePlayers()){
if(msg.contains(ChatEventListener.SEPARATOR +p.getName())){
if(msg.contains(ChatListener.SEPARATOR +p.getName())){
return Result.DENY;
}
}
@@ -0,0 +1,54 @@
package me.dadus33.chatitem.itemnamer;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import me.dadus33.chatitem.utils.Storage;
public interface INamer {
/**
* Get priority of this namer.<br>
* Get first name that is not null, with this order:
* - MAJOR
*
*
* @return priority
*/
Priority getPriority();
/**
* Get the name of the item thanks to this namer.
*
* @param item the item to get the name
* @param storage the actual config
* @return the name or null if can't find a name
*/
String getName(Player p, ItemStack item, Storage storage);
public static enum Priority {
MAJOR(4),
IMPORTANT(3),
MEDIUM(2),
SMALL(1),
MINOR(0);
private final int priority;
private Priority(int priority) {
this.priority = priority;
}
public int getPriority() {
return priority;
}
public static List<Priority> getOrderedPriorities() {
return Arrays.asList(values()).stream().sorted((p1, p2) -> p2.getPriority() - p1.getPriority()).collect(Collectors.toList());
}
}
}
@@ -0,0 +1,76 @@
package me.dadus33.chatitem.itemnamer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.StringJoiner;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.PluginManager;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.itemnamer.INamer.Priority;
import me.dadus33.chatitem.itemnamer.hook.ChatItemTranslationNamer;
import me.dadus33.chatitem.itemnamer.hook.DefaultNamer;
import me.dadus33.chatitem.itemnamer.hook.ItemDisplayNamer;
import me.dadus33.chatitem.itemnamer.hook.LangUtilsNamer;
import me.dadus33.chatitem.utils.Storage;
public class NamerManager {
private static final HashMap<Priority, List<INamer>> NAMER_PER_PRIORITY = new HashMap<>();
public static void load(ChatItem pl) {
NAMER_PER_PRIORITY.clear();
StringJoiner sj = new StringJoiner(", ");
PluginManager pm = Bukkit.getPluginManager();
if(pm.getPlugin("LangUtils") != null) {
addNamer(new LangUtilsNamer());
sj.add("LangUtils");
}
if(sj.length() > 0)
pl.getLogger().info("Loaded namer for plugin " + sj.toString() + ".");
addNamer(new ChatItemTranslationNamer());
addNamer(new ItemDisplayNamer());
addNamer(new DefaultNamer());
}
/**
* Add namer according to his {@link INamer#getPriority()}'s value
*
* @param namer the namer to add
*/
public static void addNamer(INamer namer) {
List<INamer> namers = getOrCreate(namer.getPriority());
namers.add(namer);
}
private static List<INamer> getOrCreate(Priority p){
return NAMER_PER_PRIORITY.computeIfAbsent(p, (a) -> new ArrayList<>());
}
/**
* Get the name of this item, according to this storage.
*
* @param item
* @param storage
* @return the name (should NOT return null)
*/
public static String getName(Player p, ItemStack item, Storage storage) {
for(Priority pr : Priority.getOrderedPriorities()) {
List<INamer> allNamers = NAMER_PER_PRIORITY.get(pr);
if(allNamers == null || allNamers.isEmpty())
continue;
for(INamer namer : allNamers) {
String tmpName = namer.getName(p, item, storage);
if(tmpName != null)
return tmpName;
}
}
return null; // this should NEVER append
}
}
@@ -0,0 +1,31 @@
package me.dadus33.chatitem.itemnamer.hook;
import java.util.HashMap;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import me.dadus33.chatitem.itemnamer.INamer;
import me.dadus33.chatitem.utils.Storage;
public class ChatItemTranslationNamer implements INamer {
@Override
public Priority getPriority() {
return Priority.SMALL;
}
@Override
public String getName(Player p, ItemStack item, Storage storage) {
HashMap<Short, String> translationSection = storage.TRANSLATIONS.get(item.getType().name());
if (translationSection != null) {
@SuppressWarnings("deprecation")
String translated = translationSection.get(item.getDurability());
if (translated != null) {
return translated;
}
}
return null;
}
}
@@ -0,0 +1,23 @@
package me.dadus33.chatitem.itemnamer.hook;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import me.dadus33.chatitem.itemnamer.INamer;
import me.dadus33.chatitem.utils.Storage;
public class DefaultNamer implements INamer {
@Override
public Priority getPriority() {
return Priority.MINOR;
}
@Override
public String getName(Player p, ItemStack item, Storage storage) {
Material m = item.getType();
return m.equals(Material.TNT) ? "TNT" : WordUtils.capitalize(m.name().replaceAll("_", " ").toLowerCase());
}
}
@@ -0,0 +1,26 @@
package me.dadus33.chatitem.itemnamer.hook;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import me.dadus33.chatitem.itemnamer.INamer;
import me.dadus33.chatitem.utils.Storage;
public class ItemDisplayNamer implements INamer {
@Override
public Priority getPriority() {
return Priority.MEDIUM;
}
@Override
public String getName(Player p, ItemStack item, Storage storage) {
if(item.hasItemMeta() && item.getItemMeta().hasDisplayName()) {
String name = item.getItemMeta().getDisplayName();
return storage.COLOR_IF_ALREADY_COLORED ? ChatColor.stripColor(name) : name;
}
return null;
}
}
@@ -0,0 +1,23 @@
package me.dadus33.chatitem.itemnamer.hook;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import com.meowj.langutils.lang.LanguageHelper;
import me.dadus33.chatitem.itemnamer.INamer;
import me.dadus33.chatitem.utils.Storage;
public class LangUtilsNamer implements INamer {
@Override
public Priority getPriority() {
return Priority.IMPORTANT;
}
@Override
public String getName(Player p, ItemStack item, Storage storage) {
return LanguageHelper.getItemName(item, p);
}
}
@@ -1,903 +0,0 @@
package me.dadus33.chatitem.json;
import com.github.steveice10.opennbt.tag.builtin.*;
import com.google.gson.*;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.utils.Item;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.Reflect;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@SuppressWarnings("unchecked")
public class JSONManipulatorCurrent implements JSONManipulator{
private static final Class<?> CRAFT_ITEM_STACK_CLASS = PacketUtils.getObcClass("inventory.CraftItemStack");
private static final Class<?> NBT_STRING = PacketUtils.getNmsClass("NBTTagString", "nbt.");
private static final Class<?> NBT_LIST = PacketUtils.getNmsClass("NBTTagList", "nbt.");
private static final Map<Type, Tag> TYPES_TO_OPEN_NBT_TAGS = new HashMap<>();
private static final List<Class<?>> NBT_BASE_CLASSES = new ArrayList<>();
private static final List<Field> NBT_BASE_DATA_FIELD = new ArrayList<>();
private static final Class<?> NMS_ITEM_STACK_CLASS = PacketUtils.getNmsClass("ItemStack", "world.item.");
private static final Method AS_NMS_COPY = Reflect.getMethod(CRAFT_ITEM_STACK_CLASS, "asNMSCopy", ItemStack.class);
private static final Class<?> NBT_TAG_COMPOUND = PacketUtils.getNmsClass("NBTTagCompound", "nbt.");
private static final Method SAVE_NMS_ITEM_STACK_METHOD = Reflect.getMethod(NMS_ITEM_STACK_CLASS, "save", NBT_TAG_COMPOUND);
private static final Field MAP = Reflect.getField(NBT_TAG_COMPOUND, "map", "x");
private static final Field LIST_FIELD = Reflect.getField(NBT_LIST, "list", "c");
//Tags to be ignored. Currently it only contains tags from PortableHorses, but feel free to submit a pull request to add tags from your plugins
private static final List<String> IGNORED = Arrays.asList("horsetag", "phorse", "iscnameviz", "cname");
private static final ConcurrentHashMap<Map.Entry<ProtocolVersion, ItemStack>, JsonObject> STACKS = new ConcurrentHashMap<>();
static{
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagByte", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagByteArray", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagDouble", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagFloat", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagInt", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagIntArray", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagLong", "nbt."));
NBT_BASE_CLASSES.add(PacketUtils.getNmsClass("NBTTagShort", "nbt."));
for (Class<?> NBT_BASE_CLASS : NBT_BASE_CLASSES) {
NBT_BASE_DATA_FIELD.add(Reflect.getField(NBT_BASE_CLASS, "data", "c", "x"));
}
TYPES_TO_OPEN_NBT_TAGS.put(Byte.class, new ByteTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Byte[].class, new ByteArrayTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Double.class, new DoubleTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Float.class, new FloatTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Integer.class, new IntTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Integer[].class, new IntArrayTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Long.class, new LongTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(Short.class, new ShortTag(""));
//Add the primitive types too, just in case
TYPES_TO_OPEN_NBT_TAGS.put(byte.class, new ByteTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(byte[].class, new ByteArrayTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(double.class, new DoubleTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(float.class, new FloatTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(int.class, new IntTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(int[].class, new IntArrayTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(long.class, new LongTag(""));
TYPES_TO_OPEN_NBT_TAGS.put(short.class, new ShortTag(""));
}
private List<String> replaces;
private String rgx;
private ProtocolVersion protocolVersion;
private JsonObject itemTooltip;
private JsonArray classicTooltip;
private final JsonParser PARSER = new JsonParser();
public String parse(String json, List<String> replacements, ItemStack item, String replacement, int protocol) throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchFieldException, NoSuchMethodException {
JsonObject obj = PARSER.parse(json).getAsJsonObject();
JsonArray array = obj.getAsJsonArray("extra");
replaces = replacements;
String regex = "";
for (int i = 0; i < replacements.size(); ++i) {
if (replacements.size() == 1) {
regex = Pattern.quote(replacements.get(0));
break;
}
if (i == 0 || i + 1 == replacements.size()) {
if (i == 0) {
regex = "(" + Pattern.quote(replacements.get(i));
} else {
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i))).concat(")");
}
continue;
}
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i)));
}
rgx = regex;
JsonArray rep = new JsonArray();
final AbstractMap.SimpleEntry<ProtocolVersion, ItemStack> p = new AbstractMap.SimpleEntry<>(protocolVersion = ProtocolVersion.getVersion(protocol), item);
if ((itemTooltip = STACKS.get(p)) == null) {
JsonArray use = Translator.toJson(replacement); //We get the json representation of the old color formatting method
JsonObject hover = PARSER.parse("{\"action\":\"show_item\", \"value\": \"\"}").getAsJsonObject(); //There's no public clone method for JSONObjects so we need to parse them every time
String jsonRep = stringifyItem(item); //Get the JSON representation of the item (well, not really JSON, but rather a string representation of NBT data)
hover.addProperty("value", jsonRep);
JsonObject wrapper = new JsonObject(); //Create a wrapper object for the whole array
wrapper.addProperty("text", ""); //The text field is compulsory, even if it's empty
wrapper.add("extra", use);
wrapper.add("hoverEvent", hover);
itemTooltip = wrapper; //Save the tooltip for later use when we encounter a placeholder
STACKS.put(p, itemTooltip); //Save it in the cache too so when parsing other packets with the same item (and client version) we no longer have to create it again
Bukkit.getScheduler().runTaskLaterAsynchronously(ChatItem.getInstance(), () ->
STACKS.remove(p)
, 100L); //We remove it later when no longer needed to save memory
}
for (int i = 0; i < array.size(); ++i) {
if (array.get(i).isJsonObject()){
JsonObject o = array.get(i).getAsJsonObject();
boolean inside = false;
for (String replace : replacements)
if (o.toString().contains(replace)) {
if (inside) {
break;
}
inside = true;
}
JsonElement text = o.get("text");
if (text == null) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if(jar.size()!=0) {
jar = parseArray(jar);
o.add("extra", jar);
}else{
o.remove("extra");
}
}
continue;
} else {
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if(jar.size()!=0) {
jar = parseArray(jar);
o.add("extra", jar);
}else{
o.remove("extra");
}
}
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.add(itemTooltip);
}
}
if (!fnd) {
rep.add(o);
}
}else{
if(array.get(i).isJsonNull()){
continue;
}else{
if(array.get(i).isJsonArray()){
JsonArray jar = array.get(i).getAsJsonArray();
if(jar.size()!=0) {
jar = parseArray(array.get(i).getAsJsonArray());
rep.set(i, jar);
}
}else{
String msg = array.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.add(itemTooltip);
}
}
if (!fnd) {
rep.add(array.get(i));
}
}
}
}
}
obj.add("extra", rep);
if(!obj.has("text")){
obj.addProperty("text", "");
}
return obj.toString();
}
@Override
public String parseEmpty(String json, List<String> replacements, String repl, List<String> tooltip, Player sender) {
JsonObject obj = PARSER.parse(json).getAsJsonObject();
JsonArray array = obj.getAsJsonArray("extra");
replaces = replacements;
String regex = "";
for (int i = 0; i < replacements.size(); ++i) {
if (replacements.size() == 1) {
regex = Pattern.quote(replacements.get(0));
break;
}
if (i == 0 || i + 1 == replacements.size()) {
if (i == 0) {
regex = "(" + Pattern.quote(replacements.get(i));
} else {
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i))).concat(")");
}
continue;
}
regex = regex.concat("|").concat(Pattern.quote(replacements.get(i)));
}
rgx = regex;
JsonArray rep = new JsonArray();
JsonArray use = Translator.toJson(repl.replace("{name}", sender.getName()).replace("{display-name}", sender.getDisplayName()));
JsonObject hover = PARSER.parse("{\"action\":\"show_text\", \"value\": \"\"}").getAsJsonObject();
StringBuilder oneLineTooltip = new StringBuilder("");
int index = 0;
for(String m : tooltip){
oneLineTooltip.append(m.replace("{name}", sender.getName()).replace("{display-name}", sender.getDisplayName()));
++index;
if(index!=tooltip.size()){
oneLineTooltip.append('\n');
}
}
hover.add("value", new JsonPrimitive(oneLineTooltip.toString()));
for (JsonElement ob : use)
ob.getAsJsonObject().add("hoverEvent", hover);
classicTooltip = use;
for (int i = 0; i < array.size(); ++i) {
if (array.get(i).isJsonObject()){
JsonObject o = array.get(i).getAsJsonObject();
boolean inside = false;
for (String replace : replacements)
if (o.toString().contains(replace)) {
if (inside) {
break;
}
inside = true;
}
JsonElement text = o.get("text");
if (text == null) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if(jar.size()!=0) {
jar = parseNoItemArray(jar);
o.add("extra", jar);
}else{
o.remove("extra");
}
}
continue;
} else {
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el != null) {
JsonArray jar = el.getAsJsonArray();
if(jar.size()!=0) {
jar = parseNoItemArray(jar);
o.add("extra", jar);
}else{
o.remove("extra");
}
}
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.addAll(use);
}
}
if (!fnd) {
rep.add(o);
}
}else{
if(array.get(i).isJsonNull()){
continue;
}else{
if(array.get(i).isJsonArray()){
JsonArray jar = array.get(i).getAsJsonArray();
if(jar.size()!=0) {
jar = parseNoItemArray(array.get(i).getAsJsonArray());
rep.set(i, jar);
}
}else{
String msg = array.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replacements) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(regex);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
rep.add(fix);
}
if (j != splits.length - 1) {
rep.addAll(use);
}
}
if (!fnd) {
rep.add(array.get(i));
}
}
}
}
}
obj.add("extra", rep);
return obj.toString();
}
private JsonArray parseNoItemArray(JsonArray arr) {
JsonArray replacer = new JsonArray();
for (int i = 0; i < arr.size(); ++i) {
if (arr.get(i).isJsonObject()){
JsonObject o = arr.get(i).getAsJsonObject();
boolean inside = false;
for (String replacement : replaces)
if (o.toString().contains(replacement)) {
if (inside) {
break;
}
inside = true;
}
if (!inside) { //the placeholder we're looking for is not inside this element, so we continue searching
replacer.add(o);
continue;
}
JsonElement text = o.get("text");
if (text == null) {
continue;
}
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el == null) {
continue;
}
JsonArray jar = el.getAsJsonArray();
if(jar.size()!=0) {
jar = parseNoItemArray(jar);
o.add("extra", jar);
}else{
o.remove("extra");
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.addAll(classicTooltip);
}
}
if (!fnd) {
replacer.add(o);
}
}else{
if(arr.get(i).isJsonNull()){
continue;
}else{
if(arr.get(i).isJsonArray()){
JsonArray jar = arr.get(i).getAsJsonArray();
if(jar.size()!=0) {
jar = parseNoItemArray(arr.get(i).getAsJsonArray());
replacer.set(i, jar);
}
}else{
String msg = arr.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.addAll(classicTooltip);
}
}
if (!fnd) {
replacer.add(arr.get(i));
}
}
}
}
}
return replacer;
}
private JsonArray parseArray(JsonArray arr) {
JsonArray replacer = new JsonArray();
for (int i = 0; i < arr.size(); ++i) {
if (arr.get(i).isJsonObject()){
JsonObject o = arr.get(i).getAsJsonObject();
boolean inside = false;
for (String replacement : replaces)
if (o.toString().contains(replacement)) {
if (inside) {
break;
}
inside = true;
}
if (!inside) { //the placeholder we're looking for is not inside this element, so we continue searching
replacer.add(o);
continue;
}
JsonElement text = o.get("text");
if (text == null) {
continue;
}
if (text.getAsString().isEmpty()) {
JsonElement el = o.get("extra");
if (el == null) {
continue;
}
JsonArray jar = el.getAsJsonArray();
if(jar.size()!=0) {
jar = parseArray(jar);
o.add("extra", jar);
}else{
o.remove("extra");
}
}
String msg = text.getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
String st = o.toString();
JsonObject fix = PARSER.parse(st).getAsJsonObject();
fix.addProperty("text", splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.add(itemTooltip);
}
}
if (!fnd) {
replacer.add(o);
}
}else{
if(arr.get(i).isJsonNull()){
continue;
}else{
if(arr.get(i).isJsonArray()){
JsonArray jar = arr.get(i).getAsJsonArray();
if(jar.size()!=0) {
jar = parseArray(arr.get(i).getAsJsonArray());
replacer.set(i, jar);
}
}else{
String msg = arr.get(i).getAsString();
boolean isLast = false;
boolean done = false;
boolean fnd;
String[] splits;
for (String repls : replaces) {
if (done) {
break;
}
isLast = msg.endsWith(repls);
if (isLast) {
done = true;
msg = msg.concat(".");
}
}
splits = msg.split(rgx);
fnd = splits.length != 1;
if (fnd)
for (int j = 0; j < splits.length; ++j) {
boolean endDot = (j == splits.length - 1) && isLast;
if (!splits[j].isEmpty() && !endDot) {
JsonElement fix = new JsonPrimitive(splits[j]);
replacer.add(fix);
}
if (j != splits.length - 1) {
replacer.add(itemTooltip);
}
}
if (!fnd) {
replacer.add(arr.get(i));
}
}
}
}
}
return replacer;
}
@SuppressWarnings("deprecation")
private Item toItem(ItemStack is) throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
CompoundTag tag = new CompoundTag("tag");
Object nmsStack = AS_NMS_COPY.invoke(null, is);
Object nmsTag = NBT_TAG_COMPOUND.newInstance();
SAVE_NMS_ITEM_STACK_METHOD.invoke(nmsStack, nmsTag);
Map<String, Object> nmsMap = (Map<String, Object>) MAP.get(nmsTag);
String id = nmsMap.get("id").toString().replace("\"", "");
Object realTag = nmsMap.get("tag");
if(NBT_TAG_COMPOUND.isInstance(realTag)) { //We need to make sure this is indeed an NBTTagCompound
Map<String, Object> realMap = (Map<String, Object>) MAP.get(realTag);
Set<Map.Entry<String, Object>> entrySet = realMap.entrySet();
Map<String, Tag> map = tag.getValue();
for (Map.Entry<String, Object> entry : entrySet) {
map.put(entry.getKey(), toOpenTag(entry.getValue(), entry.getKey()));
}
tag.setValue(map);
}
Item item = new Item();
item.setAmount((byte)is.getAmount());
item.setData(is.getDurability());
item.setId(id);
item.setTag(tag);
return item;
}
private Tag toOpenTag(Object nmsTag, String name) throws IllegalAccessException, NoSuchMethodException, InvocationTargetException, InstantiationException {
if(NBT_TAG_COMPOUND.isInstance(nmsTag)) {
CompoundTag tag = new CompoundTag(name);
Map<String, Tag> tagMap = tag.getValue();
Map<String, Object> nmsMap = (Map<String, Object>) MAP.get(nmsTag);
Set<Map.Entry<String, Object>> entrySet = nmsMap.entrySet();
for (Map.Entry<String, Object> entry : entrySet) {
Tag value = toOpenTag(entry.getValue(), entry.getKey());
tagMap.put(entry.getKey(), value);
}
tag.setValue(tagMap);
return tag;
} else {
//Strings are a special case as they need proper escaping
if(NBT_STRING.isInstance(nmsTag)) {
String toString = nmsTag.toString();
if (toString.startsWith("\"") && toString.endsWith("\"")) {
toString = toString.substring(1, toString.length() - 1);
//toString = escapeSpecials(toString);
return new StringTag(name, toString);
}
}
//NBTTag Lists are also special, as they are a sort of compound themselves and need to be parsed recursively
if(NBT_LIST.isInstance(nmsTag)){
List<Object> nmsNBTBaseList = (List<Object>) LIST_FIELD.get(nmsTag);
List<Tag> list = new ArrayList<>();
int i = 0;
for(Object baseTag : nmsNBTBaseList){
list.add(toOpenTag(baseTag, String.valueOf(i)));
++i;
}
return new ListTag(name, list);
}
for(int i = 0; i < NBT_BASE_CLASSES.size(); ++i){
Class<?> c = NBT_BASE_CLASSES.get(i);
if(c.isInstance(nmsTag)){
Object value = NBT_BASE_DATA_FIELD.get(i).get(nmsTag);
Tag t = TYPES_TO_OPEN_NBT_TAGS.get(value.getClass()).getClass().getConstructor(String.class).newInstance(name);
if(t instanceof ByteTag){
((ByteTag)t).setValue((byte)value);
((ByteTag)t).setValue((byte)value);
return t;
}
if(t instanceof ByteArrayTag){
((ByteArrayTag)t).setValue((byte[])value);
return t;
}
if(t instanceof DoubleTag){
((DoubleTag)t).setValue((double)value);
return t;
}
if(t instanceof FloatTag){
((FloatTag)t).setValue((float)value);
return t;
}
if(t instanceof IntTag){
((IntTag)t).setValue((int)value);
return t;
}
if(t instanceof IntArrayTag){
((IntArrayTag)t).setValue((int[])value);
return t;
}
if(t instanceof LongTag){
((LongTag)t).setValue((long)value);
return t;
}
if(t instanceof ShortTag){
((ShortTag)t).setValue((short)value);
return t;
}
return null; //Should never happen
}
}
return null; //Should never happen
}
}
private String stringifyItem(ItemStack stack) throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchFieldException, NoSuchMethodException {
Item item = toItem(stack);
ProtocolVersion.remapIds(ProtocolVersion.getServerVersion().MAX_VER, protocolVersion.MAX_VER, item);
StringBuilder sb = new StringBuilder("{id:");
sb.append("\"").append(item.getId()).append("\"").append(","); //Append the id
sb.append("Count:").append(item.getAmount()).append("b,"); //Append the amount
sb.append("Damage:").append(item.getData()).append("s"); //Append the durability data
Map<String, Tag> tagMap = item.getTag().getValue();
if(tagMap.isEmpty()){
sb.append("}");
return sb.toString();
}
Set<Map.Entry<String, Tag>> entrySet = tagMap.entrySet();
boolean first = true;
sb.append(",tag:{"); //Start of the tag
for(Map.Entry<String, Tag> entry : entrySet){
String key = entry.getKey();
if(IGNORED.contains(key)){
continue;
}
Pattern pattern = Pattern.compile("[{}\\[\\],\":\\\\/]");
Matcher matcher = pattern.matcher(key);
if(matcher.find()){
continue; //Skip invalid keys, as they can cause exceptions client-side
}
String value = stringifyTag(entry.getValue());
if(!first){
sb.append(",");
}
sb.append(key).append(":").append(value);
first = false;
}
sb.append("}}"); //End of tag and end of item
return sb.toString();
}
private String stringifyTag(Tag normalTag){
if(normalTag instanceof CompoundTag) {
StringBuilder sb = new StringBuilder("{");
CompoundTag tagCompound = (CompoundTag) normalTag;
Map<String, Tag> tagMap = tagCompound.getValue();
Set<Map.Entry<String, Tag>> entrySet = tagMap.entrySet();
for(Map.Entry<String, Tag> entry : entrySet){
String value = stringifyTag(entry.getValue());
if(value == null){
continue;
}
if(sb.length()>1){
sb.append(",");
}
sb.append(entry.getKey()).append(":").append(value);
}
sb.append("}");
return sb.toString();
} else {
if(normalTag instanceof StringTag) {
return "\""+((StringTag)normalTag).getValue()+"\""; //Should be already escaped
}
if(normalTag instanceof ListTag){
List<Tag> list = ((ListTag)normalTag).getValue();
StringBuilder sb = new StringBuilder("[");
boolean first = true;
for(Tag tag : list){
String index = tag.getName();
String value = stringifyTag(tag);
if(value == null){
continue;
}
if(!first){
sb.append(",");
}
if(protocolVersion.MAX_VER <= ProtocolVersion.V1_11.MAX_VER){ //it's before 1.12
sb.append(index).append(":").append(value);
}else{
sb.append(value);
}
first = false;
}
sb.append("]");
return sb.toString();
}
if(normalTag instanceof ByteTag){
return normalTag.getValue()+"b";
}
if(normalTag instanceof ByteArrayTag){
return "["+((byte[])normalTag.getValue()).length+" bytes]";
}
if(normalTag instanceof DoubleTag){
return (double)normalTag.getValue()+"d";
}
if(normalTag instanceof FloatTag){
return (float)normalTag.getValue()+"f";
}
if(normalTag instanceof IntTag){
return String.valueOf((int)normalTag.getValue());
}
if(normalTag instanceof IntArrayTag){
int[] array = (int[])normalTag.getValue();
if(array.length == 0){
return null;
}
StringBuilder sb = new StringBuilder("[");
boolean first = true;
for(int i : array){
if(!first){
sb.append(",");
}
sb.append(i);
first = false;
}
sb.append("]");
return sb.toString();
}
if(normalTag instanceof LongTag){
return (long)normalTag.getValue()+"L";
}
if(normalTag instanceof ShortTag){
return (short)normalTag.getValue()+"s";
}
return null; //Should never happen
}
}
}
@@ -1,256 +0,0 @@
package me.dadus33.chatitem.listeners;
import me.dadus33.chatitem.utils.Storage;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import java.util.HashMap;
public class ChatEventListener implements Listener {
private Storage c;
public final static char SEPARATOR = ((char)0x0007);
private final static String LEFT = "{remaining}";
private final HashMap<String, Long> COOLDOWNS = new HashMap<>();
public ChatEventListener(Storage storage) {
c = storage;
}
private String calculateTime(long seconds){
if(seconds < 60){
return seconds+c.SECONDS;
}
if(seconds < 3600){
StringBuilder builder = new StringBuilder();
int minutes = (int) seconds / 60;
builder.append(minutes).append(c.MINUTES);
int secs = (int) seconds - minutes*60;
if(secs != 0){
builder.append(" ").append(secs).append(c.SECONDS);
}
return builder.toString();
}
StringBuilder builder = new StringBuilder();
int hours = (int) seconds / 3600;
builder.append(hours).append(c.HOURS);
int minutes = (int) (seconds/60) - (hours*60);
if(minutes != 0){
builder.append(" ").append(minutes).append(c.MINUTES);
}
int secs = (int) (seconds - ((seconds/60)*60));
if(secs != 0){
builder.append(" ").append(secs).append(c.SECONDS);
}
return builder.toString();
}
private int countOccurrences(String findStr, String str){
int lastIndex = 0;
int count = 0;
while(lastIndex != -1){
lastIndex = str.indexOf(findStr,lastIndex);
if(lastIndex != -1){
count++;
lastIndex += findStr.length();
}
}
return count;
}
@SuppressWarnings("deprecation")
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) //We need to have lowest priority in order to get to the event before DeluxeChat or other plugins do
public void onChat(final AsyncPlayerChatEvent e) {
if(e.getMessage().indexOf(SEPARATOR)!=-1){ //If the BELL character is found, we have to remove it
String msg = e.getMessage().replace(Character.toString(SEPARATOR), "");
e.setMessage(msg);
}
boolean found = false;
for (String rep : c.PLACEHOLDERS)
if (e.getMessage().contains(rep)) {
found = true;
break;
}
if (!found) {
return;
}
Player p = e.getPlayer();
if (!p.hasPermission("chatitem.use")) {
if(!c.LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if(!c.NO_PERMISSION_MESSAGE.isEmpty() && c.SHOW_NO_PERM_NORMAL){
p.sendMessage(c.NO_PERMISSION_MESSAGE);
}
return;
}
if (p.getItemInHand().getType().equals(Material.AIR)) {
if (c.DENY_IF_NO_ITEM) {
e.setCancelled(true);
if (!c.DENY_MESSAGE.isEmpty())
e.getPlayer().sendMessage(c.DENY_MESSAGE);
return;
}
if(c.HAND_DISABLED) {
return;
}
}
if(c.COOLDOWN > 0 && !p.hasPermission("chatitem.ignore-cooldown")){
if(COOLDOWNS.containsKey(p.getName())){
long start = COOLDOWNS.get(p.getName());
long current = System.currentTimeMillis()/1000;
long elapsed = current - start;
if(elapsed >= c.COOLDOWN){
COOLDOWNS.remove(p.getName());
}else{
if(!c.LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if(!c.COOLDOWN_MESSAGE.isEmpty()){
long left = (start + c.COOLDOWN) - current;
p.sendMessage(c.COOLDOWN_MESSAGE.replace(LEFT, calculateTime(left)));
}
return;
}
}
}
String s = e.getMessage();
for(String placeholder : c.PLACEHOLDERS){
s = s.replace(placeholder, c.PLACEHOLDERS.get(0));
}
int occurrences = countOccurrences(c.PLACEHOLDERS.get(0), s);
if(occurrences>c.LIMIT){
e.setCancelled(true);
if(c.LIMIT_MESSAGE.isEmpty()){
return;
}
e.getPlayer().sendMessage(c.LIMIT_MESSAGE);
return;
}
String oldmsg = e.getMessage();
StringBuilder sb = new StringBuilder(oldmsg);
sb.append(SEPARATOR).append(e.getPlayer().getName());
e.setMessage(sb.toString());
Bukkit.getConsoleSender().sendMessage(String.format(e.getFormat(), e.getPlayer().getDisplayName(), oldmsg));
if(!p.hasPermission("chatitem.ignore-cooldown")) {
COOLDOWNS.put(p.getName(), System.currentTimeMillis() / 1000);
}
}
@SuppressWarnings("deprecation")
@EventHandler(priority = EventPriority.LOWEST)
public void onCommand(final PlayerCommandPreprocessEvent e){
if(e.getMessage().indexOf(SEPARATOR)!=-1){ //If the BELL character is found, we have to remove it
String msg = e.getMessage().replace(Character.toString(SEPARATOR), "");
e.setMessage(msg);
}
String commandString = e.getMessage().split(" ")[0].replaceAll("^/+", ""); //First part of the command, without leading slashes and without arguments
Command cmd = Bukkit.getPluginCommand(commandString);
if(cmd==null){ //not a plugin command
if(!c.ALLOWED_DEFAULT_COMMANDS.contains(commandString)){
return;
}
}else{
if(!c.ALLOWED_PLUGIN_COMMANDS.contains(cmd)){
return;
}
}
Player p = e.getPlayer();
boolean found = false;
for (String rep : c.PLACEHOLDERS) {
if (e.getMessage().contains(rep)) {
found = true;
break;
}
}
if (!found) {
return;
}
if (!p.hasPermission("chatitem.use")) {
if(!c.NO_PERMISSION_MESSAGE.isEmpty() && c.SHOW_NO_PERM_COMMAND){
p.sendMessage(c.NO_PERMISSION_MESSAGE);
}
e.setCancelled(true);
return;
}
if (e.getPlayer().getItemInHand().getType().equals(Material.AIR)) {
if (c.DENY_IF_NO_ITEM) {
e.setCancelled(true);
if (!c.DENY_MESSAGE.isEmpty()) {
e.getPlayer().sendMessage(c.DENY_MESSAGE);
}
}
if(c.HAND_DISABLED) {
return;
}
}
if(c.COOLDOWN > 0 && !p.hasPermission("chatitem.ignore-cooldown")){
if(COOLDOWNS.containsKey(p.getName())){
long start = COOLDOWNS.get(p.getName());
long current = System.currentTimeMillis()/1000;
long elapsed = current - start;
if(elapsed >= c.COOLDOWN){
COOLDOWNS.remove(p.getName());
}else{
if(!c.LET_MESSAGE_THROUGH) {
e.setCancelled(true);
}
if(!c.COOLDOWN_MESSAGE.isEmpty()){
long left = (start + c.COOLDOWN) - current;
p.sendMessage(c.COOLDOWN_MESSAGE.replace(LEFT, calculateTime(left)));
}
return;
}
}
}
String s = e.getMessage();
for(String placeholder : c.PLACEHOLDERS){
s = s.replace(placeholder, c.PLACEHOLDERS.get(0));
}
int occurrences = countOccurrences(c.PLACEHOLDERS.get(0), s);
if(occurrences>c.LIMIT){
e.setCancelled(true);
if(c.LIMIT_MESSAGE.isEmpty()){
return;
}
e.getPlayer().sendMessage(c.LIMIT_MESSAGE);
return;
}
StringBuilder sb = new StringBuilder(e.getMessage());
sb.append(SEPARATOR).append(e.getPlayer().getName());
e.setMessage(sb.toString());
if(!p.hasPermission("chatitem.ignore-cooldown")) {
COOLDOWNS.put(p.getName(), System.currentTimeMillis() / 1000);
}
}
public void setStorage(Storage st) {
c = st;
}
}
@@ -0,0 +1,17 @@
package me.dadus33.chatitem.listeners;
import java.util.HashMap;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
public class ChatItemAdminHolder implements InventoryHolder {
public final HashMap<Integer, String> keyBySlot = new HashMap<>();
@Override
public Inventory getInventory() {
return null;
}
}
@@ -1,233 +0,0 @@
package me.dadus33.chatitem.listeners;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.plugin.Plugin;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.Storage;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.ComponentSerializer;
@Deprecated
public class ChatPacketListener extends PacketAdapter {
private final static String NAME = "{name}";
private final static String AMOUNT = "{amount}";
private final static String TIMES = "{times}";
private final static List<Material> SHULKER_BOXES = new ArrayList<>();
private Storage c;
public ChatPacketListener(Plugin plugin, ListenerPriority listenerPriority, Storage s, PacketType... types) {
super(plugin, listenerPriority, types);
if(ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_11)){
SHULKER_BOXES.addAll(Arrays.asList(Material.BLACK_SHULKER_BOX, Material.BLUE_SHULKER_BOX,
Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX, Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX,
Material.LIGHT_BLUE_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX, Material.ORANGE_SHULKER_BOX,
Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX, Material.RED_SHULKER_BOX, Material.LIGHT_GRAY_SHULKER_BOX,
Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX));
}
c = s;
}
private static String materialToName(Material m) {
if (m.equals(Material.TNT)) {
return "TNT";
}
String orig = m.toString().toLowerCase();
String[] splits = orig.split("_");
StringBuilder sb = new StringBuilder(orig.length());
int pos = 0;
for (String split : splits) {
sb.append(split);
int loc = sb.lastIndexOf(split);
char charLoc = sb.charAt(loc);
if (!(split.equalsIgnoreCase("of") || split.equalsIgnoreCase("and") ||
split.equalsIgnoreCase("with") || split.equalsIgnoreCase("on")))
sb.setCharAt(loc, Character.toUpperCase(charLoc));
if (pos != splits.length - 1)
sb.append(' ');
++pos;
}
return sb.toString();
}
private void stripData(ItemStack i){
if(i == null){
return;
}
if(i.getType().equals(Material.AIR)){
return;
}
if(!i.hasItemMeta()){
return;
}
ItemMeta im = Bukkit.getItemFactory().getItemMeta(i.getType());
ItemMeta original = i.getItemMeta();
if(original.hasDisplayName()){
im.setDisplayName(original.getDisplayName());
}
i.setItemMeta(im);
}
@Override
public void onPacketSending(final PacketEvent e) {
if(e.isPlayerTemporary())
return;
final PacketContainer packet = e.getPacket();
if(!packet.getMeta("parse").isPresent()){ //First we check if the packet validator has validated this packet to be parsed by us
return;
}
final boolean usesBaseComponents = (boolean)packet.getMeta("base-component").orElse(false); //The packet validator should also tell if this packet uses base components
e.setCancelled(true); //We cancel the packet as we're going to resend it anyways (ignoring listeners this time)
Bukkit.getScheduler().runTaskAsynchronously(ChatItem.getInstance(), () -> {
String json = (String)packet.getMeta("json").orElse(""); //The packet validator got the json for us, so no need to get it again
int topIndex = -1;
String name = null;
for(Player p : Bukkit.getOnlinePlayers()){
String pname = "\\u0007"+p.getName();
if(!json.contains(pname)){
continue;
}
int index = json.lastIndexOf(pname)+pname.length();
if(index>topIndex){
topIndex = index;
name = pname.replace("\\u0007", "");
}
}
if(name==null){ //something went really bad, so we run away and hide (AKA the player left or is on another server)
return;
}
Player p = Bukkit.getPlayer(name);
StringBuilder builder = new StringBuilder(json);
builder.replace(topIndex-(name.length()+6), topIndex, ""); //we remove both the name and the separator from the json string
json = builder.toString();
String message = null;
try {
if(!p.getItemInHand().getType().equals(Material.AIR)) {
ItemStack copy = p.getItemInHand().clone();
if(copy.getType().name().contains("_BOOK")){ //filtering written books
BookMeta bm = (BookMeta)copy.getItemMeta();
bm.setPages(Collections.emptyList());
copy.setItemMeta(bm);
} else {
if (ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_11)) { //filtering shulker boxes
if (SHULKER_BOXES.contains(copy.getType())) {
if (copy.hasItemMeta()) {
BlockStateMeta bsm = (BlockStateMeta) copy.getItemMeta();
if (bsm.hasBlockState()) {
ShulkerBox sb = (ShulkerBox) bsm.getBlockState();
for (ItemStack item : sb.getInventory()) {
stripData(item);
}
bsm.setBlockState(sb);
}
copy.setItemMeta(bsm);
}
}
}
}
message = ChatItem.getManipulator().parse(json, c.PLACEHOLDERS, copy, styleItem(copy, c), ProtocolVersion.getClientVersion(e.getPlayer()));
} else {
if(!c.HAND_DISABLED){
message = ChatItem.getManipulator().parseEmpty(json, c.PLACEHOLDERS, c.HAND_NAME, c.HAND_TOOLTIP, p);
}
}
} catch (InvocationTargetException | IllegalAccessException | InstantiationException | NoSuchFieldException | NoSuchMethodException e1) {
e1.printStackTrace();
}
if(message!=null) {
if(!usesBaseComponents) {
packet.getChatComponents().writeSafely(0, WrappedChatComponent.fromJson(message));
}else{
packet.getSpecificModifier(BaseComponent[].class).writeSafely(0, ComponentSerializer.parse(message));
}
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(e.getPlayer(), packet, false);
} catch (InvocationTargetException e1) {
e1.printStackTrace();
}
} else {
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(e.getPlayer(), packet, false);
} catch (InvocationTargetException e1) {
e1.printStackTrace();
}
}
});
}
public void setStorage(Storage st) {
c = st;
}
public static String styleItem(ItemStack item, Storage c){
String replacer = c.NAME_FORMAT;
String amount = c.AMOUNT_FORMAT;
boolean dname = item.hasItemMeta() ? item.getItemMeta().hasDisplayName() : false;
if (item.getAmount() == 1) {
if (c.FORCE_ADD_AMOUNT) {
amount = amount.replace(TIMES, "1");
replacer = replacer.replace(AMOUNT, amount);
} else {
replacer = replacer.replace(AMOUNT, "");
}
} else {
amount = amount.replace(TIMES, String.valueOf(item.getAmount()));
replacer = replacer.replace(AMOUNT, amount);
}
if (dname) {
String trp = item.getItemMeta().getDisplayName();
if(c.COLOR_IF_ALREADY_COLORED){
replacer = replacer.replace(NAME, ChatColor.stripColor(trp));
} else {
replacer = replacer.replace(NAME, trp);
}
} else {
HashMap<Short, String> translationSection = c.TRANSLATIONS.get(item.getType().name());
if(translationSection==null){
String trp = materialToName(item.getType());
replacer = replacer.replace(NAME, trp);
}else {
String translated = translationSection.get(item.getDurability());
if (translated != null) {
replacer = replacer.replace(NAME, translated);
} else {
replacer = replacer.replace(NAME, materialToName(item.getType()));
}
}
}
return replacer;
}
}
@@ -1,84 +0,0 @@
package me.dadus33.chatitem.listeners;
import org.bukkit.plugin.Plugin;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.Storage;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.ComponentSerializer;
@Deprecated
public class ChatPacketValidator extends PacketAdapter {
private Storage c;
public ChatPacketValidator(Plugin plugin, ListenerPriority listenerPriority, Storage s, PacketType... types) {
super(plugin, listenerPriority, types);
c = s;
}
@Override
public void onPacketSending(PacketEvent e){
if(e.isPlayerTemporary())
return;
ProtocolVersion version = ProtocolVersion.getServerVersion();
if(version.isNewerOrEquals(ProtocolVersion.V1_8)) { //only if action bar messages are supported in this version of minecraft
if(version.isNewerOrEquals(ProtocolVersion.V1_12)){
try {
if(((Enum<?>)e.getPacket().getSpecificModifier(Class.forName("net.minecraft.server." + ProtocolVersion.BUKKIT_VERSION + ".ChatMessageType")).read(0)).name().equals("GAME_INFO")){
return; //It means it's an actionbar message, and we ain't intercepting those
}
} catch (Exception exc) {
exc.printStackTrace();
}
} else if (e.getPacket().getBytes().readSafely(0) == (byte) 2) {
return; //It means it's an actionbar message, and we ain't intercepting those
}
}
boolean usesBaseComponents = false;
PacketContainer packet = e.getPacket();
String json;
if(packet.getChatComponents().readSafely(0)==null){ //null check for some cases of messages sent using spigot's Chat Component API or other means
if(ChatItem.supportsChatComponentApi()){ //only if the API is supported in this server distribution
BaseComponent[] components = packet.getSpecificModifier(BaseComponent[].class).readSafely(0);
if(components == null){
return;
}
json = ComponentSerializer.toString(components);
usesBaseComponents = true;
}else{
return; //We don't know how to deal with anything else. Most probably some mod message we shouldn't mess with anyways
}
}else{
json = packet.getChatComponents().readSafely(0).getJson();
}
boolean found = false;
for (String rep : c.PLACEHOLDERS)
if (json.contains(rep)) {
found = true;
break;
}
if (!found) {
return; //then it's just a normal message without placeholders, so we leave it alone
}
if(json.lastIndexOf("\\u0007")==-1){ //if the message doesn't contain the BELL separator, then it's certainly NOT a message we want to parse
return;
}
packet.setMeta("parse", true); //We mark this packet to be parsed by the packet listener
packet.setMeta("base-component", usesBaseComponents); //We also tell it whether this packet uses the base component API
packet.setMeta("json", json); //And we finally provide it with the json we already got from the packet
}
public void setStorage(Storage st){
c = st;
}
}
@@ -1,101 +0,0 @@
package me.dadus33.chatitem.listeners;
import java.lang.reflect.Method;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.packets.ChatItemPacket;
import me.dadus33.chatitem.packets.PacketContent;
import me.dadus33.chatitem.packets.PacketHandler;
import me.dadus33.chatitem.packets.PacketMetadata;
import me.dadus33.chatitem.packets.PacketType;
import me.dadus33.chatitem.utils.PacketUtils;
import me.dadus33.chatitem.utils.ProtocolVersion;
import me.dadus33.chatitem.utils.Storage;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.chat.ComponentSerializer;
public class ChatPacketValidatorV2 extends PacketHandler {
private Storage c;
private Method serializerGetJson;
public ChatPacketValidatorV2(Storage s) {
c = s;
try {
for(Method m : PacketUtils.CHAT_SERIALIZER.getDeclaredMethods()) {
if(m.getParameterCount() == 1 && m.getParameterTypes()[0].equals(PacketUtils.COMPONENT_CLASS) && m.getReturnType().equals(String.class)) {
serializerGetJson = m;
break;
}
}
if(serializerGetJson == null)
ChatItem.getInstance().getLogger().warning("Failed to find JSON serializer in class: " + PacketUtils.CHAT_SERIALIZER.getCanonicalName());
} catch (Exception e) {
e.printStackTrace();
}
}
@Override
public void onSend(ChatItemPacket e) {
if(!e.hasPlayer() || !e.getPacketType().equals(PacketType.Server.CHAT))
return;
ProtocolVersion version = ProtocolVersion.getServerVersion();
if(version.isNewerOrEquals(ProtocolVersion.V1_8)) { //only if action bar messages are supported in this version of minecraft
if(version.isNewerOrEquals(ProtocolVersion.V1_12)){
try {
if(((Enum<?>)e.getContent().getSpecificModifier(PacketUtils.getNmsClass("ChatMessageType", "network.chat.")).read(0)).name().equals("GAME_INFO")){
return; //It means it's an actionbar message, and we ain't intercepting those
}
} catch (Exception exc) {
exc.printStackTrace();
}
} else if (e.getContent().getBytes().readSafely(0) == (byte) 2) {
return; //It means it's an actionbar message, and we ain't intercepting those
}
}
boolean usesBaseComponents = false;
PacketContent packet = e.getContent();
String json;
if(packet.getChatComponents().readSafely(0) == null){ //null check for some cases of messages sent using spigot's Chat Component API or other means
if(!ChatItem.supportsChatComponentApi()) //only if the API is supported in this server distribution
return;//We don't know how to deal with anything else. Most probably some mod message we shouldn't mess with anyways
BaseComponent[] components = packet.getSpecificModifier(BaseComponent[].class).readSafely(0);
if(components == null){
return;
}
json = ComponentSerializer.toString(components);
usesBaseComponents = true;
} else {
try {
json = (String) serializerGetJson.invoke(null, packet.getChatComponents().readSafely(0));// (String) ReflectionUtils.callMethod(packet.getChatComponents().readSafely(0), "getJson");
} catch (Exception exc) {
exc.printStackTrace();
json = "{}";
}
}
boolean found = false;
for (String rep : c.PLACEHOLDERS) {
if (json.contains(rep)) {
found = true;
break;
}
}
if (!found) {
return; //then it's just a normal message without placeholders, so we leave it alone
}
if(json.lastIndexOf("\\u0007") == -1){ //if the message doesn't contain the BELL separator, then it's certainly NOT a message we want to parse
ChatItem.debug("Not containb bell " + json);
return;
}
PacketMetadata meta = e.getMetaData();
meta.setMeta("parse", true); //We mark this packet to be parsed by the packet listener
meta.setMeta("base-component", usesBaseComponents); //We also tell it whether this packet uses the base component API
meta.setMeta("json", json); //And we finally provide it with the json we already got from the packet
}
public void setStorage(Storage st){
c = st;
}
}
@@ -0,0 +1,112 @@
package me.dadus33.chatitem.listeners;
import static me.dadus33.chatitem.utils.ItemUtils.createItem;
import java.util.Arrays;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.utils.ItemUtils;
import me.dadus33.chatitem.utils.Messages;
import me.dadus33.chatitem.utils.Storage;
public class InventoryListener implements Listener {
@EventHandler
public void onClick(InventoryClickEvent e) {
if(e.getClickedInventory() == null || !(e.getWhoClicked() instanceof Player) || e.getCurrentItem() == null
|| !(e.getClickedInventory().getHolder() instanceof ChatItemAdminHolder))
return;
e.setCancelled(true);
Player p = (Player) e.getWhoClicked();
ItemStack item = e.getCurrentItem();
Material type = item.getType();
Storage c = ChatItem.getInstance().getStorage();
if(type.equals(ItemUtils.MATERIAL_CLOSE)) {
p.closeInventory();
} else if(type.equals(Material.PAPER)) {
ChatItemAdminHolder holder = (ChatItemAdminHolder) e.getClickedInventory().getHolder();
String key = holder.keyBySlot.get(e.getSlot());
if(key != null) {
setInConfig("manager", key);
p.closeInventory();
ChatItem.reload(p);
}
} else if(type.equals(Material.INK_SAC)) {
setInConfig("general.color-if-already-colored", c.COLOR_IF_ALREADY_COLORED = !c.COLOR_IF_ALREADY_COLORED);
open(p);
} else if(type.equals(Material.REDSTONE)) {
setInConfig("general.deny-if-no-item", c.DENY_IF_NO_ITEM = !c.DENY_IF_NO_ITEM);
open(p);
} else if(type.equals(Material.STICK)) {
setInConfig("general.hand.disabled", c.HAND_DISABLED = !c.HAND_DISABLED);
open(p);
} else if(type.equals(Material.IRON_DOOR)) {
if(e.getClick().equals(ClickType.RIGHT))
c.LIMIT--;
else if(e.getClick().equals(ClickType.LEFT))
c.LIMIT++;
setInConfig("general.limit-per-message", c.LIMIT);
open(p);
} else if(type.equals(Material.APPLE)) {
if(e.getClick().equals(ClickType.RIGHT))
c.COOLDOWN--;
else if(e.getClick().equals(ClickType.LEFT))
c.COOLDOWN++;
setInConfig("general.cooldown", c.COOLDOWN);
open(p);
}
}
private void setInConfig(String key, Object val) {
ChatItem pl = ChatItem.getInstance();
pl.getConfig().set(key, val);
pl.saveConfig();
}
public static void open(Player p) {
ChatItemAdminHolder holder = new ChatItemAdminHolder();
Storage c = ChatItem.getInstance().getStorage();
Inventory inv = Bukkit.createInventory(holder, 27, Messages.getMessage("admin-inv.name"));
for(int i = 0; i < inv.getSize(); i ++)
inv.setItem(i, createItem(ItemUtils.WHITE_STAINED_GLASS, "-"));
int slot = 0;
for(String manager : Arrays.asList("both", "auto", "packet", "chat")) {
holder.keyBySlot.put(slot, manager);
inv.setItem(slot++, getManagerItem(manager));
}
inv.setItem(slot + 1, getManagerItem("actual", "%manager%", Messages.getMessage("admin-inv.manager." + c.MANAGER + ".name")));
inv.setItem(18, getBoolChangeItem(Material.INK_SAC, "color-if-already-colored", c.COLOR_IF_ALREADY_COLORED));
inv.setItem(19, getBoolChangeItem(Material.REDSTONE, "deny-no-item", c.DENY_IF_NO_ITEM));
inv.setItem(20, getBoolChangeItem(Material.STICK, "hand-disabled", c.HAND_DISABLED));
inv.setItem(21, getAmountChangeItem(Material.IRON_DOOR, "limit-per-message", c.LIMIT));
inv.setItem(22, getAmountChangeItem(Material.APPLE, "cooldown", c.COOLDOWN));
inv.setItem(26, createItem(ItemUtils.MATERIAL_CLOSE, Messages.getMessage("admin-inv.close")));
p.openInventory(inv);
}
private static ItemStack getBoolChangeItem(Material type, String key, boolean b) {
return createItem(type, Messages.getMessage("admin-inv." + key, "%state%", Messages.getMessage(b ? "enabled" : "disabled")), Messages.getMessageList("admin-inv.bool-lore"));
}
private static ItemStack getAmountChangeItem(Material type, String key, int amount) {
return createItem(type, Messages.getMessage("admin-inv." + key, "%state%", amount), Messages.getMessageList("admin-inv.amount-lore"));
}
private static ItemStack getManagerItem(String manager, Object... placeholders) {
return createItem(Material.PAPER, Messages.getMessage("admin-inv.manager." + manager + ".name", placeholders),
Messages.getMessageList("admin-inv.manager." + manager + ".lore", placeholders));
}
}
@@ -0,0 +1,30 @@
package me.dadus33.chatitem.listeners;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
import me.dadus33.chatitem.ChatItem;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ComponentBuilder;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
public class JoinListener implements Listener {
@SuppressWarnings("deprecation")
@EventHandler
public void onJoin(PlayerJoinEvent e) {
Player p = e.getPlayer();
if(!p.isOp())
return;
ChatItem pl = ChatItem.getInstance();
if(pl.isHasNewVersion()) {
TextComponent text = new TextComponent(pl.getStorage().JOIN_UPDATE_MESSAGE);
text.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(pl.getStorage().JOIN_UPDATE_HOVER).create()));
text.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://www.spigotmc.org/resources/19064/"));
p.spigot().sendMessage(text);
}
}
}
@@ -0,0 +1,11 @@
package me.dadus33.chatitem.playernamer;
import org.bukkit.entity.Player;
import net.md_5.bungee.api.chat.TextComponent;
public interface IPlayerNamer {
public TextComponent getName(Player p);
}
@@ -0,0 +1,28 @@
package me.dadus33.chatitem.playernamer;
import org.bukkit.Bukkit;
import me.dadus33.chatitem.ChatItem;
import me.dadus33.chatitem.playernamer.hook.DefaultPlayerNamer;
import me.dadus33.chatitem.playernamer.hook.HexNicksPlayerNamer;
public class PlayerNamerManager {
private static IPlayerNamer playerNamer;
public static IPlayerNamer getPlayerNamer() {
return playerNamer;
}
public static void setPlayerNamer(IPlayerNamer playerNamer) {
PlayerNamerManager.playerNamer = playerNamer;
}
public static void load(ChatItem pl) {
if(Bukkit.getPluginManager().getPlugin("HexNicks") != null) {
setPlayerNamer(new HexNicksPlayerNamer());
pl.getLogger().info("Enable support for HexNicks plugin !");
} else {
setPlayerNamer(new DefaultPlayerNamer());
pl.getLogger().info("Use default player namer.");
}
}
}
@@ -0,0 +1,14 @@
package me.dadus33.chatitem.playernamer.hook;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.playernamer.IPlayerNamer;
import net.md_5.bungee.api.chat.TextComponent;
public class DefaultPlayerNamer implements IPlayerNamer {
@Override
public TextComponent getName(Player p) {
return new TextComponent(p.getName());
}
}
@@ -0,0 +1,18 @@
package me.dadus33.chatitem.playernamer.hook;
import org.bukkit.entity.Player;
import dev.majek.hexnicks.Nicks;
import me.dadus33.chatitem.playernamer.IPlayerNamer;
import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer;
import net.md_5.bungee.api.chat.TextComponent;
public class HexNicksPlayerNamer implements IPlayerNamer {
@Override
public TextComponent getName(Player p) {
return new TextComponent(BukkitComponentSerializer.legacy().toBuilder().hexColors()
.useUnusualXRepeatedCharacterHexFormat().build().serialize(Nicks.api().getStoredNick(p).join()));
}
}
@@ -1,14 +0,0 @@
package me.dadus33.chatitem.playerversion;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.utils.ProtocolVersion;
public interface IPlayerVersion {
public int getProtocolVersion(Player p);
default ProtocolVersion getPlayerVersion(Player p) {
return ProtocolVersion.getVersion(getProtocolVersion(p));
}
}
@@ -0,0 +1,86 @@
package me.dadus33.chatitem.utils;
import java.util.Arrays;
import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
public class ItemUtils {
public static final Material MATERIAL_CLOSE = getMaterialWithCompatibility("BARRIER", "REDSTONE_BLOCK");
// items
public static final Material EMPTY_MAP = getMaterialWithCompatibility("EMPTY_MAP", "MAP");
public static final Material BOOK_AND_QUILL = getMaterialWithCompatibility("BOOK_AND_QUILL", "WRITTEN_BOOK");
public static final Material WEB = getMaterialWithCompatibility("WEB", "COBWEB");
public static final Material FIREBALL = getMaterialWithCompatibility("FIREBALL", "FIRE_CHARGE");
public static final Material BIRCH_WOOD_STAIRS = getMaterialWithCompatibility("BIRCH_WOOD_STAIRS", "BIRCH_STAIRS");
// colored items
public static final Material GRAY_STAINED_GLASS_PANE = getMaterialWithCompatibility("STAINED_GLASS_PANE", "GRAY_STAINED_GLASS_PANE");
public static final Material WHITE_STAINED_GLASS = getMaterialWithCompatibility("STAINED_GLASS_PANE", "WHITE_STAINED_GLASS_PANE");
public static Material getMaterialWithCompatibility(String... tempMat) {
for(String s : tempMat) {
try {
Material m = (Material) Material.class.getField(s).get(Material.class);
if(m != null)
return m;
} catch (IllegalArgumentException | IllegalAccessException | SecurityException e2) {
e2.printStackTrace();
} catch (NoSuchFieldException e) {}
}
return null;
}
public static ItemStack createItem(Material m, String name, String... lore) {
return createItem(m, name, 1, lore);
}
public static ItemStack createItem(Material m, String name, int quantite, String... lore) {
ItemStack item = new ItemStack(m, quantite);
ItemMeta meta = (ItemMeta) item.getItemMeta();
meta.setDisplayName(ChatColor.RESET + name);
meta.setLore(Arrays.asList(lore));
item.setItemMeta(meta);
return item;
}
public static ItemStack createItem(Material m, String name, List<String> lore) {
return createItem(m, name, 1, lore);
}
public static ItemStack createItem(Material m, String name, int quantite, List<String> lore) {
ItemStack item = new ItemStack(m, quantite);
ItemMeta meta = (ItemMeta) item.getItemMeta();
meta.setDisplayName(ChatColor.RESET + name);
meta.setLore(lore);
item.setItemMeta(meta);
return item;
}
@SuppressWarnings("deprecation")
public static ItemStack createItem(Material m, String name, int amount, byte b, String... lore) {
ItemStack item = new ItemStack(m, amount, b);
ItemMeta meta = (ItemMeta) item.getItemMeta();
meta.setDisplayName(ChatColor.RESET + name);
meta.setLore(Arrays.asList(lore));
item.setItemMeta(meta);
return item;
}
public static ItemStack hideAttributes(ItemStack stack) {
if (Version.getVersion().isNewerThan(Version.V1_7)) {
ItemMeta meta = stack.getItemMeta();
// All ItemFlags are used to hide attributes, their javadoc says so too.
meta.addItemFlags(ItemFlag.values());
stack.setItemMeta(meta);
}
return stack;
}
}
@@ -0,0 +1,42 @@
package me.dadus33.chatitem.utils;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import org.bukkit.command.CommandSender;
import me.dadus33.chatitem.ChatItem;
public class Messages {
public static void sendMessage(CommandSender p, String key, Object... placeholders) {
getMessageList(key, placeholders).forEach(p::sendMessage);
}
public static String getMessage(String key, Object... placeholders) {
return colorAndPlaceholders(ChatItem.getInstance().getConfig().getString("messages." + key, key), placeholders);
}
@SuppressWarnings("unchecked")
public static List<String> getMessageList(String key, Object... placeholders) {
Object obj = ChatItem.getInstance().getConfig().get("messages." + key);
if(obj == null)
return Arrays.asList(key);
if(obj instanceof List) {
return ((List<String>) obj).stream().map((s) -> colorAndPlaceholders(s, placeholders)).collect(Collectors.toList());
} else if(obj instanceof String)
return Arrays.asList(colorAndPlaceholders((String) obj, placeholders));
else
return Arrays.asList(colorAndPlaceholders(obj.toString(), placeholders));
}
private static String colorAndPlaceholders(String msg, Object... placeholders) {
if(msg == null)
return "";
for (int index = 0; index <= placeholders.length - 1; index += 2) {
msg = msg.replace(String.valueOf(placeholders[index]), String.valueOf(placeholders[index + 1]));
}
return Storage.color(msg);
}
}
@@ -11,21 +11,22 @@ public class PacketUtils {
.split(",")[3];
public static final String NMS_PREFIX;
public static final String OBC_PREFIX;
public static final boolean IS_THERMOS;
public static final Class<?> CRAFT_PLAYER_CLASS, CRAFT_SERVER_CLASS, CHAT_SERIALIZER, COMPONENT_CLASS;
/**
* This Map is to reduce Reflection action which take more ressources than just RAM action
* This Map is to reduce Reflection action which take more resources than just RAM action
*/
private static final HashMap<String, Class<?>> ALL_CLASS;
static {
ALL_CLASS = new HashMap<>();
NMS_PREFIX = ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_17) ? "net.minecraft." : "net.minecraft.server." + VERSION + ".";
IS_THERMOS = isClassExist("thermos.Thermos");
NMS_PREFIX = Version.getVersion().isNewerOrEquals(Version.V1_17) || IS_THERMOS ? "net.minecraft." : "net.minecraft.server." + VERSION + ".";
OBC_PREFIX = "org.bukkit.craftbukkit." + VERSION + ".";
CRAFT_PLAYER_CLASS = getObcClass("entity.CraftPlayer");
CHAT_SERIALIZER = getNmsClass("IChatBaseComponent$ChatSerializer", "network.chat.", "ChatSerializer");
COMPONENT_CLASS = getNmsClass("IChatBaseComponent", "network.chat.");
CRAFT_PLAYER_CLASS = getObcClass("entity.CraftPlayer");
CRAFT_SERVER_CLASS = getObcClass("CraftServer");
}
@@ -37,7 +38,7 @@ public class PacketUtils {
*/
public static Class<?> getNmsClass(String name, String packagePrefix, String... alias){
return ALL_CLASS.computeIfAbsent(name, (a) -> {
String fullPrefix = NMS_PREFIX + (ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_17) ? packagePrefix : "");
String fullPrefix = NMS_PREFIX + (Version.getVersion().isNewerOrEquals(Version.V1_17) || IS_THERMOS ? packagePrefix : "");
try {
Class<?> clazz = Class.forName(fullPrefix + name);
if(clazz != null)
@@ -94,41 +95,6 @@ public class PacketUtils {
});
}
/**
* Get the current player ping
*
* @param p the player
* @return the player ping
*/
public static int getPing(Player p) {
try {
Object entityPlayer = getEntityPlayer(p);
return entityPlayer.getClass().getField("ping").getInt(entityPlayer);
} catch (Exception e) {
e.printStackTrace();
}
return 0;
}
/**
* Get NMS player connection of specified player
*
* @param p Player of which we want to get the player connection
* @return the NMS player connection
*/
public static Object getPlayerConnection(Player p) {
try {
Object entityPlayer = getEntityPlayer(p);
if(ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_17))
return entityPlayer.getClass().getField("b").get(entityPlayer);
else
return entityPlayer.getClass().getField("playerConnection").get(entityPlayer);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
/**
* Get NMS entity player of specified one
*
@@ -145,32 +111,31 @@ public class PacketUtils {
}
}
public static String getNmsEntityName(Object nmsEntity) {
public static boolean isClassExist(String name) {
try {
if(ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_13)) {
Object chatBaseComponent = getNmsClass("Entity", "world.entity.").getDeclaredMethod("getDisplayName").invoke(nmsEntity);
return (String) getNmsClass("IChatBaseComponent", "network.chat.").getDeclaredMethod("getString").invoke(chatBaseComponent);
} else {
return (String) getNmsClass("Entity", "world.entity.").getDeclaredMethod("getName").invoke(nmsEntity);
}
Class.forName(name);
return true;
} catch (Exception e) {
e.printStackTrace();
return null;
return false;
}
}
/**
* Send the packet to the specified player
* Get NMS player connection of specified player
*
* @param p which will receive the packet
* @param packet the packet to sent
* @param p Player of which we want to get the player connection
* @return the NMS player connection
*/
public static void sendPacket(Player p, Object packet) {
public static Object getPlayerConnection(Player p) {
try {
Object playerConnection = getPlayerConnection(p);
playerConnection.getClass().getMethod("sendPacket", getNmsClass("Packet", "network.protocol.")).invoke(playerConnection, packet);
Object entityPlayer = getEntityPlayer(p);
if(Version.getVersion().isNewerOrEquals(Version.V1_17))
return entityPlayer.getClass().getField("b").get(entityPlayer);
else
return entityPlayer.getClass().getField("playerConnection").get(entityPlayer);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
@@ -189,4 +154,19 @@ public class PacketUtils {
return null;
}
}
/**
* Send the packet to the specified player
*
* @param p which will receive the packet
* @param packet the packet to sent
*/
public static void sendPacket(Player p, Object packet) {
try {
Object playerConnection = getPlayerConnection(p);
playerConnection.getClass().getMethod(Version.getVersion().isNewerOrEquals(Version.V1_18) ? "a" : "sendPacket", getNmsClass("Packet", "network.protocol.")).invoke(playerConnection, packet);
} catch (Exception e) {
e.printStackTrace();
}
}
}
@@ -1,121 +0,0 @@
package me.dadus33.chatitem.utils;
import java.net.InetSocketAddress;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.ChatItem;
public enum ProtocolVersion {
// http://wiki.vg/Protocol_version_numbers
V1_7(0, 5, 0),
V1_8(6, 47, 1),
V1_9(49, 110, 2), // 1.9.X - Starts with 49 as 48 was an april fools update
V1_10(201, 210, 3), // 1.10.X - Starts with 201 because why not.
V1_11(301, 316, 4),
V1_12(317, 340, 5),
V1_13(341, 440, 6),
V1_14(100, 441, 500),
V1_15(100, 550, 578),
V1_16(100, 700, 754),
V1_17(100, 755, 756),
V1_18(100, 757, 800),
V1_19(100, 801, 1000),
HIGHER(Integer.MAX_VALUE, -1, Integer.MAX_VALUE);
// Latest version should always have the upper limit set to Integer.MAX_VALUE so
// I don't have to update the plugin for every minor protocol change
public final int MIN_VER;
public final int MAX_VER;
public final int index; // Represents how new the version is (0 - extremely old)
private static final ProtocolVersion SERVER_VERSION;
public static final String BUKKIT_VERSION;
static {
BUKKIT_VERSION = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
SERVER_VERSION = getVersionByName(BUKKIT_VERSION);
}
ProtocolVersion(int min, int max, int index) {
this.MIN_VER = min;
this.MAX_VER = max;
this.index = index;
}
public boolean isNewerThan(ProtocolVersion other) {
return index > other.index;
}
public boolean isNewerOrEquals(ProtocolVersion other) {
return index >= other.index;
}
public static ProtocolVersion getVersionByName(String name) {
for (ProtocolVersion v : ProtocolVersion.values())
if (name.toLowerCase().startsWith(v.name().toLowerCase()))
return v;
return HIGHER;
}
public static ProtocolVersion getVersion(int protocolVersion) {
for (ProtocolVersion ver : ProtocolVersion.values()) {
if (protocolVersion >= ver.MIN_VER && protocolVersion <= ver.MAX_VER) {
return ver;
}
}
return HIGHER;
}
public static ProtocolVersion getServerVersion() {
return SERVER_VERSION;
}
public static void remapIds(int server, int player, Item item) {
if (areIdsCompatible(server, player)) {
return;
}
if ((server >= V1_9.MIN_VER && player <= V1_8.MAX_VER) || (player >= V1_9.MIN_VER && server <= V1_8.MAX_VER)) {
if ((server >= V1_9.MIN_VER && player <= V1_8.MAX_VER)) {
ItemRewriter_1_9_TO_1_8.reversedToClient(item);
return;
}
ItemRewriter_1_9_TO_1_8.toClient(item);
return;
}
if ((server <= V1_10.MAX_VER && player >= V1_11.MIN_VER)
|| (player <= V1_10.MAX_VER && server >= V1_11.MIN_VER)) {
if (server <= V1_10.MAX_VER && player >= V1_11.MIN_VER) {
ItemRewriter_1_11_TO_1_10.toClient(item);
} else {
ItemRewriter_1_11_TO_1_10.reverseToClient(item);
}
}
}
public static boolean areIdsCompatible(int version1, int version2) {
if ((version1 >= V1_9.MIN_VER && version2 <= V1_8.MAX_VER)
|| (version2 >= V1_9.MIN_VER && version1 <= V1_8.MAX_VER)) {
return false;
}
if ((version1 <= V1_10.MAX_VER && version2 >= V1_11.MIN_VER)
|| (version1 <= V1_10.MAX_VER && version2 >= V1_11.MIN_VER)) {
return false;
}
return true;
}
public static int getClientVersion(Player p) {
return ChatItem.getInstance().getPlayerVersionAdapter().getProtocolVersion(p);
}
public static String stringifyAdress(InetSocketAddress address) {
String port = String.valueOf(address.getPort());
String ip = address.getAddress().getHostAddress();
return ip + ":" + port;
}
}
@@ -16,6 +16,28 @@ public class Reflect {
return null;
}
}
public static Method getMethod(Class<?> clazz, Class<?> returned, Class<?>... params) {
try {
for(Method m : clazz.getDeclaredMethods()) {
if(returned.equals(m.getReturnType()) && areParamsEquals(m.getParameterTypes(), params))
return m;
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
private static boolean areParamsEquals(Class<?>[] p1, Class<?>[] p2) {
if(p1.length != p2.length)
return false;
for(int i = 0; i < p1.length; i++) {
if(!p1[i].equals(p2[i]))
return false;
}
return true;
}
public static Field getField(Class<?> clazz, String... fieldNames){
for(String field : fieldNames) {
@@ -1,126 +1,118 @@
package me.dadus33.chatitem.utils;
import com.google.common.collect.ImmutableList;
import me.dadus33.chatitem.ChatItem;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.configuration.file.FileConfiguration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.configuration.file.FileConfiguration;
import com.google.common.collect.ImmutableList;
import me.dadus33.chatitem.ChatItem;
public class Storage {
private FileConfiguration conf;
public final HashMap<String, HashMap<Short, String>> TRANSLATIONS = new HashMap<>();
public final Boolean COLOR_IF_ALREADY_COLORED;
public final Boolean FORCE_ADD_AMOUNT;
public final Boolean LET_MESSAGE_THROUGH;
public final Boolean DENY_IF_NO_ITEM;
public final Boolean HAND_DISABLED;
public final Boolean SHOW_NO_PERM_NORMAL;
public final Boolean SHOW_NO_PERM_COMMAND;
public final String HAND_NAME;
public final String NAME_FORMAT;
public final String AMOUNT_FORMAT;
public final String NO_PERMISSION_MESSAGE;
public final String DENY_MESSAGE;
public final String LIMIT_MESSAGE;
public final String RELOAD_MESSAGE;
public final String COOLDOWN_MESSAGE;
public final String SECONDS;
public final String MINUTES;
public final String HOURS;
private final Integer CONFIG_VERSION;
public final Long COOLDOWN;
public final Integer LIMIT;
public final List<Command> ALLOWED_PLUGIN_COMMANDS = new ArrayList<>();
public final List<String> ALLOWED_DEFAULT_COMMANDS = new ArrayList<>();
public final List<String> PLACEHOLDERS;
public final List<String> HAND_TOOLTIP;
private FileConfiguration conf;
public final HashMap<String, HashMap<Short, String>> TRANSLATIONS = new HashMap<>();
public boolean COLOR_IF_ALREADY_COLORED, FORCE_ADD_AMOUNT, LET_MESSAGE_THROUGH, DENY_IF_NO_ITEM,
HAND_DISABLED, SHOW_NO_PERM_NORMAL, CHECK_UPDATE, SHOW_NO_PERM_COMMAND;
public final String HAND_NAME, NAME_FORMAT, AMOUNT_FORMAT, MANAGER;
public final String NO_PERMISSION_MESSAGE, DENY_MESSAGE, RELOAD_MESSAGE, COOLDOWN_MESSAGE, LIMIT_MESSAGE;
public final String SECONDS, MINUTES, HOURS;
public final String JOIN_UPDATE_MESSAGE, JOIN_UPDATE_HOVER;
public int CONFIG_VERSION, LIMIT, COOLDOWN;
public final List<Command> ALLOWED_PLUGIN_COMMANDS = new ArrayList<>();
public final List<String> ALLOWED_DEFAULT_COMMANDS = new ArrayList<>();
public final List<String> PLACEHOLDERS, HAND_TOOLTIP;
public Storage(FileConfiguration cnf) {
this.conf = cnf;
CONFIG_VERSION = conf.getInt("config-version");
checkConfigVersion();
Set<String> keys = conf.getConfigurationSection("Translations").getKeys(false);
for (String key : keys) {
HashMap<Short, String> entry = new HashMap<>();
Set<String> subKeys = conf.getConfigurationSection("Translations.".concat(key)).getKeys(false);
for (String subKey : subKeys) {
entry.put(Short.parseShort(subKey), color(conf.getString("Translations.".concat(key).concat(".")
.concat(subKey))));
}
public Storage(FileConfiguration cnf) {
this.conf = cnf;
CONFIG_VERSION = conf.getInt("config-version", 13);
checkConfigVersion();
this.MANAGER = conf.getString("manager", "auto");
Set<String> keys = conf.getConfigurationSection("translations").getKeys(false);
for (String key : keys) {
HashMap<Short, String> entry = new HashMap<>();
Set<String> subKeys = conf.getConfigurationSection("translations.".concat(key)).getKeys(false);
for (String subKey : subKeys) {
entry.put(Short.parseShort(subKey),
color(conf.getString("translations.".concat(key).concat(".").concat(subKey))));
}
TRANSLATIONS.put(key, entry);
}
COOLDOWN = conf.getLong("General.cooldown");
LIMIT = conf.getInt("General.limit");
List<String> added = conf.getStringList("General.placeholders");
PLACEHOLDERS = ImmutableList.copyOf(added);
NAME_FORMAT = color(conf.getString("General.name-format"));
AMOUNT_FORMAT = color(conf.getString("General.amount-format"));
COLOR_IF_ALREADY_COLORED = conf.getBoolean("General.color-if-already-colored");
LET_MESSAGE_THROUGH = conf.getBoolean("General.let-message-through");
FORCE_ADD_AMOUNT = conf.getBoolean("General.force-add-amount");
DENY_IF_NO_ITEM = conf.getBoolean("General.deny-if-no-item");
HAND_DISABLED = conf.getBoolean("General.hand.disabled");
SHOW_NO_PERM_NORMAL = conf.getBoolean("General.show-no-permission-message.normal");
SHOW_NO_PERM_COMMAND = conf.getBoolean("General.show-no-permission-message.command");
DENY_MESSAGE = color(conf.getString("Messages.deny-message"));
HAND_NAME = color(conf.getString("General.hand.name"));
LIMIT_MESSAGE = color(conf.getString("Messages.limit-message"));
RELOAD_MESSAGE = color(conf.getString("Messages.reload-success"));
NO_PERMISSION_MESSAGE = color(conf.getString("Messages.no-permission"));
COOLDOWN_MESSAGE = color(conf.getString("Messages.cooldown-message"));
SECONDS = color(conf.getString("Messages.seconds"));
MINUTES = color(conf.getString("Messages.minutes"));
HOURS = color(conf.getString("Messages.hours"));
HAND_TOOLTIP = conf.getStringList("General.hand.tooltip");
colorStringList(HAND_TOOLTIP);
final List<String> cmds = conf.getStringList("General.commands");
Bukkit.getScheduler().runTaskLaterAsynchronously(ChatItem.getInstance(), () -> {
for(String s : cmds){
Command c = Bukkit.getPluginCommand(s);
if(c!=null) {
ALLOWED_PLUGIN_COMMANDS.add(c);
}
else {
ALLOWED_DEFAULT_COMMANDS.add(s);
}
}
}, 100L);
TRANSLATIONS.put(key, entry);
}
PLACEHOLDERS = ImmutableList.copyOf(conf.getStringList("general.placeholders"));
NAME_FORMAT = color(conf.getString("general.name-format", "&b&l&o{name} {amount}&r"));
AMOUNT_FORMAT = color(conf.getString("general.amount-format", "x{times}"));
COLOR_IF_ALREADY_COLORED = conf.getBoolean("general.color-if-already-colored", true);
LET_MESSAGE_THROUGH = conf.getBoolean("general.let-message-through", true);
FORCE_ADD_AMOUNT = conf.getBoolean("general.force-add-amount", true);
DENY_IF_NO_ITEM = conf.getBoolean("general.deny-if-no-item", false);
LIMIT = conf.getInt("general.limit", 8);
COOLDOWN = conf.getInt("general.cooldown", 60);
SHOW_NO_PERM_NORMAL = conf.getBoolean("general.show-no-permission-message.normal", true);
SHOW_NO_PERM_COMMAND = conf.getBoolean("general.show-no-permission-message.command", false);
HAND_DISABLED = conf.getBoolean("general.hand.disabled", false);
HAND_NAME = color(conf.getString("general.hand.name", "&b&l&o{display-name}&b&l&o's hand"));
HAND_TOOLTIP = conf.getStringList("general.hand.tooltip");
CHECK_UPDATE = conf.getBoolean("general.check-update", true);
DENY_MESSAGE = color(conf.getString("messages.deny-message", "&c&lYou have no item in hand!"));
RELOAD_MESSAGE = color(conf.getString("messages.reload-success", "&b&lSuccessful reload!"));
NO_PERMISSION_MESSAGE = color(conf.getString("messages.no-permission",
"&c&lI'm sorry, but you are not allowed to use the placeholder in chat!"));
COOLDOWN_MESSAGE = color(conf.getString("messages.cooldown-message",
"&c&lYou can only use items in chat once a minute! You have {remaining} left!"));
JOIN_UPDATE_MESSAGE = color(conf.getString("messages.join-update.message",
"&cA new version of ChatItem is available. &aClick here to download."));
JOIN_UPDATE_HOVER = color(conf.getString("messages.join-update.hover", "&6Click to go to spigot page !"));
LIMIT_MESSAGE = color(conf.getString("messages.limit-message"));
}
SECONDS = color(conf.getString("messages.seconds", " seconds"));
MINUTES = color(conf.getString("messages.minutes", " minutes"));
HOURS = color(conf.getString("messages.hours", " hours"));
colorStringList(HAND_TOOLTIP);
final List<String> cmds = conf.getStringList("general.commands");
Bukkit.getScheduler().runTaskLaterAsynchronously(ChatItem.getInstance(), () -> {
for (String s : cmds) {
Command c = Bukkit.getPluginCommand(s);
if (c != null) {
ALLOWED_PLUGIN_COMMANDS.add(c);
} else {
ALLOWED_DEFAULT_COMMANDS.add(s);
}
}
}, 100L);
private static String color(String s) {
return ChatColor.translateAlternateColorCodes('&', s);
}
}
private void checkConfigVersion() {
int latestVersion = ChatItem.CFG_VER;
if (latestVersion != CONFIG_VERSION) {
Bukkit.getLogger().log(Level.WARNING, ChatColor.RED + "ChatItem detected an older or invalid configuration file. Replacing it with the default config...");
performOverwrite();
conf = ChatItem.getInstance().getConfig();
Bukkit.getLogger().log(Level.WARNING, ChatColor.RED + "Replacement complete!");
}
}
public static String color(String s) {
return s == null || s.isEmpty() ? s : ChatColor.translateAlternateColorCodes('&', s);
}
private void checkConfigVersion() {
int latestVersion = ChatItem.CFG_VER;
if (latestVersion != CONFIG_VERSION) {
ChatItem pl = ChatItem.getInstance();
pl.getLogger().warning(ChatColor.RED
+ "ChatItem detected an older or invalid configuration file. Replacing it with the default config...");
performOverwrite();
conf = pl.getConfig();
pl.getLogger().warning(ChatColor.RED + "Replacement complete!");
}
}
private void performOverwrite() {
ChatItem.getInstance().saveResource("config.yml", true);
}
private void performOverwrite() {
ChatItem.getInstance().saveResource("config.yml", true);
}
private static void colorStringList(List<String> input){
for(int i=0; i<input.size(); ++i){
input.set(i, color(input.get(i)));
}
}
private static void colorStringList(List<String> input) {
for (int i = 0; i < input.size(); ++i) {
input.set(i, color(input.get(i)));
}
}
}
@@ -1,66 +1,61 @@
package me.dadus33.chatitem.utils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.ConnectException;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.SocketTimeoutException;
import java.net.URL;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import me.dadus33.chatitem.ChatItem;
public class Utils {
public static final String VERSION = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",")
.split(",")[3];
public static String coloredMessage(String msg) {
return ChatColor.translateAlternateColorCodes('&', msg);
}
public static List<String> coloredMessage(String... messages) {
List<String> ret = new ArrayList<>();
for (String message : messages) {
ret.add(coloredMessage(message));
}
return ret;
}
@SuppressWarnings("unchecked")
public static List<Player> getOnlinePlayers() {
List<Player> list = new ArrayList<>();
try {
Class<?> mcServer = PacketUtils.getNmsClass("MinecraftServer", "server.");
Object server = mcServer.getMethod("getServer").invoke(mcServer);
Object craftServer = server.getClass().getField("server").get(server);
Object getted = craftServer.getClass().getMethod("getOnlinePlayers").invoke(craftServer);
if (getted instanceof Player[])
for (Player obj : (Player[]) getted)
list.add(obj);
else if (getted instanceof List)
for (Object obj : (List<?>) getted)
list.add((Player) obj);
else
System.out.println("Unknow getOnlinePlayers");
} catch (Exception e) {
e.printStackTrace();
}
return list;
Object players = Bukkit.getOnlinePlayers();
if(players instanceof Player[])
return Arrays.asList((Player[]) players);
return new ArrayList<>((Collection<Player>) players);
}
/**
* Get the current player ping
*
* @param p the player
* @return the player ping
*/
public static int getPing(Player p) {
public static String getFromURL(String urlName) {
ChatItem pl = ChatItem.getInstance();
try {
Object entityPlayer = PacketUtils.getEntityPlayer(p);
if(ProtocolVersion.getServerVersion().isNewerOrEquals(ProtocolVersion.V1_17))
return entityPlayer.getClass().getField("e").getInt(entityPlayer);
else
return entityPlayer.getClass().getField("ping").getInt(entityPlayer);
} catch (Exception e) {
e.printStackTrace();
URL url = new URL(urlName);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setUseCaches(true);
connection.setConnectTimeout(5000);
connection.setReadTimeout(5000);
connection.setRequestProperty("User-Agent", "ChatItem " + pl.getDescription().getVersion());
connection.setDoOutput(true);
connection.setRequestMethod("GET");
BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream()));
String content = "";
String input;
while ((input = br.readLine()) != null)
content = content + input;
br.close();
return content;
} catch (SocketTimeoutException e) {
pl.getLogger().info("Failed to access to " + urlName + " (Reason: timed out).");
} catch (UnknownHostException | MalformedURLException e) {
pl.getLogger().info("Could not use the internet connection to check for update or send stats");
} catch (ConnectException e) {
pl.getLogger().warning("Cannot connect to " + urlName + " (Reason: " + e.getMessage() + ").");
} catch (IOException e) {
e.printStackTrace();
}
return 0;
return null;
}
}
@@ -0,0 +1,79 @@
package me.dadus33.chatitem.utils;
import java.net.InetSocketAddress;
import org.bukkit.Bukkit;
public enum Version {
// http://wiki.vg/Protocol_version_numbers
V1_7(0, 5, 0),
V1_8(6, 47, 1),
V1_9(49, 110, 2), // 1.9.X - Starts with 49 as 48 was an april fools update
V1_10(201, 210, 3), // 1.10.X - Starts with 201 because why not.
V1_11(301, 316, 4),
V1_12(317, 340, 5),
V1_13(341, 440, 6),
V1_14(100, 441, 500),
V1_15(100, 550, 578),
V1_16(100, 700, 754),
V1_17(100, 755, 756),
V1_18(100, 757, 800),
V1_19(100, 801, 1000),
HIGHER(Integer.MAX_VALUE, -1, Integer.MAX_VALUE);
// Latest version should always have the upper limit set to Integer.MAX_VALUE so
// I don't have to update the plugin for every minor protocol change
public final int MIN_VER;
public final int MAX_VER;
public final int index; // Represents how new the version is (0 - extremely old)
private static final Version SERVER_VERSION;
public static final String BUKKIT_VERSION;
static {
BUKKIT_VERSION = Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
SERVER_VERSION = getVersionByName(BUKKIT_VERSION);
}
Version(int min, int max, int index) {
this.MIN_VER = min;
this.MAX_VER = max;
this.index = index;
}
public boolean isNewerOrEquals(Version other) {
return index >= other.index;
}
public boolean isNewerThan(Version other) {
return index > other.index;
}
public static Version getVersionByName(String name) {
for (Version v : Version.values())
if (name.toLowerCase().startsWith(v.name().toLowerCase()))
return v;
return HIGHER;
}
public static Version getVersion(int protocolVersion) {
for (Version ver : Version.values()) {
if (protocolVersion >= ver.MIN_VER && protocolVersion <= ver.MAX_VER) {
return ver;
}
}
return HIGHER;
}
public static Version getVersion() {
return SERVER_VERSION;
}
public static String stringifyAdress(InetSocketAddress address) {
String port = String.valueOf(address.getPort());
String ip = address.getAddress().getHostAddress();
return ip + ":" + port;
}
}
+128 -37
View File
@@ -1,50 +1,52 @@
#Config for ChatItem
#For info visit
#https://www.spigotmc.org/resources/chatitem.19064/
# Config for ChatItem
# For info visit
# Spigotmc: https://www.spigotmc.org/resources/chatitem.19064/
# Discord: https://discord.gg/ttA5CjMhk7
#Version info, DON'T TOUCH
config-version: 12
# Version info, DON'T TOUCH
config-version: 13
# By default, it's in "both" mode.
#
# Available mode :
# - "both" : Prevent chat editing with multiple plugins by using all ways possible to edit the chat.
# - "auto" : Choose automatically between all available according to actual plugins.
# - "packet" : The working system for 1.4's ChatItem version (and older)
# It was working with lot of others chat plugin, specially those who made hover text.
# - "chat" : New system which works without other chat plugin, which is simpler and with lower
# amount of possible issues.
# You can replace 'both' by another mode that should correspond to what you want.
# If you don't know which one use, come on discord (link at begin of config or in spigotmc)
manager: "both"
#General configuration
General:
#The placeholders you want to use for the item. You can add as many as you want.
general:
# The placeholders to display an item in chat.
placeholders:
- "[i]"
- "{item}"
# How will the item be displayed in chat? {name} represents the display name of
# the item, or material name (ex. Diamond Sword) if it doesn't have a customized
# display name nor any available translation, and {amount} will be replaced by
# the amount-format configured bellow.
# You can use color codes.
# The format of the item placeholders.
name-format: "&b&l&o{name} {amount}&r"
# The amount format that will replace the {amount} placeholder in the 'name-format'
# field above. The {times} placeholder represents the number of times the item is
# presented in the itemstack, in other words, the actual item amount in the stack
# the player holds. You can use color codes too.
# The format of the {amount} placeholder.
# {times} correspond to amount of item
amount-format: "x{times}"
# Should we apply the colors/formats set in the name format and/or amount format
# settings on the name of the item even though it already has a color of it's own,
# like a custom display name? Setting this to true will always disregard any color
# or or message
# Should we use the translated item name or the custom name of an item
color-if-already-colored: true
# Should we add the item amount even if there's only one item in the stack?
# Should we always show the amount, even if it's just one
force-add-amount: true
# Should we let the message through, as-is (with the placeholder not replaced)
# if the user doesn't have permission or if the user is on cooldown?
let-message-through: true
# Should we cancel the user message if the item in his (main) hand is air or null?
# (No item in hand, that is)
# Should we allow users to show their hands off
deny-if-no-item: false
# If the above (deny-if-no-item) is set to false, what should the placeholder be replaced with?
# Bellow you can configure that behaviour.
hand:
# Should the empty hand formatting be totally disabled? That will just leave the placeholder
# untouched in the final message
# Should we completely disable users being able to show their hands off
disabled: false
# The string the placeholder shall be replaced with. You can use {name} as a placeholder for
# the player's name and {display-name} as a placeholder for the player's display (custom) name.
# The name of the hand chat message.
name: "&b&l&o{display-name}&b&l&o's hand"
# The text to be displayed whe users hove their cursor above the name
# The lore of the hand chat message.
tooltip:
- "&7Nothing to see here"
- "&7Just the empty hand of {display-name}."
@@ -69,21 +71,110 @@ General:
# The cooldown, in seconds, between allowing players to send messages with items. Setting this to 0
# will remove the cooldown entirely.
cooldown: 60
# Check if the plugin have update
check-update: true
# Messages section. You can disable any of them by simply leaving them empty, like this: ""
Messages:
# The message users will get upon attempting to use the placeholder without any item in hand.
messages:
# The message sent if showing off hands is disabled and the user isn't holding an item.
# Only works if 'General.deny-if-no-item' is set to true!
deny-message: "&c&lYou have no item in hand!"
# The message you will get after reloading the plugin using /cireload.
# The message sent after the configuration file is successfully reloaded.
reload-success: "&b&lSuccessful reload!"
# The message a player will get when attempting to send a message with more placeholders then the allowed limit.
limit-message: "&c&lYou can only add 8 item placeholders per message!"
# The message to display players when they can't display items in chat due to the cooldown
# The message sent if the player is on cooldown from sending a placeholder.
cooldown-message: "&c&lYou can only use items in chat once a minute! You have {remaining} left!"
# The no permission message to be showed to players who don't have the required permission to use the placeholder
# The message sent if the no permission messages are enabled and the user doesn't have permission to send an item placeholder.
no-permission: "&c&lI'm sorry, but you are not allowed to use the placeholder in chat!"
# The message sent if the player uses more placeholders than configured in one message.
limit-message: "&c&lYou can only add 8 item placeholders per message!"
# All message about the update of the plugin
join-update:
message: "&cA new version of ChatItem is available. &aClick here to download."
hover: "&6Click to go to spigot page !"
# For all commands ran by console by reserved to player
only-players: "&cOnly players can run this command"
# All messages for the /chatitem command
chatitem-cmd:
help:
- "&6/chatitem admin : &7Manage some options"
- "&6/chatitem links : &7See all links which are usefull"
links:
begin: "&aAll usefull links: "
list:
1:
message: "\n&7- &eSpigotmc updates"
hover: "&6Click to go to spigot page !"
link: "https://www.spigotmc.org/resources/19064/"
2:
message: " "
3:
message: "&7(Original author: &aDadus33"
hover: "&6See &aDadus33&6's profile"
link: "https://www.spigotmc.org/members/10224/"
4:
message: "&7, "
5:
message: "&7Maintainer: &aElikill58&7)"
hover: "&6See &aElikill58&6's profile"
link: "https://www.spigotmc.org/members/310762/"
6:
message: "\n&7- &6Support on discord"
hover: "&6Click to open discord !"
link: "https://discord.gg/ttA5CjMhk7"
# All messages in admin inventory
admin-inv:
name: "ChatItem - Admin"
close: "Close"
# Generic lores for options items
amount-lore:
- "&aLeft-click: &6+1"
- "&aRight-click: &6-1"
bool-lore:
- "&7Click to enable/disable"
# Name of options items
color-if-already-colored: "&6Color if already colored: %state%"
deny-no-item: "&6Deny without item: %state%"
hand-disabled: "&6Hand disabled: %state%"
limit-per-message: "&6Limit per message: &a%state%"
cooldown: "&6Cooldown: &a%state%"
# Change name and lore of all managers
manager:
both:
name: "&6Use both manager&7: &aPacket & Chat"
lore:
- "&aTry both manager. Very usefull when you have lot of plugins"
- "&eIt enable to use ChatItem for all type of messages"
- ""
- "&7Since ChatItem v2.1"
auto:
name: "&6Choose automatically"
lore:
- "&aChoose automatically between managers available"
- "&aaccording to actuals plugins."
- "&eThis is better when you are not using own plugin."
- ""
- "&7Since ChatItem v2.1"
packet:
name: "&6Intercept packets"
lore:
- "&aChange message sent directly by intercepting packet"
- "&aCan use &6ProtocolLib &aif present."
- "&cCan have error with &e/cir &c!"
- ""
- "&7Originally made until ChatItem v1.4"
chat:
name: "&6Change basic message"
lore:
- "&aVery quick and usefull for server without plugin message !"
- "&aIt enable to use ChatItem without packet reading."
- "&eIt's more optimized than others manager"
- ""
- "&7Since ChatItem v2.0"
# The item that show the actual manager
actual:
name: '&6Actual manager: %manager%'
lore: []
# All the fields bellow shold be translated in your own language. Those will be used in the {remaining} format of the cooldown message.
# You should leave a space as a PREFIX as we will add a number in front of them
seconds: " seconds"
@@ -92,8 +183,8 @@ Messages:
# Translations
# Below you can find a set of default values for all items in Minecraft 1.8.
Translations:
# This is used to display prettier names in chat for items/blocks. Modifying this is usually unnecessary unless you know what you're doing.
translations:
## Blocks ##
STONE:
1: "Granite"
+4 -1
View File
@@ -2,7 +2,7 @@ name: ChatItem
main: me.dadus33.chatitem.ChatItem
version: ${project.version}
softdepend: [ViaVersion, ProtocolSupport, ProtocolLib]
softdepend: [ViaVersion, ProtocolSupport, ProtocolLib, LangUtils, HexNicks]
authors: [dadus33, WOLFI3654, Elikill58]
api-version: 1.13
@@ -11,6 +11,9 @@ commands:
description: Reload the ChatItem config.
aliases: [chatitemreload, citemreload, cir]
permission: chatitem.reload
chatitem:
description: See and edit ChatItem informations
permission: chatitem.reload
permissions:
chatitem.reload:
description: Allows reloading the config