diff --git a/bin/main/com/loki/lochat/listeners/ChatListener.class b/bin/main/com/loki/lochat/listeners/ChatListener.class index c162034..aa708f5 100644 Binary files a/bin/main/com/loki/lochat/listeners/ChatListener.class and b/bin/main/com/loki/lochat/listeners/ChatListener.class differ diff --git a/bin/main/com/loki/lochat/managers/AutoMessageManager.class b/bin/main/com/loki/lochat/managers/AutoMessageManager.class index 6151e92..93b74dd 100644 Binary files a/bin/main/com/loki/lochat/managers/AutoMessageManager.class and b/bin/main/com/loki/lochat/managers/AutoMessageManager.class differ diff --git a/bin/main/plugin.yml b/bin/main/plugin.yml index 9a0757f..63d897a 100644 --- a/bin/main/plugin.yml +++ b/bin/main/plugin.yml @@ -1,10 +1,10 @@ name: LoChat -version: '1.5.5' +version: '1.5.5-1.20.1' main: com.loki.lochat.LoChat -api-version: '1.21' -folia-supported: true +api-version: '1.20' +folia-supported: false author: loki -description: Advanced chat plugin for Folia with gradient nicks +description: Advanced chat plugin for Paper 1.20.1 with gradient nicks softdepend: - PlaceholderAPI diff --git a/build.gradle b/build.gradle index 212ec66..0ebd19a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'com.loki' -version = '1.5.5' +version = '1.5.5-1.20.1' repositories { mavenCentral() @@ -14,7 +14,7 @@ repositories { } dependencies { - compileOnly 'dev.folia:folia-api:1.21.4-R0.1-SNAPSHOT' + compileOnly 'io.papermc.paper:paper-api:1.20.1-R0.1-SNAPSHOT' compileOnly 'me.clip:placeholderapi:2.11.6' compileOnly 'org.black_ixx:playerpoints:3.2.7' compileOnly 'net.luckperms:api:5.4' @@ -44,7 +44,7 @@ test { } jar { - archiveFileName = 'LoChat-1.5.5.jar' + archiveFileName = 'LoChat-1.5.5-1.20.1.jar' from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } diff --git a/src/main/java/com/loki/lochat/listeners/ChatListener.java b/src/main/java/com/loki/lochat/listeners/ChatListener.java index 31abb3c..d100bec 100644 --- a/src/main/java/com/loki/lochat/listeners/ChatListener.java +++ b/src/main/java/com/loki/lochat/listeners/ChatListener.java @@ -1,6 +1,7 @@ package com.loki.lochat.listeners; import com.loki.lochat.LoChat; +import com.loki.lochat.gradient.util.FoliaUtil; import com.loki.lochat.managers.AntiSpamManager; import io.papermc.paper.event.player.AsyncChatEvent; import net.kyori.adventure.text.Component; @@ -30,10 +31,10 @@ public class ChatListener implements Listener { Component originalMessage = event.message(); String plainMessage = PLAIN.serialize(originalMessage); - // Folia-safe - player.getScheduler().run(plugin, task -> { + // Paper/Folia-safe + FoliaUtil.runEntityTask(plugin, player, () -> { processChat(player, originalMessage, plainMessage); - }, null); + }); } private void processChat(Player player, Component message, String plainMessage) { @@ -125,6 +126,9 @@ public class ChatListener implements Listener { ); return; } + case ALLOWED -> { + // Сообщение прошло проверку, продолжаем + } } } diff --git a/src/main/java/com/loki/lochat/managers/AutoMessageManager.java b/src/main/java/com/loki/lochat/managers/AutoMessageManager.java index 91adde5..2b3534b 100644 --- a/src/main/java/com/loki/lochat/managers/AutoMessageManager.java +++ b/src/main/java/com/loki/lochat/managers/AutoMessageManager.java @@ -2,12 +2,12 @@ package com.loki.lochat.managers; import com.loki.lochat.LoChat; import com.loki.lochat.utils.ChatFormatter; -import io.papermc.paper.threadedregions.scheduler.ScheduledTask; import net.kyori.adventure.text.Component; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; +import org.bukkit.scheduler.BukkitTask; import java.io.File; import java.util.*; @@ -18,7 +18,7 @@ public class AutoMessageManager { private final LoChat plugin; private final Random random = new Random(); private final AtomicInteger currentIndex = new AtomicInteger(0); - private ScheduledTask task; + private BukkitTask task; private Map> messages; private List messageOrder; @@ -108,9 +108,10 @@ public class AutoMessageManager { int intervalSeconds = plugin.getConfigManager().getAutoMessagesInterval(); long intervalTicks = intervalSeconds * 20L; - task = plugin.getServer().getGlobalRegionScheduler().runAtFixedRate( + // Используем FoliaUtil для совместимости с Paper и Folia + task = Bukkit.getScheduler().runTaskTimer( plugin, - scheduledTask -> broadcastNextMessage(), + this::broadcastNextMessage, intervalTicks, intervalTicks ); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 9a0757f..63d897a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,10 +1,10 @@ name: LoChat -version: '1.5.5' +version: '1.5.5-1.20.1' main: com.loki.lochat.LoChat -api-version: '1.21' -folia-supported: true +api-version: '1.20' +folia-supported: false author: loki -description: Advanced chat plugin for Folia with gradient nicks +description: Advanced chat plugin for Paper 1.20.1 with gradient nicks softdepend: - PlaceholderAPI