mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2026-02-16 02:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

removal of Adventure API

Browse Source
This commit is contained in:
SuperRonanCraft
2022-10-14 22:48:15 -04:00
parent d5a0a73991
commit 55eae3814e
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@@ -354,12 +354,5 @@
<version>1.8.1</version>
<scope>provided</scope>
</dependency>
<!-- Kyori Adventure -->
<dependency>
<groupId>net.kyori</groupId>
<artifactId>adventure-platform-bukkit</artifactId>
<version>4.1.2</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

9
src/main/java/me/SuperRonanCraft/BetterRTP/BetterRTP.java
View File

@@ -20,7 +20,6 @@ import me.SuperRonanCraft.BetterRTP.references.rtpinfo.QueueHandler;
import me.SuperRonanCraft.BetterRTP.references.settings.Settings;
import me.SuperRonanCraft.BetterRTP.references.web.Metrics;
import me.SuperRonanCraft.BetterRTP.references.web.Updater;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -44,13 +43,13 @@ public class BetterRTP extends JavaPlugin {
@Getter private final QueueHandler queue = new QueueHandler();
@Getter private final DatabaseHandler databaseHandler = new DatabaseHandler();
@Getter private final WarningHandler warningHandler = new WarningHandler();
@Getter private BukkitAudiences adventure;
//@Getter private BukkitAudiences adventure;
@Getter private boolean PlaceholderAPI;
@Override
public void onEnable() {
instance = this;
this.adventure = BukkitAudiences.create(this);
//this.adventure = BukkitAudiences.create(this);
registerDependencies();
new Updater(this);
new Metrics(this);
@@ -68,10 +67,10 @@ public class BetterRTP extends JavaPlugin {
public void onDisable() {
invs.closeAll();
queue.unload();
if (this.adventure != null) {
/*if (this.adventure != null) {
this.adventure.close();
this.adventure = null;
}
}*/
}
private void registerDependencies() {

5
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTitles.java
View File

@@ -2,6 +2,7 @@ package me.SuperRonanCraft.BetterRTP.player.rtp;
import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
import me.SuperRonanCraft.BetterRTP.references.messages.Message;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@@ -49,8 +50,8 @@ public class RTPTitles {
// int fadeOut = text.getFadeOut();
title = Message.color(title);
sub = Message.color(sub);
Message.smsTitle(p, Arrays.asList(title, sub));
//p.sendTitle(title, sub);
//Message.smsTitle(p, Arrays.asList(title, sub));
p.sendTitle(title, sub);
// player.sendTitle(title, subTitle, fadeIn, stay, fadeOut);
}

18
src/main/java/me/SuperRonanCraft/BetterRTP/references/messages/Message.java
View File

@@ -5,17 +5,15 @@ import lombok.NonNull;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.file.FileData;
import me.SuperRonanCraft.BetterRTP.references.messages.placeholder.PlaceholderAnalyzer;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.title.Title;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -50,7 +48,7 @@ public interface Message {
}
}
static void smsActionBar(Player sendi, List<String> msg) {
/*static void smsActionBar(Player sendi, List<String> msg) {
if (msg == null || msg.isEmpty()) return;
String str = msg.get(new Random().nextInt(msg.size()));
smsActionBar(sendi, str);
@@ -61,16 +59,16 @@ public interface Message {
Audience audience = BetterRTP.getInstance().getAdventure().player(sendi);
audience.sendActionBar(Component.text(msg));
//sendi.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(msg));
}
}*/
static void smsTitle(Player sendi, List<String> msg) {
/*static void smsTitle(Player sendi, List<String> msg) {
if (msg == null || msg.isEmpty()) return;
Audience audience = BetterRTP.getInstance().getAdventure().player(sendi);
if (msg.size() == 1)
audience.showTitle(Title.title(Component.text(" "), Component.text(msg.get(0))));
else
audience.showTitle(Title.title(Component.text(msg.get(0)), Component.text(msg.get(1))));
}
}*/
static String getPrefix(Message messenger) {
return messenger.lang().getString("Messages.Prefix");