Skip to content

Commit bca409a

Browse files
UnknownSiliconUnknownSilicon
authored
Merge pull request #61 from ParallelMC/staging
Staging
2 parents 3f681cd + c641748 commit bca409a

26 files changed

Lines changed: 719 additions & 145 deletions

‎api/build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
group = 'org.parallelmc'
99

10-
version = '4.0.0'
10+
version = '4.1.0'
1111
description = 'A set of utilities and features for use on the Parallel Minecraft server'
1212

1313
java {
@@ -254,6 +254,14 @@ bukkit {
254254
description = 'Shows the top scores for a course'
255255
usage = '/leaderboard (course name)'
256256
}
257+
joinmessages {
258+
description = 'Opens the join/leave message GUI'
259+
usage = '/joinmessages'
260+
}
261+
leavemessages {
262+
description = 'Opens the join/leave message GUI'
263+
usage = '/leavemessages'
264+
}
257265
}
258266

259267
permissions {

‎api/src/main/java/parallelmc/parallelutils/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class Constants {
44

5-
public static final Version VERSION = new Version(4, 0, 0);
5+
public static final Version VERSION = new Version(4, 1, 0);
66
public static final String PLUGIN_NAME = "ParallelUtils";
77
public static final String DEFAULT_WORLD = "world2";
88
}

‎api/src/main/java/parallelmc/parallelutils/ParallelUtils.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import org.bukkit.configuration.file.FileConfiguration;
77
import org.bukkit.plugin.java.JavaPlugin;
88
import parallelmc.parallelutils.commands.*;
9+
import parallelmc.parallelutils.events.OnMenuInteract;
10+
import parallelmc.parallelutils.util.BukkitTools;
11+
import parallelmc.parallelutils.util.GUIManager;
912
import parallelmc.parallelutils.versionchecker.UpdateChecker;
1013

1114
import javax.annotation.Nullable;
@@ -171,7 +174,7 @@ public void onEnable() {
171174
getCommand("pu").setExecutor(commands);
172175
getCommand("pu").setTabCompleter(commands);
173176

174-
177+
Bukkit.getPluginManager().registerEvents(new OnMenuInteract(), this);
175178

176179
// Setup modules
177180

modules/src/main/java/parallelmc/parallelutils/modules/paralleltowns/events/OnMenuInteract.java renamed to api/src/main/java/parallelmc/parallelutils/events/OnMenuInteract.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package parallelmc.parallelutils.modules.paralleltowns.events;
1+
package parallelmc.parallelutils.events;
22

33
import org.bukkit.Material;
44
import org.bukkit.entity.Player;
@@ -10,15 +10,15 @@
1010
import org.bukkit.event.inventory.InventoryMoveItemEvent;
1111
import org.bukkit.event.player.PlayerQuitEvent;
1212
import org.bukkit.inventory.ItemStack;
13-
import parallelmc.parallelutils.modules.paralleltowns.ParallelTowns;
14-
import parallelmc.parallelutils.modules.paralleltowns.gui.GUIInventory;
13+
import parallelmc.parallelutils.ParallelUtils;
14+
import parallelmc.parallelutils.util.GUIInventory;
15+
import parallelmc.parallelutils.util.GUIManager;
1516

1617
public class OnMenuInteract implements Listener {
17-
1818
@EventHandler
1919
public void onMenuClick(InventoryClickEvent event) {
2020
Player player = (Player)event.getWhoClicked();
21-
GUIInventory inv = ParallelTowns.get().guiManager.getOpenInventory(player);
21+
GUIInventory inv = GUIManager.get().getOpenInventory(player);
2222
if (inv != null && (inv.inventory.equals(event.getClickedInventory()) || inv.inventory.equals(event.getInventory()))) {
2323
event.setCancelled(true);
2424
ItemStack item = event.getCurrentItem();
@@ -33,34 +33,34 @@ public void onMenuClick(InventoryClickEvent event) {
3333
@EventHandler
3434
public void onMenuDrag(InventoryDragEvent event) {
3535
Player player = (Player)event.getWhoClicked();
36-
GUIInventory inv = ParallelTowns.get().guiManager.getOpenInventory(player);
36+
GUIInventory inv = GUIManager.get().getOpenInventory(player);
3737
if (inv != null && inv.inventory.equals(event.getInventory())) {
3838
event.setCancelled(true);
3939
}
4040
}
4141

4242
@EventHandler
4343
public void onMenuMoveItem(InventoryMoveItemEvent event) {
44-
if (ParallelTowns.get().guiManager.openInventoryExists(event.getDestination())) {
44+
if (GUIManager.get().openInventoryExists(event.getDestination())) {
4545
event.setCancelled(true);
4646
}
4747
}
4848

4949
@EventHandler
5050
public void onCloseMenu(InventoryCloseEvent event) {
5151
Player player = (Player)event.getPlayer();
52-
GUIInventory inv = ParallelTowns.get().guiManager.getOpenInventory(player);
52+
GUIInventory inv = GUIManager.get().getOpenInventory(player);
5353
if (inv != null && event.getInventory().equals(inv.inventory)) {
54-
ParallelTowns.get().guiManager.closeMenu(player);
54+
GUIManager.get().closeMenu(player);
5555
}
5656
}
5757

5858
@EventHandler
5959
public void onLeaveWhileInMenu(PlayerQuitEvent event) {
6060
Player player = event.getPlayer();
61-
GUIInventory inv = ParallelTowns.get().guiManager.getOpenInventory(player);
61+
GUIInventory inv = GUIManager.get().getOpenInventory(player);
6262
if (inv != null) {
63-
ParallelTowns.get().guiManager.closeMenu(player);
63+
GUIManager.get().closeMenu(player);
6464
}
6565
}
6666

modules/src/main/java/parallelmc/parallelutils/modules/paralleltowns/gui/GUIInventory.java renamed to api/src/main/java/parallelmc/parallelutils/util/GUIInventory.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
1-
package parallelmc.parallelutils.modules.paralleltowns.gui;
1+
package parallelmc.parallelutils.util;
22

33
import net.kyori.adventure.text.Component;
44
import net.kyori.adventure.text.format.NamedTextColor;
5-
import net.kyori.adventure.text.format.TextDecoration;
65
import org.bukkit.Bukkit;
76
import org.bukkit.Material;
87
import org.bukkit.entity.Player;
98
import org.bukkit.inventory.Inventory;
109
import org.bukkit.inventory.ItemStack;
1110
import org.bukkit.inventory.meta.ItemMeta;
12-
import parallelmc.parallelutils.modules.paralleltowns.TownRank;
1311

1412
public abstract class GUIInventory {
1513
public Inventory inventory;
1614

1715
// represents a placeholder item in a gui
1816
public static ItemStack PLACEHOLDER;
1917

18+
// represents air in a gui
19+
public static ItemStack AIR;
20+
2021
// initialize the placeholder on class load
2122
static {
2223
PLACEHOLDER = new ItemStack(Material.LIGHT_BLUE_STAINED_GLASS_PANE);
2324
ItemMeta meta = PLACEHOLDER.getItemMeta();
2425
meta.displayName(Component.text('-', NamedTextColor.AQUA));
2526
PLACEHOLDER.setItemMeta(meta);
27+
28+
AIR = new ItemStack(Material.AIR);
2629
}
2730

2831
public GUIInventory(int size, Component name) {
@@ -33,13 +36,4 @@ public GUIInventory(int size, Component name) {
3336

3437
public abstract void onSlotClicked(Player player, int slotNum, ItemStack itemClicked);
3538

36-
public Component getComponentForRank(short rank) {
37-
if (rank == TownRank.LEADER)
38-
return Component.text("Town Leader", NamedTextColor.LIGHT_PURPLE).decoration(TextDecoration.ITALIC, false);
39-
else if (rank == TownRank.OFFICIAL)
40-
return Component.text("Town Official", NamedTextColor.AQUA).decoration(TextDecoration.ITALIC, false);
41-
else
42-
return Component.text("Member", NamedTextColor.GRAY).decoration(TextDecoration.ITALIC, false);
43-
}
44-
4539
}

‎api/src/main/java/parallelmc/parallelutils/util/GUIManager.java‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package parallelmc.parallelutils.util;
2+
3+
import org.bukkit.entity.Player;
4+
import org.bukkit.inventory.Inventory;
5+
6+
import java.util.HashMap;
7+
import java.util.UUID;
8+
9+
10+
public class GUIManager {
11+
private static GUIManager Instance;
12+
13+
public static GUIManager get() {
14+
if (Instance == null)
15+
Instance = new GUIManager();
16+
return Instance;
17+
}
18+
19+
// a list of all players with a GUI open
20+
private final HashMap<UUID, GUIInventory> openGUIs = new HashMap<>();
21+
22+
public void openInventoryForPlayer(Player player, GUIInventory type) {
23+
type.onOpen(player);
24+
player.openInventory(type.inventory);
25+
openGUIs.put(player.getUniqueId(), type);
26+
}
27+
28+
public boolean openInventoryExists(Inventory input) {
29+
return openGUIs.values().stream().anyMatch(x -> x.inventory.equals(input));
30+
}
31+
32+
public GUIInventory getOpenInventory(Player player) {
33+
return openGUIs.get(player.getUniqueId());
34+
}
35+
36+
public void closeMenu(Player player) {
37+
openGUIs.remove(player.getUniqueId());
38+
}
39+
}

‎modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/ParallelChat.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
import parallelmc.parallelutils.modules.parallelchat.events.OnChatMessage;
3232
import parallelmc.parallelutils.modules.parallelchat.commands.ParallelFakeJoin;
3333
import parallelmc.parallelutils.modules.parallelchat.commands.ParallelFakeLeave;
34+
import parallelmc.parallelutils.modules.parallelchat.gui.JoinLeaveInventory;
35+
import parallelmc.parallelutils.modules.parallelchat.gui.JoinLeaveSelectInventory;
36+
import parallelmc.parallelutils.modules.parallelchat.messages.CustomMessageManager;
37+
import parallelmc.parallelutils.util.GUIManager;
3438

3539
import java.io.BufferedWriter;
3640
import java.io.File;
@@ -85,6 +89,8 @@ public class ParallelChat extends ParallelModule {
8589

8690
public EmojiManager emojiManager;
8791

92+
public CustomMessageManager customMessageManager;
93+
8894
private final Random rand = new Random();
8995

9096
private ParallelUtils puPlugin;
@@ -232,6 +238,8 @@ UUID varchar(36) not null,
232238

233239
this.emojiManager = new EmojiManager();
234240

241+
this.customMessageManager = new CustomMessageManager();
242+
235243
manager.registerEvents(new OnBookEdit(), puPlugin);
236244
manager.registerEvents(new OnChatMessage(), puPlugin);
237245
manager.registerEvents(new OnJoinLeave(puPlugin), puPlugin);
@@ -258,6 +266,8 @@ UUID varchar(36) not null,
258266
puPlugin.getCommand("emojis").setExecutor(new ParallelEmojis());
259267
puPlugin.getCommand("banword").setExecutor(new ParallelBanWord());
260268
puPlugin.getCommand("allowword").setExecutor(new ParallelAllowWord());
269+
puPlugin.getCommand("joinmessages").setExecutor(new ParallelJoinMessages());
270+
puPlugin.getCommand("leavemessages").setExecutor(new ParallelLeaveMessages());
261271

262272
this.chatroomCommands = new ChatroomCommands();
263273
puPlugin.getCommand("chatroom").setExecutor(chatroomCommands);
@@ -318,6 +328,9 @@ public void onDisable() {
318328
// save chatrooms
319329
chatRoomManager.saveChatroomsToFile();
320330

331+
// save player's custom message selections
332+
customMessageManager.saveSelectedCustomMessages();
333+
321334
// save banned words list in case any words were added or removed
322335
bannedWordsConfig.set("Banned-Words", bannedWords);
323336
try {
@@ -338,6 +351,18 @@ public void onUnload() {
338351
return "ParallelChat";
339352
}
340353

354+
public void openMainJoinLeaveInventory(Player player) {
355+
GUIManager.get().openInventoryForPlayer(player, new JoinLeaveInventory());
356+
}
357+
358+
public void openJoinMessageInventory(Player player) {
359+
GUIManager.get().openInventoryForPlayer(player, new JoinLeaveSelectInventory("Join"));
360+
}
361+
362+
public void openLeaveMessageInventory(Player player) {
363+
GUIManager.get().openInventoryForPlayer(player, new JoinLeaveSelectInventory("Leave"));
364+
}
365+
341366
/**
342367
* Sends a chat message to a player with the ParallelUtils prefix
343368
* @param player The player to send the message to

‎modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/commands/ParallelJoinMessages.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package parallelmc.parallelutils.modules.parallelchat.commands;
2+
3+
import org.bukkit.command.Command;
4+
import org.bukkit.command.CommandExecutor;
5+
import org.bukkit.command.CommandSender;
6+
import org.bukkit.entity.Player;
7+
import org.jetbrains.annotations.NotNull;
8+
import parallelmc.parallelutils.modules.parallelchat.ParallelChat;
9+
10+
public class ParallelJoinMessages implements CommandExecutor {
11+
@Override
12+
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, String[] args) {
13+
if (commandSender instanceof Player player) {
14+
ParallelChat.get().openMainJoinLeaveInventory(player);
15+
}
16+
return true;
17+
}
18+
}

‎modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/commands/ParallelLeaveMessages.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package parallelmc.parallelutils.modules.parallelchat.commands;
2+
3+
import org.bukkit.command.Command;
4+
import org.bukkit.command.CommandExecutor;
5+
import org.bukkit.command.CommandSender;
6+
import org.bukkit.entity.Player;
7+
import org.jetbrains.annotations.NotNull;
8+
import parallelmc.parallelutils.modules.parallelchat.ParallelChat;
9+
10+
public class ParallelLeaveMessages implements CommandExecutor {
11+
@Override
12+
public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String label, String[] args) {
13+
if (commandSender instanceof Player player) {
14+
ParallelChat.get().openMainJoinLeaveInventory(player);
15+
}
16+
return true;
17+
}
18+
}

‎modules/src/main/java/parallelmc/parallelutils/modules/parallelchat/events/OnJoinLeave.java‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package parallelmc.parallelutils.modules.parallelchat.events;
22

33
import net.kyori.adventure.text.Component;
4+
import net.kyori.adventure.text.format.NamedTextColor;
45
import net.kyori.adventure.text.minimessage.MiniMessage;
56
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
67
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -15,6 +16,7 @@
1516
import parallelmc.parallelutils.ParallelUtils;
1617
import parallelmc.parallelutils.modules.discordintegration.JoinQuitSuppressorListener;
1718
import parallelmc.parallelutils.modules.parallelchat.ParallelChat;
19+
import parallelmc.parallelutils.modules.parallelchat.messages.CustomMessageSelection;
1820

1921
public class OnJoinLeave implements Listener {
2022

@@ -33,7 +35,13 @@ public void onPlayerLeave(PlayerQuitEvent event) {
3335
ParallelChat.get().chatRoomManager.removeActiveChatroom(player);
3436
event.quitMessage(null);
3537

36-
Component leave = MiniMessage.miniMessage().deserialize("<yellow><player> left the game", TagResolver.resolver(Placeholder.parsed("player", player.getName())));
38+
String customMsg = ParallelChat.get().customMessageManager.getLeaveMessageForPlayer(player);
39+
40+
Component leave;
41+
if (customMsg == null)
42+
leave = MiniMessage.miniMessage().deserialize("<yellow><player> left the game", TagResolver.resolver(Placeholder.parsed("player", player.getName())));
43+
else
44+
leave = Component.text(customMsg, NamedTextColor.YELLOW);
3745

3846
if (puPlugin.getModule("DiscordIntegration") != null) {
3947
synchronized (JoinQuitSuppressorListener.hiddenUsersLock) { // NOTE: This MIGHT cause lag problems. It shouldn't, but beware
@@ -63,7 +71,14 @@ public void onPlayerJoin(PlayerJoinEvent event) {
6371
Server server = player.getServer();
6472
event.joinMessage(null);
6573

66-
Component join = MiniMessage.miniMessage().deserialize("<yellow><player> joined the game", TagResolver.resolver(Placeholder.parsed("player", player.getName())));
74+
String customMsg = ParallelChat.get().customMessageManager.getJoinMessageForPlayer(player);
75+
76+
Component join;
77+
if (customMsg == null)
78+
join = MiniMessage.miniMessage().deserialize("<yellow><player> joined the game", TagResolver.resolver(Placeholder.parsed("player", player.getName())));
79+
else
80+
join = Component.text(customMsg, NamedTextColor.YELLOW);
81+
6782
if (!player.hasPlayedBefore()) {
6883
Component welcome = MiniMessage.miniMessage().deserialize("\n<dark_aqua><strikethrough>⎯⎯⎯⎯</strikethrough> Welcome to <white><bold>Parallel</bold><dark_aqua>, <player>! <strikethrough>⎯⎯⎯⎯", TagResolver.resolver(Placeholder.parsed("player", player.getName())));
6984

0 commit comments

Comments
 (0)