YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-12 05:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

got rid of bungee api (yuck)

Browse Source
This commit is contained in:
YouHaveTrouble
2021-02-22 15:34:53 +01:00
parent 8086586df6
commit e05a841262
4 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/eu/endermite/togglepvp/commands/HelpCommand.java
-1
View File
@@ -4,7 +4,6 @@ import eu.endermite.togglepvp.TogglePvp;
import eu.endermite.togglepvp.util.PluginMessages; import eu.endermite.togglepvp.util.PluginMessages;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
src/main/java/eu/endermite/togglepvp/commands/MainCommand.java
-1
View File
@@ -7,7 +7,6 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor; import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
src/main/java/eu/endermite/togglepvp/commands/PvpToggleCommand.java
+15 -26
View File
@@ -3,10 +3,8 @@ package eu.endermite.togglepvp.commands;
import eu.endermite.togglepvp.TogglePvp; import eu.endermite.togglepvp.TogglePvp;
import eu.endermite.togglepvp.util.CombatTimer; import eu.endermite.togglepvp.util.CombatTimer;
import eu.endermite.togglepvp.util.PluginMessages; import eu.endermite.togglepvp.util.PluginMessages;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -17,9 +15,8 @@ public class PvpToggleCommand {
Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> { Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
if (!sender.hasPermission("togglepvp.command.toggle")) { if (!sender.hasPermission("togglepvp.command.toggle")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
@@ -40,16 +37,14 @@ public class PvpToggleCommand {
} else { } else {
message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled()); message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled());
} }
BaseComponent[] component = TextComponent.fromLegacyText(message); player.sendMessage(message);
player.spigot().sendMessage(ChatMessageType.CHAT, component);
} else { } else {
sender.sendMessage("Try /pvp toggle <player>"); sender.sendMessage("Try /pvp toggle <player>");
} }
} else if (args.length == 2) { } else if (args.length == 2) {
if (!sender.hasPermission("togglepvp.command.toggle.others")) { if (!sender.hasPermission("togglepvp.command.toggle.others")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
@@ -86,9 +81,8 @@ public class PvpToggleCommand {
public static void enable(CommandSender sender, String[] args) { public static void enable(CommandSender sender, String[] args) {
if (!sender.hasPermission("togglepvp.command.toggle")) { if (!sender.hasPermission("togglepvp.command.toggle")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
if (args.length == 1) { if (args.length == 1) {
@@ -100,16 +94,14 @@ public class PvpToggleCommand {
} }
TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true); TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), true);
String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_enabled()); String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_enabled());
BaseComponent[] component = TextComponent.fromLegacyText(message); player.sendMessage(message);
player.spigot().sendMessage(ChatMessageType.CHAT, component);
} else { } else {
sender.sendMessage("Try /pvp enable <player>"); sender.sendMessage("Try /pvp enable <player>");
} }
} else if (args.length == 2) { } else if (args.length == 2) {
if (!sender.hasPermission("togglepvp.command.toggle.others")) { if (!sender.hasPermission("togglepvp.command.toggle.others")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
if (sender instanceof Player) { if (sender instanceof Player) {
@@ -138,9 +130,8 @@ public class PvpToggleCommand {
public static void disable(CommandSender sender, String[] args) { public static void disable(CommandSender sender, String[] args) {
if (!sender.hasPermission("togglepvp.command.toggle")) { if (!sender.hasPermission("togglepvp.command.toggle")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
if (args.length == 1) { if (args.length == 1) {
@@ -152,16 +143,14 @@ public class PvpToggleCommand {
} }
TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), false); TogglePvp.getPlugin().getPlayerManager().setPlayerPvpState(player.getUniqueId(), false);
String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled()); String message = PluginMessages.parseMessage(TogglePvp.getPlugin().getConfigCache().getPvp_disabled());
BaseComponent[] component = TextComponent.fromLegacyText(message); player.sendMessage(message);
player.spigot().sendMessage(ChatMessageType.CHAT, component);
} else { } else {
sender.sendMessage("Try /pvp disable <player>"); sender.sendMessage("Try /pvp disable <player>");
} }
} else if (args.length == 2) { } else if (args.length == 2) {
if (!sender.hasPermission("togglepvp.command.toggle.others")) { if (!sender.hasPermission("togglepvp.command.toggle.others")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = TogglePvp.getPlugin().getConfigCache().getNo_permission();
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
if (sender instanceof Player) { if (sender instanceof Player) {
src/main/java/eu/endermite/togglepvp/commands/ReloadCommand.java
+3 -5
View File
@@ -1,9 +1,8 @@
package eu.endermite.togglepvp.commands; package eu.endermite.togglepvp.commands;
import eu.endermite.togglepvp.TogglePvp; import eu.endermite.togglepvp.TogglePvp;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
public class ReloadCommand { public class ReloadCommand {
@@ -12,9 +11,8 @@ public class ReloadCommand {
Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> { Bukkit.getScheduler().runTaskAsynchronously(TogglePvp.getPlugin(), () -> {
if (!sender.hasPermission("togglepvp.command.reload")) { if (!sender.hasPermission("togglepvp.command.reload")) {
String message = TogglePvp.getPlugin().getConfigCache().getNo_permission(); String message = ChatColor.translateAlternateColorCodes('&', TogglePvp.getPlugin().getConfigCache().getNo_permission());
BaseComponent[] component = TextComponent.fromLegacyText(message); sender.sendMessage(message);
sender.spigot().sendMessage(component);
return; return;
} }
TogglePvp.getPlugin().reloadPluginConfig(sender); TogglePvp.getPlugin().reloadPluginConfig(sender);