From d02a2cf9cab1d4494e1a9e5bdf32573c42c4cb9b Mon Sep 17 00:00:00 2001 From: LukeIThink <62862211+LukeIThink@users.noreply.github.com> Date: Thu, 9 Jun 2022 20:53:18 -0500 Subject: [PATCH 1/4] Message changes --- src/main/java/net/cybercake/fallback/Main.java | 2 ++ .../java/net/cybercake/fallback/commands/AttemptConnect.java | 4 ++-- .../java/net/cybercake/fallback/commands/FallbackReload.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/cybercake/fallback/Main.java b/src/main/java/net/cybercake/fallback/Main.java index e6520e3..93ebbe4 100644 --- a/src/main/java/net/cybercake/fallback/Main.java +++ b/src/main/java/net/cybercake/fallback/Main.java @@ -12,6 +12,7 @@ import net.cybercake.fallback.listeners.JoinLeaveEvent; import net.cybercake.fallback.listeners.MoveEvent; import net.cybercake.fallback.tasks.AttemptToSend; +import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandExecutor; @@ -77,6 +78,7 @@ public void onDisable() { public @NotNull Configuration getConfiguration() { return configuration; } public void send(Player player, String server) { + player.sendMessage(StringUtils.repeat(" \n", 100)); if(server.equalsIgnoreCase("$$configuration")) server = getConfiguration().getConnectTo(); player.sendMessage(UChat.component("&6Sending you to &a" + server + "&6!")); try { diff --git a/src/main/java/net/cybercake/fallback/commands/AttemptConnect.java b/src/main/java/net/cybercake/fallback/commands/AttemptConnect.java index a73f192..69ce836 100644 --- a/src/main/java/net/cybercake/fallback/commands/AttemptConnect.java +++ b/src/main/java/net/cybercake/fallback/commands/AttemptConnect.java @@ -22,10 +22,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command } if(args.length < 1) { - player.sendMessage(UChat.component("&6Attempting to connect you to default server &2(&a" + Main.getInstance().getConfiguration().getConnectTo() + "&2)&6...")); + player.sendMessage(UChat.component("&7Attempting to connect you to default server &8(&b" + Main.getInstance().getConfiguration().getConnectTo() + "&8)&7...")); Main.getInstance().send(player, "$$configuration"); }else{ - player.sendMessage(UChat.component("&6Attempting to connect you to &a" + args[0] + "&6...")); + player.sendMessage(UChat.component("&7Attempting to connect you to &b" + args[0] + "&7...")); Main.getInstance().send(player, args[0]); } diff --git a/src/main/java/net/cybercake/fallback/commands/FallbackReload.java b/src/main/java/net/cybercake/fallback/commands/FallbackReload.java index 6632be8..628d92c 100644 --- a/src/main/java/net/cybercake/fallback/commands/FallbackReload.java +++ b/src/main/java/net/cybercake/fallback/commands/FallbackReload.java @@ -24,7 +24,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command Main.getInstance().getConfiguration().reload(); - sender.sendMessage(UChat.component("&6Successfully reloaded the fallback configuration in &a" + (System.currentTimeMillis()-mss) + "&ams&6!")); + sender.sendMessage(UChat.component("&aSuccessfully &7reloaded the fallback configuration in &b" + (System.currentTimeMillis()-mss) + "&bms&7!")); Spigot.playSound(sender, Sound.ENTITY_PLAYER_LEVELUP, 1F, 1F); } catch (Exception exception) { sender.sendMessage(UChat.component("&cAn error occurred whilst reloading the fallback configuration! &4" + exception)); From 7cb9a8df9d1c887f99193af7d56403138abd5767 Mon Sep 17 00:00:00 2001 From: LukeIThink <62862211+LukeIThink@users.noreply.github.com> Date: Sat, 11 Jun 2022 18:09:50 -0500 Subject: [PATCH 2/4] yes --- src/main/java/net/cybercake/fallback/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/cybercake/fallback/Main.java b/src/main/java/net/cybercake/fallback/Main.java index 93ebbe4..80569f2 100644 --- a/src/main/java/net/cybercake/fallback/Main.java +++ b/src/main/java/net/cybercake/fallback/Main.java @@ -80,7 +80,7 @@ public void onDisable() { public void send(Player player, String server) { player.sendMessage(StringUtils.repeat(" \n", 100)); if(server.equalsIgnoreCase("$$configuration")) server = getConfiguration().getConnectTo(); - player.sendMessage(UChat.component("&6Sending you to &a" + server + "&6!")); + player.sendMessage(UChat.component("&7Sending you to &b" + server + "")); try { ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); DataOutputStream out = new DataOutputStream(byteArrayOutputStream); From 53457908c900ccebf2e888f2ae96202029912759 Mon Sep 17 00:00:00 2001 From: LukeIThink <62862211+LukeIThink@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:24:27 -0500 Subject: [PATCH 3/4] No Damage/Death --- .../fallback/listeners/DamageEvent.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/net/cybercake/fallback/listeners/DamageEvent.java diff --git a/src/main/java/net/cybercake/fallback/listeners/DamageEvent.java b/src/main/java/net/cybercake/fallback/listeners/DamageEvent.java new file mode 100644 index 0000000..a384451 --- /dev/null +++ b/src/main/java/net/cybercake/fallback/listeners/DamageEvent.java @@ -0,0 +1,22 @@ +package net.cybercake.fallback.listeners; + +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityDamageEvent; +import org.bukkit.event.entity.PlayerDeathEvent; + +public class DamageEvent implements Listener { + + @EventHandler + public void onDamage(EntityDamageEvent event) { + if (!(event.getEntity() instanceof Player player)) { return; } + + event.setCancelled(true); + } + + @EventHandler + public void onDeath(PlayerDeathEvent event) { + event.setCancelled(true); + } +} From 53200cf3c49495cb7d945f6290b8b7a258caf6e7 Mon Sep 17 00:00:00 2001 From: LukeIThink <62862211+LukeIThink@users.noreply.github.com> Date: Sat, 2 Jul 2022 19:35:50 -0500 Subject: [PATCH 4/4] CyberAPI Updates --- build.gradle | 6 ++-- .../net/cybercake/fallback/Commodore.java | 15 ++++++---- .../net/cybercake/fallback/Configuration.java | 10 +++---- .../java/net/cybercake/fallback/Main.java | 29 ++++++++++++------- .../fallback/commands/FallbackReload.java | 5 ++-- .../fallback/listeners/JoinLeaveEvent.java | 2 +- .../fallback/tasks/AttemptToSend.java | 2 +- 7 files changed, 39 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 52b13b6..39681e3 100644 --- a/build.gradle +++ b/build.gradle @@ -21,10 +21,10 @@ repositories { } dependencies { - compileOnly 'io.papermc.paper:paper-api:1.18.2-R0.1-SNAPSHOT' + compileOnly 'io.papermc.paper:paper-api:1.19-R0.1-SNAPSHOT' - implementation 'com.github.CyberedCake:CyberAPI:v2.1.11' - implementation 'me.lucko:commodore:1.13' + implementation 'com.github.CyberedCake:CyberAPI:v3.0.3-spigot' + implementation 'me.lucko:commodore:2.0' } shadowJar { diff --git a/src/main/java/net/cybercake/fallback/Commodore.java b/src/main/java/net/cybercake/fallback/Commodore.java index e15304a..c7c0645 100644 --- a/src/main/java/net/cybercake/fallback/Commodore.java +++ b/src/main/java/net/cybercake/fallback/Commodore.java @@ -2,16 +2,19 @@ import com.mojang.brigadier.tree.LiteralCommandNode; import me.lucko.commodore.CommodoreProvider; -import me.lucko.commodore.file.CommodoreFileFormat; +import me.lucko.commodore.file.CommodoreFileReader; +import net.cybercake.cyberapi.chat.Log; import org.bukkit.command.PluginCommand; import java.io.IOException; public class Commodore { - public static void register(PluginCommand pluginCommand, String fileName) throws IOException { - LiteralCommandNode timeCommand = CommodoreFileFormat.parse(Main.getPlugin().getResource("commodore/" + fileName + ".commodore")); - CommodoreProvider.getCommodore(Main.getPlugin()).register(pluginCommand, timeCommand); + try { + LiteralCommandNode commandProvided = CommodoreFileReader.INSTANCE.parse(Main.getInstance().getResource("commodore/" + fileName + ".commodore")); + CommodoreProvider.getCommodore(Main.getInstance()).register(pluginCommand, commandProvided); + }catch (Exception ignored) { + Log.error("Commodore file for command \"" + fileName + "\" not found"); + } } - -} +} \ No newline at end of file diff --git a/src/main/java/net/cybercake/fallback/Configuration.java b/src/main/java/net/cybercake/fallback/Configuration.java index 0c8a0b1..c3ec0ba 100644 --- a/src/main/java/net/cybercake/fallback/Configuration.java +++ b/src/main/java/net/cybercake/fallback/Configuration.java @@ -1,6 +1,6 @@ package net.cybercake.fallback; -import net.cybercake.cyberapi.Log; +import net.cybercake.cyberapi.chat.Log; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; @@ -19,10 +19,10 @@ public class Configuration { private boolean playerVisibility; public void reload() { - Main.getPlugin().saveDefaultConfig(); - Main.getPlugin().reloadConfig(); + Main.getInstance().saveDefaultConfig(); + Main.getInstance().reloadConfig(); - FileConfiguration config = Main.getMainConfig(); + FileConfiguration config = Main.getInstance().getMainConfig().values(); this.connectTo = config.getString("connectTo"); this.connectionInterval = config.getInt("connectionInterval"); @@ -32,7 +32,7 @@ public void reload() { this.spawn = new Location(world, config.getDouble("spawnAt.x"), config.getDouble("spawnAt.y"), config.getDouble("spawnAt.z"), config.getInt("spawnAt.yaw"), config.getInt("spawnAt.pitch")); }else{ Log.warn("You have put an invalid world in your configuration file! Set to default values for now..."); - this.spawn = new Location(Main.getPlugin().getServer().getWorlds().get(0), 0.0, 100.0, 0.0, 0, 0); + this.spawn = new Location(Main.getInstance().getServer().getWorlds().get(0), 0.0, 100.0, 0.0, 0, 0); } this.joinLeaveEvents = config.getBoolean("disable.joinLeaveMessages"); diff --git a/src/main/java/net/cybercake/fallback/Main.java b/src/main/java/net/cybercake/fallback/Main.java index 80569f2..f8ad65e 100644 --- a/src/main/java/net/cybercake/fallback/Main.java +++ b/src/main/java/net/cybercake/fallback/Main.java @@ -2,28 +2,29 @@ import me.lucko.commodore.CommodoreProvider; import net.cybercake.cyberapi.CyberAPI; -import net.cybercake.cyberapi.Log; +import net.cybercake.cyberapi.basic.BetterStackTraces; +import net.cybercake.cyberapi.basic.StringUtils; +import net.cybercake.cyberapi.chat.Log; import net.cybercake.cyberapi.chat.UChat; -import net.cybercake.cyberapi.exceptions.BetterStackTraces; -import net.cybercake.cyberapi.instances.Spigot; +import net.cybercake.cyberapi.settings.Settings; import net.cybercake.fallback.commands.AttemptConnect; import net.cybercake.fallback.commands.FallbackReload; import net.cybercake.fallback.listeners.ChatEvent; import net.cybercake.fallback.listeners.JoinLeaveEvent; import net.cybercake.fallback.listeners.MoveEvent; import net.cybercake.fallback.tasks.AttemptToSend; -import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandExecutor; import org.bukkit.command.TabCompleter; import org.bukkit.entity.Player; +import org.bukkit.util.StringUtil; import org.jetbrains.annotations.NotNull; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; -public final class Main extends Spigot { +public final class Main extends CyberAPI { private static Main instance; @@ -33,8 +34,15 @@ public final class Main extends Spigot { public void onEnable() { long mss = System.currentTimeMillis(); instance = this; - CyberAPI.silenceLogs(true); - CyberAPI.initSpigot(this, true); + + startCyberAPI(new Settings() + .name("Fallback") + .prefix("Fallback") + .checkForUpdates(false) + .silenced(true) + .showPrefixInLogs(true) + .build() + ); configuration = new Configuration(); Log.info("Loaded the configuration!"); @@ -78,7 +86,7 @@ public void onDisable() { public @NotNull Configuration getConfiguration() { return configuration; } public void send(Player player, String server) { - player.sendMessage(StringUtils.repeat(" \n", 100)); + player.sendMessage(UChat.getClearedChat()); if(server.equalsIgnoreCase("$$configuration")) server = getConfiguration().getConnectTo(); player.sendMessage(UChat.component("&7Sending you to &b" + server + "")); try { @@ -88,7 +96,7 @@ public void send(Player player, String server) { out.writeUTF("Connect"); out.writeUTF(server); - player.sendPluginMessage(Main.getPlugin(), "BungeeCord", byteArrayOutputStream.toByteArray()); + player.sendPluginMessage(Main.getInstance(), "BungeeCord", byteArrayOutputStream.toByteArray()); byteArrayOutputStream.close(); out.close(); @@ -100,8 +108,7 @@ public void send(Player player, String server) { public static void registerCommandAndTab(String name, Object commandExecutor, boolean withCommodore) { try { - registerCommand(name, (CommandExecutor)commandExecutor); - registerTabCompleter(name, (TabCompleter)commandExecutor); + Main.getInstance().registerCommand(name, (CommandExecutor) commandExecutor); if(withCommodore) { if(CommodoreProvider.isSupported()) { Commodore.register(Bukkit.getPluginCommand(name), name); diff --git a/src/main/java/net/cybercake/fallback/commands/FallbackReload.java b/src/main/java/net/cybercake/fallback/commands/FallbackReload.java index 628d92c..128c8e2 100644 --- a/src/main/java/net/cybercake/fallback/commands/FallbackReload.java +++ b/src/main/java/net/cybercake/fallback/commands/FallbackReload.java @@ -1,9 +1,8 @@ package net.cybercake.fallback.commands; +import net.cybercake.cyberapi.basic.BetterStackTraces; import net.cybercake.cyberapi.chat.UChat; import net.cybercake.cyberapi.chat.UTabComp; -import net.cybercake.cyberapi.exceptions.BetterStackTraces; -import net.cybercake.cyberapi.instances.Spigot; import net.cybercake.fallback.Main; import org.bukkit.Sound; import org.bukkit.command.Command; @@ -25,7 +24,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command Main.getInstance().getConfiguration().reload(); sender.sendMessage(UChat.component("&aSuccessfully &7reloaded the fallback configuration in &b" + (System.currentTimeMillis()-mss) + "&bms&7!")); - Spigot.playSound(sender, Sound.ENTITY_PLAYER_LEVELUP, 1F, 1F); + Main.getInstance().playSound(sender, Sound.ENTITY_PLAYER_LEVELUP, 1F, 1F); } catch (Exception exception) { sender.sendMessage(UChat.component("&cAn error occurred whilst reloading the fallback configuration! &4" + exception)); BetterStackTraces.print(exception); diff --git a/src/main/java/net/cybercake/fallback/listeners/JoinLeaveEvent.java b/src/main/java/net/cybercake/fallback/listeners/JoinLeaveEvent.java index 0b29e3b..50df40c 100644 --- a/src/main/java/net/cybercake/fallback/listeners/JoinLeaveEvent.java +++ b/src/main/java/net/cybercake/fallback/listeners/JoinLeaveEvent.java @@ -17,7 +17,7 @@ public void onJoin(PlayerJoinEvent event) { Configuration configuration = Main.getInstance().getConfiguration(); Player player = event.getPlayer(); - if(configuration.disableVisibility()) Bukkit.getOnlinePlayers().forEach(player1 -> player.hidePlayer(Main.getPlugin(), player1)); + if(configuration.disableVisibility()) Bukkit.getOnlinePlayers().forEach(player1 -> player.hidePlayer(Main.getInstance(), player1)); if(!configuration.disableJoinLeaveEvents()) return; diff --git a/src/main/java/net/cybercake/fallback/tasks/AttemptToSend.java b/src/main/java/net/cybercake/fallback/tasks/AttemptToSend.java index 2f35da5..ef84b5f 100644 --- a/src/main/java/net/cybercake/fallback/tasks/AttemptToSend.java +++ b/src/main/java/net/cybercake/fallback/tasks/AttemptToSend.java @@ -9,7 +9,7 @@ public class AttemptToSend implements Runnable { public void run() { boolean disableVisibility = Main.getInstance().getConfiguration().disableVisibility(); Bukkit.getOnlinePlayers().forEach(player -> { - if(disableVisibility) Bukkit.getOnlinePlayers().forEach(player1 -> player.hidePlayer(Main.getPlugin(), player1)); + if(disableVisibility) Bukkit.getOnlinePlayers().forEach(player1 -> player.hidePlayer(Main.getInstance(), player1)); Main.getInstance().send(player, "$$configuration"); });