From 47cd73cc6d2886f5b12abb273bdbd994c25a3606 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:11:03 -0500 Subject: [PATCH 01/83] Created TutorialCommand.java --- .../hccore/commands/TutorialCommand.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/com/hackclub/hccore/commands/TutorialCommand.java diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java new file mode 100644 index 00000000..0f05cd90 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -0,0 +1,31 @@ +package com.hackclub.hccore.commands; + +import com.hackclub.hccore.HCCorePlugin; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class TutorialCommand implements CommandExecutor { + private static final String message = "(╯°□°）╯︵ ┻━┻ toutoral uwu owo"; + + private final HCCorePlugin plugin; + + public TutorialCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "You must be a player to use this"); + return true; + } + + Player player = (Player) sender; + sender.sendMessage(ChatColor.RED + TutorialCommand.message); + + return true; + } +} From 282f4b2ebf6ece5b51fbbf659def897ffc67d02c Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:11:26 -0500 Subject: [PATCH 02/83] Added /tutorial to plugins.yml --- src/main/resources/plugin.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 76bd91f3..f6e16dc7 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -32,3 +32,7 @@ commands: tableflip: description: Appends a tableflip to your message usage: /tableflip [message] + tutorial: + description: Greets new users to the server + usage: /tutorial + From 921b9e172afd01bc72939cc789a2bb584a1ade32 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:41:25 -0500 Subject: [PATCH 03/83] Added tutorial command to PlayerListener.java --- src/main/java/com/hackclub/hccore/HCCorePlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index f28fec6c..15660ebf 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -15,6 +15,7 @@ import com.hackclub.hccore.commands.SpawnCommand; import com.hackclub.hccore.commands.StatsCommand; import com.hackclub.hccore.commands.TableflipCommand; +import com.hackclub.hccore.commands.TutorialCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -63,6 +64,7 @@ public void onEnable() { this.getCommand("spawn").setExecutor(new SpawnCommand(this)); this.getCommand("stats").setExecutor(new StatsCommand(this)); this.getCommand("tableflip").setExecutor(new TableflipCommand(this)); + this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); From 00a8ab0cbb53d26748a2808b209784c24c6d5638 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 13:56:21 -0500 Subject: [PATCH 04/83] Finished /tutorial command --- .../java/com/hackclub/hccore/commands/TutorialCommand.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 0f05cd90..6e43a243 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; public class TutorialCommand implements CommandExecutor { - private static final String message = "(╯°□°）╯︵ ┻━┻ toutoral uwu owo"; + private static final String[] message = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:\n", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; private final HCCorePlugin plugin; @@ -24,7 +24,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String } Player player = (Player) sender; - sender.sendMessage(ChatColor.RED + TutorialCommand.message); + for (String i : TutorialCommand.message) { + sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + i); + } return true; } From 1f17838164b9b0ae8b26d7833138cec8b8b6b1ed Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 13:58:02 -0500 Subject: [PATCH 05/83] Run /tutorial when new players join --- .../java/com/hackclub/hccore/listeners/PlayerListener.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index 515eb348..c94575d1 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -68,7 +68,11 @@ public void onPlayerJoin(final PlayerJoinEvent event) { event.getPlayer().resetTitle(); event.setJoinMessage(ChatColor.YELLOW + ChatColor.stripColor(event.getPlayer().getDisplayName()) + " joined the game"); - } + + if (event.getPlayer().hasPlayedBefore() == false) { + event.getPlayer().performCommand("tutorial"); + } + } @EventHandler public void onPlayerLogin(final PlayerLoginEvent event) { From 3df48fb933171a0114e2c62cd120765665979549 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 19:43:30 -0500 Subject: [PATCH 06/83] remove extra space in plugin.yml --- src/main/resources/plugin.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index f6e16dc7..58d5c734 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -35,4 +35,3 @@ commands: tutorial: description: Greets new users to the server usage: /tutorial - From b578fee85b64e151c6eb092d736d4d20c58a613e Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 19:45:57 -0500 Subject: [PATCH 07/83] capitalized name of static array message --- .../java/com/hackclub/hccore/commands/TutorialCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 6e43a243..f65157fd 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; public class TutorialCommand implements CommandExecutor { - private static final String[] message = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:\n", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; + private static final String[] MESSAGE = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; private final HCCorePlugin plugin; @@ -24,8 +24,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String } Player player = (Player) sender; - for (String i : TutorialCommand.message) { - sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + i); + for (String message : TutorialCommand.MESSAGE) { + sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); } return true; From be30415dc58f50878354a7b925f9c9fb5f034f4a Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:11:16 -0500 Subject: [PATCH 08/83] Get rid of unused variable player --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index f65157fd..5c8ed1b3 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -23,7 +23,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String return true; } - Player player = (Player) sender; for (String message : TutorialCommand.MESSAGE) { sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); } From baa942f1bfd50d5c982aa18d81f24617f0107df3 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:12:42 -0500 Subject: [PATCH 09/83] Moved for loop into if else statement --- .../com/hackclub/hccore/commands/TutorialCommand.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 5c8ed1b3..f674e382 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -21,11 +21,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String if (!(sender instanceof Player)) { sender.sendMessage(ChatColor.RED + "You must be a player to use this"); return true; + } else { + for (String message : TutorialCommand.MESSAGE) { + sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); + } } - for (String message : TutorialCommand.MESSAGE) { - sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); - } + return true; } From 9693fb7a52eb4311b7289d96e8626ed503073291 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:17:32 -0500 Subject: [PATCH 10/83] Simplified L26 --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index f674e382..8a96516b 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -23,7 +23,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String return true; } else { for (String message : TutorialCommand.MESSAGE) { - sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); + sender.sendMessage(ChatColor.YELLOW + ChatColor.BOLD.toString() + message); } } From 400399360a1c2175e8cc15f74189834405923150 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:18:17 -0500 Subject: [PATCH 11/83] Removed extra spaces --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 8a96516b..6f3b59ea 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -27,8 +27,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String } } - - return true; } } From 0b84b59408b47955c28666b7041e6e5ff8ad49d8 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 13 May 2020 16:37:28 -0400 Subject: [PATCH 12/83] Fix autocomplete for second parameter of /stats (#95) --- src/main/java/com/hackclub/hccore/commands/StatsCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/StatsCommand.java b/src/main/java/com/hackclub/hccore/commands/StatsCommand.java index 08de1f2b..be0d626c 100644 --- a/src/main/java/com/hackclub/hccore/commands/StatsCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/StatsCommand.java @@ -108,7 +108,8 @@ public List onTabComplete(CommandSender sender, Command cmd, String alia } break; case 2: - Collections.addAll(completions, "extended", "only"); + List subcommands = Arrays.asList("extended", "only"); + StringUtil.copyPartialMatches(args[1], subcommands, completions); break; case 3: // Only send statistic name suggestions in /stats only From bcf7496af3b132fe9a7c34087bf3faedd3e8978d Mon Sep 17 00:00:00 2001 From: Harshith Iyer Date: Sun, 17 May 2020 18:56:03 -0400 Subject: [PATCH 13/83] Exclude AFKed players from the sleep threshold (#92) --- .../com/hackclub/hccore/listeners/SleepListener.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/SleepListener.java b/src/main/java/com/hackclub/hccore/listeners/SleepListener.java index db46ec6d..29f31912 100644 --- a/src/main/java/com/hackclub/hccore/listeners/SleepListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/SleepListener.java @@ -1,6 +1,7 @@ package com.hackclub.hccore.listeners; import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.PlayerData; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.World.Environment; @@ -158,7 +159,15 @@ private int getSleepingPlayers(World world) { } private int getMinSleepingPlayersNeeded(World world) { - return (int) Math.ceil(world.getPlayers().size() + // Get the number of AFK players + int afkPlayersCount = 0; + for (Player player : world.getPlayers()) { + PlayerData playerData = this.plugin.getDataManager().getData(player); + if (playerData.isAfk()) { + afkPlayersCount++; + } + } + return (int) Math.ceil((world.getPlayers().size() - afkPlayersCount) * this.plugin.getConfig().getDouble("settings.skip-sleep-threshold")); } } From 82b3f620bd05dc0f0acb06fb12a70f765f003859 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Thu, 21 May 2020 03:30:14 -0700 Subject: [PATCH 14/83] Fix NPEs in SleepListener on player quit (#99) --- .../hccore/listeners/AFKListener.java | 30 +++++++++---------- .../hccore/listeners/PlayerListener.java | 5 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/AFKListener.java b/src/main/java/com/hackclub/hccore/listeners/AFKListener.java index 6893a4a9..e2559c94 100644 --- a/src/main/java/com/hackclub/hccore/listeners/AFKListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/AFKListener.java @@ -20,6 +20,21 @@ public AFKListener(HCCorePlugin plugin) { this.plugin = plugin; } + @EventHandler + public void onPlayerAFKStatusChange(final PlayerAFKStatusChangeEvent event) { + Player player = event.getPlayer(); + PlayerData data = this.plugin.getDataManager().getData(player); + + if (event.getNewValue()) { + player.sendTitle(ChatColor.RED + ChatColor.BOLD.toString() + "You are AFK", + "Run /afk to mark yourself as active", 10, 999999, 20); + player.getServer().broadcastMessage(data.getUsableName() + " is now AFK"); + } else { + player.sendTitle(null, null, 0, 1, -1); + player.getServer().broadcastMessage(data.getUsableName() + " is now active"); + } + } + @EventHandler public void onAsyncPlayerChat(final AsyncPlayerChatEvent event) { this.plugin.getDataManager().getData(event.getPlayer()) @@ -51,19 +66,4 @@ public void onPlayerMove(final PlayerMoveEvent event) { this.plugin.getDataManager().getData(event.getPlayer()) .setLastActiveAt(System.currentTimeMillis()); } - - @EventHandler - public void onPlayerAFKStatusChange(final PlayerAFKStatusChangeEvent event) { - Player player = event.getPlayer(); - PlayerData data = this.plugin.getDataManager().getData(player); - - if (event.getNewValue()) { - player.sendTitle(ChatColor.RED + ChatColor.BOLD.toString() + "You are AFK", - "Run /afk to mark yourself as active", 10, 999999, 20); - player.getServer().broadcastMessage(data.getUsableName() + " is now AFK"); - } else { - player.sendTitle(null, null, 0, 1, -1); - player.getServer().broadcastMessage(data.getUsableName() + " is now active"); - } - } } diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index c94575d1..364c98fd 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -5,6 +5,7 @@ import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.PlayerDeathEvent; @@ -57,7 +58,7 @@ public void onAsyncPlayerChat(final AsyncPlayerChatEvent event) { playerColor + ChatColor.translateAlternateColorCodes('&', event.getMessage())); } - @EventHandler + @EventHandler(priority = EventPriority.LOWEST) // Runs foremost public void onPlayerJoin(final PlayerJoinEvent event) { this.plugin.getDataManager().registerPlayer(event.getPlayer()); // Set the initial active time @@ -114,7 +115,7 @@ public void onPlayerRespawn(final PlayerRespawnEvent event) { this.plugin.getDataManager().getData(event.getPlayer()).setLastDamagedAt(0); } - @EventHandler + @EventHandler(priority = EventPriority.MONITOR) // Runs very last public void onPlayerQuit(final PlayerQuitEvent event) { // NOTE: Title isn't cleared when the player leaves the server // event.getPlayer().resetTitle(); From f08d5def26ae221b333f45ae8c28a90d0a67c3c4 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Thu, 21 May 2020 15:41:28 -0700 Subject: [PATCH 15/83] Disallow AFK players from sleeping (#98) --- .../hccore/listeners/SleepListener.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/SleepListener.java b/src/main/java/com/hackclub/hccore/listeners/SleepListener.java index 29f31912..56ac305a 100644 --- a/src/main/java/com/hackclub/hccore/listeners/SleepListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/SleepListener.java @@ -2,6 +2,7 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; +import com.hackclub.hccore.events.player.PlayerAFKStatusChangeEvent; import org.bukkit.ChatColor; import org.bukkit.World; import org.bukkit.World.Environment; @@ -28,6 +29,16 @@ public SleepListener(HCCorePlugin plugin) { this.plugin = plugin; } + @EventHandler + public void onPlayerAFKStatusChange(final PlayerAFKStatusChangeEvent event) { + // Wake the player up if they become AFK while sleeping + Player player = event.getPlayer(); + if (event.getNewValue() && player.isSleeping()) { + player.wakeup(true); + player.sendMessage(ChatColor.RED + "You can’t sleep while you’re AFK."); + } + } + @EventHandler public void onPlayerBedEnter(final PlayerBedEnterEvent event) { // Ignore unsuccessful attempts to sleep @@ -35,6 +46,14 @@ public void onPlayerBedEnter(final PlayerBedEnterEvent event) { return; } + // Only allow active players to sleep + PlayerData data = this.plugin.getDataManager().getData(event.getPlayer()); + if (data.isAfk()) { + event.setCancelled(true); + event.getPlayer().sendMessage(ChatColor.RED + "You can’t sleep while you’re AFK."); + return; + } + World currentWorld = event.getPlayer().getWorld(); // Add 1 to account for the player that just slept int sleepingPlayers = this.getSleepingPlayers(currentWorld) + 1; @@ -118,7 +137,7 @@ private void checkCanSkip(World world) { .scheduleSyncDelayedTask(this.plugin, new Runnable() { @Override public void run() { - if (world.getPlayers().size() == 0) { + if (world.getPlayers().size() == 0 || getSleepingPlayers(world) == 0) { return; } From 4d68c0a57ad9198f5ec5cd4432cafd07eef45da0 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Fri, 19 Jun 2020 00:15:48 -0700 Subject: [PATCH 16/83] Make /spawn message clearer (#100) --- src/main/java/com/hackclub/hccore/commands/SpawnCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java b/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java index e9fcc8f6..dd35868e 100644 --- a/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java @@ -55,7 +55,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String Block highestBlock = player.getWorld().getHighestBlockAt(player.getLocation()); if (player.getLocation().getY() < highestBlock.getY()) { sender.sendMessage( - ChatColor.RED + "You need to have direct sky access to use this command"); + ChatColor.RED + "You need be directly under the sky to use this command"); return true; } From 6c60beb35db40a3eda27ef0bdff93ad8fb2022ef Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Wed, 1 Jul 2020 14:50:54 -0700 Subject: [PATCH 17/83] Upgrade dependencies to 1.16 --- pom.xml | 6 +++--- .../hackclub/hccore/listeners/AdvancementListener.java | 10 +++++----- src/main/resources/plugin.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index c225f15b..58f77ca6 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ de.tr7zw item-nbt-api - 2.3.1 + 2.4.1 com.comphenix.protocol @@ -36,13 +36,13 @@ org.spigotmc spigot - 1.15.2-R0.1-SNAPSHOT + 1.16.1-R0.1-SNAPSHOT provided org.spigotmc spigot-api - 1.15.2-R0.1-SNAPSHOT + 1.16.1-R0.1-SNAPSHOT provided diff --git a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java index 2c0dbad4..2ddf651f 100644 --- a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java @@ -7,7 +7,7 @@ import org.bukkit.Statistic; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; -import org.bukkit.craftbukkit.v1_15_R1.advancement.CraftAdvancement; +import org.bukkit.craftbukkit.v1_16_R1.advancement.CraftAdvancement; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -19,9 +19,9 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import net.minecraft.server.v1_15_R1.AdvancementDisplay; -import net.minecraft.server.v1_15_R1.AdvancementFrameType; -import net.minecraft.server.v1_15_R1.IChatBaseComponent; +import net.minecraft.server.v1_16_R1.AdvancementDisplay; +import net.minecraft.server.v1_16_R1.AdvancementFrameType; +import net.minecraft.server.v1_16_R1.IChatBaseComponent; public class AdvancementListener implements Listener { private final HCCorePlugin plugin; @@ -137,7 +137,7 @@ public void onPlayerAdvancementDone(final PlayerAdvancementDoneEvent event) { try { // NOTE: We interface with Minecraft's internal code here. It is unlikely, but possible // for it to break in the case of a future upgrade. - net.minecraft.server.v1_15_R1.Advancement nmsAdvancement = + net.minecraft.server.v1_16_R1.Advancement nmsAdvancement = ((CraftAdvancement) advancement).getHandle(); AdvancementDisplay display = nmsAdvancement.c(); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index ab8aacb4..13e6a81f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ${project.name} version: ${project.version} -api-version: 1.15 +api-version: 1.16 main: com.hackclub.hccore.HCCorePlugin depend: [ProtocolLib] commands: From 3adbda6335ccabbce561a97c6b3a6149ceee9761 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Wed, 1 Jul 2020 14:51:35 -0700 Subject: [PATCH 18/83] Download 1.16 Spigot JAR on Travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7c6a4d05..edd575ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ jdk: openjdk8 install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - - java -jar BuildTools.jar --rev 1.15.2 > /dev/null + - java -jar BuildTools.jar --rev 1.16.1 > /dev/null - mvn clean package cache: directories: From 36520946c4d03def352886a954522d072011d904 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Wed, 1 Jul 2020 15:21:17 -0700 Subject: [PATCH 19/83] Fix advancement message colors --- .../hccore/listeners/AdvancementListener.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java index 2ddf651f..0b9a6ee5 100644 --- a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java @@ -159,31 +159,33 @@ public void onPlayerAdvancementDone(final PlayerAdvancementDoneEvent event) { switch (frameType.a()) { case "task": default: - args = new Object[] {"made", "advancement", ChatColor.GREEN}; + args = new Object[] {"made", "advancement", ChatColor.GREEN.asBungee()}; break; case "goal": - args = new Object[] {"reached", "goal", ChatColor.GREEN}; + args = new Object[] {"reached", "goal", ChatColor.GREEN.asBungee()}; break; case "challenge": - args = new Object[] {"completed", "challenge", ChatColor.DARK_PURPLE}; + args = new Object[] {"completed", "challenge", + ChatColor.DARK_PURPLE.asBungee()}; break; } // Announce custom advancement message BaseComponent nameComponent = - new TextComponent(ChatColor.stripColor(player.getDisplayName())); + TextComponent.fromLegacyText(ChatColor.stripColor(player.getDisplayName()))[0]; nameComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, - new ComponentBuilder(player.getName()).create())); - BaseComponent advancementComponent = new TextComponent(titleComponent.getText()); + TextComponent.fromLegacyText(player.getName()))); + BaseComponent advancementComponent = + TextComponent.fromLegacyText(titleComponent.getText())[0]; advancementComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, - new ComponentBuilder().color(((ChatColor) args[2]).asBungee()) + new ComponentBuilder().color((net.md_5.bungee.api.ChatColor) args[2]) .append(titleComponent.getText() + "\n") .append(descriptionComponent.getText()).create())); BaseComponent[] message = new ComponentBuilder(nameComponent) .append(String.format(" has %s the %s %s[", args), ComponentBuilder.FormatRetention.NONE) - .append(advancementComponent) + .append(advancementComponent).color((net.md_5.bungee.api.ChatColor) args[2]) .append("]", ComponentBuilder.FormatRetention.FORMATTING).create(); player.getServer().spigot().broadcast(message); } catch (Exception e) { From bf0a2610b78c47e6ebebfe122465012b5175126f Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Wed, 1 Jul 2020 15:25:19 -0700 Subject: [PATCH 20/83] Use license's full name [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2aa52883..9030e044 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ Main plugin for the Hack Club Minecraft server. ## License -[MIT](LICENSE.txt) +[MIT License](LICENSE.txt) From b41ad231fba0909fbec1e0e54a39dbccbfeb6cc1 Mon Sep 17 00:00:00 2001 From: Steggy Date: Thu, 16 Jul 2020 03:07:17 -0400 Subject: [PATCH 21/83] Added /upvote and /downvote (#103) --- .../com/hackclub/hccore/HCCorePlugin.java | 7 ++++ .../hccore/commands/DownvoteCommand.java | 35 +++++++++++++++++++ .../hccore/commands/UpvoteCommand.java | 35 +++++++++++++++++++ src/main/resources/plugin.yml | 6 ++++ 4 files changed, 83 insertions(+) create mode 100644 src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java create mode 100644 src/main/java/com/hackclub/hccore/commands/UpvoteCommand.java diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index 15660ebf..d0b22e88 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -8,6 +8,7 @@ import com.comphenix.protocol.events.ListenerPriority; import com.hackclub.hccore.commands.AFKCommand; import com.hackclub.hccore.commands.ColorCommand; +import com.hackclub.hccore.commands.DownvoteCommand; import com.hackclub.hccore.commands.LocCommand; import com.hackclub.hccore.commands.NickCommand; import com.hackclub.hccore.commands.PingCommand; @@ -16,6 +17,7 @@ import com.hackclub.hccore.commands.StatsCommand; import com.hackclub.hccore.commands.TableflipCommand; import com.hackclub.hccore.commands.TutorialCommand; +import com.hackclub.hccore.commands.UpvoteCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -57,6 +59,7 @@ public void onEnable() { // Register commands this.getCommand("afk").setExecutor(new AFKCommand(this)); this.getCommand("color").setExecutor(new ColorCommand(this)); + this.getCommand("downvote").setExecutor(new DownvoteCommand(this)); this.getCommand("loc").setExecutor(new LocCommand(this)); this.getCommand("nick").setExecutor(new NickCommand(this)); this.getCommand("ping").setExecutor(new PingCommand(this)); @@ -64,7 +67,11 @@ public void onEnable() { this.getCommand("spawn").setExecutor(new SpawnCommand(this)); this.getCommand("stats").setExecutor(new StatsCommand(this)); this.getCommand("tableflip").setExecutor(new TableflipCommand(this)); +<<<<<<< HEAD this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); +======= + this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); +>>>>>>> 2bb8394 (Added /upvote and /downvote (#103)) // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); diff --git a/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java b/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java new file mode 100644 index 00000000..30805708 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java @@ -0,0 +1,35 @@ +package com.hackclub.hccore.commands; + +import com.hackclub.hccore.HCCorePlugin; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class DownvoteCommand implements CommandExecutor { + private static final String DOWNVOTE = ChatColor.AQUA + ChatColor.BOLD.toString() + "↓"; + + private final HCCorePlugin plugin; + + public DownvoteCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "You must be a player to use this"); + return true; + } + + Player player = (Player) sender; + if (args.length == 0) { + player.chat(DownvoteCommand.DOWNVOTE); + } else { + player.chat(String.join(" ", args) + " " + DownvoteCommand.DOWNVOTE); + } + + return true; + } +} diff --git a/src/main/java/com/hackclub/hccore/commands/UpvoteCommand.java b/src/main/java/com/hackclub/hccore/commands/UpvoteCommand.java new file mode 100644 index 00000000..9b47c61a --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/UpvoteCommand.java @@ -0,0 +1,35 @@ +package com.hackclub.hccore.commands; + +import com.hackclub.hccore.HCCorePlugin; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class UpvoteCommand implements CommandExecutor { + private static final String UPVOTE = ChatColor.RED + ChatColor.BOLD.toString() + "↑"; + + private final HCCorePlugin plugin; + + public UpvoteCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "You must be a player to use this"); + return true; + } + + Player player = (Player) sender; + if (args.length == 0) { + player.chat(UpvoteCommand.UPVOTE); + } else { + player.chat(String.join(" ", args) + " " + UpvoteCommand.UPVOTE); + } + + return true; + } +} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 13e6a81f..a2676ac4 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -11,6 +11,9 @@ commands: color: description: Sets your chat or name color usage: /color [color] + downvote: + description: Appends a downvote to your message + usage: /downvote [message] loc: description: Manage your saved locations usage: /loc [...args] @@ -35,3 +38,6 @@ commands: tutorial: description: Greets new users to the server usage: /tutorial + upvote: + description: Appends an upvote to your message + usage: /upvote [message] From 86e8fc5c32b63379a6f30455afd7f8a6f4583a83 Mon Sep 17 00:00:00 2001 From: Steggy Date: Thu, 16 Jul 2020 03:18:17 -0400 Subject: [PATCH 22/83] Change /downvote from aqua to blue (#105) Made the downvote look more blue (per request of @ifvictr) --- src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java b/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java index 30805708..80823ded 100644 --- a/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/DownvoteCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; public class DownvoteCommand implements CommandExecutor { - private static final String DOWNVOTE = ChatColor.AQUA + ChatColor.BOLD.toString() + "↓"; + private static final String DOWNVOTE = ChatColor.BLUE + ChatColor.BOLD.toString() + "↓"; private final HCCorePlugin plugin; From c82c5c43344dc58515d83652f05c072d201a1afc Mon Sep 17 00:00:00 2001 From: Steggy Date: Fri, 17 Jul 2020 00:40:00 -0400 Subject: [PATCH 23/83] Added Pigstep to Musicophile (#107) --- src/main/java/com/hackclub/hccore/HCCorePlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index d0b22e88..a342a759 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -127,7 +127,7 @@ private void registerAdvancements() { "Collect every single music disc", Material.JUKEBOX, Material.MUSIC_DISC_11, Material.MUSIC_DISC_13, Material.MUSIC_DISC_BLOCKS, Material.MUSIC_DISC_CAT, Material.MUSIC_DISC_CHIRP, Material.MUSIC_DISC_FAR, Material.MUSIC_DISC_MALL, - Material.MUSIC_DISC_MELLOHI, Material.MUSIC_DISC_STAL, Material.MUSIC_DISC_STRAD, + Material.MUSIC_DISC_MELLOHI, Material.MUSIC_DISC_PIGSTEP, Material.MUSIC_DISC_STAL, Material.MUSIC_DISC_STRAD, Material.MUSIC_DISC_WAIT, Material.MUSIC_DISC_WARD) .setFrame(Advancement.Frame.CHALLENGE); From 2ca45ededf1c5fc14fafca9c5177a1e5ac32cd02 Mon Sep 17 00:00:00 2001 From: Steggy Date: Thu, 13 Aug 2020 16:37:02 -0400 Subject: [PATCH 24/83] Show usernames when hovering on player nickname in chat (#108) Co-authored-by: Saharsh Yeruva Co-authored-by: Victor Truong --- .../hccore/listeners/PlayerListener.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index 364c98fd..34e2a3cb 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -2,6 +2,10 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; +import net.md_5.bungee.api.chat.BaseComponent; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.chat.HoverEvent; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -49,13 +53,25 @@ public void onPlayerDeath(final PlayerDeathEvent event) { @EventHandler public void onAsyncPlayerChat(final AsyncPlayerChatEvent event) { - event.setFormat(ChatColor.WHITE + "%s " + ChatColor.GOLD + "» " + ChatColor.GRAY + "%s"); - + // Apply the player's chat color to the message and translate color codes + PlayerData data = this.plugin.getDataManager().getData(event.getPlayer()); - ChatColor playerColor = data.getMessageColor(); - event.setMessage( - playerColor + ChatColor.translateAlternateColorCodes('&', event.getMessage())); + net.md_5.bungee.api.ChatColor messageColor = data.getMessageColor().asBungee(); + net.md_5.bungee.api.ChatColor nameColor = data.getNameColor().asBungee(); + + TextComponent nameComponent = new TextComponent(event.getPlayer().getDisplayName()); + nameComponent.setColor(nameColor); + nameComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(event.getPlayer().getName()).create())); + + TextComponent arrowComponent = new TextComponent(" » "); + arrowComponent.setColor(ChatColor.GOLD.asBungee()); + + TextComponent playerChatComponent = new TextComponent(ChatColor.translateAlternateColorCodes('&', event.getMessage())); + playerChatComponent.setColor(messageColor); + + this.plugin.getServer().spigot().broadcast(nameComponent, arrowComponent, playerChatComponent); + event.setCancelled(true); } @EventHandler(priority = EventPriority.LOWEST) // Runs foremost From 7617a31472c42a07f5daa4517181e079e474a171 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Sat, 7 Nov 2020 22:05:00 -0800 Subject: [PATCH 25/83] migrate to gradle --- .gitignore | 9 +- .vscode/settings.json | 3 +- .vscode/tasks.json | 2 +- Justfile | 11 ++ build.gradle | 43 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++++ pom.xml | 131 ---------------- settings.gradle | 1 + src/main/resources/plugin.yml | 4 +- 12 files changed, 345 insertions(+), 138 deletions(-) create mode 100644 Justfile create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index d40d8982..9d2d9cb5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,11 @@ -**/.DS_Store +.DS_Store + .idea/ .settings/ -target/ .classpath .project *.iml -pom.xml.bak + +.gradle/ +build/ +bin/ diff --git a/.vscode/settings.json b/.vscode/settings.json index 604339ba..a3e98b83 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,6 @@ "files.trimTrailingWhitespace": true, "java.format.settings.profile": "GoogleStyle", "java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml", - "java.saveActions.organizeImports": true + "java.saveActions.organizeImports": true, + "java.configuration.updateBuildConfiguration": "automatic" } diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4acc0aaf..f070ddcc 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "Build plugin", "type": "shell", - "command": "mvn -B install", + "command": "gradle build", "group": "build", "presentation": { "group": "dev" diff --git a/Justfile b/Justfile new file mode 100644 index 00000000..39266596 --- /dev/null +++ b/Justfile @@ -0,0 +1,11 @@ +build: + gradle build + +view: + jar tf build/libs/*.jar + +run: build + java -jar build/libs/*.jar + +copy: build + cp build/libs/*.jar ../server-root/plugins diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..f3607fe0 --- /dev/null +++ b/build.gradle @@ -0,0 +1,43 @@ +plugins { + id 'java' + id 'application' + id 'com.github.johnrengelman.shadow' version '6.1.0' +} + +mainClassName = "com.hackclub.hccore.HCCorePluginJava" + +shadowJar { + archiveBaseName.set('HCCore-Shadow') + archiveClassifier.set('') + archiveVersion.set('') +} + +processResources { + expand(name: rootProject.name, version: "1.0.0") +} + +repositories { + jcenter() + + // AdvancementCreator + maven { url "https://jitpack.io" } + + // Bukkit + maven { url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } + + // NBT-API + maven { url "https://repo.codemc.org/repository/maven-public/" } + + // ProtoLib, org.spigotmc:spigot:1.16 + maven { url "https://repo.dmulloy2.net/nexus/repository/public/" } +} + +dependencies { + implementation 'com.github.Trigary:AdvancementCreator:v2.0' + implementation 'com.google.code.gson:gson:2.8.6' + implementation 'de.tr7zw:item-nbt-api:2.6.0' + + compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' + compileOnly 'org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 zcma&O1CT9Y(k9%tZQHhO+qUh#ZQHhO+qmuS+qP|E@9xZO?0h@l{(r>DQ>P;GjjD{w zH}lENr;dU&FbEU?00aa80D$0M0RRB{U*7-#kbjS|qAG&4l5%47zyJ#WrfA#1$1Ctx zf&Z_d{GW=lf^w2#qRJ|CvSJUi(^E3iv~=^Z(zH}F)3Z%V3`@+rNB7gTVU{Bb~90p|f+0(v;nz01EG7yDMX9@S~__vVgv%rS$+?IH+oZ03D5zYrv|^ zC1J)SruYHmCki$jLBlTaE5&dFG9-kq3!^i>^UQL`%gn6)jz54$WDmeYdsBE9;PqZ_ zoGd=P4+|(-u4U1dbAVQrFWoNgNd;0nrghPFbQrJctO>nwDdI`Q^i0XJDUYm|T|RWc zZ3^Qgo_Qk$%Fvjj-G}1NB#ZJqIkh;kX%V{THPqOyiq)d)0+(r9o(qKlSp*hmK#iIY zA^)Vr$-Hz<#SF=0@tL@;dCQsm`V9s1vYNq}K1B)!XSK?=I1)tX+bUV52$YQu*0%fnWEukW>mxkz+%3-S!oguE8u#MGzST8_Dy^#U?fA@S#K$S@9msUiX!gd_ow>08w5)nX{-KxqMOo7d?k2&?Vf z&diGDtZr(0cwPe9z9FAUSD9KC)7(n^lMWuayCfxzy8EZsns%OEblHFSzP=cL6}?J| z0U$H!4S_TVjj<`6dy^2j`V`)mC;cB%* z8{>_%E1^FH!*{>4a7*C1v>~1*@TMcLK{7nEQ!_igZC}ikJ$*<$yHy>7)oy79A~#xE zWavoJOIOC$5b6*q*F_qN1>2#MY)AXVyr$6x4b=$x^*aqF*L?vmj>Mgv+|ITnw_BoW zO?jwHvNy^prH{9$rrik1#fhyU^MpFqF2fYEt(;4`Q&XWOGDH8k6M=%@fics4ajI;st# zCU^r1CK&|jzUhRMv;+W~6N;u<;#DI6cCw-otsc@IsN3MoSD^O`eNflIoR~l4*&-%RBYk@gb^|-JXs&~KuSEmMxB}xSb z@K76cXD=Y|=I&SNC2E+>Zg?R6E%DGCH5J1nU!A|@eX9oS(WPaMm==k2s_ueCqdZw| z&hqHp)47`c{BgwgvY2{xz%OIkY1xDwkw!<0veB#yF4ZKJyabhyyVS`gZepcFIk%e2 zTcrmt2@-8`7i-@5Nz>oQWFuMC_KlroCl(PLSodswHqJ3fn<;gxg9=}~3x_L3P`9Sn zChIf}8vCHvTriz~T2~FamRi?rh?>3bX1j}%bLH+uFX+p&+^aXbOK7clZxdU~6Uxgy z8R=obwO4dL%pmVo*Ktf=lH6hnlz_5k3cG;m8lgaPp~?eD!Yn2kf)tU6PF{kLyn|oI@eQ`F z3IF7~Blqg8-uwUuWZScRKn%c2_}dXB6Dx_&xR*n9M9LXasJhtZdr$vBY!rP{c@=)& z#!?L$2UrkvClwQO>U*fSMs67oSj2mxiJ$t;E|>q%Kh_GzzWWO&3;ufU%2z%ucBU8H z3WIwr$n)cfCXR&>tyB7BcSInK>=ByZA%;cVEJhcg<#6N{aZC4>K41XF>ZgjG`z_u& zGY?;Ad?-sgiOnI`oppF1o1Gurqbi*;#x2>+SSV6|1^G@ooVy@fg?wyf@0Y!UZ4!}nGuLeC^l)6pwkh|oRY`s1Pm$>zZ3u-83T|9 zGaKJIV3_x+u1>cRibsaJpJqhcm%?0-L;2 zitBrdRxNmb0OO2J%Y&Ym(6*`_P3&&5Bw157{o7LFguvxC$4&zTy#U=W*l&(Q2MNO} zfaUwYm{XtILD$3864IA_nn34oVa_g^FRuHL5wdUd)+W-p-iWCKe8m_cMHk+=? zeKX)M?Dt(|{r5t7IenkAXo%&EXIb-i^w+0CX0D=xApC=|Xy(`xy+QG^UyFe z+#J6h_&T5i#sV)hj3D4WN%z;2+jJcZxcI3*CHXGmOF3^)JD5j&wfX)e?-|V0GPuA+ zQFot%aEqGNJJHn$!_}#PaAvQ^{3-Ye7b}rWwrUmX53(|~i0v{}G_sI9uDch_brX&6 zWl5Ndj-AYg(W9CGfQf<6!YmY>Ey)+uYd_JNXH=>|`OH-CDCmcH(0%iD_aLlNHKH z7bcW-^5+QV$jK?R*)wZ>r9t}loM@XN&M-Pw=F#xn(;u3!(3SXXY^@=aoj70;_=QE9 zGghsG3ekq#N||u{4We_25U=y#T*S{4I{++Ku)> zQ!DZW;pVcn>b;&g2;YE#+V`v*Bl&Y-i@X6D*OpNA{G@JAXho&aOk(_j^weW{#3X5Y z%$q_wpb07EYPdmyH(1^09i$ca{O<}7) zRWncXdSPgBE%BM#by!E>tdnc$8RwUJg1*x($6$}ae$e9Knj8gvVZe#bLi!<+&BkFj zg@nOpDneyc+hU9P-;jmOSMN|*H#>^Ez#?;%C3hg_65leSUm;iz)UkW)jX#p)e&S&M z1|a?wDzV5NVnlhRBCd_;F87wp>6c<&nkgvC+!@KGiIqWY4l}=&1w7|r6{oBN8xyzh zG$b#2=RJp_iq6)#t5%yLkKx(0@D=C3w+oiXtSuaQ%I1WIb-eiE$d~!)b@|4XLy!CZ z9p=t=%3ad@Ep+<9003D2KZ5VyP~_n$=;~r&YUg5UZ0KVD&tR1DHy9x)qWtKJp#Kq# zP*8p#W(8JJ_*h_3W}FlvRam?<4Z+-H77^$Lvi+#vmhL9J zJ<1SV45xi;SrO2f=-OB(7#iNA5)x1uNC-yNxUw|!00vcW2PufRm>e~toH;M0Q85MQLWd?3O{i8H+5VkR@l9Dg-ma ze2fZ%>G(u5(k9EHj2L6!;(KZ8%8|*-1V|B#EagbF(rc+5iL_5;Eu)L4Z-V;0HfK4d z*{utLse_rvHZeQ>V5H=f78M3Ntg1BPxFCVD{HbNA6?9*^YIq;B-DJd{Ca2L#)qWP? zvX^NhFmX?CTWw&Ns}lgs;r3i+Bq@y}Ul+U%pzOS0Fcv9~aB(0!>GT0)NO?p=25LjN z2bh>6RhgqD7bQj#k-KOm@JLgMa6>%-ok1WpOe)FS^XOU{c?d5shG(lIn3GiVBxmg`u%-j=)^v&pX1JecJics3&jvPI)mDut52? z3jEA)DM%}BYbxxKrizVYwq?(P&19EXlwD9^-6J+4!}9{ywR9Gk42jjAURAF&EO|~N z)?s>$Da@ikI4|^z0e{r`J8zIs>SpM~Vn^{3fArRu;?+43>lD+^XtUcY1HidJwnR6+ z!;oG2=B6Z_=M%*{z-RaHc(n|1RTKQdNjjV!Pn9lFt^4w|AeN06*j}ZyhqZ^!-=cyGP_ShV1rGxkx8t zB;8`h!S{LD%ot``700d0@Grql(DTt4Awgmi+Yr0@#jbe=2#UkK%rv=OLqF)9D7D1j z!~McAwMYkeaL$~kI~90)5vBhBzWYc3Cj1WI0RS`z000R8-@ET0dA~*r(gSiCJmQMN&4%1D zyVNf0?}sBH8zNbBLn>~(W{d3%@kL_eQ6jEcR{l>C|JK z(R-fA!z|TTRG40|zv}7E@PqCAXP3n`;%|SCQ|ZS%ym$I{`}t3KPL&^l5`3>yah4*6 zifO#{VNz3)?ZL$be;NEaAk9b#{tV?V7 zP|wf5YA*1;s<)9A4~l3BHzG&HH`1xNr#%){4xZ!jq%o=7nN*wMuXlFV{HaiQLJ`5G zBhDi#D(m`Q1pLh@Tq+L;OwuC52RdW7b8}~60WCOK5iYMUad9}7aWBuILb({5=z~YF zt?*Jr5NG+WadM{mDL>GyiByCuR)hd zA=HM?J6l1Xv0Dl+LW@w$OTcEoOda^nFCw*Sy^I@$sSuneMl{4ys)|RY#9&NxW4S)9 zq|%83IpslTLoz~&vTo!Ga@?rj_kw{|k{nv+w&Ku?fyk4Ki4I?);M|5Axm)t+BaE)D zm(`AQ#k^DWrjbuXoJf2{Aj^KT zFb1zMSqxq|vceV+Mf-)$oPflsO$@*A0n0Z!R{&(xh8s}=;t(lIy zv$S8x>m;vQNHuRzoaOo?eiWFe{0;$s`Bc+Osz~}Van${u;g(su`3lJ^TEfo~nERfP z)?aFzpDgnLYiERsKPu|0tq4l2wT)Atr6Qb%m-AUn6HnCue*yWICp7TjW$@sO zm5rm4aTcPQ(rfi7a`xP7cKCFrJD}*&_~xgLyr^-bmsL}y;A5P|al8J3WUoBSjqu%v zxC;mK!g(7r6RRJ852Z~feoC&sD3(6}^5-uLK8o)9{8L_%%rItZK9C){UxB|;G>JbP zsRRtS4-3B*5c+K2kvmgZK8472%l>3cntWUOVHxB|{Ay~aOg5RN;{PJgeVD*H%ac+y!h#wi%o2bF2Ca8IyMyH{>4#{E_8u^@+l-+n=V}Sq?$O z{091@v%Bd*3pk0^2UtiF9Z+(a@wy6 zUdw8J*ze$K#=$48IBi1U%;hmhO>lu!uU;+RS}p&6@rQila7WftH->*A4=5W|Fmtze z)7E}jh@cbmr9iup^i%*(uF%LG&!+Fyl@LFA-}Ca#bxRfDJAiR2dt6644TaYw1Ma79 zt8&DYj31j^5WPNf5P&{)J?WlCe@<3u^78wnd(Ja4^a>{^Tw}W>|Cjt^If|7l^l)^Q zbz|7~CF(k_9~n|h;ysZ+jHzkXf(*O*@5m zLzUmbHp=x!Q|!9NVXyipZ3)^GuIG$k;D)EK!a5=8MFLI_lpf`HPKl=-Ww%z8H_0$j ztJ||IfFG1lE9nmQ0+jPQy zCBdKkjArH@K7jVcMNz);Q(Q^R{d5G?-kk;Uu_IXSyWB)~KGIizZL(^&qF;|1PI7!E zTP`%l)gpX|OFn&)M%txpQ2F!hdA~hX1Cm5)IrdljqzRg!f{mN%G~H1&oqe`5eJCIF zHdD7O;AX-{XEV(a`gBFJ9ews#CVS2y!&>Cm_dm3C8*n3MA*e67(WC?uP@8TXuMroq z{#w$%z@CBIkRM7?}Xib+>hRjy?%G!fiw8! z8(gB+8J~KOU}yO7UGm&1g_MDJ$IXS!`+*b*QW2x)9>K~Y*E&bYMnjl6h!{17_8d!%&9D`a7r&LKZjC<&XOvTRaKJ1 zUY@hl5^R&kZl3lU3njk`3dPzxj$2foOL26r(9zsVF3n_F#v)s5vv3@dgs|lP#eylq62{<-vczqP!RpVBTgI>@O6&sU>W|do17+#OzQ7o5A$ICH z?GqwqnK^n2%LR;$^oZM;)+>$X3s2n}2jZ7CdWIW0lnGK-b#EG01)P@aU`pg}th&J-TrU`tIpb5t((0eu|!u zQz+3ZiOQ^?RxxK4;zs=l8q!-n7X{@jSwK(iqNFiRColuEOg}!7cyZi`iBX4g1pNBj zAPzL?P^Ljhn;1$r8?bc=#n|Ed7wB&oHcw()&*k#SS#h}jO?ZB246EGItsz*;^&tzp zu^YJ0=lwsi`eP_pU8}6JA7MS;9pfD;DsSsLo~ogzMNP70@@;Fm8f0^;>$Z>~}GWRw!W5J3tNX*^2+1f3hz{~rIzJo z6W%J(H!g-eI_J1>0juX$X4Cl6i+3wbc~k146UIX&G22}WE>0ga#WLsn9tY(&29zBvH1$`iWtTe zG2jYl@P!P)eb<5DsR72BdI7-zP&cZNI{7q3e@?N8IKc4DE#UVr->|-ryuJXk^u^>4 z$3wE~=q390;XuOQP~TNoDR?#|NSPJ%sTMInA6*rJ%go|=YjGe!B>z6u$IhgQSwoV* zjy3F2#I>uK{42{&IqP59)Y(1*Z>>#W8rCf4_eVsH)`v!P#^;BgzKDR`ARGEZzkNX+ zJUQu=*-ol=Xqqt5=`=pA@BIn@6a9G8C{c&`i^(i+BxQO9?YZ3iu%$$da&Kb?2kCCo zo7t$UpSFWqmydXf@l3bVJ=%K?SSw)|?srhJ-1ZdFu*5QhL$~-IQS!K1s@XzAtv6*Y zl8@(5BlWYLt1yAWy?rMD&bwze8bC3-GfNH=p zynNFCdxyX?K&G(ZZ)afguQ2|r;XoV^=^(;Cku#qYn4Lus`UeKt6rAlFo_rU`|Rq z&G?~iWMBio<78of-2X(ZYHx~=U0Vz4btyXkctMKdc9UM!vYr~B-(>)(Hc|D zMzkN4!PBg%tZoh+=Gba!0++d193gbMk2&krfDgcbx0jI92cq?FFESVg0D$>F+bil} zY~$)|>1HZsX=5sAZ2WgPB5P=8X#TI+NQ(M~GqyVB53c6IdX=k>Wu@A0Svf5#?uHaF zsYn|koIi3$(%GZ2+G+7Fv^lHTb#5b8sAHSTnL^qWZLM<(1|9|QFw9pnRU{svj}_Al zL)b9>fN{QiA($8peNEJyy`(a{&uh-T4_kdZFIVsKKVM(?05}76EEz?#W za^fiZOAd14IJ4zLX-n7Lq0qlQ^lW8Cvz4UKkV9~P}>sq0?xD3vg+$4vLm~C(+ zM{-3Z#qnZ09bJ>}j?6ry^h+@PfaD7*jZxBEY4)UG&daWb??6)TP+|3#Z&?GL?1i+280CFsE|vIXQbm| zM}Pk!U`U5NsNbyKzkrul-DzwB{X?n3E6?TUHr{M&+R*2%yOiXdW-_2Yd6?38M9Vy^ z*lE%gA{wwoSR~vN0=no}tP2Ul5Gk5M(Xq`$nw#ndFk`tcpd5A=Idue`XZ!FS>Q zG^0w#>P4pPG+*NC9gLP4x2m=cKP}YuS!l^?sHSFftZy{4CoQrb_ z^20(NnG`wAhMI=eq)SsIE~&Gp9Ne0nD4%Xiu|0Fj1UFk?6avDqjdXz{O1nKao*46y zT8~iA%Exu=G#{x=KD;_C&M+Zx4+n`sHT>^>=-1YM;H<72k>$py1?F3#T1*ef9mLZw z5naLQr?n7K;2l+{_uIw*_1nsTn~I|kkCgrn;|G~##hM;9l7Jy$yJfmk+&}W@JeKcF zx@@Woiz8qdi|D%aH3XTx5*wDlbs?dC1_nrFpm^QbG@wM=i2?Zg;$VK!c^Dp8<}BTI zyRhAq@#%2pGV49*Y5_mV4+OICP|%I(dQ7x=6Ob}>EjnB_-_18*xrY?b%-yEDT(wrO z9RY2QT0`_OpGfMObKHV;QLVnrK%mc?$WAdIT`kJQT^n%GuzE7|9@k3ci5fYOh(287 zuIbg!GB3xLg$YN=n)^pHGB0jH+_iIiC=nUcD;G6LuJsjn2VI1cyZx=a?ShCsF==QK z;q~*m&}L<-cb+mDDXzvvrRsybcgQ;Vg21P(uLv5I+eGc7o7tc6`;OA9{soHFOz zT~2?>Ts}gprIX$wRBb4yE>ot<8+*Bv`qbSDv*VtRi|cyWS>)Fjs>fkNOH-+PX&4(~ z&)T8Zam2L6puQl?;5zg9h<}k4#|yH9czHw;1jw-pwBM*O2hUR6yvHATrI%^mvs9q_ z&ccT0>f#eDG<^WG^q@oVqlJrhxH)dcq2cty@l3~|5#UDdExyXUmLQ}f4#;6fI{f^t zDCsgIJ~0`af%YR%Ma5VQq-p21k`vaBu6WE?66+5=XUd%Ay%D$irN>5LhluRWt7 zov-=f>QbMk*G##&DTQyou$s7UqjjW@k6=!I@!k+S{pP8R(2=e@io;N8E`EOB;OGoI zw6Q+{X1_I{OO0HPpBz!X!@`5YQ2)t{+!?M_iH25X(d~-Zx~cXnS9z>u?+If|iNJbx zyFU2d1!ITX64D|lE0Z{dLRqL1Ajj=CCMfC4lD3&mYR_R_VZ>_7_~|<^o*%_&jevU+ zQ4|qzci=0}Jydw|LXLCrOl1_P6Xf@c0$ieK2^7@A9UbF{@V_0p%lqW|L?5k>bVM8|p5v&2g;~r>B8uo<4N+`B zH{J)h;SYiIVx@#jI&p-v3dwL5QNV1oxPr8J%ooezTnLW>i*3Isb49%5i!&ac_dEXv zvXmVUck^QHmyrF8>CGXijC_R-y(Qr{3Zt~EmW)-nC!tiH`wlw5D*W7Pip;T?&j%kX z6DkZX4&}iw>hE(boLyjOoupf6JpvBG8}jIh!!VhnD0>}KSMMo{1#uU6kiFcA04~|7 zVO8eI&x1`g4CZ<2cYUI(n#wz2MtVFHx47yE5eL~8bot~>EHbevSt}LLMQX?odD{Ux zJMnam{d)W4da{l7&y-JrgiU~qY3$~}_F#G7|MxT)e;G{U`In&?`j<5D->}cb{}{T(4DF0BOk-=1195KB-E*o@c?`>y#4=dMtYtSY=&L{!TAjFVcq0y@AH`vH! z$41+u!Ld&}F^COPgL(EE{0X7LY&%D7-(?!kjFF7=qw<;`V{nwWBq<)1QiGJgUc^Vz ztMUlq1bZqKn17|6x6iAHbWc~l1HcmAxr%$Puv!znW)!JiukwIrqQ00|H$Z)OmGG@= zv%A8*4cq}(?qn4rN6o`$Y))(MyXr8R<2S^J+v(wmFmtac!%VOfN?&(8Nr!T@kV`N; z*Q33V3t`^rN&aBiHet)18wy{*wi1=W!B%B-Q6}SCrUl$~Hl{@!95ydml@FK8P=u4s z4e*7gV2s=YxEvskw2Ju!2%{8h01rx-3`NCPc(O zH&J0VH5etNB2KY6k4R@2Wvl^Ck$MoR3=)|SEclT2ccJ!RI9Nuter7u9@;sWf-%um;GfI!=eEIQ2l2p_YWUd{|6EG ze{yO6;lMc>;2tPrsNdi@&1K6(1;|$xe8vLgiouj%QD%gYk`4p{Ktv9|j+!OF-P?@p z;}SV|oIK)iwlBs+`ROXkhd&NK zzo__r!B>tOXpBJMDcv!Mq54P+n4(@dijL^EpO1wdg~q+!DT3lB<>9AANSe!T1XgC=J^)IP0XEZ()_vpu!!3HQyJhwh?r`Ae%Yr~b% zO*NY9t9#qWa@GCPYOF9aron7thfWT`eujS4`t2uG6)~JRTI;f(ZuoRQwjZjp5Pg34 z)rp$)Kr?R+KdJ;IO;pM{$6|2y=k_siqvp%)2||cHTe|b5Ht8&A{wazGNca zX$Ol?H)E_R@SDi~4{d-|8nGFhZPW;Cts1;08TwUvLLv&_2$O6Vt=M)X;g%HUr$&06 zISZb(6)Q3%?;3r~*3~USIg=HcJhFtHhIV(siOwV&QkQe#J%H9&E21!C*d@ln3E@J* zVqRO^<)V^ky-R|%{(9`l-(JXq9J)1r$`uQ8a}$vr9E^nNiI*thK8=&UZ0dsFN_eSl z(q~lnD?EymWLsNa3|1{CRPW60>DSkY9YQ;$4o3W7Ms&@&lv9eH!tk~N&dhqX&>K@} zi1g~GqglxkZ5pEFkllJ)Ta1I^c&Bt6#r(QLQ02yHTaJB~- zCcE=5tmi`UA>@P=1LBfBiqk)HB4t8D?02;9eXj~kVPwv?m{5&!&TFYhu>3=_ zsGmYZ^mo*-j69-42y&Jj0cBLLEulNRZ9vXE)8~mt9C#;tZs;=#M=1*hebkS;7(aGf zcs7zH(I8Eui9UU4L--))yy`&d&$In&VA2?DAEss4LAPCLd>-$i?lpXvn!gu^JJ$(DoUlc6wE98VLZ*z`QGQov5l4Fm_h?V-;mHLYDVOwKz7>e4+%AzeO>P6v}ndPW| zM>m#6Tnp7K?0mbK=>gV}=@k*0Mr_PVAgGMu$j+pWxzq4MAa&jpCDU&-5eH27Iz>m^ zax1?*HhG%pJ((tkR(V(O(L%7v7L%!_X->IjS3H5kuXQT2!ow(;%FDE>16&3r){!ex zhf==oJ!}YU89C9@mfDq!P3S4yx$aGB?rbtVH?sHpg?J5C->!_FHM%Hl3#D4eplxzQ zRA+<@LD%LKSkTk2NyWCg7u=$%F#;SIL44~S_OGR}JqX}X+=bc@swpiClB`Zbz|f!4 z7Ysah7OkR8liXfI`}IIwtEoL}(URrGe;IM8%{>b1SsqXh)~w}P>yiFRaE>}rEnNkT z!HXZUtxUp1NmFm)Dm@-{FI^aRQqpSkz}ZSyKR%Y}YHNzBk)ZIp} zMtS=aMvkgWKm9&oTcU0?S|L~CDqA+sHpOxwnswF-fEG)cXCzUR?ps@tZa$=O)=L+5 zf%m58cq8g_o}3?Bhh+c!w4(7AjxwQ3>WnVi<{{38g7yFboo>q|+7qs<$8CPXUFAN< zG&}BHbbyQ5n|qqSr?U~GY{@GJ{(Jny{bMaOG{|IkUj7tj^9pa9|FB_<+KHLxSxR;@ zHpS$4V)PP+tx}22fWx(Ku9y+}Ap;VZqD0AZW4gCDTPCG=zgJmF{|x;(rvdM|2|9a}cex6xrMkERnkE;}jvU-kmzd%_J50$M`lIPCKf+^*zL=@LW`1SaEc%=m zQ+lT06Gw+wVwvQ9fZ~#qd430v2HndFsBa9WjD0P}K(rZYdAt^5WQIvb%D^Q|pkVE^ zte$&#~zmULFACGfS#g=2OLOnIf2Of-k!(BIHjs77nr!5Q1*I9 z1%?=~#Oss!rV~?-6Gm~BWJiA4mJ5TY&iPm_$)H1_rTltuU1F3I(qTQ^U$S>%$l z)Wx1}R?ij0idp@8w-p!Oz{&*W;v*IA;JFHA9%nUvVDy7Q8woheC#|8QuDZb-L_5@R zOqHwrh|mVL9b=+$nJxM`3eE{O$sCt$UK^2@L$R(r^-_+z?lOo+me-VW=Zw z-Bn>$4ovfWd%SPY`ab-u9{INc*k2h+yH%toDHIyqQ zO68=u`N}RIIs7lsn1D){)~%>ByF<>i@qFb<-axvu(Z+6t7v<^z&gm9McRB~BIaDn$ z#xSGT!rzgad8o>~kyj#h1?7g96tOcCJniQ+*#=b7wPio>|6a1Z?_(TS{)KrPe}(8j z!#&A=k(&Pj^F;r)CI=Z{LVu>uj!_W1q4b`N1}E(i%;BWjbEcnD=mv$FL$l?zS6bW!{$7j1GR5ocn94P2u{ z70tAAcpqtQo<@cXw~@i-@6B23;317|l~S>CB?hR5qJ%J3EFgyBdJd^fHZu7AzHF(BQ!tyAz^L0`X z23S4Fe{2X$W0$zu9gm%rg~A>ijaE#GlYlrF9$ds^QtaszE#4M(OLVP2O-;XdT(XIC zatwzF*)1c+t~c{L=fMG8Z=k5lv>U0;C{caN1NItnuSMp)6G3mbahu>E#sj&oy94KC zpH}8oEw{G@N3pvHhp{^-YaZeH;K+T_1AUv;IKD<=mv^&Ueegrb!yf`4VlRl$M?wsl zZyFol(2|_QM`e_2lYSABpKR{{NlxlDSYQNkS;J66aT#MSiTx~;tUmvs-b*CrR4w=f z8+0;*th6kfZ3|5!Icx3RV11sp=?`0Jy3Fs0N4GZQMN=8HmT6%x9@{Dza)k}UwL6JT zHRDh;%!XwXr6yuuy`4;Xsn0zlR$k%r%9abS1;_v?`HX_hI|+EibVnlyE@3aL5vhQq zlIG?tN^w@0(v9M*&L+{_+RQZw=o|&BRPGB>e5=ys7H`nc8nx)|-g;s7mRc7hg{GJC zAe^vCIJhajmm7C6g! zL&!WAQ~5d_5)00?w_*|*H>3$loHrvFbitw#WvLB!JASO?#5Ig5$Ys10n>e4|3d;tS zELJ0|R4n3Az(Fl3-r^QiV_C;)lQ1_CW{5bKS15U|E9?ZgLec@%kXr84>5jV2a5v=w z?pB1GPdxD$IQL4)G||B_lI+A=08MUFFR4MxfGOu07vfIm+j=z9tp~5i_6jb`tR>qV z$#`=BQ*jpCjm$F0+F)L%xRlnS%#&gro6PiRfu^l!EVan|r3y}AHJQOORGx4~ z&<)3=K-tx518DZyp%|!EqpU!+X3Et7n2AaC5(AtrkW>_57i}$eqs$rupubg0a1+WO zGHZKLN2L0D;ab%{_S1Plm|hx8R?O14*w*f&2&bB050n!R2by zw!@XOQx$SqZ5I<(Qu$V6g>o#A!JVwErWv#(Pjx=KeS0@hxr4?13zj#oWwPS(7Ro|v z>Mp@Kmxo79q|}!5qtX2-O@U&&@6s~!I&)1WQIl?lTnh6UdKT_1R640S4~f=_xoN3- zI+O)$R@RjV$F=>Ti7BlnG1-cFKCC(t|Qjm{SalS~V-tX#+2ekRhwmN zZr`8{QF6y~Z!D|{=1*2D-JUa<(1Z=;!Ei!KiRNH?o{p5o3crFF=_pX9O-YyJchr$~ zRC`+G+8kx~fD2k*ZIiiIGR<8r&M@3H?%JVOfE>)})7ScOd&?OjgAGT@WVNSCZ8N(p zuQG~76GE3%(%h1*vUXg$vH{ua0b`sQ4f0*y=u~lgyb^!#CcPJa2mkSEHGLsnO^kb$ zru5_l#nu=Y{rSMWiYx?nO{8I!gH+?wEj~UM?IrG}E|bRIBUM>UlY<`T1EHpRr36vv zBi&dG8oxS|J$!zoaq{+JpJy+O^W(nt*|#g32bd&K^w-t>!Vu9N!k9eA8r!Xc{utY> zg9aZ(D2E0gL#W0MdjwES-7~Wa8iubPrd?8-$C4BP?*wok&O8+ykOx{P=Izx+G~hM8 z*9?BYz!T8~dzcZr#ux8kS7u7r@A#DogBH8km8Ry4slyie^n|GrTbO|cLhpqgMdsjX zJ_LdmM#I&4LqqsOUIXK8gW;V0B(7^$y#h3h>J0k^WJfAMeYek%Y-Dcb_+0zPJez!GM zAmJ1u;*rK=FNM0Nf}Y!!P9c4)HIkMnq^b;JFd!S3?_Qi2G#LIQ)TF|iHl~WKK6JmK zbv7rPE6VkYr_%_BT}CK8h=?%pk@3cz(UrZ{@h40%XgThP*-Oeo`T0eq9 zA8BnWZKzCy5e&&_GEsU4*;_k}(8l_&al5K-V*BFM=O~;MgRkYsOs%9eOY6s6AtE*<7GQAR2ulC3RAJrG_P1iQK5Z~&B z&f8X<>yJV6)oDGIlS$Y*D^Rj(cszTy5c81a5IwBr`BtnC6_e`ArI8CaTX_%rx7;cn zR-0?J_LFg*?(#n~G8cXut(1nVF0Oka$A$1FGcERU<^ggx;p@CZc?3UB41RY+wLS`LWFNSs~YP zuw1@DNN3lTd|jDL7gjBsd9}wIw}4xT2+8dBQzI00m<@?c2L%>}QLfK5%r!a-iII`p zX@`VEUH)uj^$;7jVUYdADQ2k*!1O3WdfgF?OMtUXNpQ1}QINamBTKDuv19^{$`8A1 zeq%q*O0mi@(%sZU>Xdb0Ru96CFqk9-L3pzLVsMQ`Xpa~N6CR{9Rm2)A|CI21L(%GW zh&)Y$BNHa=FD+=mBw3{qTgw)j0b!Eahs!rZnpu)z!!E$*eXE~##yaXz`KE5(nQM`s zD!$vW9XH)iMxu9R>r$VlLk9oIR%HxpUiW=BK@4U)|1WNQ=mz9a z^!KkO=>GaJ!GBXm{KJj^;kh-MkUlEQ%lza`-G&}C5y1>La1sR6hT=d*NeCnuK%_LV zOXt$}iP6(YJKc9j-Fxq~*ItVUqljQ8?oaysB-EYtFQp9oxZ|5m0^Hq(qV!S+hq#g( z?|i*H2MIr^Kxgz+3vIljQ*Feejy6S4v~jKEPTF~Qhq!(ms5>NGtRgO5vfPPc4Z^AM zTj!`5xEreIN)vaNxa|q6qWdg>+T`Ol0Uz)ckXBXEGvPNEL3R8hB3=C5`@=SYgAju1 z!)UBr{2~=~xa{b8>x2@C7weRAEuatC)3pkRhT#pMPTpSbA|tan%U7NGMvzmF?c!V8 z=pEWxbdXbTAGtWTyI?Fml%lEr-^AE}w#l(<7OIw;ctw}imYax&vR4UYNJZK6P7ZOd zP87XfhnUHxCUHhM@b*NbTi#(-8|wcv%3BGNs#zRCVV(W?1Qj6^PPQa<{yaBwZ`+<`w|;rqUY_C z&AeyKwwf*q#OW-F()lir=T^<^wjK65Lif$puuU5+tk$;e_EJ;Lu+pH>=-8=PDhkBg z8cWt%@$Sc#C6F$Vd+0507;{OOyT7Hs%nKS88q-W!$f~9*WGBpHGgNp}=C*7!RiZ5s zn1L_DbKF@B8kwhDiLKRB@lsXVVLK|ph=w%_`#owlf@s@V(pa`GY$8h%;-#h@TsO|Y8V=n@*!Rog7<7Cid%apR|x zOjhHCyfbIt%+*PCveTEcuiDi%Wx;O;+K=W?OFUV%)%~6;gl?<0%)?snDDqIvkHF{ zyI02)+lI9ov42^hL>ZRrh*HhjF9B$A@=H94iaBESBF=eC_KT$8A@uB^6$~o?3Wm5t1OIaqF^~><2?4e3c&)@wKn9bD? zoeCs;H>b8DL^F&>Xw-xjZEUFFTv>JD^O#1E#)CMBaG4DX9bD(Wtc8Rzq}9soQ8`jf zeSnHOL}<+WVSKp4kkq&?SbETjq6yr@4%SAqOG=9E(3YeLG9dtV+8vmzq+6PFPk{L; z(&d++iu=^F%b+ea$i2UeTC{R*0Isk;vFK!no<;L+(`y`3&H-~VTdKROkdyowo1iqR zbVW(3`+(PQ2>TKY>N!jGmGo7oeoB8O|P_!Ic@ zZ^;3dnuXo;WJ?S+)%P>{Hcg!Jz#2SI(s&dY4QAy_vRlmOh)QHvs_7c&zkJCmJGVvV zX;Mtb>QE+xp`KyciG$Cn*0?AK%-a|=o!+7x&&yzHQOS>8=B*R=niSnta^Pxp1`=md z#;$pS$4WCT?mbiCYU?FcHGZ#)kHVJTTBt^%XE(Q};aaO=Zik0UgLcc0I(tUpt(>|& zcxB_|fxCF7>&~5eJ=Dpn&5Aj{A^cV^^}(7w#p;HG&Q)EaN~~EqrE1qKrMAc&WXIE;>@<&)5;gD2?={Xf@Mvn@OJKw=8Mgn z!JUFMwD+s==JpjhroT&d{$kQAy%+d`a*XxDEVxy3`NHzmITrE`o!;5ClXNPb4t*8P zzAivdr{j_v!=9!^?T3y?gzmqDWX6mkzhIzJ-3S{T5bcCFMr&RPDryMcdwbBuZbsgN zGrp@^i?rcfN7v0NKGzDPGE#4yszxu=I_`MI%Z|10nFjU-UjQXXA?k8Pk|OE<(?ae) zE%vG#eZAlj*E7_3dx#Zz4kMLj>H^;}33UAankJiDy5ZvEhrjr`!9eMD8COp}U*hP+ zF}KIYx@pkccIgyxFm#LNw~G&`;o&5)2`5aogs`1~7cMZQ7zj!%L4E`2yzlQN6REX20&O<9 zKV6fyr)TScJPPzNTC2gL+0x#=u>(({{D7j)c-%tvqls3#Y?Z1m zV5WUE)zdJ{$p>yX;^P!UcXP?UD~YM;IRa#Rs5~l+*$&nO(;Ers`G=0D!twR(0GF@c zHl9E5DQI}Oz74n zfKP>&$q0($T4y$6w(p=ERAFh+>n%iaeRA%!T%<^+pg?M)@ucY<&59$x9M#n+V&>}=nO9wCV{O~lg&v#+jcUj(tQ z`0u1YH)-`U$15a{pBkGyPL0THv1P|4e@pf@3IBZS4dVJPo#H>pWq%Lr0YS-SeWash z8R7=jb28KPMI|_lo#GEO|5B?N_e``H*23{~a!AmUJ+fb4HX-%QI@lSEUxKlGV7z7Q zSKw@-TR>@1RL%w{x}dW#k1NgW+q4yt2Xf1J62Bx*O^WG8OJ|FqI4&@d3_o8Id@*)4 zYrk=>@!wv~mh7YWv*bZhxqSmFh2Xq)o=m;%n$I?GSz49l1$xRpPu_^N(vZ>*>Z<04 z2+rP70oM=NDysd!@fQdM2OcyT?3T^Eb@lIC-UG=Bw{BjQ&P`KCv$AcJ;?`vdZ4){d z&gkoUK{$!$$K`3*O-jyM1~p-7T*qb)Ys>Myt^;#1&a%O@x8A+E>! zY8=eD`ZG)LVagDLBeHg>=atOG?Kr%h4B%E6m@J^C+U|y)XX@f z8oyJDW|9g=<#f<{JRr{y#~euMnv)`7j=%cHWLc}ngjq~7k**6%4u>Px&W%4D94(r* z+akunK}O0DC2A%Xo9jyF;DobX?!1I(7%}@7F>i%&nk*LMO)bMGg2N+1iqtg+r(70q zF5{Msgsm5GS7DT`kBsjMvOrkx&|EU!{{~gL4d2MWrAT=KBQ-^zQCUq{5PD1orxlIL zq;CvlWx#f1NWvh`hg011I%?T_s!e38l*lWVt|~z-PO4~~1g)SrJ|>*tXh=QfXT)%( z+ex+inPvD&O4Ur;JGz>$sUOnWdpSLcm1X%aQDw4{dB!cnj`^muI$CJ2%p&-kULVCE z>$eMR36kN$wCPR+OFDM3-U(VOrp9k3)lI&YVFqd;Kpz~K)@Fa&FRw}L(SoD z9B4a+hQzZT-BnVltst&=kq6Y(f^S4hIGNKYBgMxGJ^;2yrO}P3;r)(-I-CZ)26Y6? z&rzHI_1GCvGkgy-t1E;r^3Le30|%$ebDRu2+gdLG)r=A~Qz`}~&L@aGJ{}vVs_GE* zVUjFnzHiXfKQbpv&bR&}l2bzIjAooB)=-XNcYmrGmBh(&iu@o!^hn0^#}m2yZZUK8 zufVm7Gq0y`Mj;9b>`c?&PZkU0j4>IL=UL&-Lp3j&47B5pAW4JceG{!XCA)kT<%2nqCxj<)uy6XR_uws~>_MEKPOpAQ!H zkn>FKh)<9DwwS*|Y(q?$^N!6(51O0 z^JM~Ax{AI1Oj$fs-S5d4T7Z_i1?{%0SsIuQ&r8#(JA=2iLcTN+?>wOL532%&dMYkT z*T5xepC+V6zxhS@vNbMoi|i)=rpli@R9~P!39tWbSSb904ekv7D#quKbgFEMTb48P zuq(VJ+&L8aWU(_FCD$3^uD!YM%O^K(dvy~Wm2hUuh6bD|#(I39Xt>N1Y{ZqXL`Fg6 zKQ?T2htHN!(Bx;tV2bfTtIj7e)liN-29s1kew>v(D^@)#v;}C4-G=7x#;-dM4yRWm zyY`cS21ulzMK{PoaQ6xChEZ}o_#}X-o}<&0)$1#3we?+QeLt;aVCjeA)hn!}UaKt< zat1fHEx13y-rXNMvpUUmCVzocPmN~-Y4(YJvQ#db)4|%B!rBsgAe+*yor~}FrNH08 z3V!97S}D7d$zbSD{$z;@IYMxM6aHdypIuS*pr_U6;#Y!_?0i|&yU*@16l z*dcMqDQgfNBf}?quiu4e>H)yTVfsp#f+Du0@=Kc41QockXkCkvu>FBd6Q+@FL!(Yx z2`YuX#eMEiLEDhp+9uFqME_E^faV&~9qjBHJkIp~%$x^bN=N)K@kvSVEMdDuzA0sn z88CBG?`RX1@#hQNd`o^V{37)!w|nA)QfiYBE^m=yQKv-fQF+UCMcuEe1d4BH7$?>b zJl-r9@0^Ie=)guO1vOd=i$_4sz>y3x^R7n4ED!5oXL3@5**h(xr%Hv)_gILarO46q+MaDOF%ChaymKoI6JU5Pg;7#2n9-18|S1;AK+ zgsn6;k6-%!QD>D?cFy}8F;r@z8H9xN1jsOBw2vQONVqBVEbkiNUqgw~*!^##ht>w0 zUOykwH=$LwX2j&nLy=@{hr)2O&-wm-NyjW7n~Zs9UlH;P7iP3 zI}S(r0YFVYacnKH(+{*)Tbw)@;6>%=&Th=+Z6NHo_tR|JCI8TJiXv2N7ei7M^Q+RM z?9o`meH$5Yi;@9XaNR#jIK^&{N|DYNNbtdb)XW1Lv2k{E>;?F`#Pq|&_;gm~&~Zc9 zf+6ZE%{x4|{YdtE?a^gKyzr}dA>OxQv+pq|@IXL%WS0CiX!V zm$fCePA%lU{%pTKD7|5NJHeXg=I0jL@$tOF@K*MI$)f?om)D63K*M|r`gb9edD1~Y zc|w7N)Y%do7=0{RC|AziW7#am$)9jciRJ?IWl9PE{G3U+$%FcyKs_0Cgq`=K3@ttV z9g;M!3z~f_?P%y3-ph%vBMeS@p7P&Ea8M@97+%XEj*(1E6vHj==d zjsoviB>j^$_^OI_DEPvFkVo(BGRo%cJeD){6Uckei=~1}>sp299|IRjhXe)%?uP0I zF5+>?0#Ye}T^Y$u_rc4=lPcq4K^D(TZG-w30-YiEM=dcK+4#o*>lJ8&JLi+3UcpZk z!^?95S^C0ja^jwP`|{<+3cBVog$(mRdQmadS+Vh~z zS@|P}=|z3P6uS+&@QsMp0no9Od&27O&14zHXGAOEy zh~OKpymK5C%;LLb467@KgIiVwYbYd6wFxI{0-~MOGfTq$nBTB!{SrWmL9Hs}C&l&l#m?s*{tA?BHS4mVKHAVMqm63H<|c5n0~k)-kbg zXidai&9ZUy0~WFYYKT;oe~rytRk?)r8bptITsWj(@HLI;@=v5|XUnSls7$uaxFRL+ zRVMGuL3w}NbV1`^=Pw*0?>bm8+xfeY(1PikW*PB>>Tq(FR`91N0c2&>lL2sZo5=VD zQY{>7dh_TX98L2)n{2OV=T10~*YzX27i2Q7W86M4$?gZIXZaBq#sA*{PH8){|GUi;oM>e?ua7eF4WFuFYZSG| zze?srg|5Ti8Og{O zeFxuw9!U+zhyk?@w zjsA6(oKD=Ka;A>Ca)oPORxK+kxH#O@zhC!!XS4@=swnuMk>t+JmLmFiE^1aX3f<)D@`%K0FGK^gg1a1j>zi z2KhV>sjU7AX3F$SEqrXSC}fRx64GDoc%!u2Yag68Lw@w9v;xOONf@o)Lc|Uh3<21ctTYu-mFZuHk*+R{GjXHIGq3p)tFtQp%TYqD=j1&y)>@zxoxUJ!G@ zgI0XKmP6MNzw>nRxK$-Gbzs}dyfFzt>#5;f6oR27ql!%+{tr+(`(>%51|k`ML} zY4eE)Lxq|JMas(;JibNQds1bUB&r}ydMQXBY4x(^&fY_&LlQC)3hylc$~8&~|06-D z#T+%66rYbHX%^KuqJED_wuGB+=h`nWA!>1n0)3wZrBG3%`b^Ozv6__dNa@%V14|!D zQ?o$z5u0^8`giv%qE!BzZ!3j;BlDlJDk)h@9{nSQeEk!z9RGW) z${RSF3phEM*ce*>Xdp}585vj$|40=&S{S-GTiE?Op*vY&Lvr9}BO$XWy80IF+6@%n z5*2ueT_g@ofP#u5pxb7n*fv^Xtt7&?SRc{*2Ka-*!BuOpf}neHGCiHy$@Ka1^Dint z;DkmIL$-e)rj4o2WQV%Gy;Xg(_Bh#qeOsTM2f@KEe~4kJ8kNLQ+;(!j^bgJMcNhvklP5Z6I+9Fq@c&D~8Fb-4rmDT!MB5QC{Dsb;BharP*O;SF4& zc$wj-7Oep7#$WZN!1nznc@Vb<_Dn%ga-O#J(l=OGB`dy=Sy&$(5-n3zzu%d7E#^8`T@}V+5B;PP8J14#4cCPw-SQTdGa2gWL0*zKM z#DfSXs_iWOMt)0*+Y>Lkd=LlyoHjublNLefhKBv@JoC>P7N1_#> zv=mLWe96%EY;!ZGSQDbZWb#;tzqAGgx~uk+-$+2_8U`!ypbwXl z^2E-FkM1?lY@yt8=J3%QK+xaZ6ok=-y%=KXCD^0r!5vUneW>95PzCkOPO*t}p$;-> ze5j-BLT_;)cZQzR2CEsm@rU7GZfFtdp*a|g4wDr%8?2QkIGasRfDWT-Dvy*U{?IHT z*}wGnzdlSptl#ZF^sf)KT|BJs&kLG91^A6ls{CzFprZ6-Y!V0Xysh%9p%iMd7HLsS zN+^Un$tDV)T@i!v?3o0Fsx2qI(AX_$dDkBzQ@fRM%n zRXk6hb9Py#JXUs+7)w@eo;g%QQ95Yq!K_d=z{0dGS+pToEI6=Bo8+{k$7&Z zo4>PH(`ce8E-Ps&uv`NQ;U$%t;w~|@E3WVOCi~R4oj5wP?%<*1C%}Jq%a^q~T7u>K zML5AKfQDv6>PuT`{SrKHRAF+^&edg6+5R_#H?Lz3iGoWo#PCEd0DS;)2U({{X#zU^ zw_xv{4x7|t!S)>44J;KfA|DC?;uQ($l+5Vp7oeqf7{GBF9356nx|&B~gs+@N^gSdd zvb*>&W)|u#F{Z_b`f#GVtQ`pYv3#||N{xj1NgB<#=Odt6{eB%#9RLt5v zIi|0u70`#ai}9fJjKv7dE!9ZrOIX!3{$z_K5FBd-Kp-&e4(J$LD-)NMTp^_pB`RT; zftVVlK2g@+1Ahv2$D){@Y#cL#dUj9*&%#6 zd2m9{1NYp>)6=oAvqdCn5#cx{AJ%S8skUgMglu2*IAtd+z1>B&`MuEAS(D(<6X#Lj z?f4CFx$)M&$=7*>9v1ER4b6!SIz-m0e{o0BfkySREchp?WdVPpQCh!q$t>?rL!&Jg zd#heM;&~A}VEm8Dvy&P|J*eAV&w!&Nx6HFV&B8jJFVTmgLaswn!cx$&%JbTsloz!3 zMEz1d`k==`Ueub_JAy_&`!ogbwx27^ZXgFNAbx=g_I~5nO^r)}&myw~+yY*cJl4$I znNJ32M&K=0(2Dj_>@39`3=FX!v3nZHno_@q^!y}%(yw0PqOo=);6Y@&ylVe>nMOZ~ zd>j#QQSBn3oaWd;qy$&5(5H$Ayi)0haAYO6TH>FR?rhqHmNOO+(})NB zLI@B@v0)eq!ug`>G<@htRlp3n!EpU|n+G+AvXFrWSUsLMBfL*ZB`CRsIVHNTR&b?K zxBgsN0BjfB>UVcJ|x%=-zb%OV7lmZc& zxiupadZVF7)6QuhoY;;FK2b*qL0J-Rn-8!X4ZY$-ZSUXV5DFd7`T41c(#lAeLMoeT z4%g655v@7AqT!i@)Edt5JMbN(=Q-6{=L4iG8RA%}w;&pKmtWvI4?G9pVRp|RTw`g0 zD5c12B&A2&P6Ng~8WM2eIW=wxd?r7A*N+&!Be7PX3s|7~z=APxm=A?5 zt>xB4WG|*Td@VX{Rs)PV0|yK`oI3^xn(4c_j&vgxk_Y3o(-`_5o`V zRTghg6%l@(qodXN;dB#+OKJEEvhfcnc#BeO2|E(5df-!fKDZ!%9!^BJ_4)9P+9Dq5 zK1=(v?KmIp34r?z{NEWnLB3Px{XYwy-akun4F7xTRr2^zeYW{gcK9)>aJDdU5;w5@ zak=<+-PLH-|04pelTb%ULpuuuJC7DgyT@D|p{!V!0v3KpDnRjANN12q6SUR3mb9<- z>2r~IApQGhstZ!3*?5V z8#)hJ0TdZg0M-BK#nGFP>$i=qk82DO z7h;Ft!D5E15OgW)&%lej*?^1~2=*Z5$2VX>V{x8SC+{i10BbtUk9@I#Vi&hX)q
Q!LwySI{Bnv%Sm)yh{^sSVJ8&h_D-BJ_YZe5eCaAWU9b$O2c z$T|{vWVRtOL!xC0DTc(Qbe`ItNtt5hr<)VijD0{U;T#bUEp381_y`%ZIav?kuYG{iyYdEBPW=*xNSc;Rlt6~F4M`5G+VtOjc z*0qGzCb@gME5udTjJA-9O<&TWd~}ysBd(eVT1-H82-doyH9RST)|+Pb{o*;$j9Tjs zhU!IlsPsj8=(x3bAKJTopW3^6AKROHR^7wZ185wJGVhA~hEc|LP;k7NEz-@4p5o}F z`AD6naG3(n=NF9HTH81=F+Q|JOz$7wm9I<+#BSmB@o_cLt2GkW9|?7mM;r!JZp89l zbo!Hp8=n!XH1{GwaDU+k)pGp`C|cXkCU5%vcH)+v@0eK>%7gWxmuMu9YLlChA|_D@ zi#5zovN_!a-0?~pUV-Rj*1P)KwdU-LguR>YM&*Nen+ln8Q$?WFCJg%DY%K}2!!1FE zDv-A%Cbwo^p(lzac&_TZ-l#9kq`mhLcY3h9ZTUVCM(Ad&=EriQY5{jJv<5K&g|*Lk zgV%ILnf1%8V2B0E&;Sp4sYbYOvvMebLwYwzkRQ#F8GpTQq#uv=J`uaSJ34OWITeSGo6+-8Xw znCk*n{kdDEi)Hi&u^)~cs@iyCkFWB2SWZU|Uc%^43ZIZQ-vWNExCCtDWjqHs;;tWf$v{}0{p0Rvxkq``)*>+Akq%|Na zA`@~-Vfe|+(AIlqru+7Ceh4nsVmO9p9jc8}HX^W&ViBDXT+uXbT#R#idPn&L>+#b6 zflC-4C5-X;kUnR~L>PSLh*gvL68}RBsu#2l`s_9KjUWRhiqF`j)`y`2`YU(>3bdBj z?>iyjEhe-~$^I5!nn%B6Wh+I`FvLNvauve~eX<+Ipl&04 zT}};W&1a3%W?dJ2=N#0t?e+aK+%t}5q%jSLvp3jZ%?&F}nOOWr>+{GFIa%wO_2`et z=JzoRR~}iKuuR+azPI8;Gf9)z3kyA4EIOSl!sRR$DlW}0>&?GbgPojmjmnln;cTqCt=ADbE zZ8GAnoM+S1(5$i8^O4t`ue;vO4i}z0wz-QEIVe5_u03;}-!G1NyY8;h^}y;tzY}i5 zqQr#Ur3Fy8sSa$Q0ys+f`!`+>9WbvU_I`Sj;$4{S>O3?#inLHCrtLy~!s#WXV=oVP zeE93*Nc`PBi4q@%Ao$x4lw9vLHM!6mn3-b_cebF|n-2vt-zYVF_&sDE--J-P;2WHo z+@n2areE0o$LjvjlV2X7ZU@j+`{*8zq`JR3gKF#EW|#+{nMyo-a>nFFTg&vhyT=b} zDa8+v0(Dgx0yRL@ZXOYIlVSZ0|MFizy0VPW8;AfA5|pe!#j zX}Py^8fl5SyS4g1WSKKtnyP+_PoOwMMwu`(i@Z)diJp~U54*-miOchy7Z35eL>^M z4p<-aIxH4VUZgS783@H%M7P9hX>t{|RU7$n4T(brCG#h9e9p! z+o`i;EGGq3&pF;~5V~eBD}lC)>if$w%Vf}AFxGqO88|ApfHf&Bvu+xdG)@vuF}Yvk z)o;~k-%+0K0g+L`Wala!$=ZV|z$e%>f0%XoLib%)!R^RoS+{!#X?h-6uu zF&&KxORdZU&EwQFITIRLo(7TA3W}y6X{?Y%y2j0It!ekU#<)$qghZtpcS>L3uh`Uj z7GY;6f$9qKynP#oS3$$a{p^{D+0oJQ71`1?OAn_m8)UGZmj3l*ZI)`V-a>MKGGFG< z&^jg#Ok%(hhm>hSrZ5;Qga4u(?^i>GiW_j9%_7M>j(^|Om$#{k+^*ULnEgzW_1gCICtAD^WpC`A z{9&DXkG#01Xo)U$OC(L5Y$DQ|Q4C6CjUKk1UkPj$nXH##J{c8e#K|&{mA*;b$r0E4 zUNo0jthwA(c&N1l=PEe8Rw_8cEl|-eya9z&H3#n`B$t#+aJ03RFMzrV@gowbe8v(c zIFM60^0&lCFO10NU4w@|61xiZ4CVXeaKjd;d?sv52XM*lS8XiVjgWpRB;&U_C0g+`6B5V&w|O6B*_q zsATxL!M}+$He)1eOWECce#eS@2n^xhlB4<_Nn?yCVEQWDs(r`|@2GqLe<#(|&P0U? z$7V5IgpWf09uIf_RazRwC?qEqRaHyL?iiS05UiGesJy%^>-C{{ypTBI&B0-iUYhk> zIk<5xpsuV@g|z(AZD+C-;A!fTG=df1=<%nxy(a(IS+U{ME4ZbDEBtcD_3V=icT6*_ z)>|J?>&6%nvHhZERBtjK+s4xnut*@>GAmA5m*OTp$!^CHTr}vM4n(X1Q*;{e-Rd2BCF-u@1ZGm z!S8hJ6L=Gl4T_SDa7Xx|-{4mxveJg=ctf`BJ*fy!yF6Dz&?w(Q_6B}WQVtNI!BVBC zKfX<>7vd6C96}XAQmF-Jd?1Q4eTfRB3q7hCh0f!(JkdWT5<{iAE#dKy*Jxq&3a1@~ z8C||Dn2mFNyrUV|<-)C^_y7@8c2Fz+2jrae9deBDu;U}tJ{^xAdxCD248(k;dCJ%o z`y3sADe>U%suxwwv~8A1+R$VB=Q?%U?4joI$um;aH+eCrBqpn- z%79D_7rb;R-;-9RTrwi9dPlg8&@tfWhhZ(Vx&1PQ+6(huX`;M9x~LrW~~#3{j0Bh2kDU$}@!fFQej4VGkJv?M4rU^x!RU zEwhu$!CA_iDjFjrJa`aocySDX16?~;+wgav;}Zut6Mg%C4>}8FL?8)Kgwc(Qlj{@#2Pt0?G`$h7P#M+qoXtlV@d}%c&OzO+QYKK`kyXaK{U(O^2DyIXCZlNQjt0^8~8JzNGrIxhj}}M z&~QZlbx%t;MJ(Vux;2tgNKGlAqphLq%pd}JG9uoVHUo?|hN{pLQ6Em%r*+7t^<);X zm~6=qChlNAVXNN*Sow->*4;}T;l;D1I-5T{Bif@4_}=>l`tK;qqDdt5zvisCKhMAH z#r}`)7VW?LZqfdmXQ%zo5bJ00{Xb9^YKrk0Nf|oIW*K@(=`o2Vndz}ZDyk{!u}PVx zzd--+_WC*U{~DH3{?GI64IB+@On&@9X>EUAo&L+G{L^dozaI4C3G#2wr~hseW@K&g zKWs{uHu-9Je!3;4pE>eBltKUXb^*hG8I&413)$J&{D4N%7PcloU6bn%jPxJyQL?g* z9g+YFFEDiE`8rW^laCNzQmi7CTnPfwyg3VDHRAl>h=In6jeaVOP@!-CP60j3+#vpL zEYmh_oP0{-gTe7Or`L6x)6w?77QVi~jD8lWN@3RHcm80iV%M1A!+Y6iHM)05iC64tb$X2lV_%Txk@0l^hZqi^%Z?#- zE;LE0uFx)R08_S-#(wC=dS&}vj6P4>5ZWjhthP=*Hht&TdLtKDR;rXEX4*z0h74FA zMCINqrh3Vq;s%3MC1YL`{WjIAPkVL#3rj^9Pj9Ss7>7duy!9H0vYF%>1jh)EPqvlr6h%R%CxDsk| z!BACz7E%j?bm=pH6Eaw{+suniuY7C9Ut~1cWfOX9KW9=H><&kQlinPV3h9R>3nJvK z4L9(DRM=x;R&d#a@oFY7mB|m8h4692U5eYfcw|QKwqRsshN(q^v$4$)HgPpAJDJ`I zkqjq(8Cd!K!+wCd=d@w%~e$=gdUgD&wj$LQ1r>-E=O@c ze+Z$x{>6(JA-fNVr)X;*)40Eym1TtUZI1Pwwx1hUi+G1Jlk~vCYeXMNYtr)1?qwyg zsX_e*$h?380O00ou?0R@7-Fc59o$UvyVs4cUbujHUA>sH!}L54>`e` zHUx#Q+Hn&Og#YVOuo*niy*GU3rH;%f``nk#NN5-xrZ34NeH$l`4@t);4(+0|Z#I>Y z)~Kzs#exIAaf--65L0UHT_SvV8O2WYeD>Mq^Y6L!Xu8%vnpofG@w!}R7M28?i1*T&zp3X4^OMCY6(Dg<-! zXmcGQrRgHXGYre7GfTJ)rhl|rs%abKT_Nt24_Q``XH{88NVPW+`x4ZdrMuO0iZ0g` z%p}y};~T5gbb9SeL8BSc`SO#ixC$@QhXxZ=B}L`tP}&k?1oSPS=4%{UOHe0<_XWln zwbl5cn(j-qK`)vGHY5B5C|QZd5)W7c@{bNVXqJ!!n$^ufc?N9C-BF2QK1(kv++h!>$QbAjq)_b$$PcJdV+F7hz0Hu@ zqj+}m0qn{t^tD3DfBb~0B36|Q`bs*xs|$i^G4uNUEBl4g;op-;Wl~iThgga?+dL7s zUP(8lMO?g{GcYpDS{NM!UA8Hco?#}eNEioRBHy4`mq!Pd-9@-97|k$hpEX>xoX+dY zDr$wfm^P&}Wu{!%?)U_(%Mn79$(ywvu*kJ9r4u|MyYLI_67U7%6Gd_vb##Nerf@>& z8W11z$$~xEZt$dPG}+*IZky+os5Ju2eRi;1=rUEeIn>t-AzC_IGM-IXWK3^6QNU+2pe=MBn4I*R@A%-iLDCOHTE-O^wo$sL_h{dcPl=^muAQb`_BRm};=cy{qSkui;`WSsj9%c^+bIDQ z0`_?KX0<-=o!t{u(Ln)v>%VGL z0pC=GB7*AQ?N7N{ut*a%MH-tdtNmNC+Yf$|KS)BW(gQJ*z$d{+{j?(e&hgTy^2|AR9vx1Xre2fagGv0YXWqtNkg*v%40v?BJBt|f9wX5 z{QTlCM}b-0{mV?IG>TW_BdviUKhtosrBqdfq&Frdz>cF~yK{P@(w{Vr7z2qKFwLhc zQuogKO@~YwyS9%+d-zD7mJG~@?EFJLSn!a&mhE5$_4xBl&6QHMzL?CdzEnC~C3$X@ zvY!{_GR06ep5;<#cKCSJ%srxX=+pn?ywDwtJ2{TV;0DKBO2t++B(tIO4)Wh`rD13P z4fE$#%zkd=UzOB74gi=-*CuID&Z3zI^-`4U^S?dHxK8fP*;fE|a(KYMgMUo`THIS1f!*6dOI2 zFjC3O=-AL`6=9pp;`CYPTdVX z8(*?V&%QoipuH0>WKlL8A*zTKckD!paN@~hh zmXzm~qZhMGVdQGd=AG8&20HW0RGV8X{$9LldFZYm zE?}`Q3i?xJRz43S?VFMmqRyvWaS#(~Lempg9nTM$EFDP(Gzx#$r)W&lpFKqcAoJh-AxEw$-bjW>`_+gEi z2w`99#UbFZGiQjS8kj~@PGqpsPX`T{YOj`CaEqTFag;$jY z8_{Wzz>HXx&G*Dx<5skhpETxIdhKH?DtY@b9l8$l?UkM#J-Snmts7bd7xayKTFJ(u zyAT&@6cAYcs{PBfpqZa%sxhJ5nSZBPji?Zlf&}#L?t)vC4X5VLp%~fz2Sx<*oN<7` z?ge=k<=X7r<~F7Tvp9#HB{!mA!QWBOf%EiSJ6KIF8QZNjg&x~-%e*tflL(ji_S^sO ztmib1rp09uon}RcsFi#k)oLs@$?vs(i>5k3YN%$T(5Or(TZ5JW9mA6mIMD08=749$ z!d+l*iu{Il7^Yu}H;lgw=En1sJpCKPSqTCHy4(f&NPelr31^*l%KHq^QE>z>Ks_bH zjbD?({~8Din7IvZeJ>8Ey=e;I?thpzD=zE5UHeO|neioJwG;IyLk?xOz(yO&0DTU~ z^#)xcs|s>Flgmp;SmYJ4g(|HMu3v7#;c*Aa8iF#UZo7CvDq4>8#qLJ|YdZ!AsH%^_7N1IQjCro

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..be52383e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..4f906e0c --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 58f77ca6..00000000 --- a/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - 4.0.0 - com.hackclub.hccore - HCCore - 1.0.0 - jar - HCCore - - 1.8 - 1.8 - UTF-8 - - - - com.github.Trigary - AdvancementCreator - v2.0 - - - com.google.code.gson - gson - 2.8.6 - - - de.tr7zw - item-nbt-api - 2.4.1 - - - com.comphenix.protocol - ProtocolLib - 4.5.0 - provided - - - org.spigotmc - spigot - 1.16.1-R0.1-SNAPSHOT - provided - - - org.spigotmc - spigot-api - 1.16.1-R0.1-SNAPSHOT - provided - - - - - codemc-repo - https://repo.codemc.org/repository/maven-public/ - - - dmulloy2-repo - https://repo.dmulloy2.net/nexus/repository/public/ - - - jitpack.io - https://jitpack.io - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - ${project.name} - - - true - src/main/resources - - config.yml - plugin.yml - - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - 2.8.0 - - recommended_2008_06 - artifactId - - - - - sort - - verify - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - false - - - de.tr7zw.changeme.nbtapi - com.hackclub.nbtapi - - - - - - - shade - - package - - - - - ${project.basedir}/src/main/java - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..dea0bc88 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'HCCore' diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index a2676ac4..5d084461 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ -name: ${project.name} -version: ${project.version} +name: ${name} +version: ${version} api-version: 1.16 main: com.hackclub.hccore.HCCorePlugin depend: [ProtocolLib] From 9b50e5ef97835fc01e9ceca25c4d90bab7f4c653 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Sat, 7 Nov 2020 22:57:08 -0800 Subject: [PATCH 26/83] fix: remove accidentally commited Justfile --- Justfile | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 Justfile diff --git a/Justfile b/Justfile deleted file mode 100644 index 39266596..00000000 --- a/Justfile +++ /dev/null @@ -1,11 +0,0 @@ -build: - gradle build - -view: - jar tf build/libs/*.jar - -run: build - java -jar build/libs/*.jar - -copy: build - cp build/libs/*.jar ../server-root/plugins From 1301bf3d43a232283186aba9263d9d2e8c293f0e Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 10:49:02 -0800 Subject: [PATCH 27/83] ci: remove maven --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index edd575ba..0c76bcb2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,10 @@ install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar --rev 1.16.1 > /dev/null - - mvn clean package + - gradle build cache: directories: - - "$HOME/.m2" + - "$HOME/.gradle" - "$HOME/BuildData" - "$HOME/Bukkit" - "$HOME/CraftBukkit" From ee941b2d35e66af786294862ff3819b990963a47 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 11:07:09 -0800 Subject: [PATCH 28/83] ci: fix travis --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c76bcb2..6c7b7f55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,14 @@ install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar --rev 1.16.1 > /dev/null - - gradle build + - ./gradlew build --scan -s +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ cache: directories: - - "$HOME/.gradle" + - "$HOME/.gradle/caches" + - "$HOME/.gradle/wrapper" - "$HOME/BuildData" - "$HOME/Bukkit" - "$HOME/CraftBukkit" From e08d6ce73b522c6f56d947c9f2a09599b4d1e889 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 11:29:09 -0800 Subject: [PATCH 29/83] ci: fix gradle scan --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6c7b7f55..f951df98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar --rev 1.16.1 > /dev/null - - ./gradlew build --scan -s + - yes | ./gradlew build -s before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From 1b84ebd432d1b35a32d8d18657ebd55f9a6a4d48 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:26:47 -0800 Subject: [PATCH 30/83] ci: travis don't daemonize --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f951df98..2e54b5fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar --rev 1.16.1 > /dev/null - - yes | ./gradlew build -s + - yes | ./gradlew build -s --no-daemon before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From a976c3ad73ee2d1d0e7db0fdc5fe21014316572c Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:49:19 -0800 Subject: [PATCH 31/83] ci: remove gradle scan --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2e54b5fa..cfe85fe4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ +dist: focal language: java jdk: openjdk8 install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - java -jar BuildTools.jar --rev 1.16.1 > /dev/null - - yes | ./gradlew build -s --no-daemon + - ./gradlew build -s before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ From 4d2a75521ebdd69ea737fb5953c1f30bca8ab063 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:54:25 -0800 Subject: [PATCH 32/83] ci: fix java installation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cfe85fe4..f5504e32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ dist: focal language: java -jdk: openjdk8 +jdk: openjdk11 install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar From 4e827857f80f5c5639fc37482fdab739a05d4709 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 13:24:14 -0800 Subject: [PATCH 33/83] ci: add maven central --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index f3607fe0..a77b9f2e 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ processResources { repositories { jcenter() + mavenCentral() // AdvancementCreator maven { url "https://jitpack.io" } From d2b976447e3b3074f2ccb296ab418d98fa82456d Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 01:39:40 -0400 Subject: [PATCH 34/83] Allow spaces in loc command --- .../hackclub/hccore/commands/LocCommand.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 54aebddc..a14a1454 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -22,6 +22,23 @@ public LocCommand(HCCorePlugin plugin) { this.plugin = plugin; } + /** + * Convert args from startIndex to args.length into a + * space-separated string. + * @param args List of arguments + * @param startIndex The argument to start concatenating from + * @return Concatenated, space-separated argument string. + */ + private String getArgsAsString(String[] args, int startIndex) { + if (startIndex > args.length - 1) return ""; // Invalid starting index + if (args.length < 2) return ""; // Only one arg, hence nothing to concat + String arguments = args[startIndex]; + for (int i = startIndex+1; i < args.length; ++i) { + arguments = String.join(" ", arguments, args[i]); + } + return arguments; + } + @Override public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { if (!(sender instanceof Player)) { @@ -61,12 +78,14 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String break; } if (!data.getSavedLocations().containsKey(locationName)) { + sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; } Location savedLocation = data.getSavedLocations().get(locationName); sender.sendMessage(locationName + ": " + savedLocation.getWorld().getName() + " @ " + + savedLocation.getBlockX() + ", " + savedLocation.getBlockY() + ", " + savedLocation.getBlockZ()); break; @@ -117,6 +136,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "Please specify the location name"); break; } + if (data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "A location with that name already exists"); break; From 81e607e43946ef9069fcf771b5794113a64a7b7e Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 10:25:20 -0400 Subject: [PATCH 35/83] Use built-in functions for string joining --- src/main/java/com/hackclub/hccore/commands/LocCommand.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index a14a1454..18414f0a 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -32,10 +32,7 @@ public LocCommand(HCCorePlugin plugin) { private String getArgsAsString(String[] args, int startIndex) { if (startIndex > args.length - 1) return ""; // Invalid starting index if (args.length < 2) return ""; // Only one arg, hence nothing to concat - String arguments = args[startIndex]; - for (int i = startIndex+1; i < args.length; ++i) { - arguments = String.join(" ", arguments, args[i]); - } + String arguments = String.join(" ", Arrays.copyOfRange(args, startIndex, args.length)); return arguments; } From b8f23427a6e1d4ab2f4184acde9715cd23c88b96 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 19:30:31 -0400 Subject: [PATCH 36/83] Delimit location names with underscores --- src/main/java/com/hackclub/hccore/commands/LocCommand.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 18414f0a..cbae308e 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -32,7 +32,7 @@ public LocCommand(HCCorePlugin plugin) { private String getArgsAsString(String[] args, int startIndex) { if (startIndex > args.length - 1) return ""; // Invalid starting index if (args.length < 2) return ""; // Only one arg, hence nothing to concat - String arguments = String.join(" ", Arrays.copyOfRange(args, startIndex, args.length)); + String arguments = String.join("_", Arrays.copyOfRange(args, startIndex, args.length)); return arguments; } @@ -68,7 +68,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String ChatColor.GREEN + "Removed " + locationName + " from saved locations"); break; } - // /loc get + // /loc get case "get": { if (args.length < 2) { sender.sendMessage(ChatColor.RED + "Please specify the location name"); From 2311e28b875da67dcf36d32981677a6339554a33 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 19:30:52 -0400 Subject: [PATCH 37/83] Replace argString with locationName --- src/main/java/com/hackclub/hccore/commands/LocCommand.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index cbae308e..3b38ccf0 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -57,7 +57,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "Please specify the location name"); break; } - + if (!data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; @@ -75,14 +75,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String break; } if (!data.getSavedLocations().containsKey(locationName)) { - sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; } Location savedLocation = data.getSavedLocations().get(locationName); sender.sendMessage(locationName + ": " + savedLocation.getWorld().getName() + " @ " - + savedLocation.getBlockX() + ", " + savedLocation.getBlockY() + ", " + savedLocation.getBlockZ()); break; @@ -133,7 +131,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "Please specify the location name"); break; } - if (data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "A location with that name already exists"); break; From 77c942c04953011efac8b40766243aad0ae55b0a Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 22:13:24 -0400 Subject: [PATCH 38/83] Remove getArgAsString, it's not necessary --- .../com/hackclub/hccore/commands/LocCommand.java | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 3b38ccf0..17c0ecbe 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -22,20 +22,6 @@ public LocCommand(HCCorePlugin plugin) { this.plugin = plugin; } - /** - * Convert args from startIndex to args.length into a - * space-separated string. - * @param args List of arguments - * @param startIndex The argument to start concatenating from - * @return Concatenated, space-separated argument string. - */ - private String getArgsAsString(String[] args, int startIndex) { - if (startIndex > args.length - 1) return ""; // Invalid starting index - if (args.length < 2) return ""; // Only one arg, hence nothing to concat - String arguments = String.join("_", Arrays.copyOfRange(args, startIndex, args.length)); - return arguments; - } - @Override public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { if (!(sender instanceof Player)) { From 6bc3b9324dcb6d7098d765824ee3097b361a3f7a Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Wed, 15 Apr 2020 19:57:09 -0700 Subject: [PATCH 39/83] Remove space --- src/main/java/com/hackclub/hccore/commands/LocCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 17c0ecbe..88a68ce4 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -54,7 +54,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String ChatColor.GREEN + "Removed " + locationName + " from saved locations"); break; } - // /loc get + // /loc get case "get": { if (args.length < 2) { sender.sendMessage(ChatColor.RED + "Please specify the location name"); From beba7a99c15eb96373a4f80e9b872131c8cb1f92 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 19:44:33 -0400 Subject: [PATCH 40/83] Location sharing, first implementation attempt --- .../hackclub/hccore/commands/LocCommand.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 88a68ce4..7ad0049a 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -137,11 +137,33 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String + "Please specify the location name and the player you want to share it with"); break; } + // Re-get the location name because our arguments here are a bit different... + locationName = getArgsAsString(args, 2); if (!data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; } + Location sendLocation = data.getSavedLocations().get(locationName); // TODO: Add share functionality + // Get the player we're sending to + Player recipient = org.bukkit.Bukkit.getPlayer(args[1]); + if (recipient == null) { + sender.sendMessage(ChatColor.RED + + "Player '" + args[1] + "' does not exist."); + break; + } + if (recipient.getName().equals(player.getName())) { + sender.sendMessage(ChatColor.RED + + "You can't share a location with yourself!"); + break; + } + PlayerData recipData = this.plugin.getDataManager().getData(recipient); + String locationString = "(" + + sendLocation.getWorld().getName() + " @ " + sendLocation.getBlockX() + + ", " + sendLocation.getBlockY() + ", " + sendLocation.getBlockZ() + + ")"; + recipient.sendMessage(String.format("%s has shared a location: %s (%s)", player.getName(), locationName, locationString)); + //recipData.getSavedLocations().put(locationName,sendLocation); // Not sure if we want this functionality break; } default: From bb1d3b930ab5cdb139f0dbee4c49bb78e1d0ba5e Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Thu, 16 Apr 2020 20:38:15 -0400 Subject: [PATCH 41/83] Bring up to date with master --- .../com/hackclub/hccore/commands/LocCommand.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 7ad0049a..57ebfd70 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -137,8 +137,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String + "Please specify the location name and the player you want to share it with"); break; } - // Re-get the location name because our arguments here are a bit different... - locationName = getArgsAsString(args, 2); + locationName = args[1]; + String recipientName = args[2]; + if (!data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; @@ -146,13 +147,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String Location sendLocation = data.getSavedLocations().get(locationName); // TODO: Add share functionality // Get the player we're sending to - Player recipient = org.bukkit.Bukkit.getPlayer(args[1]); + Player recipient = org.bukkit.Bukkit.getPlayer(recipientName); if (recipient == null) { sender.sendMessage(ChatColor.RED - + "Player '" + args[1] + "' does not exist."); + + "Player '" + recipientName + "' does not exist."); break; } - if (recipient.getName().equals(player.getName())) { + if (recipientName.equals(player.getName())) { sender.sendMessage(ChatColor.RED + "You can't share a location with yourself!"); break; @@ -163,7 +164,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String + ", " + sendLocation.getBlockY() + ", " + sendLocation.getBlockZ() + ")"; recipient.sendMessage(String.format("%s has shared a location: %s (%s)", player.getName(), locationName, locationString)); - //recipData.getSavedLocations().put(locationName,sendLocation); // Not sure if we want this functionality + recipData.getSavedLocations().put(locationName,sendLocation); break; } default: From 4f03437aaf38447f9a38a433058067b88997b5ae Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 22 Apr 2020 01:13:07 -0400 Subject: [PATCH 42/83] Location sharing (not well tested) --- .../com/hackclub/hccore/commands/LocCommand.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 57ebfd70..4767963c 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -159,12 +159,24 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String break; } PlayerData recipData = this.plugin.getDataManager().getData(recipient); + String shareLocName = player.getName() + " " + locationName; + + if (recipData.getSavedLocations().containsKey(player.getName() + ":" + shareLocName)) { + sender.sendMessage(ChatColor.RED + + recipientName + " already has a location called " + + shareLocName + ); + break; + } + String locationString = "(" + sendLocation.getWorld().getName() + " @ " + sendLocation.getBlockX() + ", " + sendLocation.getBlockY() + ", " + sendLocation.getBlockZ() + ")"; - recipient.sendMessage(String.format("%s has shared a location: %s (%s)", player.getName(), locationName, locationString)); - recipData.getSavedLocations().put(locationName,sendLocation); + + player.sendMessage(ChatColor.GREEN + String.format("Shared %s with %s", locationName, recipientName)); + recipient.sendMessage(ChatColor.GREEN + String.format("%s has shared a location: %s (%s)", player.getName(), locationName, locationString)); + recipData.getSavedLocations().put(player.getName() + ":" + locationName,sendLocation); break; } default: From c8ca4b23c0288c3e7eecbf374d5e1acbea09a2fe Mon Sep 17 00:00:00 2001 From: Zane Date: Mon, 9 Nov 2020 14:27:29 -0800 Subject: [PATCH 43/83] Implement @ifvictr's suggestions --- .../hackclub/hccore/commands/LocCommand.java | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 4767963c..11470254 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -145,38 +145,37 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String break; } Location sendLocation = data.getSavedLocations().get(locationName); - // TODO: Add share functionality // Get the player we're sending to - Player recipient = org.bukkit.Bukkit.getPlayer(recipientName); + Player recipient = sender.getServer().getPlayer(recipientName); if (recipient == null) { - sender.sendMessage(ChatColor.RED - + "Player '" + recipientName + "' does not exist."); + sender.sendMessage(ChatColor.RED + "No online player with that name was found"); break; } if (recipientName.equals(player.getName())) { - sender.sendMessage(ChatColor.RED - + "You can't share a location with yourself!"); + sender.sendMessage(ChatColor.RED + "You can’t share a location with yourself!"); break; } - PlayerData recipData = this.plugin.getDataManager().getData(recipient); + PlayerData recipData = this.plugin.getDataManager().getData(recipient); String shareLocName = player.getName() + " " + locationName; - if (recipData.getSavedLocations().containsKey(player.getName() + ":" + shareLocName)) { - sender.sendMessage(ChatColor.RED - + recipientName + " already has a location called " - + shareLocName - ); + if (recipData.getSavedLocations() + .containsKey(player.getName() + ":" + shareLocName)) { + sender.sendMessage(ChatColor.RED + recipientName + + " already has a location called " + shareLocName); break; } - String locationString = "(" - + sendLocation.getWorld().getName() + " @ " + sendLocation.getBlockX() - + ", " + sendLocation.getBlockY() + ", " + sendLocation.getBlockZ() - + ")"; + String locationString = "(" + sendLocation.getWorld().getName() + " @ " + + sendLocation.getBlockX() + ", " + sendLocation.getBlockY() + ", " + + sendLocation.getBlockZ() + ")"; - player.sendMessage(ChatColor.GREEN + String.format("Shared %s with %s", locationName, recipientName)); - recipient.sendMessage(ChatColor.GREEN + String.format("%s has shared a location: %s (%s)", player.getName(), locationName, locationString)); - recipData.getSavedLocations().put(player.getName() + ":" + locationName,sendLocation); + player.sendMessage(ChatColor.GREEN + + String.format("Shared %s with %s", locationName, recipientName)); + recipient.sendMessage( + ChatColor.GREEN + String.format("%s has shared a location: %s (%s)", + player.getName(), locationName, locationString)); + recipData.getSavedLocations().put(player.getName() + ":" + locationName, + sendLocation); break; } default: From 898eb4d48733e19c927c3ea1c5c4f2ac06fe9984 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Fri, 6 Nov 2020 00:58:39 -0800 Subject: [PATCH 44/83] docs: add documentation for setting up environment --- README.md | 4 +++ SETUP.md | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 SETUP.md diff --git a/README.md b/README.md index 9030e044..7686cc9e 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ Main plugin for the Hack Club Minecraft server. +## Setup + +See the `./SETUP.md` documentation to help you get a development environment started! + ## License [MIT License](LICENSE.txt) diff --git a/SETUP.md b/SETUP.md new file mode 100644 index 00000000..ec11b526 --- /dev/null +++ b/SETUP.md @@ -0,0 +1,99 @@ +# SETUP + +## Setup + +For the purposes of this guide we'll designate the `~/minecraft-server` and `~/HCCore` directories for the locations of the minecraft (paper) server, and the HCCore source code. Of course, you don't have to put the files in the same place + +### 1. Start Minecraft Paper Server + +[Download Paper](https://papermc.io/downloads) (build #261 at the time of writing) and place the resulting jar to `~/minecraft-server` + +Start the server and check that it works properly + +```sh +java -Xms2G -Xmx2G -jar paper-261.jar --nogui +``` + +Something like the following should be outputed to the console + +```txt +This server is running Paper version git-Paper-261 (MC: 1.16.4) (Implementing API version 1.16.4-R0.1-SNAPSHOT) +``` + +You'll notice other files and folders like `folder`, `whitelist.json`, etc. are created + +To join the server, launch your Minecraft client, and click `[Direct Connection]` -> and enter `localhost` to 'Server Address'. Notice that the `/color` command doesn't work (it will work once we add the HCCore plugin) + +#### 2. Download and Build HCCore + +Ensure [maven](https://maven.apache.org/download.cgi) is installed + +```sh +git clone https://github.com/hackclub/HCCore +cd HCCore +mvn package +``` + +#### 3. Copy the Built HCCore Plugin to the Minecraft Paper Server + +```sh +cp ~/HCCore/target/HCCore.jar ~/minecraft-server/plugins +``` + +On launch, you should recieve an error: + +```txt +[00:33:58 ERROR]: Could not load 'plugins/HCCore.jar' in folder 'plugins' +org.bukkit.plugin.UnknownDependencyException: Unknown dependency ProtocolLib. Please download and install ProtocolLib to run this plugin. + at org.bukkit.plugin.SimplePluginManager.loadPlugins(SimplePluginManager.java:272) ~[patched_1.16.4.jar:git-Paper-261] + at org.bukkit.craftbukkit.v1_16_R3.CraftServer.loadPlugins(CraftServer.java:389) ~[patched_1.16.4.jar:git-Paper-261] + at net.minecraft.server.v1_16_R3.DedicatedServer.init(DedicatedServer.java:206) ~[patched_1.16.4.jar:git-Paper-261] + at net.minecraft.server.v1_16_R3.MinecraftServer.w(MinecraftServer.java:939) ~[patched_1.16.4.jar:git-Paper-261] + at net.minecraft.server.v1_16_R3.MinecraftServer.lambda$a$0(MinecraftServer.java:177) ~[patched_1.16.4.jar:git-Paper-261] + at java.lang.Thread.run(Thread.java:834) [?:?] +``` + +We fix this by [installing ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997/) + +```sh +mv ~/Downloads/ProtocolLib.jar ~/minecraft-server/plugins +``` + +Note: Make sure you stop the server and restart it for the plugins to properly load + +BOOM! Now we can connect with our Minecraft client and test/use the plugin + +```text +-> wilde_fox joined the game +/color +-> /color [color] +``` + +#### 4. Install BileTools + +We can use BileTools to hot-reload our plugin. BileTools looks for changes in the directory, and when it detects that a `.jar` file has changed, it will reload that plugin + +You can test this out by modifying the strings in `player.getServer().broadcastMessage()` in `src/main/java/com/hackclub/hccore/listeners/AFKListener.java` + +Once you have made your modifications, rebuild + +``` +cd ~/HCCore +mvn package +cp ~/HCCore/target/HCCore.jar ~/minecraft-server/plugins +``` + +Without closing the server, your console should look like the following + +```text +[00:47:50 INFO]: [BileTools] File change detected: HCCore.jar +[00:47:50 INFO]: [BileTools] Identified Plugin: HCCore <-> HCCore.jar +[00:47:50 INFO]: [BileTools] Reloading: HCCore +[00:47:50 INFO]: Backed up HCCore 1.0.0 +[00:47:50 INFO]: [Bile]: Unloading HCCore +[00:47:50 INFO]: [HCCore] Disabling HCCore v1.0.0 +[00:47:50 INFO]: [Bile]: Loading HCCore 1.0.0 +[00:47:50 INFO]: [HCCore] Enabling HCCore v1.0.0 +[00:47:50 INFO]: Reloading ResourceManager: Default, bukkit +[00:47:50 INFO]: Loaded 7 recipes +``` From fdbd9b7c1e605fcebc1b92c8451c8b054d32cfa1 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Sat, 7 Nov 2020 00:13:22 -0800 Subject: [PATCH 45/83] Fix typos --- SETUP.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SETUP.md b/SETUP.md index ec11b526..ca95aff4 100644 --- a/SETUP.md +++ b/SETUP.md @@ -14,7 +14,7 @@ Start the server and check that it works properly java -Xms2G -Xmx2G -jar paper-261.jar --nogui ``` -Something like the following should be outputed to the console +Something like the following should be outputted to the console ```txt This server is running Paper version git-Paper-261 (MC: 1.16.4) (Implementing API version 1.16.4-R0.1-SNAPSHOT) @@ -40,7 +40,7 @@ mvn package cp ~/HCCore/target/HCCore.jar ~/minecraft-server/plugins ``` -On launch, you should recieve an error: +On launch, you should receive an error: ```txt [00:33:58 ERROR]: Could not load 'plugins/HCCore.jar' in folder 'plugins' From 0f61260b73089a6436c7f55914b614703d72b277 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Sat, 7 Nov 2020 00:15:50 -0800 Subject: [PATCH 46/83] Make heading levels descend by one --- SETUP.md | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/SETUP.md b/SETUP.md index ca95aff4..5f9c6093 100644 --- a/SETUP.md +++ b/SETUP.md @@ -1,10 +1,8 @@ -# SETUP - -## Setup +# Setup For the purposes of this guide we'll designate the `~/minecraft-server` and `~/HCCore` directories for the locations of the minecraft (paper) server, and the HCCore source code. Of course, you don't have to put the files in the same place -### 1. Start Minecraft Paper Server +## 1. Start Minecraft Paper Server [Download Paper](https://papermc.io/downloads) (build #261 at the time of writing) and place the resulting jar to `~/minecraft-server` @@ -24,7 +22,7 @@ You'll notice other files and folders like `folder`, `whitelist.json`, etc. are To join the server, launch your Minecraft client, and click `[Direct Connection]` -> and enter `localhost` to 'Server Address'. Notice that the `/color` command doesn't work (it will work once we add the HCCore plugin) -#### 2. Download and Build HCCore +## 2. Download and Build HCCore Ensure [maven](https://maven.apache.org/download.cgi) is installed @@ -34,7 +32,7 @@ cd HCCore mvn package ``` -#### 3. Copy the Built HCCore Plugin to the Minecraft Paper Server +## 3. Copy the Built HCCore Plugin to the Minecraft Paper Server ```sh cp ~/HCCore/target/HCCore.jar ~/minecraft-server/plugins @@ -69,7 +67,7 @@ BOOM! Now we can connect with our Minecraft client and test/use the plugin -> /color [color] ``` -#### 4. Install BileTools +## 4. Install BileTools We can use BileTools to hot-reload our plugin. BileTools looks for changes in the directory, and when it detects that a `.jar` file has changed, it will reload that plugin From 8c6dbf2855625cc2b313d9c22e9bc133e043cb52 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Sat, 7 Nov 2020 00:16:39 -0800 Subject: [PATCH 47/83] Replace "l" with vertical bar in usage message --- SETUP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SETUP.md b/SETUP.md index 5f9c6093..8576d772 100644 --- a/SETUP.md +++ b/SETUP.md @@ -64,7 +64,7 @@ BOOM! Now we can connect with our Minecraft client and test/use the plugin ```text -> wilde_fox joined the game /color --> /color [color] +-> /color [color] ``` ## 4. Install BileTools From 991419f022e46da64a7fb3e2b4029110cae1a4ed Mon Sep 17 00:00:00 2001 From: Zane Davis-Barrs Date: Wed, 11 Nov 2020 18:51:28 -0800 Subject: [PATCH 48/83] Update point-of-contact Also ran formatter --- .../hccore/listeners/PlayerListener.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index 34e2a3cb..160a59c0 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -2,10 +2,6 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; -import net.md_5.bungee.api.chat.BaseComponent; -import net.md_5.bungee.api.chat.ComponentBuilder; -import net.md_5.bungee.api.chat.TextComponent; -import net.md_5.bungee.api.chat.HoverEvent; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -18,6 +14,9 @@ import org.bukkit.event.player.PlayerLoginEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerRespawnEvent; +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 PlayerListener implements Listener { private final HCCorePlugin plugin; @@ -53,24 +52,27 @@ public void onPlayerDeath(final PlayerDeathEvent event) { @EventHandler public void onAsyncPlayerChat(final AsyncPlayerChatEvent event) { - + // Apply the player's chat color to the message and translate color codes - + PlayerData data = this.plugin.getDataManager().getData(event.getPlayer()); net.md_5.bungee.api.ChatColor messageColor = data.getMessageColor().asBungee(); net.md_5.bungee.api.ChatColor nameColor = data.getNameColor().asBungee(); - + TextComponent nameComponent = new TextComponent(event.getPlayer().getDisplayName()); nameComponent.setColor(nameColor); - nameComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(event.getPlayer().getName()).create())); - + nameComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + new ComponentBuilder(event.getPlayer().getName()).create())); + TextComponent arrowComponent = new TextComponent(" » "); arrowComponent.setColor(ChatColor.GOLD.asBungee()); - - TextComponent playerChatComponent = new TextComponent(ChatColor.translateAlternateColorCodes('&', event.getMessage())); + + TextComponent playerChatComponent = + new TextComponent(ChatColor.translateAlternateColorCodes('&', event.getMessage())); playerChatComponent.setColor(messageColor); - - this.plugin.getServer().spigot().broadcast(nameComponent, arrowComponent, playerChatComponent); + + this.plugin.getServer().spigot().broadcast(nameComponent, arrowComponent, + playerChatComponent); event.setCancelled(true); } @@ -104,8 +106,7 @@ public void onPlayerLogin(final PlayerLoginEvent event) { message = ChatColor.RED + ChatColor.BOLD.toString() + "You’ve been banned :(\n\n" + ChatColor.RESET + ChatColor.WHITE + "If you believe this was a mistake, please DM " + ChatColor.AQUA - + "@ifvictr " + ChatColor.WHITE + "or " + ChatColor.AQUA + "@Luke " - + ChatColor.WHITE + "on Slack."; + + "@zane " + ChatColor.WHITE + "on Slack."; break; case KICK_FULL: message = ChatColor.RED + ChatColor.BOLD.toString() + "The server is full!\n\n" @@ -116,8 +117,7 @@ public void onPlayerLogin(final PlayerLoginEvent event) { message = ChatColor.RED + ChatColor.BOLD.toString() + "You’re not whitelisted!\n\n" + ChatColor.RESET + ChatColor.WHITE + "Join " + ChatColor.AQUA + "#minecraft " + ChatColor.WHITE + "on Slack and ping " + ChatColor.AQUA - + "@ifvictr " + ChatColor.WHITE + "or " + ChatColor.AQUA + "@Luke " - + ChatColor.WHITE + "to be added."; + + "@zane " + ChatColor.WHITE + "to be added."; break; default: break; From ad0517eede11629eb315197c50e958b657127ede Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 13:37:24 -0800 Subject: [PATCH 49/83] fix: modify SETUP for Gradle --- SETUP.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/SETUP.md b/SETUP.md index 8576d772..29475d85 100644 --- a/SETUP.md +++ b/SETUP.md @@ -24,24 +24,29 @@ To join the server, launch your Minecraft client, and click `[Direct Connection] ## 2. Download and Build HCCore -Ensure [maven](https://maven.apache.org/download.cgi) is installed +We use [Gradle](https://gradle.org/install) for dependency management and as a build time tool ```sh git clone https://github.com/hackclub/HCCore cd HCCore -mvn package + +# linux +./gradlew build + +# windows +./gradlew.bat build ``` ## 3. Copy the Built HCCore Plugin to the Minecraft Paper Server ```sh -cp ~/HCCore/target/HCCore.jar ~/minecraft-server/plugins +cp ~/HCCore/build/libs/HCCore-Shadow.jar ~/minecraft-server/plugins ``` On launch, you should receive an error: ```txt -[00:33:58 ERROR]: Could not load 'plugins/HCCore.jar' in folder 'plugins' +[00:33:58 ERROR]: Could not load 'plugins/HCCore-Shadow.jar' in folder 'plugins' org.bukkit.plugin.UnknownDependencyException: Unknown dependency ProtocolLib. Please download and install ProtocolLib to run this plugin. at org.bukkit.plugin.SimplePluginManager.loadPlugins(SimplePluginManager.java:272) ~[patched_1.16.4.jar:git-Paper-261] at org.bukkit.craftbukkit.v1_16_R3.CraftServer.loadPlugins(CraftServer.java:389) ~[patched_1.16.4.jar:git-Paper-261] @@ -77,8 +82,8 @@ Once you have made your modifications, rebuild ``` cd ~/HCCore -mvn package -cp ~/HCCore/target/HCCore.jar ~/minecraft-server/plugins +./gradlew build +cp ~/HCCore/build/libs/HCCore-Shadow.jar ~/minecraft-server/plugins ``` Without closing the server, your console should look like the following From 59e7dd711810de4bcdfe0c21febcc30614443f7b Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Fri, 6 Nov 2020 23:55:33 -0800 Subject: [PATCH 50/83] Download 1.16.4 server JAR on Travis builds Cherry picked from 4d90bab29e817799c964a4603149af85532c43b1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f5504e32..781e5afa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jdk: openjdk11 install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - - java -jar BuildTools.jar --rev 1.16.1 > /dev/null + - java -jar BuildTools.jar --rev 1.16.4 > /dev/null - ./gradlew build -s before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock From 975b67f21fc29d83d3ed38727333037b04717cf8 Mon Sep 17 00:00:00 2001 From: Victor Truong Date: Sat, 7 Nov 2020 00:05:16 -0800 Subject: [PATCH 51/83] Depend on 1.16.4 (cherry picked from commit 6508943a5bf85e548f01f7743e12742673626408) --- build.gradle | 4 +- pom.xml | 131 ++++++++++++++++++ .../hccore/listeners/AdvancementListener.java | 10 +- 3 files changed, 138 insertions(+), 7 deletions(-) create mode 100644 pom.xml diff --git a/build.gradle b/build.gradle index a77b9f2e..9d45b24b 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,6 @@ dependencies { implementation 'de.tr7zw:item-nbt-api:2.6.0' compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' - compileOnly 'org.spigotmc:spigot-api:1.16.1-R0.1-SNAPSHOT' - compileOnly 'org.spigotmc:spigot:1.16.1-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' } diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..a8378625 --- /dev/null +++ b/pom.xml @@ -0,0 +1,131 @@ + + + 4.0.0 + com.hackclub.hccore + HCCore + 1.0.0 + jar + HCCore + + 1.8 + 1.8 + UTF-8 + + + + com.github.Trigary + AdvancementCreator + v2.0 + + + com.google.code.gson + gson + 2.8.6 + + + de.tr7zw + item-nbt-api + 2.6.0 + + + com.comphenix.protocol + ProtocolLib + 4.5.1 + provided + + + org.spigotmc + spigot + 1.16.4-R0.1-SNAPSHOT + provided + + + org.spigotmc + spigot-api + 1.16.4-R0.1-SNAPSHOT + provided + + + + + codemc-repo + https://repo.codemc.org/repository/maven-public/ + + + dmulloy2-repo + https://repo.dmulloy2.net/nexus/repository/public/ + + + jitpack.io + https://jitpack.io + + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + + + ${project.name} + + + true + src/main/resources + + config.yml + plugin.yml + + + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + 2.8.0 + + recommended_2008_06 + artifactId + + + + + sort + + verify + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + false + + + de.tr7zw.changeme.nbtapi + com.hackclub.nbtapi + + + + + + + shade + + package + + + + + ${project.basedir}/src/main/java + + diff --git a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java index 0b9a6ee5..b5751cdf 100644 --- a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java @@ -7,7 +7,7 @@ import org.bukkit.Statistic; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; -import org.bukkit.craftbukkit.v1_16_R1.advancement.CraftAdvancement; +import org.bukkit.craftbukkit.v1_16_R3.advancement.CraftAdvancement; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -19,9 +19,9 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import net.minecraft.server.v1_16_R1.AdvancementDisplay; -import net.minecraft.server.v1_16_R1.AdvancementFrameType; -import net.minecraft.server.v1_16_R1.IChatBaseComponent; +import net.minecraft.server.v1_16_R3.AdvancementDisplay; +import net.minecraft.server.v1_16_R3.AdvancementFrameType; +import net.minecraft.server.v1_16_R3.IChatBaseComponent; public class AdvancementListener implements Listener { private final HCCorePlugin plugin; @@ -137,7 +137,7 @@ public void onPlayerAdvancementDone(final PlayerAdvancementDoneEvent event) { try { // NOTE: We interface with Minecraft's internal code here. It is unlikely, but possible // for it to break in the case of a future upgrade. - net.minecraft.server.v1_16_R1.Advancement nmsAdvancement = + net.minecraft.server.v1_16_R3.Advancement nmsAdvancement = ((CraftAdvancement) advancement).getHandle(); AdvancementDisplay display = nmsAdvancement.c(); From 39e707b8c36c1ac4b6513d54828956dab9b63d25 Mon Sep 17 00:00:00 2001 From: Edwin Kofler <24364012+eankeen@users.noreply.github.com> Date: Thu, 12 Nov 2020 13:50:38 -0800 Subject: [PATCH 52/83] fix: actually merge properly --- pom.xml | 131 -------------------------------------------------------- 1 file changed, 131 deletions(-) delete mode 100644 pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index a8378625..00000000 --- a/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - 4.0.0 - com.hackclub.hccore - HCCore - 1.0.0 - jar - HCCore - - 1.8 - 1.8 - UTF-8 - - - - com.github.Trigary - AdvancementCreator - v2.0 - - - com.google.code.gson - gson - 2.8.6 - - - de.tr7zw - item-nbt-api - 2.6.0 - - - com.comphenix.protocol - ProtocolLib - 4.5.1 - provided - - - org.spigotmc - spigot - 1.16.4-R0.1-SNAPSHOT - provided - - - org.spigotmc - spigot-api - 1.16.4-R0.1-SNAPSHOT - provided - - - - - codemc-repo - https://repo.codemc.org/repository/maven-public/ - - - dmulloy2-repo - https://repo.dmulloy2.net/nexus/repository/public/ - - - jitpack.io - https://jitpack.io - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - ${project.name} - - - true - src/main/resources - - config.yml - plugin.yml - - - - - - com.github.ekryd.sortpom - sortpom-maven-plugin - 2.8.0 - - recommended_2008_06 - artifactId - - - - - sort - - verify - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - false - - - de.tr7zw.changeme.nbtapi - com.hackclub.nbtapi - - - - - - - shade - - package - - - - - ${project.basedir}/src/main/java - - From a54de44c38b0c409bf53d6175d6b56fc3c4c8823 Mon Sep 17 00:00:00 2001 From: fayd Date: Sat, 26 Jun 2021 19:53:24 +0530 Subject: [PATCH 53/83] Update ping message for new joiners --- src/main/java/com/hackclub/hccore/listeners/PlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index 160a59c0..4612f913 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -117,7 +117,7 @@ public void onPlayerLogin(final PlayerLoginEvent event) { message = ChatColor.RED + ChatColor.BOLD.toString() + "You’re not whitelisted!\n\n" + ChatColor.RESET + ChatColor.WHITE + "Join " + ChatColor.AQUA + "#minecraft " + ChatColor.WHITE + "on Slack and ping " + ChatColor.AQUA - + "@zane " + ChatColor.WHITE + "to be added."; + + "@alx or @eli " + ChatColor.WHITE + "to be added."; break; default: break; From 0a3a163c28a6677e0572819cc2873ef86c009fa1 Mon Sep 17 00:00:00 2001 From: Alex Park Date: Mon, 5 Jul 2021 18:42:14 -0500 Subject: [PATCH 54/83] Remove deploy section as that is broken because of the migration to the new server --- .travis.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 781e5afa..50b17cbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,3 @@ cache: - "$HOME/CraftBukkit" - "$HOME/Spigot" - "$HOME/work" -deploy: - - provider: releases - api_key: - secure: ErgchoYWtI7M7RMpPoH9tAS4p6cznME8YIbJEo4kfjD5d0/BCmocejg6aIY0qb7TdwxrYJua8re07HWOTDB4Glr12sQNnL6sDeQs1deXPPmpplPm8/8yA7fck9elPKTdAuvlZu/f7rBxNCXF+Zpz6b+K0m5ICrKbalBkwnqH6xgSH3Lu91zzkt+ChaWkD9dgwlBPc8KqWwMwXVutOqszHDnqhp14chUpR+KcBz+xYNrMkTbikUl745d6InvAQ3TjfQpxeouYBoOE0WxNi0Wbml+EeO8LGtns1uZQQv1YeLBc8DSdkR7VfJXoWSFjgzfcn0sCPYnvraFIRKflXBH8bJl15LS3FB/8iGjXSX0ea6W4bEWOMya+PiBlEJu2XajaS5bhn/2xSnD+28Umk/9f31mXRBxG9dM/2GNRgiQS+Q8V7ISOPVHk4hVyzcjGNbm962J6nt6FDLDV7la0nQsodecWHDKa4FF9SjhXu3YX017MvzDkFms9nlJE2BI0FWI7TfObZIlLTyJ1p1BvZy6W3nvWuNnOWvwUv5/QExFnOj56sraQJVJnOwJhpkxHtj7aJ8LMeSDzOjwB7V3OaxHcjTrDY2Eua0iayh7O6Tfi8jM59+ucaoffNWpmsNdEQZ+8602258dtV+r/R0LASx2+AP6aVFSte61dvZgoU2eIbnY= - file: target/HCCore.jar - skip_cleanup: true - on: - branch: master - tags: true - - provider: script - script: bash scripts/deploy.sh - skip_cleanup: true - on: - branch: master From c7a1e5beffce9d9d0fe694795ae19b43c08e7756 Mon Sep 17 00:00:00 2001 From: Dolphinbob <32620307+Dolphinbob@users.noreply.github.com> Date: Mon, 24 May 2021 18:46:03 -0500 Subject: [PATCH 55/83] Added Discord integration --- build.gradle | 13 ++ .../com/hackclub/hccore/HCCorePlugin.java | 33 ++-- .../hccore/commands/DiscordCommand.java | 42 +++++ .../hackclub/hccore/discord/DiscordBot.java | 162 ++++++++++++++++++ src/main/resources/config.yml | 6 + src/main/resources/plugin.yml | 3 + 6 files changed, 247 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/hackclub/hccore/commands/DiscordCommand.java create mode 100644 src/main/java/com/hackclub/hccore/discord/DiscordBot.java diff --git a/build.gradle b/build.gradle index 9d45b24b..53a55647 100644 --- a/build.gradle +++ b/build.gradle @@ -6,6 +6,12 @@ plugins { mainClassName = "com.hackclub.hccore.HCCorePluginJava" +compileJava.options.encoding = 'UTF-8' + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + shadowJar { archiveBaseName.set('HCCore-Shadow') archiveClassifier.set('') @@ -31,6 +37,11 @@ repositories { // ProtoLib, org.spigotmc:spigot:1.16 maven { url "https://repo.dmulloy2.net/nexus/repository/public/" } + + maven { + name 'm2-dv8tion' + url 'https://m2.dv8tion.net/releases' + } } dependencies { @@ -41,4 +52,6 @@ dependencies { compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' + + compile 'net.dv8tion:JDA:4.2.1_265' } diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index a342a759..d74300e5 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -2,22 +2,14 @@ import java.util.ArrayList; import java.util.List; +import java.util.logging.Level; + import com.comphenix.protocol.PacketType; import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.ProtocolManager; import com.comphenix.protocol.events.ListenerPriority; -import com.hackclub.hccore.commands.AFKCommand; -import com.hackclub.hccore.commands.ColorCommand; -import com.hackclub.hccore.commands.DownvoteCommand; -import com.hackclub.hccore.commands.LocCommand; -import com.hackclub.hccore.commands.NickCommand; -import com.hackclub.hccore.commands.PingCommand; -import com.hackclub.hccore.commands.ShrugCommand; -import com.hackclub.hccore.commands.SpawnCommand; -import com.hackclub.hccore.commands.StatsCommand; -import com.hackclub.hccore.commands.TableflipCommand; -import com.hackclub.hccore.commands.TutorialCommand; -import com.hackclub.hccore.commands.UpvoteCommand; +import com.hackclub.hccore.commands.*; +import com.hackclub.hccore.discord.DiscordBot; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -27,6 +19,9 @@ import com.hackclub.hccore.tasks.AutoAFKTask; import com.hackclub.hccore.tasks.CheckAdAstraTask; import com.hackclub.hccore.utils.TimeUtil; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.entities.Activity; import org.bukkit.GameRule; import org.bukkit.Material; import org.bukkit.NamespacedKey; @@ -38,9 +33,12 @@ import hu.trigary.advancementcreator.shared.ItemObject; import net.md_5.bungee.api.chat.TextComponent; +import javax.security.auth.login.LoginException; + public class HCCorePlugin extends JavaPlugin { private DataManager dataManager; private ProtocolManager protocolManager; + private DiscordBot bot; @Override public void onEnable() { @@ -56,6 +54,11 @@ public void onEnable() { this.dataManager = new DataManager(this); this.protocolManager = ProtocolLibrary.getProtocolManager(); + + if (this.getConfig().getBoolean("settings.discord-link.enabled")) { + this.bot = new DiscordBot(this); + } + // Register commands this.getCommand("afk").setExecutor(new AFKCommand(this)); this.getCommand("color").setExecutor(new ColorCommand(this)); @@ -71,7 +74,11 @@ public void onEnable() { this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); ======= this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); +<<<<<<< HEAD >>>>>>> 2bb8394 (Added /upvote and /downvote (#103)) +======= + this.getCommand("discord").setExecutor(new DiscordCommand(this)); +>>>>>>> b823cff (Added Discord integration) // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); @@ -102,6 +109,8 @@ public void onEnable() { @Override public void onDisable() { this.getDataManager().unregisterAll(); + this.bot.close(); + this.bot = null; } public DataManager getDataManager() { diff --git a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java new file mode 100644 index 00000000..68cbe7f3 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java @@ -0,0 +1,42 @@ +package com.hackclub.hccore.commands; + +import com.comphenix.protocol.PacketType; +import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.discord.DiscordBot; +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.TextComponent; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.command.TabCompleter; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.xml.soap.Text; +import java.util.List; + +public class DiscordCommand implements CommandExecutor { + private HCCorePlugin plugin; + + public DiscordCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { + String inviteLink = plugin.getConfig().getString("discord-invite-url"); + + TextComponent component = new TextComponent("Join our Discord Server: "); + component.setColor(ChatColor.GREEN.asBungee()); + + TextComponent inviteComponent = new TextComponent(inviteLink); + inviteComponent.setColor(ChatColor.BLUE.asBungee()); + inviteComponent.setClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, inviteLink)); + inviteComponent.setUnderlined(true); + sender.spigot().sendMessage(component, inviteComponent); + + return true; + } +} diff --git a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java new file mode 100644 index 00000000..181fd437 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java @@ -0,0 +1,162 @@ + package com.hackclub.hccore.discord; + +import com.hackclub.hccore.DataManager; +import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.PlayerData; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.JDA; +import net.dv8tion.jda.api.JDABuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.entities.*; +import net.dv8tion.jda.api.events.ReadyEvent; +import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; +import net.dv8tion.jda.api.hooks.ListenerAdapter; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.chat.hover.content.Text; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.craftbukkit.v1_16_R3.advancement.CraftAdvancement; +import org.bukkit.entity.Player; +import org.bukkit.event.*; +import org.bukkit.event.Event; +import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.player.AsyncPlayerChatEvent; +import org.bukkit.event.player.PlayerAdvancementDoneEvent; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerQuitEvent; + +import javax.annotation.Nonnull; +import javax.security.auth.login.LoginException; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; + +public class DiscordBot extends ListenerAdapter implements Listener { + private JDA jda; + private HCCorePlugin plugin; + private TextChannel channel; + private String prefix; + + public DiscordBot(HCCorePlugin plugin) { + this.plugin = plugin; + + JDABuilder builder = JDABuilder.createDefault(this.plugin.getConfig().getString("settings.discord-link.bot-token")); + builder.setActivity(Activity.playing("mc.hackclub.com")); + try { + this.jda = builder.build(); + } catch (LoginException e) { + this.plugin.getLogger().log(Level.SEVERE, "Error logging into Discord!"); + e.printStackTrace(); + } + + jda.addEventListener(this); + plugin.getServer().getPluginManager().registerEvents(this, plugin); + this.prefix = plugin.getConfig().getString("settings.discord-link.bot-prefix"); + } + + @Override + public void onReady(ReadyEvent e) { + this.channel = jda.getTextChannelById(this.plugin.getConfig().getLong("settings.discord-link.channel-id")); + EmbedBuilder embed = new EmbedBuilder(); + embed.setColor(Color.GREEN); + embed.setAuthor("Server Started!"); + this.channel.sendMessage(embed.build()).queue(); + } + + @Override + public void onGuildMessageReceived(GuildMessageReceivedEvent event) { + if (event.getMember() == null || event.getAuthor().equals(jda.getSelfUser())) return; + + if (event.getChannel() == this.channel) { + // list command + if (event.getMessage().getContentRaw().equals(prefix + "list")) { + EmbedBuilder embed = new EmbedBuilder(); + embed.setTitle(Bukkit.getOnlinePlayers().size() + " / " + Bukkit.getMaxPlayers() + " Players Online"); + StringBuilder listBuilder = new StringBuilder(); + Bukkit.getOnlinePlayers().forEach(player -> { + PlayerData data = plugin.getDataManager().getData(player); + listBuilder.append("\n • " + ChatColor.stripColor(data.getDisplayedName())); + }); + embed.setDescription(listBuilder.toString()); + embed.setColor(Color.CYAN); + this.channel.sendMessage(embed.build()).queue(); + return; + } + + TextComponent prefixComponent = new TextComponent("[Discord] "); + prefixComponent.setColor(ChatColor.BLUE.asBungee()); + + TextComponent nameComponent = new TextComponent(event.getMember().getEffectiveName()); + nameComponent.setColor(event.getMember().getColor() != null ? net.md_5.bungee.api.ChatColor.of(event.getMember().getColor()) : ChatColor.WHITE.asBungee()); + nameComponent.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new Text(event.getAuthor().getAsTag()))); + + TextComponent arrowComponent = new TextComponent(" » "); + arrowComponent.setColor(ChatColor.GOLD.asBungee()); + + TextComponent playerChatComponent = + new TextComponent(ChatColor.translateAlternateColorCodes('&', event.getMessage().getContentDisplay())); + playerChatComponent.setColor(ChatColor.WHITE.asBungee()); + plugin.getServer().spigot().broadcast(prefixComponent, nameComponent, arrowComponent, playerChatComponent); + } + } + + @EventHandler(ignoreCancelled = true) + public void onChat(AsyncPlayerChatEvent e) { + PlayerData player = plugin.getDataManager().getData(e.getPlayer()); + channel.sendMessage(ChatColor.stripColor(player.getDisplayedName()) + " » " + ChatColor.stripColor(e.getMessage())).queue(); + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onJoin(PlayerJoinEvent e) { + Player player = e.getPlayer(); + EmbedBuilder embed = new EmbedBuilder(); + embed.setColor(Color.GREEN); + embed.setAuthor(ChatColor.stripColor(player.getDisplayName()) + " joined the game!", null, getAvatarUrl(player)); + channel.sendMessage(embed.build()).queue(); + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onQuit(PlayerQuitEvent e) { + Player player = e.getPlayer(); + EmbedBuilder embed = new EmbedBuilder(); + embed.setColor(Color.RED); + embed.setAuthor(ChatColor.stripColor(player.getDisplayName()) + " left the game!", null, getAvatarUrl(player)); + channel.sendMessage(embed.build()).queue(); + } + + @EventHandler(priority = EventPriority.MONITOR) + public void onDeath(PlayerDeathEvent e) { + EmbedBuilder embed = new EmbedBuilder(); + embed.setColor(Color.BLACK); + embed.setAuthor(e.getDeathMessage(), null, getAvatarUrl(e.getEntity())); + channel.sendMessage(embed.build()).queue(); + } + + /*@EventHandler(priority = EventPriority.MONITOR) + public void onAchievement(PlayerAdvancementDoneEvent e) { + if(e.getAdvancement() == null || e.getAdvancement().getKey().getKey().contains("recipe/") || e.getPlayer() == null) return; + + CraftAdvancement craftAdvancement = (CraftAdvancement) e.getAdvancement(); + String title = craftAdvancement.getHandle().c().a().getText(); + + EmbedBuilder embed = new EmbedBuilder(); + embed.setColor(Color.YELLOW); + embed.setAuthor(ChatColor.stripColor(e.getPlayer().getDisplayName()) + " has made the advancement " + title, null, getAvatarUrl(e.getPlayer())); + channel.sendMessage(embed.build()).queue(); + }*/ + + private String getAvatarUrl(Player player) { + return "https://cravatar.eu/helmavatar/" + player.getUniqueId() + ".png"; + } + + public void close() { + EmbedBuilder embed = new EmbedBuilder(); + embed.setColor(Color.RED); + embed.setAuthor("Server Stopped!"); + this.channel.sendMessage(embed.build()).queue(); + this.jda.shutdown(); + } +} diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 46a6f5b6..f4ef9de9 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,6 @@ # URL to request form to claim exclusive Hack Club stickers claim-stickers-url: "https://example.com/claim-stickers" +discord-invite-url: "discord.gg/example" settings: # Time in seconds after which a player will be automatically set to AFK auto-afk-time: 600 @@ -9,3 +10,8 @@ settings: allowed-radius: 2000 # Time in seconds a player has to wait before being able to use the command again damage-cooldown: 10 + discord-link: + enabled: false + bot-token: "" + channel-id: 00000000000000 + bot-prefix: "/" diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5d084461..d212fceb 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -41,3 +41,6 @@ commands: upvote: description: Appends an upvote to your message usage: /upvote [message] + discord: + description: Gets the invite link to the Hackclub Minecraft Community Discord server + usage: /discord From 85d7f645f953cf0d220206f850a446289ca39a5d Mon Sep 17 00:00:00 2001 From: Dolphinbob <32620307+Dolphinbob@users.noreply.github.com> Date: Sat, 19 Jun 2021 17:53:49 -0500 Subject: [PATCH 56/83] Update to 1.17 --- build.gradle | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- .../hackclub/hccore/commands/DiscordCommand.java | 8 -------- .../com/hackclub/hccore/discord/DiscordBot.java | 1 - .../hccore/listeners/AdvancementListener.java | 13 +++++++------ 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 53a55647..db3adb1b 100644 --- a/build.gradle +++ b/build.gradle @@ -47,11 +47,11 @@ repositories { dependencies { implementation 'com.github.Trigary:AdvancementCreator:v2.0' implementation 'com.google.code.gson:gson:2.8.6' - implementation 'de.tr7zw:item-nbt-api:2.6.0' + implementation 'de.tr7zw:item-nbt-api:2.8.0' compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' - compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' - compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT' - compile 'net.dv8tion:JDA:4.2.1_265' + compileOnly 'net.dv8tion:JDA:4.2.1_265' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index be52383e..f371643e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java index 68cbe7f3..b0b38d0c 100644 --- a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java @@ -1,21 +1,13 @@ package com.hackclub.hccore.commands; -import com.comphenix.protocol.PacketType; import com.hackclub.hccore.HCCorePlugin; -import com.hackclub.hccore.discord.DiscordBot; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.command.TabCompleter; -import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.xml.soap.Text; -import java.util.List; public class DiscordCommand implements CommandExecutor { private HCCorePlugin plugin; diff --git a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java index 181fd437..71923007 100644 --- a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java +++ b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java @@ -17,7 +17,6 @@ import net.md_5.bungee.api.chat.hover.content.Text; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import org.bukkit.craftbukkit.v1_16_R3.advancement.CraftAdvancement; import org.bukkit.entity.Player; import org.bukkit.event.*; import org.bukkit.event.Event; diff --git a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java index b5751cdf..7c75a42e 100644 --- a/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/AdvancementListener.java @@ -1,13 +1,16 @@ package com.hackclub.hccore.listeners; import com.hackclub.hccore.HCCorePlugin; +import net.minecraft.advancements.AdvancementDisplay; +import net.minecraft.advancements.AdvancementFrameType; +import net.minecraft.network.chat.IChatBaseComponent; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.Statistic; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; -import org.bukkit.craftbukkit.v1_16_R3.advancement.CraftAdvancement; +import org.bukkit.craftbukkit.v1_17_R1.advancement.CraftAdvancement; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; @@ -19,9 +22,6 @@ import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import net.minecraft.server.v1_16_R3.AdvancementDisplay; -import net.minecraft.server.v1_16_R3.AdvancementFrameType; -import net.minecraft.server.v1_16_R3.IChatBaseComponent; public class AdvancementListener implements Listener { private final HCCorePlugin plugin; @@ -101,7 +101,8 @@ public void onEntityToggleGlide(final EntityToggleGlideEvent event) { Player player = (Player) event.getEntity(); - // Check the player has flown over 1m miles (1,609,344 km) + // Check the player has flown over 1m miles (1,609,344 km)import org.bukkit.craftbukkit.v1_17_R1.advancement.CraftAdvancement; + final int CM_PER_MILE = 160934; if (player.getStatistic(Statistic.AVIATE_ONE_CM) <= (1000000 * CM_PER_MILE)) { return; @@ -137,7 +138,7 @@ public void onPlayerAdvancementDone(final PlayerAdvancementDoneEvent event) { try { // NOTE: We interface with Minecraft's internal code here. It is unlikely, but possible // for it to break in the case of a future upgrade. - net.minecraft.server.v1_16_R3.Advancement nmsAdvancement = + net.minecraft.advancements.Advancement nmsAdvancement = ((CraftAdvancement) advancement).getHandle(); AdvancementDisplay display = nmsAdvancement.c(); From 5128823ccf94a8c4a69b28cbf2388ff92aa1ec27 Mon Sep 17 00:00:00 2001 From: Dolphinbob <32620307+Dolphinbob@users.noreply.github.com> Date: Sat, 19 Jun 2021 20:01:56 -0500 Subject: [PATCH 57/83] Fixed build.gradle to include JDA in the jar --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index db3adb1b..2fe189af 100644 --- a/build.gradle +++ b/build.gradle @@ -48,10 +48,9 @@ dependencies { implementation 'com.github.Trigary:AdvancementCreator:v2.0' implementation 'com.google.code.gson:gson:2.8.6' implementation 'de.tr7zw:item-nbt-api:2.8.0' + implementation 'net.dv8tion:JDA:4.2.1_265' compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT' - - compileOnly 'net.dv8tion:JDA:4.2.1_265' } From 0f8cc906354be46722ec3b507839eb4d12f54b2a Mon Sep 17 00:00:00 2001 From: Eli <32620307+Dolphinbob@users.noreply.github.com> Date: Mon, 5 Jul 2021 19:11:45 -0500 Subject: [PATCH 58/83] Update the travis for 1.17 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 50b17cbc..8f07faa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ dist: focal language: java -jdk: openjdk11 +jdk: openjdk16 install: true script: - wget -O BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar - - java -jar BuildTools.jar --rev 1.16.4 > /dev/null + - java -jar BuildTools.jar --rev 1.17 > /dev/null - ./gradlew build -s before_cache: - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock From 8068b72f32026ac9edc11ab791f8dc0024cb65c0 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:11:26 -0500 Subject: [PATCH 59/83] Added /tutorial to plugins.yml --- src/main/resources/plugin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d212fceb..82644d7f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -44,3 +44,6 @@ commands: discord: description: Gets the invite link to the Hackclub Minecraft Community Discord server usage: /discord + tutorial: + description: Greets new users to the server + usage: /tutorial From 8e78ea70d59c9da2e985ce21a484c27596aaca15 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:41:25 -0500 Subject: [PATCH 60/83] Added tutorial command to PlayerListener.java --- .../java/com/hackclub/hccore/HCCorePlugin.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index d74300e5..d11bc9c1 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -10,6 +10,16 @@ import com.comphenix.protocol.events.ListenerPriority; import com.hackclub.hccore.commands.*; import com.hackclub.hccore.discord.DiscordBot; +import com.hackclub.hccore.commands.AFKCommand; +import com.hackclub.hccore.commands.ColorCommand; +import com.hackclub.hccore.commands.LocCommand; +import com.hackclub.hccore.commands.NickCommand; +import com.hackclub.hccore.commands.PingCommand; +import com.hackclub.hccore.commands.ShrugCommand; +import com.hackclub.hccore.commands.SpawnCommand; +import com.hackclub.hccore.commands.StatsCommand; +import com.hackclub.hccore.commands.TableflipCommand; +import com.hackclub.hccore.commands.TutorialCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -70,15 +80,10 @@ public void onEnable() { this.getCommand("spawn").setExecutor(new SpawnCommand(this)); this.getCommand("stats").setExecutor(new StatsCommand(this)); this.getCommand("tableflip").setExecutor(new TableflipCommand(this)); -<<<<<<< HEAD this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); -======= this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); -<<<<<<< HEAD ->>>>>>> 2bb8394 (Added /upvote and /downvote (#103)) -======= this.getCommand("discord").setExecutor(new DiscordCommand(this)); ->>>>>>> b823cff (Added Discord integration) + this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); From 17396c7a7bb218ab73482260da337cee00f2842d Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:11:03 -0500 Subject: [PATCH 61/83] Created TutorialCommand.java --- .../hccore/commands/TutorialCommand.java | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/main/java/com/hackclub/hccore/commands/TutorialCommand.java diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java new file mode 100644 index 00000000..0f05cd90 --- /dev/null +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -0,0 +1,31 @@ +package com.hackclub.hccore.commands; + +import com.hackclub.hccore.HCCorePlugin; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +public class TutorialCommand implements CommandExecutor { + private static final String message = "(╯°□°）╯︵ ┻━┻ toutoral uwu owo"; + + private final HCCorePlugin plugin; + + public TutorialCommand(HCCorePlugin plugin) { + this.plugin = plugin; + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.RED + "You must be a player to use this"); + return true; + } + + Player player = (Player) sender; + sender.sendMessage(ChatColor.RED + TutorialCommand.message); + + return true; + } +} From a40c395b28d96e6f7f281debf815966ad4710418 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:11:26 -0500 Subject: [PATCH 62/83] Added /tutorial to plugins.yml --- src/main/resources/plugin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 1be3c90d..7b22b428 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -41,3 +41,6 @@ commands: discord: description: Gets the invite link to the Hackclub Minecraft Community Discord server usage: /discord + tutorial: + description: Greets new users to the server + usage: /tutorial From d0c058794893670bdf8286b148653f79600db9de Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:41:25 -0500 Subject: [PATCH 63/83] Added tutorial command to PlayerListener.java --- src/main/java/com/hackclub/hccore/HCCorePlugin.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index bcc74085..31df38a2 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -10,6 +10,16 @@ import com.comphenix.protocol.events.ListenerPriority; import com.hackclub.hccore.commands.*; import com.hackclub.hccore.discord.DiscordBot; +import com.hackclub.hccore.commands.AFKCommand; +import com.hackclub.hccore.commands.ColorCommand; +import com.hackclub.hccore.commands.LocCommand; +import com.hackclub.hccore.commands.NickCommand; +import com.hackclub.hccore.commands.PingCommand; +import com.hackclub.hccore.commands.ShrugCommand; +import com.hackclub.hccore.commands.SpawnCommand; +import com.hackclub.hccore.commands.StatsCommand; +import com.hackclub.hccore.commands.TableflipCommand; +import com.hackclub.hccore.commands.TutorialCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -72,6 +82,7 @@ public void onEnable() { this.getCommand("tableflip").setExecutor(new TableflipCommand(this)); this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); this.getCommand("discord").setExecutor(new DiscordCommand(this)); + this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); From 91f5ead55d64df4fe5db584416c1b328124c5d8f Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 13:56:21 -0500 Subject: [PATCH 64/83] Finished /tutorial command --- .../java/com/hackclub/hccore/commands/TutorialCommand.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 0f05cd90..6e43a243 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; public class TutorialCommand implements CommandExecutor { - private static final String message = "(╯°□°）╯︵ ┻━┻ toutoral uwu owo"; + private static final String[] message = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:\n", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; private final HCCorePlugin plugin; @@ -24,7 +24,9 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String } Player player = (Player) sender; - sender.sendMessage(ChatColor.RED + TutorialCommand.message); + for (String i : TutorialCommand.message) { + sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + i); + } return true; } From 50505cd848feca1bd667f2c7db7990bf7822e8d9 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 13:58:02 -0500 Subject: [PATCH 65/83] Run /tutorial when new players join --- .../java/com/hackclub/hccore/listeners/PlayerListener.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index 51f8c8a4..4612f913 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -87,7 +87,11 @@ public void onPlayerJoin(final PlayerJoinEvent event) { event.getPlayer().resetTitle(); event.setJoinMessage(ChatColor.YELLOW + ChatColor.stripColor(event.getPlayer().getDisplayName()) + " joined the game"); - } + + if (event.getPlayer().hasPlayedBefore() == false) { + event.getPlayer().performCommand("tutorial"); + } + } @EventHandler public void onPlayerLogin(final PlayerLoginEvent event) { From 4d03fb3385c899250ce9704836d405ca74a4bd4a Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 19:45:57 -0500 Subject: [PATCH 66/83] capitalized name of static array message --- .../java/com/hackclub/hccore/commands/TutorialCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 6e43a243..f65157fd 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; public class TutorialCommand implements CommandExecutor { - private static final String[] message = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:\n", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; + private static final String[] MESSAGE = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; private final HCCorePlugin plugin; @@ -24,8 +24,8 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String } Player player = (Player) sender; - for (String i : TutorialCommand.message) { - sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + i); + for (String message : TutorialCommand.MESSAGE) { + sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); } return true; From 3dfda39d4ac5ca2214aa35c04f9ce9a338f422da Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:11:16 -0500 Subject: [PATCH 67/83] Get rid of unused variable player --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index f65157fd..5c8ed1b3 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -23,7 +23,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String return true; } - Player player = (Player) sender; for (String message : TutorialCommand.MESSAGE) { sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); } From 8aeb7de9b3dffd0138f3520f7c1dbe544fd41998 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:12:42 -0500 Subject: [PATCH 68/83] Moved for loop into if else statement --- .../com/hackclub/hccore/commands/TutorialCommand.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 5c8ed1b3..f674e382 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -21,11 +21,13 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String if (!(sender instanceof Player)) { sender.sendMessage(ChatColor.RED + "You must be a player to use this"); return true; + } else { + for (String message : TutorialCommand.MESSAGE) { + sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); + } } - for (String message : TutorialCommand.MESSAGE) { - sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); - } + return true; } From b334808b99caa098c538aed9a20ca1c3e2e8a8cd Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:17:32 -0500 Subject: [PATCH 69/83] Simplified L26 --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index f674e382..8a96516b 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -23,7 +23,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String return true; } else { for (String message : TutorialCommand.MESSAGE) { - sender.sendMessage(ChatColor.YELLOW + "" + ChatColor.BOLD + message); + sender.sendMessage(ChatColor.YELLOW + ChatColor.BOLD.toString() + message); } } From cca345bf7dd7e15583560ab6bf00b29c10ee3f7d Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Sat, 2 May 2020 21:18:17 -0500 Subject: [PATCH 70/83] Removed extra spaces --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 8a96516b..6f3b59ea 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -27,8 +27,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String } } - - return true; } } From b4de51e35c176938829145d2bbcda38bc20991c7 Mon Sep 17 00:00:00 2001 From: Steggy Date: Thu, 16 Jul 2020 03:07:17 -0400 Subject: [PATCH 71/83] Added /upvote and /downvote (#103) --- src/main/java/com/hackclub/hccore/HCCorePlugin.java | 4 +++- src/main/resources/plugin.yml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index 31df38a2..714c9986 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -12,6 +12,7 @@ import com.hackclub.hccore.discord.DiscordBot; import com.hackclub.hccore.commands.AFKCommand; import com.hackclub.hccore.commands.ColorCommand; +import com.hackclub.hccore.commands.DownvoteCommand; import com.hackclub.hccore.commands.LocCommand; import com.hackclub.hccore.commands.NickCommand; import com.hackclub.hccore.commands.PingCommand; @@ -20,6 +21,7 @@ import com.hackclub.hccore.commands.StatsCommand; import com.hackclub.hccore.commands.TableflipCommand; import com.hackclub.hccore.commands.TutorialCommand; +import com.hackclub.hccore.commands.UpvoteCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -80,9 +82,9 @@ public void onEnable() { this.getCommand("spawn").setExecutor(new SpawnCommand(this)); this.getCommand("stats").setExecutor(new StatsCommand(this)); this.getCommand("tableflip").setExecutor(new TableflipCommand(this)); + this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); this.getCommand("discord").setExecutor(new DiscordCommand(this)); - this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7b22b428..46e46d3b 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -44,3 +44,6 @@ commands: tutorial: description: Greets new users to the server usage: /tutorial + upvote: + description: Appends an upvote to your message + usage: /upvote [message] From 1dfd3e1a72e4a49697de6f87c3d8e47198410fd5 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 01:39:40 -0400 Subject: [PATCH 72/83] Allow spaces in loc command --- .../hackclub/hccore/commands/LocCommand.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index b578dbc2..28f446d1 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -22,6 +22,23 @@ public LocCommand(HCCorePlugin plugin) { this.plugin = plugin; } + /** + * Convert args from startIndex to args.length into a + * space-separated string. + * @param args List of arguments + * @param startIndex The argument to start concatenating from + * @return Concatenated, space-separated argument string. + */ + private String getArgsAsString(String[] args, int startIndex) { + if (startIndex > args.length - 1) return ""; // Invalid starting index + if (args.length < 2) return ""; // Only one arg, hence nothing to concat + String arguments = args[startIndex]; + for (int i = startIndex+1; i < args.length; ++i) { + arguments = String.join(" ", arguments, args[i]); + } + return arguments; + } + @Override public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { if (!(sender instanceof Player)) { @@ -61,12 +78,14 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String break; } if (!data.getSavedLocations().containsKey(locationName)) { + sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; } Location savedLocation = data.getSavedLocations().get(locationName); sender.sendMessage(locationName + ": " + savedLocation.getWorld().getName() + " @ " + + savedLocation.getBlockX() + ", " + savedLocation.getBlockY() + ", " + savedLocation.getBlockZ()); break; @@ -117,6 +136,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "Please specify the location name"); break; } + if (data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "A location with that name already exists"); break; From b463df5e155fa413332e7210c8a5ee8d3857a773 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 19:30:31 -0400 Subject: [PATCH 73/83] Delimit location names with underscores --- .../java/com/hackclub/hccore/commands/LocCommand.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 28f446d1..b97771b0 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -32,10 +32,8 @@ public LocCommand(HCCorePlugin plugin) { private String getArgsAsString(String[] args, int startIndex) { if (startIndex > args.length - 1) return ""; // Invalid starting index if (args.length < 2) return ""; // Only one arg, hence nothing to concat - String arguments = args[startIndex]; - for (int i = startIndex+1; i < args.length; ++i) { - arguments = String.join(" ", arguments, args[i]); - } + + String arguments = String.join("_", Arrays.copyOfRange(args, startIndex, args.length)); return arguments; } @@ -71,7 +69,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String ChatColor.GREEN + "Removed " + locationName + " from saved locations"); break; } - // /loc get + // /loc get case "get": { if (args.length < 2) { sender.sendMessage(ChatColor.RED + "Please specify the location name"); From 2379982fb7ac2e455202029b0296e1b30e699873 Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 19:30:52 -0400 Subject: [PATCH 74/83] Replace argString with locationName --- src/main/java/com/hackclub/hccore/commands/LocCommand.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index b97771b0..5380ba73 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -58,7 +58,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "Please specify the location name"); break; } - + if (!data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; @@ -76,14 +76,12 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String break; } if (!data.getSavedLocations().containsKey(locationName)) { - sender.sendMessage(ChatColor.RED + "No location with that name was found"); break; } Location savedLocation = data.getSavedLocations().get(locationName); sender.sendMessage(locationName + ": " + savedLocation.getWorld().getName() + " @ " - + savedLocation.getBlockX() + ", " + savedLocation.getBlockY() + ", " + savedLocation.getBlockZ()); break; @@ -134,7 +132,6 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "Please specify the location name"); break; } - if (data.getSavedLocations().containsKey(locationName)) { sender.sendMessage(ChatColor.RED + "A location with that name already exists"); break; From 55b65b43d915f0cee05cbd3e0b94b8ce2b3eb30b Mon Sep 17 00:00:00 2001 From: Wei Gao Date: Wed, 15 Apr 2020 22:13:24 -0400 Subject: [PATCH 75/83] Remove getArgAsString, it's not necessary --- .../com/hackclub/hccore/commands/LocCommand.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/commands/LocCommand.java b/src/main/java/com/hackclub/hccore/commands/LocCommand.java index 5380ba73..4704da4c 100644 --- a/src/main/java/com/hackclub/hccore/commands/LocCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/LocCommand.java @@ -22,21 +22,6 @@ public LocCommand(HCCorePlugin plugin) { this.plugin = plugin; } - /** - * Convert args from startIndex to args.length into a - * space-separated string. - * @param args List of arguments - * @param startIndex The argument to start concatenating from - * @return Concatenated, space-separated argument string. - */ - private String getArgsAsString(String[] args, int startIndex) { - if (startIndex > args.length - 1) return ""; // Invalid starting index - if (args.length < 2) return ""; // Only one arg, hence nothing to concat - - String arguments = String.join("_", Arrays.copyOfRange(args, startIndex, args.length)); - return arguments; - } - @Override public boolean onCommand(CommandSender sender, Command cmd, String alias, String[] args) { if (!(sender instanceof Player)) { From b5be2a1f035dd654b367ac535627c47278a0efe8 Mon Sep 17 00:00:00 2001 From: Dolphinbob <32620307+Dolphinbob@users.noreply.github.com> Date: Mon, 24 May 2021 18:46:03 -0500 Subject: [PATCH 76/83] Added Discord integration --- build.gradle | 7 +++++-- src/main/java/com/hackclub/hccore/HCCorePlugin.java | 3 ++- .../com/hackclub/hccore/commands/DiscordCommand.java | 10 ++++++++++ .../java/com/hackclub/hccore/discord/DiscordBot.java | 1 + src/main/resources/plugin.yml | 3 +++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2fe189af..dec412f9 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,9 @@ dependencies { implementation 'net.dv8tion:JDA:4.2.1_265' compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' - compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' - compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT' + + compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' + + compile 'net.dv8tion:JDA:4.2.1_265' } diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index 714c9986..75808365 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -22,6 +22,7 @@ import com.hackclub.hccore.commands.TableflipCommand; import com.hackclub.hccore.commands.TutorialCommand; import com.hackclub.hccore.commands.UpvoteCommand; + import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -85,7 +86,7 @@ public void onEnable() { this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); this.getCommand("discord").setExecutor(new DiscordCommand(this)); - + // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); this.getServer().getPluginManager().registerEvents(new AFKListener(this), this); diff --git a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java index b0b38d0c..d2111d3b 100644 --- a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java @@ -1,6 +1,9 @@ package com.hackclub.hccore.commands; import com.hackclub.hccore.HCCorePlugin; +import com.comphenix.protocol.PacketType; +import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.discord.DiscordBot; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.ChatColor; @@ -8,6 +11,13 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; +import org.bukkit.command.TabCompleter; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import javax.xml.soap.Text; +import java.util.List; + public class DiscordCommand implements CommandExecutor { private HCCorePlugin plugin; diff --git a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java index 71923007..181fd437 100644 --- a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java +++ b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java @@ -17,6 +17,7 @@ import net.md_5.bungee.api.chat.hover.content.Text; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.craftbukkit.v1_16_R3.advancement.CraftAdvancement; import org.bukkit.entity.Player; import org.bukkit.event.*; import org.bukkit.event.Event; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 46e46d3b..f9ac8642 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -47,3 +47,6 @@ commands: upvote: description: Appends an upvote to your message usage: /upvote [message] + discord: + description: Gets the invite link to the Hackclub Minecraft Community Discord server + usage: /discord From c642e80309c51e9737dc35f6689d2c3858bf6265 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:11:26 -0500 Subject: [PATCH 77/83] Added /tutorial to plugins.yml --- src/main/resources/plugin.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index f9ac8642..49c4d5bf 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -50,3 +50,6 @@ commands: discord: description: Gets the invite link to the Hackclub Minecraft Community Discord server usage: /discord + tutorial: + description: Greets new users to the server + usage: /tutorial From 5c20e33f4c2807fd8a3f0fdcf7234df9a2845988 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Thu, 30 Apr 2020 11:41:25 -0500 Subject: [PATCH 78/83] Added tutorial command to PlayerListener.java --- src/main/java/com/hackclub/hccore/HCCorePlugin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hackclub/hccore/HCCorePlugin.java b/src/main/java/com/hackclub/hccore/HCCorePlugin.java index 75808365..a04185e1 100644 --- a/src/main/java/com/hackclub/hccore/HCCorePlugin.java +++ b/src/main/java/com/hackclub/hccore/HCCorePlugin.java @@ -13,6 +13,7 @@ import com.hackclub.hccore.commands.AFKCommand; import com.hackclub.hccore.commands.ColorCommand; import com.hackclub.hccore.commands.DownvoteCommand; + import com.hackclub.hccore.commands.LocCommand; import com.hackclub.hccore.commands.NickCommand; import com.hackclub.hccore.commands.PingCommand; @@ -21,8 +22,8 @@ import com.hackclub.hccore.commands.StatsCommand; import com.hackclub.hccore.commands.TableflipCommand; import com.hackclub.hccore.commands.TutorialCommand; -import com.hackclub.hccore.commands.UpvoteCommand; +import com.hackclub.hccore.commands.UpvoteCommand; import com.hackclub.hccore.listeners.AFKListener; import com.hackclub.hccore.listeners.AdvancementListener; import com.hackclub.hccore.listeners.BeehiveInteractionListener; @@ -86,7 +87,8 @@ public void onEnable() { this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); this.getCommand("upvote").setExecutor(new UpvoteCommand(this)); this.getCommand("discord").setExecutor(new DiscordCommand(this)); - + this.getCommand("tutorial").setExecutor(new TutorialCommand(this)); + // Register event listeners this.getServer().getPluginManager().registerEvents(new AdvancementListener(this), this); this.getServer().getPluginManager().registerEvents(new AFKListener(this), this); From 5dff6a382b94699c8fea69e5a68f1afda3e8e3c6 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Tue, 6 Jul 2021 11:12:34 -0500 Subject: [PATCH 79/83] chore: undo accidental version change --- build.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index dec412f9..2fe189af 100644 --- a/build.gradle +++ b/build.gradle @@ -51,9 +51,6 @@ dependencies { implementation 'net.dv8tion:JDA:4.2.1_265' compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' - - compileOnly 'org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT' - compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT' - - compile 'net.dv8tion:JDA:4.2.1_265' + compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' + compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT' } From db289c29a0b9aa3535316f1b60fb01e7e2e60982 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Tue, 6 Jul 2021 11:19:09 -0500 Subject: [PATCH 80/83] Update src/main/java/com/hackclub/hccore/commands/TutorialCommand.java Co-authored-by: Alex Park --- src/main/java/com/hackclub/hccore/commands/TutorialCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index 6f3b59ea..c0929fa0 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -8,7 +8,7 @@ import org.bukkit.entity.Player; public class TutorialCommand implements CommandExecutor { - private static final String[] MESSAGE = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:", "Be nice.", "No griefing.", "Don't build within 1000 blocks of spawn.", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time."}; + private static final String[] MESSAGE = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:", "Be nice.", "No griefing or stealing", "No mods that give an unfair advantage", "Follow Hackclub CoC", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time and /discord to join the Discord!" + ChatColor.BLUE + ChatColor.BOLD + "Also checkout the modded server!"}; private final HCCorePlugin plugin; From 2889df8b0834327cd9dbb1def521179b8e2ece01 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Tue, 6 Jul 2021 12:09:36 -0500 Subject: [PATCH 81/83] chore: remove broken import --- src/main/java/com/hackclub/hccore/commands/DiscordCommand.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java index 7191cb63..c422701e 100644 --- a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java @@ -16,7 +16,6 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.xml.soap.Text; import java.util.List; From 6bcde1ecebde4495e38eaa18f91af76d5b933cf7 Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Wed, 14 Jul 2021 15:07:30 -0500 Subject: [PATCH 82/83] feat+refactor: separate greeting/rules message --- .../hccore/commands/TutorialCommand.java | 6 ++---- .../hccore/listeners/PlayerListener.java | 19 ++++++++----------- .../hackclub/hccore/utils/TutorialUtil.java | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/hackclub/hccore/utils/TutorialUtil.java diff --git a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java index c0929fa0..6b874348 100644 --- a/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/TutorialCommand.java @@ -1,6 +1,7 @@ package com.hackclub.hccore.commands; import com.hackclub.hccore.HCCorePlugin; +import com.hackclub.hccore.utils.TutorialUtil; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -8,7 +9,6 @@ import org.bukkit.entity.Player; public class TutorialCommand implements CommandExecutor { - private static final String[] MESSAGE = {ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!", "You can use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:", "Be nice.", "No griefing or stealing", "No mods that give an unfair advantage", "Follow Hackclub CoC", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time and /discord to join the Discord!" + ChatColor.BLUE + ChatColor.BOLD + "Also checkout the modded server!"}; private final HCCorePlugin plugin; @@ -22,9 +22,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String sender.sendMessage(ChatColor.RED + "You must be a player to use this"); return true; } else { - for (String message : TutorialCommand.MESSAGE) { - sender.sendMessage(ChatColor.YELLOW + ChatColor.BOLD.toString() + message); - } + TutorialUtil.send((Player) sender, false); } return true; diff --git a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java index 4612f913..6c3da896 100644 --- a/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java +++ b/src/main/java/com/hackclub/hccore/listeners/PlayerListener.java @@ -2,6 +2,10 @@ import com.hackclub.hccore.HCCorePlugin; import com.hackclub.hccore.PlayerData; +import com.hackclub.hccore.utils.TutorialUtil; +import net.md_5.bungee.api.chat.ComponentBuilder; +import net.md_5.bungee.api.chat.HoverEvent; +import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -9,14 +13,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.AsyncPlayerChatEvent; -import org.bukkit.event.player.PlayerJoinEvent; -import org.bukkit.event.player.PlayerLoginEvent; -import org.bukkit.event.player.PlayerQuitEvent; -import org.bukkit.event.player.PlayerRespawnEvent; -import net.md_5.bungee.api.chat.ComponentBuilder; -import net.md_5.bungee.api.chat.HoverEvent; -import net.md_5.bungee.api.chat.TextComponent; +import org.bukkit.event.player.*; public class PlayerListener implements Listener { private final HCCorePlugin plugin; @@ -88,10 +85,10 @@ public void onPlayerJoin(final PlayerJoinEvent event) { event.setJoinMessage(ChatColor.YELLOW + ChatColor.stripColor(event.getPlayer().getDisplayName()) + " joined the game"); - if (event.getPlayer().hasPlayedBefore() == false) { - event.getPlayer().performCommand("tutorial"); - } + if (!event.getPlayer().hasPlayedBefore()) { + TutorialUtil.send(event.getPlayer(), true); } + } @EventHandler public void onPlayerLogin(final PlayerLoginEvent event) { diff --git a/src/main/java/com/hackclub/hccore/utils/TutorialUtil.java b/src/main/java/com/hackclub/hccore/utils/TutorialUtil.java new file mode 100644 index 00000000..fb5a6a7a --- /dev/null +++ b/src/main/java/com/hackclub/hccore/utils/TutorialUtil.java @@ -0,0 +1,18 @@ +package com.hackclub.hccore.utils; +import org.bukkit.ChatColor; +import org.bukkit.entity.Player; + +public class TutorialUtil { + public static final String greeting = ChatColor.RED + "Greetings! Welcome to the Hack Club vanilla Minecraft server!"; + + public static final String[] tutorial = {"Use /nick to set your nick name and /color to set your chat and name colors", ChatColor.RED + "Rules:", "Be nice.", "No griefing or stealing", "No mods that give an unfair advantage", "Follow Hack Club CoC", "If you want to contribute to plugin development head on over to the GitHub: " + ChatColor.RED + "https://github.com/hackclub/HCCore/. ", "Type /tutorial to see this at any time and /discord to join the Discord!" + ChatColor.BLUE + ChatColor.BOLD + "Also check out the modded server - IP: modded-mc.hackclub.com"}; + + public static void send(Player player, boolean withIntro) { + if (withIntro) { + player.sendMessage(ChatColor.YELLOW + ChatColor.BOLD.toString() + greeting); + } + for (String message : tutorial) { + player.sendMessage(ChatColor.YELLOW + ChatColor.BOLD.toString() + message); + } + } +} From 6a5507087b049ac721ddeb613b50628a93c0ff8d Mon Sep 17 00:00:00 2001 From: Jason Antwi-Appah Date: Wed, 14 Jul 2021 15:25:54 -0500 Subject: [PATCH 83/83] style: lint and format --- .vscode/tasks.json | 7 ++++--- build.gradle | 2 +- .../com/hackclub/hccore/commands/DiscordCommand.java | 2 +- .../com/hackclub/hccore/commands/SpawnCommand.java | 2 +- .../com/hackclub/hccore/commands/StatsCommand.java | 10 +++++----- .../java/com/hackclub/hccore/discord/DiscordBot.java | 4 ++-- .../events/player/PlayerAFKStatusChangeEvent.java | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index f070ddcc..d519ee2c 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ { "label": "Build plugin", "type": "shell", - "command": "gradle build", + "command": "./gradlew build", "group": "build", "presentation": { "group": "dev" @@ -15,7 +15,7 @@ "type": "shell", "command": "cp", "args": [ - "${workspaceRoot}/target/HCCore.jar", + "${workspaceRoot}/build/libs/HCCore.jar", "$HOME/server/plugins" ], "group": "build", @@ -33,7 +33,8 @@ "group": { "kind": "build", "isDefault": true - } + }, + "problemMatcher": [] }, { "label": "Start server", diff --git a/build.gradle b/build.gradle index 2fe189af..7d947095 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ dependencies { implementation 'de.tr7zw:item-nbt-api:2.8.0' implementation 'net.dv8tion:JDA:4.2.1_265' - compileOnly 'com.comphenix.protocol:ProtocolLib:4.5.1' + implementation 'com.comphenix.protocol:ProtocolLib:4.5.1' compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT' compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT' } diff --git a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java index c422701e..77f1723b 100644 --- a/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/DiscordCommand.java @@ -20,7 +20,7 @@ public class DiscordCommand implements CommandExecutor { - private HCCorePlugin plugin; + private final HCCorePlugin plugin; public DiscordCommand(HCCorePlugin plugin) { this.plugin = plugin; diff --git a/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java b/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java index dd35868e..e017d40b 100644 --- a/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/SpawnCommand.java @@ -36,7 +36,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String alias, String int distanceFromSpawn = (int) player.getLocation().distance(player.getWorld().getSpawnLocation()); int allowedRadius = - this.plugin.getConfig().getInt("settings.spawn-command.allowed-radius");; + this.plugin.getConfig().getInt("settings.spawn-command.allowed-radius"); if (distanceFromSpawn > allowedRadius) { sender.sendMessage(ChatColor.RED + "You need to be within " + allowedRadius + " blocks from spawn to use this command. Currently, you’re " diff --git a/src/main/java/com/hackclub/hccore/commands/StatsCommand.java b/src/main/java/com/hackclub/hccore/commands/StatsCommand.java index be0d626c..f09368a2 100644 --- a/src/main/java/com/hackclub/hccore/commands/StatsCommand.java +++ b/src/main/java/com/hackclub/hccore/commands/StatsCommand.java @@ -143,13 +143,13 @@ private void sendStatistics(CommandSender sender, Player player, Boolean extende if (extended) { sender.sendMessage("- Distance by elytra: " - + toSIPrefix((double) player.getStatistic(Statistic.AVIATE_ONE_CM)) + "m"); + + toSIPrefix(player.getStatistic(Statistic.AVIATE_ONE_CM)) + "m"); sender.sendMessage("- Distance by minecart: " - + toSIPrefix((double) player.getStatistic(Statistic.MINECART_ONE_CM)) + "m"); + + toSIPrefix(player.getStatistic(Statistic.MINECART_ONE_CM)) + "m"); sender.sendMessage("- Distance by horse: " - + toSIPrefix((double) player.getStatistic(Statistic.HORSE_ONE_CM)) + "m"); + + toSIPrefix(player.getStatistic(Statistic.HORSE_ONE_CM)) + "m"); sender.sendMessage("- Distance walked: " - + toSIPrefix((double) player.getStatistic(Statistic.WALK_ONE_CM)) + "m"); + + toSIPrefix(player.getStatistic(Statistic.WALK_ONE_CM)) + "m"); sender.sendMessage("- Damage taken: " + player.getStatistic(Statistic.DAMAGE_TAKEN)); sender.sendMessage("- Damage dealt: " + player.getStatistic(Statistic.DAMAGE_DEALT)); sender.sendMessage("- Times jumped: " + player.getStatistic(Statistic.JUMP)); @@ -162,7 +162,7 @@ private void sendStatistics(CommandSender sender, Player player, Boolean extende // converts numbers to their SI prefix laden counterparts private static String toSIPrefix(double number) { if (number < 100) { - return String.valueOf(number) + " c"; + return number + " c"; } else if (number < 100000) { number = Math.round(number / 100); return String.valueOf(number); diff --git a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java index 09d3349f..0a153177 100644 --- a/src/main/java/com/hackclub/hccore/discord/DiscordBot.java +++ b/src/main/java/com/hackclub/hccore/discord/DiscordBot.java @@ -36,9 +36,9 @@ public class DiscordBot extends ListenerAdapter implements Listener { private JDA jda; - private HCCorePlugin plugin; + private final HCCorePlugin plugin; private TextChannel channel; - private String prefix; + private final String prefix; public DiscordBot(HCCorePlugin plugin) { this.plugin = plugin; diff --git a/src/main/java/com/hackclub/hccore/events/player/PlayerAFKStatusChangeEvent.java b/src/main/java/com/hackclub/hccore/events/player/PlayerAFKStatusChangeEvent.java index 0a5a2302..c19c0024 100644 --- a/src/main/java/com/hackclub/hccore/events/player/PlayerAFKStatusChangeEvent.java +++ b/src/main/java/com/hackclub/hccore/events/player/PlayerAFKStatusChangeEvent.java @@ -7,7 +7,7 @@ public class PlayerAFKStatusChangeEvent extends PlayerEvent { private static final HandlerList handlers = new HandlerList(); - private boolean isAfk; + private final boolean isAfk; public PlayerAFKStatusChangeEvent(Player player, boolean isAfk) { super(player);