Reformat code

BlueDevelopersInc · Mar 12, 2024 · e326e70 · e326e70
1 parent 359fd25
commit e326e70
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 29 deletions.
diff --git a/bukkit/src/main/java/dev/bluetree242/discordsrvutils/bukkit/BukkitPlatformServer.java b/bukkit/src/main/java/dev/bluetree242/discordsrvutils/bukkit/BukkitPlatformServer.java
@@ -105,19 +105,19 @@ public Object getOriginal() {
  }
 
  @Override
- public PlatformPlayer getOfflinePlayer(UUID uuid) {
+ public PlatformPlayer<?> getOfflinePlayer(UUID uuid) {
  return new BukkitOfflinePlayer(Bukkit.getOfflinePlayer(uuid), core);
  }
 
  @Override
- public PlatformPlayer getPlayer(UUID uuid) {
+ public PlatformPlayer<?> getPlayer(UUID uuid) {
  Player player = Bukkit.getPlayer(uuid);
  if (player == null) return null;
  return new BukkitPlayer(core, player);
  }
 
  @Override
- public PlatformPlayer getPlayer(String name) {
+ public PlatformPlayer<?> getPlayer(String name) {
  Player player = Bukkit.getPlayer(name);
  if (player == null) return null;
  return new BukkitPlayer(core, player);

diff --git a/bukkit/src/main/java/dev/bluetree242/discordsrvutils/bukkit/BukkitPlugin.java b/bukkit/src/main/java/dev/bluetree242/discordsrvutils/bukkit/BukkitPlugin.java
@@ -174,7 +174,7 @@ public void addHooks() {
  }
 
  @Override
- public String placehold(PlatformPlayer player, String s) {
+ public String placehold(PlatformPlayer<?> player, String s) {
  if (player instanceof BukkitPlayer) return applyPlaceholders(s, ((BukkitPlayer) player).getOriginal());
  else if (player instanceof BukkitOfflinePlayer)
  return applyPlaceholders(s, ((BukkitOfflinePlayer) player).getOriginal());

diff --git a/...t/src/main/java/dev/bluetree242/discordsrvutils/bukkit/listeners/game/BukkitListener.java b/...t/src/main/java/dev/bluetree242/discordsrvutils/bukkit/listeners/game/BukkitListener.java
@@ -41,7 +41,7 @@ public class BukkitListener implements Listener {
  public void onJoin(PlayerJoinEvent e) {
  PlatformJoinEvent event = new PlatformJoinEvent() {
  @Override
- public PlatformPlayer getPlayer() {
+ public PlatformPlayer<?> getPlayer() {
  return new BukkitPlayer(core, e.getPlayer());
  }
  };

diff --git a/bukkit/src/main/java/dev/bluetree242/discordsrvutils/bukkit/listeners/game/ChatListener.java b/bukkit/src/main/java/dev/bluetree242/discordsrvutils/bukkit/listeners/game/ChatListener.java
@@ -41,7 +41,7 @@ public class ChatListener implements Listener {
  public void onJoin(AsyncPlayerChatEvent e) {
  PlatformChatEvent event = new PlatformChatEvent() {
  @Override
- public PlatformPlayer getPlayer() {
+ public PlatformPlayer<?> getPlayer() {
  return new BukkitPlayer(core, e.getPlayer());
  }
 

diff --git a/...rc/main/java/dev/bluetree242/discordsrvutils/bukkit/listeners/game/PaperChatListener.java b/...rc/main/java/dev/bluetree242/discordsrvutils/bukkit/listeners/game/PaperChatListener.java
@@ -41,7 +41,7 @@ public class PaperChatListener implements Listener {
  public void onJoin(AsyncChatEvent e) {
  PlatformChatEvent event = new PlatformChatEvent() {
  @Override
- public PlatformPlayer getPlayer() {
+ public PlatformPlayer<?> getPlayer() {
  return new BukkitPlayer(core, e.getPlayer());
  }
 

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/ErrorHandler.java b/core/src/main/java/dev/bluetree242/discordsrvutils/ErrorHandler.java
@@ -61,7 +61,7 @@ public void defaultHandle(Throwable ex) {
  core.getLogger().severe("Read the note above the error please.");
  // Don't spam errors
  if ((System.currentTimeMillis() - lastErrorTime) >= 180000)
- for (PlatformPlayer p : core.getServer().getOnlinePlayers()) {
+ for (PlatformPlayer<?> p : core.getServer().getOnlinePlayers()) {
  if (p.hasPermission("discordsrvutils.errornotifications")) {
  // Tell admins that something was wrong
  p.sendMessage("&7[&eDSU&7] Plugin had an error. Check console for details. Support at https://discordsrvutils.xyz/support");
@@ -84,7 +84,7 @@ public void defaultHandle(Throwable ex, MessageChannel channel) {
 
  public void severe(String sv) {
  core.getLogger().severe(sv);
- for (PlatformPlayer p : core.getServer().getOnlinePlayers()) {
+ for (PlatformPlayer<?> p : core.getServer().getOnlinePlayers()) {
  if (p.hasPermission("discordsrvutils.errornotifications"))
  // Tell admins that something was wrong
  p.sendMessage("&7[&eDSU&7] &c" + sv);

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/commands/game/DiscordSRVUtilsCommand.java b/core/src/main/java/dev/bluetree242/discordsrvutils/commands/game/DiscordSRVUtilsCommand.java
@@ -175,7 +175,7 @@ public void onRunAsync(String[] args, CommandUser sender, String label) throws T
  sender.sendMessage("&cPlease provide player name.");
  return;
  }
- PlatformPlayer player = core.getServer().getPlayer(name);
+ PlatformPlayer<?> player = core.getServer().getPlayer(name);
  if (player == null) {
  sender.sendMessage("&cPlayer not found.");
  return;

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/events/MinecraftLevelupEvent.java b/core/src/main/java/dev/bluetree242/discordsrvutils/events/MinecraftLevelupEvent.java
@@ -29,9 +29,9 @@
 @Getter
 public class MinecraftLevelupEvent extends LevelupEvent {
  private final PlayerStats stats;
- private final PlatformPlayer player;
+ private final PlatformPlayer<?> player;
 
- public MinecraftLevelupEvent(PlayerStats stats, PlatformPlayer player) {
+ public MinecraftLevelupEvent(PlayerStats stats, PlatformPlayer<?> player) {
  super(stats, player.getUniqueId());
  this.stats = stats;
  this.player = player;

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/placeholder/PlaceholdObject.java b/core/src/main/java/dev/bluetree242/discordsrvutils/placeholder/PlaceholdObject.java
@@ -63,11 +63,11 @@ public Object getObject() {
  return ob;
  }
 
- public String apply(@NotNull String s, PlatformPlayer placehold) {
+ public String apply(@NotNull String s, PlatformPlayer<?> placehold) {
  return apply(s, placehold, true);
  }
 
- public String apply(@NotNull String s, PlatformPlayer placehold, boolean doAllowCode) {
+ public String apply(@NotNull String s, PlatformPlayer<?> placehold, boolean doAllowCode) {
  final String[] val = {s};
  if (ob == null) {
  if (val[0].contains("[" + display + "]")) {

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/placeholder/PlaceholdObjectList.java b/core/src/main/java/dev/bluetree242/discordsrvutils/placeholder/PlaceholdObjectList.java
@@ -41,7 +41,7 @@ public static PlaceholdObjectList ofArray(DiscordSRVUtils core, PlaceholdObject.
  return list;
  }
 
- public String apply(String s, PlatformPlayer placehold) {
+ public String apply(String s, PlatformPlayer<?> placehold) {
  String val = s;
  Map<String, Object> variables = PlaceholdObject.getVariableMap(core);
  for (PlaceholdObject holder : this) {

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/platform/PlatformServer.java b/core/src/main/java/dev/bluetree242/discordsrvutils/platform/PlatformServer.java
@@ -49,11 +49,11 @@ public abstract class PlatformServer {
 
  public abstract Debugger getDebugger();
 
- public abstract PlatformPlayer getOfflinePlayer(UUID uuid);
+ public abstract PlatformPlayer<?> getOfflinePlayer(UUID uuid);
 
- public abstract PlatformPlayer getPlayer(UUID uuid);
+ public abstract PlatformPlayer<?> getPlayer(UUID uuid);
 
- public abstract PlatformPlayer getPlayer(String name);
+ public abstract PlatformPlayer<?> getPlayer(String name);
 
  public abstract void executeConsoleCommands(String... cmds);
 

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/platform/PluginPlatform.java b/core/src/main/java/dev/bluetree242/discordsrvutils/platform/PluginPlatform.java
@@ -65,7 +65,7 @@ public abstract class PluginPlatform<K> {
  public abstract void addHooks();
 
 
- public abstract String placehold(PlatformPlayer player, String s);
+ public abstract String placehold(PlatformPlayer<?> player, String s);
 
  public abstract PlatformDiscordSRV getDiscordSRV();
 

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/platform/events/PlatformChatEvent.java b/core/src/main/java/dev/bluetree242/discordsrvutils/platform/events/PlatformChatEvent.java
@@ -26,7 +26,7 @@
 
 public abstract class PlatformChatEvent {
 
- public abstract PlatformPlayer getPlayer();
+ public abstract PlatformPlayer<?> getPlayer();
 
  public abstract boolean isCancelled();
 }
diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/platform/events/PlatformJoinEvent.java b/core/src/main/java/dev/bluetree242/discordsrvutils/platform/events/PlatformJoinEvent.java
@@ -26,5 +26,5 @@
 
 public abstract class PlatformJoinEvent {
 
- public abstract PlatformPlayer getPlayer();
+ public abstract PlatformPlayer<?> getPlayer();
 }
diff --git a/.../src/main/java/dev/bluetree242/discordsrvutils/systems/commands/discord/CommandEvent.java b/.../src/main/java/dev/bluetree242/discordsrvutils/systems/commands/discord/CommandEvent.java
@@ -63,7 +63,7 @@ public ReplyAction reply(Message msg) {
  return event.reply(msg);
  }
 
- public ReplyAction replyMessage(String content, PlaceholdObjectList holders, PlatformPlayer placehold) {
+ public ReplyAction replyMessage(String content, PlaceholdObjectList holders, PlatformPlayer<?> placehold) {
  holders.add(new PlaceholdObject(core, getAuthor(), "user"));
  if (getChannel() instanceof TextChannel) {
  holders.add(new PlaceholdObject(core, getMember(), "member"));

diff --git a/...rc/main/java/dev/bluetree242/discordsrvutils/systems/leveling/LevelingRewardsManager.java b/...rc/main/java/dev/bluetree242/discordsrvutils/systems/leveling/LevelingRewardsManager.java
@@ -145,7 +145,7 @@ public void rewardIfOnline(PlayerStats stats) {
  rewardCache.remove(stats.getUuid().toString());
  saveRewardCache();
  }
- PlatformPlayer player = core.getPlatform().getServer().getPlayer(stats.getUuid());
+ PlatformPlayer<?> player = core.getPlatform().getServer().getPlayer(stats.getUuid());
  if (player == null) return;
  List<String> commands = getCommands(stats.getLevel(), lastLevel, stats);
  if (commands.isEmpty()) return;

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/systems/messages/MessageManager.java b/core/src/main/java/dev/bluetree242/discordsrvutils/systems/messages/MessageManager.java
@@ -161,7 +161,7 @@ public EmbedBuilder parseEmbedFromJSON(JsonNode json, PlaceholdObjectList holder
  return embed;
  }
 
- private @Nullable Instant parseTimestamp(JsonNode json, PlaceholdObjectList holders, PlatformPlayer placehold) {
+ private @Nullable Instant parseTimestamp(JsonNode json, PlaceholdObjectList holders, PlatformPlayer<?> placehold) {
  if (json.hasNonNull("timestamp")) {
  if (json.get("timestamp").isLong()) return Instant.ofEpochSecond(json.get("timestamp").asLong());
  else {
@@ -198,7 +198,7 @@ public EmbedBuilder parseEmbedFromJSON(JsonNode json) {
  return parseEmbedFromJSON(json, null, null);
  }
 
- public MessageBuilder parseMessageFromJson(JsonNode json, PlaceholdObjectList holders, PlatformPlayer placehold) {
+ public MessageBuilder parseMessageFromJson(JsonNode json, PlaceholdObjectList holders, PlatformPlayer<?> placehold) {
  MessageBuilder msg = new MessageBuilder();
 
  // Content
@@ -269,7 +269,7 @@ public JsonNode getMessageJSONByName(String name) {
  }
  }
 
- public MessageBuilder getMessage(String content, PlaceholdObjectList holders, PlatformPlayer placehold) {
+ public MessageBuilder getMessage(String content, PlaceholdObjectList holders, PlatformPlayer<?> placehold) {
  MessageBuilder msg = new MessageBuilder();
  if (content.startsWith("message:")) {
  String messageName = content.replaceFirst("message:", "");
@@ -283,11 +283,11 @@ public MessageBuilder getMessage(String content, PlaceholdObjectList holders, Pl
  return msg;
  }
 
- public MessageBuilder getMessageNamed(String name, PlaceholdObjectList holders, PlatformPlayer placehold) {
+ public MessageBuilder getMessageNamed(String name, PlaceholdObjectList holders, PlatformPlayer<?> placehold) {
  return parseMessageFromJson(getMessageJSONByName(name), holders, placehold);
  }
 
- public MessageBuilder getMessage(File file, PlaceholdObjectList holders, PlatformPlayer placehold) throws IOException {
+ public MessageBuilder getMessage(File file, PlaceholdObjectList holders, PlatformPlayer<?> placehold) throws IOException {
  return parseMessageFromJson(objectMapper.readTree(file), holders, placehold);
  }
 

diff --git a/core/src/main/java/dev/bluetree242/discordsrvutils/systems/status/StatusManager.java b/core/src/main/java/dev/bluetree242/discordsrvutils/systems/status/StatusManager.java
@@ -23,7 +23,6 @@
 package dev.bluetree242.discordsrvutils.systems.status;
 
 import dev.bluetree242.discordsrvutils.DiscordSRVUtils;
-import dev.bluetree242.discordsrvutils.placeholder.PlaceholdObject;
 import dev.bluetree242.discordsrvutils.placeholder.PlaceholdObjectList;
 import dev.bluetree242.discordsrvutils.utils.FileWriter;
 import dev.bluetree242.discordsrvutils.utils.Utils;