Skip to content

Commit 3a2acd0

Browse files
RhythmicSysRhythmicSys
committed
Added command spy, something is wrong with socialspy toggle
1 parent 62fc1fb commit 3a2acd0

20 files changed

Lines changed: 280 additions & 163 deletions

‎pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>simplexity</groupId>
88
<artifactId>SimplePMs</artifactId>
9-
<version>2.0.0</version>
9+
<version>2.1.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>SimplePMs</name>
@@ -90,10 +90,5 @@
9090
<version>2.11.3</version>
9191
<scope>provided</scope>
9292
</dependency>
93-
<dependency>
94-
<groupId>org.xerial</groupId>
95-
<artifactId>sqlite-jdbc</artifactId>
96-
<version>3.45.1.0</version>
97-
</dependency>
9893
</dependencies>
9994
</project>

‎src/main/java/simplexity/simplepms/SimplePMs.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import simplexity.simplepms.commands.Unblock;
1616
import simplexity.simplepms.config.ConfigHandler;
1717
import simplexity.simplepms.listeners.LoginListener;
18+
import simplexity.simplepms.listeners.PreCommandListener;
1819
import simplexity.simplepms.listeners.QuitListener;
1920

2021
import java.util.HashSet;
@@ -43,13 +44,16 @@ public void onEnable() {
4344
registerCommands();
4445
this.getServer().getPluginManager().registerEvents(new LoginListener(), this);
4546
this.getServer().getPluginManager().registerEvents(new QuitListener(), this);
47+
this.getServer().getPluginManager().registerEvents(new PreCommandListener(), this);
4648
if (this.getServer().getPluginManager().getPlugin("PlaceholderAPI") != null) {
4749
papiEnabled = true;
4850
} else {
4951
this.getLogger().info("You do not have PlaceholderAPI loaded on your server. Any PlaceholderAPI placeholders used in this plugin's messages, will not work.");
5052
}
5153
consoleSender = this.getServer().getConsoleSender();
5254
this.saveDefaultConfig();
55+
getConfig().options().copyDefaults(true);
56+
saveConfig();
5357
ConfigHandler.getInstance().loadConfigValues();
5458
}
5559

‎src/main/java/simplexity/simplepms/commands/Block.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import org.bukkit.command.CommandSender;
77
import org.bukkit.entity.Player;
88
import org.jetbrains.annotations.NotNull;
9-
import simplexity.simplepms.config.LocaleHandler;
9+
import simplexity.simplepms.config.Message;
10+
import simplexity.simplepms.logic.Util;
1011
import simplexity.simplepms.saving.SqlHandler;
1112

