Skip to content

Commit f2f9d81

Browse files
RhythmicSysRhythmicSys
committed
Committing is probably a good thing to do yaknow
1 parent 2f7c2dc commit f2f9d81

25 files changed

Lines changed: 450 additions & 192 deletions

‎src/main/java/simplexity/simpleplayerfreeze/ConfigSettings.java‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎src/main/java/simplexity/simpleplayerfreeze/SimplePlayerFreeze.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22

33
import org.bukkit.Server;
44
import org.bukkit.command.ConsoleCommandSender;
5-
import org.bukkit.plugin.Plugin;
65
import org.bukkit.plugin.java.JavaPlugin;
76
import simplexity.simpleplayerfreeze.commands.FreezePlayer;
87
import simplexity.simpleplayerfreeze.commands.FreezeSpy;
98
import simplexity.simpleplayerfreeze.commands.ReloadConfig;
109
import simplexity.simpleplayerfreeze.commands.UnfreezePlayer;
10+
import simplexity.simpleplayerfreeze.configs.ConfigHandler;
1111
import simplexity.simpleplayerfreeze.listeners.*;
1212
import simplexity.simpleplayerfreeze.placeholderapi.IsFrozenPlaceholder;
1313

1414
public final class SimplePlayerFreeze extends JavaPlugin {
15-
public static Plugin simplePlayerFreeze;
15+
public static SimplePlayerFreeze instance;
1616
public static Server server;
1717
public static ConsoleCommandSender sfConsoleSender;
1818

1919
@Override
2020
public void onEnable() {
21-
simplePlayerFreeze = this;
21+
instance = this;
2222
server = getServer();
2323
sfConsoleSender = server.getConsoleSender();
2424
boolean papiEnabled = getServer().getPluginManager().isPluginEnabled("PlaceholderAPI");
@@ -34,7 +34,7 @@ public void onEnable() {
3434
registerListeners();
3535
this.saveDefaultConfig();
3636
this.reloadConfig();
37-
ConfigSettings.reloadConfigSettings();
37+
ConfigHandler.getInstance().reloadConfigSettings();
3838
}
3939
// Registers the Event Listeners for the events that will be blocked when someone is frozen
4040
private void registerListeners() {
@@ -55,4 +55,8 @@ private void registerListeners() {
5555
public static ConsoleCommandSender getSFConsoleSender() {
5656
return sfConsoleSender;
5757
}
58+
59+
public static SimplePlayerFreeze getInstance() {
60+
return instance;
61+
}
5862
}

‎src/main/java/simplexity/simpleplayerfreeze/Util.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
import org.bukkit.entity.Player;
99
import org.bukkit.permissions.Permission;
1010
import org.bukkit.persistence.PersistentDataType;
11+
import simplexity.simpleplayerfreeze.configs.ConfigHandler;
12+
import simplexity.simpleplayerfreeze.configs.LocaleHandler;
1113

1214
public class Util {
1315

@@ -29,12 +31,12 @@ public static void sendErrorMessage(CommandSender sender, String message) {
2931
}
3032
public static void sendUserMessage(CommandSender sender, String message) {
3133
if (message.isEmpty()) return;
32-
sender.sendMessage(miniMessage.deserialize(ConfigSettings.prefix + message));
34+
sender.sendMessage(miniMessage.deserialize(LocaleHandler.getInstance().getPrefix() + message));
3335
}
3436

3537
public static void sendUserMessageWithPlayer(CommandSender sender, String message, Player player) {
3638
if (message.isEmpty()) return;
37-
sender.sendMessage(miniMessage.deserialize(ConfigSettings.prefix + message,
39+
sender.sendMessage(miniMessage.deserialize(ConfigHandler.getInstance().getPrefix() + message,
3840
Placeholder.component("name", player.displayName())));
3941
}
4042

‎src/main/java/simplexity/simpleplayerfreeze/commands/FreezePlayer.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
import org.bukkit.command.CommandSender;
77
import org.bukkit.entity.Player;
88
import org.jetbrains.annotations.NotNull;
9-
import simplexity.simpleplayerfreeze.ConfigSettings;
9+
import simplexity.simpleplayerfreeze.configs.ConfigHandler;
1010
import simplexity.simpleplayerfreeze.Util;
11+
import simplexity.simpleplayerfreeze.configs.LocaleHandler;
1112
import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
1213

1314
public class FreezePlayer implements CommandExecutor {
@@ -16,28 +17,28 @@ public class FreezePlayer implements CommandExecutor {
1617

1718
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
1819
if (!sender.hasPermission(Util.freezePermission)) {
19-
Util.sendErrorMessage(sender, ConfigSettings.noPermission);
20+
Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPermission());
2021
return false;
2122
}
2223
if (strings.length == 0) {
23-
Util.sendErrorMessage(sender, ConfigSettings.noPlayer);
24+
Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPlayer());
2425
return false;
2526
}
2627
Player player;
2728
player = Bukkit.getPlayer(strings[0]);
2829
if (player == null) {
29-
Util.sendErrorMessage(sender, ConfigSettings.noPermission);
30+
Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPermission());
3031
return false;
3132
} else if (player.hasPermission(Util.freezeBypassPermission)) {
32-
Util.sendErrorMessage( sender, ConfigSettings.cannotBeFrozen);
33+
Util.sendErrorMessage( sender, LocaleHandler.getInstance().getCannotBeFrozen());
3334
return false;
3435
} else if (Util.isFrozen(player) && sender.hasPermission(Util.unfreezePermission)) {
3536
FreezeFunctionality.setUnfrozen(player);
36-
Util.sendUserMessageWithPlayer(sender, ConfigSettings.unfreezeMessage, player);
37+
Util.sendUserMessageWithPlayer(sender, LocaleHandler.getInstance().getUnfreezeMessage(), player);
3738
return true;
3839
} else {
3940
FreezeFunctionality.setFrozen(player);
40-
Util.sendUserMessageWithPlayer(sender, ConfigSettings.freezeMessage, player);
41+
Util.sendUserMessageWithPlayer(sender, LocaleHandler.getInstance().getFreezeMessage(), player);
4142
}
4243
return true;
4344
}

‎src/main/java/simplexity/simpleplayerfreeze/commands/FreezeSpy.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
import org.bukkit.entity.Player;
77
import org.bukkit.persistence.PersistentDataType;
88
import org.jetbrains.annotations.NotNull;
9-
import simplexity.simpleplayerfreeze.ConfigSettings;
9+
import simplexity.simpleplayerfreeze.configs.ConfigHandler;
1010
import simplexity.simpleplayerfreeze.Util;
11+
import simplexity.simpleplayerfreeze.configs.LocaleHandler;
1112
import simplexity.simpleplayerfreeze.listeners.JoinListener;
1213

1314
public class FreezeSpy implements CommandExecutor {
@@ -16,11 +17,11 @@ public class FreezeSpy implements CommandExecutor {
1617
@Override
1718
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
1819
if (!sender.hasPermission(Util.freezeChatSpy)) {
19-
Util.sendErrorMessage( sender, ConfigSettings.noPermission);
20+
Util.sendErrorMessage( sender, LocaleHandler.getInstance().getNoPermission());
2021
return false;
2122
}
2223
if (!(sender instanceof Player player)) {
23-
Util.sendErrorMessage( sender, ConfigSettings.onlyPlayer);
24+
Util.sendErrorMessage( sender, LocaleHandler.getInstance().getOnlyPlayer());
2425
return false;
2526
}
2627
toggleSpy(player);
@@ -30,11 +31,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
3031
private void toggleSpy(Player player) {
3132
if (!player.getPersistentDataContainer().getOrDefault(Util.freezeSpyDisabled, PersistentDataType.BOOLEAN, false)) {
3233
player.getPersistentDataContainer().set(Util.freezeSpyDisabled, PersistentDataType.BOOLEAN, true);
33-
Util.sendUserMessage(player, ConfigSettings.freezeSpyDisabled);
34+
Util.sendUserMessage(player, LocaleHandler.getInstance().getFreezeSpyDisabled());
3435
JoinListener.spyList.remove(player);
3536
} else {
3637
player.getPersistentDataContainer().set(Util.freezeSpyDisabled, PersistentDataType.BOOLEAN, false);
37-
Util.sendUserMessage(player, ConfigSettings.freezeSpyEnabled);
38+
Util.sendUserMessage(player, LocaleHandler.getInstance().getFreezeSpyEnabled());
3839
JoinListener.spyList.add(player);
3940
}
4041
}

‎src/main/java/simplexity/simpleplayerfreeze/commands/ReloadConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import org.bukkit.command.CommandExecutor;
55
import org.bukkit.command.CommandSender;
66
import org.jetbrains.annotations.NotNull;
7-
import simplexity.simpleplayerfreeze.ConfigSettings;
7+
import simplexity.simpleplayerfreeze.configs.ConfigHandler;
88
import simplexity.simpleplayerfreeze.SimplePlayerFreeze;
99
import simplexity.simpleplayerfreeze.Util;
10+
import simplexity.simpleplayerfreeze.configs.LocaleHandler;
1011

1112
public class ReloadConfig implements CommandExecutor {
1213

@@ -15,12 +16,11 @@ public class ReloadConfig implements CommandExecutor {
1516
@Override
1617
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
1718
if (!sender.hasPermission(Util.reloadPermission)) {
18-
sender.sendRichMessage(ConfigSettings.noPermission);
19+
sender.sendRichMessage(LocaleHandler.getInstance().getNoPermission());
1920
return false;
2021
}
21-
SimplePlayerFreeze.simplePlayerFreeze.reloadConfig();
22-
ConfigSettings.reloadConfigSettings();
23-
Util.sendUserMessage(sender, ConfigSettings.reloadMessage);
22+
ConfigHandler.getInstance().reloadConfigSettings();
23+
Util.sendUserMessage(sender, LocaleHandler.getInstance().getReloadMessage());
2424
return true;
2525
}
2626
}

‎src/main/java/simplexity/simpleplayerfreeze/commands/UnfreezePlayer.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
import org.bukkit.command.CommandSender;
77
import org.bukkit.entity.Player;
88
import org.jetbrains.annotations.NotNull;
9-
import simplexity.simpleplayerfreeze.ConfigSettings;
9+
import simplexity.simpleplayerfreeze.configs.ConfigHandler;
1010
import simplexity.simpleplayerfreeze.Util;
11+
import simplexity.simpleplayerfreeze.configs.LocaleHandler;
1112
import simplexity.simpleplayerfreeze.freeze.FreezeFunctionality;
1213

1314
public class UnfreezePlayer implements CommandExecutor {
@@ -18,20 +19,20 @@ public class UnfreezePlayer implements CommandExecutor {
1819
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String s, @NotNull String[] strings) {
1920
if (!sender.hasPermission(Util.unfreezePermission)) return false;
2021
if (strings.length == 0) {
21-
Util.sendErrorMessage(sender, ConfigSettings.noPlayer);
22+
Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPlayer());
2223
return false;
2324
}
2425
Player player;
2526
player = Bukkit.getPlayer(strings[0]);
2627
if (player == null) {
27-
Util.sendErrorMessage(sender, ConfigSettings.noPlayer);
28+
Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNoPlayer());
2829
return false;
2930
} else if (!Util.isFrozen(player)) {
30-
Util.sendErrorMessage(sender, ConfigSettings.notFrozen);
31+
Util.sendErrorMessage(sender, LocaleHandler.getInstance().getNotFrozen());
3132
return true;
3233
}
3334
FreezeFunctionality.setUnfrozen(player);
34-
Util.sendUserMessageWithPlayer(sender, ConfigSettings.unfreezeMessage, player);
35+
Util.sendUserMessageWithPlayer(sender, LocaleHandler.getInstance().getUnfreezeMessage(), player);
3536
return true;
3637
}
3738

0 commit comments

Comments
 (0)