1213
import java.util.Arrays;
@@ -16,25 +17,25 @@ public class Block implements CommandExecutor {
1617
@Override
1718
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
1819
if (!(sender instanceof Player player)) {
19-
sender.sendRichMessage(LocaleHandler.Message.ONLY_PLAYER.getMessage());
20+
sender.sendRichMessage(Message.ONLY_PLAYER.getMessage());
2021
return false;
2122
}
2223
if (args.length == 0) {
23-
player.sendRichMessage(LocaleHandler.Message.NO_USER_PROVIDED.getMessage());
24+
player.sendRichMessage(Message.NO_USER_PROVIDED.getMessage());
2425
return false;
2526
}
2627
String playerToBlockString = args[0];
2728
Player playerToBlock = Util.getInstance().getPlayer(playerToBlockString);
2829
if (playerToBlock == null) {
29-
sender.sendRichMessage(LocaleHandler.Message.RECIPIENT_NOT_EXIST.getMessage(),
30+
sender.sendRichMessage(Message.RECIPIENT_NOT_EXIST.getMessage(),
3031
Placeholder.parsed("name", playerToBlockString));
3132
return false;
3233
}
3334
UUID uuid = player.getUniqueId();
3435
UUID blockPlayerUUID = playerToBlock.getUniqueId();
3536
String reason = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
3637
SqlHandler.getInstance().addBlockedPlayer(uuid, blockPlayerUUID, reason);
37-
player.sendRichMessage(LocaleHandler.Message.BLOCKED_PLAYER.getMessage(),
38+
player.sendRichMessage(Message.BLOCKED_PLAYER.getMessage(),
3839
Placeholder.parsed("name", playerToBlockString));
3940
return true;
4041
}

‎src/main/java/simplexity/simplepms/commands/Blocklist.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.bukkit.entity.Player;
1010
import org.jetbrains.annotations.NotNull;
1111
import simplexity.simplepms.SimplePMs;
12-
import simplexity.simplepms.config.LocaleHandler;
12+
import simplexity.simplepms.config.Message;
1313
import simplexity.simplepms.objects.PlayerBlock;
1414
import simplexity.simplepms.saving.SqlHandler;
1515

@@ -23,24 +23,24 @@ public class Blocklist implements CommandExecutor {
2323
@Override
2424
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
2525
if (!(sender instanceof Player player)) {
26-
sender.sendMessage(LocaleHandler.Message.ONLY_PLAYER.getMessage());
26+
sender.sendMessage(Message.ONLY_PLAYER.getMessage());
2727
return false;
2828
}
2929
UUID uuid = player.getUniqueId();
3030
List<PlayerBlock> blockList = SqlHandler.getInstance().getBlockList(uuid);
3131
if (blockList.isEmpty()) {
32-
player.sendRichMessage(LocaleHandler.Message.BLOCKLIST_EMPTY.getMessage());
32+
player.sendRichMessage(Message.BLOCKLIST_EMPTY.getMessage());
3333
return true;
3434
}
35-
Component message = miniMessage.deserialize(LocaleHandler.Message.BLOCKLIST_HEADER.getMessage());
35+
Component message = miniMessage.deserialize(Message.BLOCKLIST_HEADER.getMessage());
3636
for (PlayerBlock block : blockList) {
3737
message = message.appendNewline();
3838
message = message.append(miniMessage.deserialize(
39-
LocaleHandler.Message.BLOCKLIST_NAME.getMessage(),
39+
Message.BLOCKLIST_NAME.getMessage(),
4040
Placeholder.parsed("name", block.blockedPlayerName())
4141
));
4242
if (block.blockReason() == null || block.blockReason().isEmpty()) continue;
43-
message = message.append(miniMessage.deserialize(LocaleHandler.Message.BLOCKLIST_REASON.getMessage(),
43+
message = message.append(miniMessage.deserialize(Message.BLOCKLIST_REASON.getMessage(),
4444
Placeholder.parsed("reason", block.blockReason())));
4545
}
4646
sender.sendMessage(message);

‎src/main/java/simplexity/simplepms/commands/MessageToggle.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.bukkit.command.CommandSender;
66
import org.bukkit.entity.Player;
77
import org.jetbrains.annotations.NotNull;
8-
import simplexity.simplepms.config.LocaleHandler;
8+
import simplexity.simplepms.config.Message;
99
import simplexity.simplepms.objects.PlayerSettings;
1010
import simplexity.simplepms.saving.SqlHandler;
1111

@@ -15,18 +15,18 @@ public class MessageToggle implements CommandExecutor {
1515
@Override
1616
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
1717
if (!(sender instanceof Player player)) {
18-
sender.sendRichMessage(LocaleHandler.Message.ONLY_PLAYER.getMessage());
18+
sender.sendRichMessage(Message.ONLY_PLAYER.getMessage());
1919
return false;
2020
}
2121
UUID uuid = player.getUniqueId();
2222
PlayerSettings playerSettings = SqlHandler.getInstance().getSettings(uuid);
2323
if (playerSettings.messagesDisabled()) {
2424
SqlHandler.getInstance().setMessagesDisabled(uuid, false);
25-
player.sendRichMessage(LocaleHandler.Message.MESSAGES_ENABLED.getMessage());
25+
player.sendRichMessage(Message.MESSAGES_ENABLED.getMessage());
2626
return true;
2727
}
2828
SqlHandler.getInstance().setMessagesDisabled(uuid, true);
29-
player.sendRichMessage(LocaleHandler.Message.MESSAGES_DISABLED.getMessage());
29+
player.sendRichMessage(Message.MESSAGES_DISABLED.getMessage());
3030
return true;
3131
}
3232
}

‎src/main/java/simplexity/simplepms/commands/PrivateMessage.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import org.bukkit.command.TabExecutor;
77
import org.jetbrains.annotations.NotNull;
88
import org.jetbrains.annotations.Nullable;
9-
import simplexity.simplepms.config.LocaleHandler;
9+
import simplexity.simplepms.config.Message;
10+
import simplexity.simplepms.logic.PreProcessing;
1011

1112
import java.util.Arrays;
1213
import java.util.List;
@@ -17,24 +18,24 @@ public class PrivateMessage implements TabExecutor {
1718
@Override
1819
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
1920
if (args.length < 1) {
20-
sender.sendRichMessage(LocaleHandler.Message.NO_RECIPIENT_PROVIDED.getMessage());
21+
sender.sendRichMessage(Message.NO_RECIPIENT_PROVIDED.getMessage());
2122
return false;
2223
}
2324
if (args.length < 2) {
24-
sender.sendRichMessage(LocaleHandler.Message.BLANK_MESSAGE.getMessage());
25+
sender.sendRichMessage(Message.BLANK_MESSAGE.getMessage());
2526
return false;
2627
}
27-
CommandSender target = MessageHandling.getInstance().getTarget(args);
28+
CommandSender target = PreProcessing.getInstance().getTarget(args);
2829
if (target == null) {
29-
sender.sendRichMessage(LocaleHandler.Message.RECIPIENT_NOT_EXIST.getMessage(),
30+
sender.sendRichMessage(Message.RECIPIENT_NOT_EXIST.getMessage(),
3031
Placeholder.unparsed("name", args[0]));
3132
return false;
3233
}
33-
if (MessageHandling.getInstance().messagingBlocked(sender, target, args[0])) {
34+
if (PreProcessing.getInstance().messagingBlocked(sender, target, args[0])) {
3435
return false;
3536
}
3637
String message = String.join(" ", Arrays.copyOfRange(args, 1, args.length));
37-
MessageHandling.getInstance().callPMEvent(sender, target, message);
38+
PreProcessing.getInstance().callPMEvent(sender, target, message);
3839
return true;
3940
}
4041

‎src/main/java/simplexity/simplepms/commands/Reload.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
import org.bukkit.command.CommandSender;
66
import org.jetbrains.annotations.NotNull;
77
import simplexity.simplepms.config.ConfigHandler;
8-
import simplexity.simplepms.config.LocaleHandler;
8+
import simplexity.simplepms.config.Message;
99

1010
public class Reload implements CommandExecutor {
1111
@Override
1212
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
1313
ConfigHandler.getInstance().loadConfigValues();
14-
sender.sendRichMessage(LocaleHandler.Message.RELOADED.getMessage());
14+
sender.sendRichMessage(Message.RELOADED.getMessage());
1515
return true;
1616
}
1717

‎src/main/java/simplexity/simplepms/commands/Reply.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,28 @@
55
import org.bukkit.command.TabExecutor;
66
import org.jetbrains.annotations.NotNull;
77
import org.jetbrains.annotations.Nullable;
8-
import simplexity.simplepms.config.LocaleHandler;
8+
import simplexity.simplepms.config.Message;
9+
import simplexity.simplepms.logic.PreProcessing;
910

1011
import java.util.List;
1112

1213
public class Reply implements TabExecutor {
1314
@Override
1415
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
1516
if (args.length < 1) {
16-
sender.sendRichMessage(LocaleHandler.Message.BLANK_MESSAGE.getMessage());
17+
sender.sendRichMessage(Message.BLANK_MESSAGE.getMessage());
1718
return false;
1819
}
19-
CommandSender recipient = MessageHandling.lastMessaged.get(sender);
20+
CommandSender recipient = PreProcessing.lastMessaged.get(sender);
2021
if (recipient == null) {
21-
sender.sendRichMessage(LocaleHandler.Message.CANNOT_REPLY.getMessage());
22+
sender.sendRichMessage(Message.CANNOT_REPLY.getMessage());
2223
return false;
2324
}
24-
if (MessageHandling.getInstance().messagingBlocked(sender, recipient, recipient.getName())) {
25+
if (PreProcessing.getInstance().messagingBlocked(sender, recipient, recipient.getName())) {
2526
return false;
2627
}
2728
String message = String.join(" ", args);
28-
MessageHandling.getInstance().callPMEvent(sender, recipient, message);
29+
PreProcessing.getInstance().callPMEvent(sender, recipient, message);
2930
return true;
3031
}
3132

‎src/main/java/simplexity/simplepms/commands/SocialSpy.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import org.bukkit.entity.Player;
77
import org.jetbrains.annotations.NotNull;
88
import simplexity.simplepms.SimplePMs;
9-
import simplexity.simplepms.config.LocaleHandler;
9+
import simplexity.simplepms.config.Message;
1010
import simplexity.simplepms.objects.PlayerSettings;
1111
import simplexity.simplepms.saving.SqlHandler;
1212

@@ -18,19 +18,19 @@ public class SocialSpy implements CommandExecutor {
1818
@Override
1919
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
2020
if (!(sender instanceof Player player)) {
21-
sender.sendRichMessage(LocaleHandler.Message.ONLY_PLAYER.getMessage());
21+
sender.sendRichMessage(Message.ONLY_PLAYER.getMessage());
2222
return false;
2323
}
2424
UUID uuid = player.getUniqueId();
2525
PlayerSettings settings = SqlHandler.getInstance().getSettings(uuid);
2626
if (settings == null || settings.socialSpyEnabled()) {
2727
SqlHandler.getInstance().setSocialSpyEnabled(uuid, false);
28-
sender.sendRichMessage(LocaleHandler.Message.SOCIAL_SPY_DISABLED.getMessage());
28+
sender.sendRichMessage(Message.SOCIAL_SPY_DISABLED.getMessage());
2929
SimplePMs.getSpyingPlayers().remove(player);
3030
return true;
3131
}
3232
SqlHandler.getInstance().setSocialSpyEnabled(uuid, true);
33-
sender.sendRichMessage(LocaleHandler.Message.SOCIAL_SPY_ENABLED.getMessage());
33+
sender.sendRichMessage(Message.SOCIAL_SPY_ENABLED.getMessage());
3434
SimplePMs.getSpyingPlayers().add(player);
3535
return true;
3636
}

‎src/main/java/simplexity/simplepms/commands/Unblock.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.bukkit.entity.Player;
88
import org.jetbrains.annotations.NotNull;
99
import org.jetbrains.annotations.Nullable;
10-
import simplexity.simplepms.config.LocaleHandler;
10+
import simplexity.simplepms.config.Message;
1111
import simplexity.simplepms.objects.PlayerBlock;
1212
import simplexity.simplepms.saving.SqlHandler;
1313

@@ -19,22 +19,22 @@ public class Unblock implements TabExecutor {
1919
@Override
2020
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] args) {
2121
if (!(sender instanceof Player player)) {
22-
sender.sendRichMessage(LocaleHandler.Message.ONLY_PLAYER.getMessage());
22+
sender.sendRichMessage(Message.ONLY_PLAYER.getMessage());
2323
return false;
2424
}
2525
if (args.length == 0) {
26-
player.sendRichMessage(LocaleHandler.Message.NO_USER_PROVIDED.getMessage());
26+
player.sendRichMessage(Message.NO_USER_PROVIDED.getMessage());
2727
return false;
2828
}
2929
String blockString = args[0];
3030
List<PlayerBlock> playerBlockList = SqlHandler.getInstance().getBlockList(player.getUniqueId());
3131
UUID blockedPlayerUUID = blockedPlayerUUID(blockString, playerBlockList);
3232
if (blockedPlayerUUID == null) {
33-
player.sendRichMessage(LocaleHandler.Message.PLAYER_NOT_BLOCKED.getMessage());
33+
player.sendRichMessage(Message.PLAYER_NOT_BLOCKED.getMessage());
3434
return false;
3535
}
3636
SqlHandler.getInstance().removeBlockedPlayer(player.getUniqueId(), blockedPlayerUUID);
37-
player.sendRichMessage(LocaleHandler.Message.NO_LONGER_BLOCKING.getMessage(),
37+
player.sendRichMessage(Message.NO_LONGER_BLOCKING.getMessage(),
3838
Placeholder.parsed("name", blockString));
3939
return true;
4040
}

0 commit comments

Comments
 (0)