feat(Utilities): Removed deprecated method

GeorgeV220 · May 4, 2023 · 33e24b8 · 33e24b8
1 parent db13424
commit 33e24b8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 72 deletions.
diff --git a/bukkit/src/main/java/com/georgev22/skinoverlay/listeners/bukkit/PlayerListeners.java b/bukkit/src/main/java/com/georgev22/skinoverlay/listeners/bukkit/PlayerListeners.java
@@ -3,7 +3,6 @@
 import com.georgev22.skinoverlay.SkinOverlay;
 import com.georgev22.skinoverlay.event.events.player.PlayerObjectConnectionEvent;
 import com.georgev22.skinoverlay.utilities.SkinOptions;
-import com.georgev22.skinoverlay.utilities.Utilities;
 import com.georgev22.skinoverlay.utilities.player.PlayerObject;
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
@@ -62,7 +61,7 @@ public void onPluginMessageReceived(@NotNull String channel, @NotNull Player pla
         ByteArrayDataInput in = ByteStreams.newDataInput(message);
         String subChannel = in.readUTF();
         UUID uuid = UUID.fromString(Objects.requireNonNull(decrypt(in.readUTF())));
-        SkinOptions skinOptions = Utilities.getSkinOptions(Objects.requireNonNull(decrypt(in.readUTF())));
+        SkinOptions skinOptions = SkinOptions.getSkinOptions(Objects.requireNonNull(decrypt(in.readUTF())));
         PlayerObject playerObject = skinOverlay.getPlayer(uuid).orElseThrow();
         if (subChannel.equalsIgnoreCase("change")) {
             if (!skinOptions.getSkinName().contains("custom")) {

diff --git a/bungee/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_BungeeCord.java b/bungee/src/main/java/com/georgev22/skinoverlay/handler/handlers/SkinHandler_BungeeCord.java
@@ -8,7 +8,6 @@
 import com.georgev22.skinoverlay.handler.SkinHandler;
 import com.georgev22.skinoverlay.handler.profile.SGameProfileBungee;
 import com.georgev22.skinoverlay.utilities.SkinOptions;
-import com.georgev22.skinoverlay.utilities.Utilities;
 import com.georgev22.skinoverlay.utilities.player.PlayerObject;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.connection.InitialHandler;
@@ -27,9 +26,9 @@ public CompletableFuture<Boolean> updateSkin(@NotNull PlayerObject playerObject,
                 skinOverlay.getPluginMessageUtils().setChannel("skinoverlay:bungee");
                 skinOverlay.getPluginMessageUtils().setObject(proxiedPlayer.getServer().getInfo());
                 if (skinOptions.getSkinName().equalsIgnoreCase("default")) {
-                    skinOverlay.getPluginMessageUtils().sendDataToServer("reset", playerObject.playerUUID().toString(), Utilities.skinOptionsToBytes(skinOptions));
+                    skinOverlay.getPluginMessageUtils().sendDataToServer("reset", playerObject.playerUUID().toString(), SkinOptions.skinOptionsToBytes(skinOptions));
                 } else {
-                    skinOverlay.getPluginMessageUtils().sendDataToServer("change", playerObject.playerUUID().toString(), Utilities.skinOptionsToBytes(skinOptions));
+                    skinOverlay.getPluginMessageUtils().sendDataToServer("change", playerObject.playerUUID().toString(), SkinOptions.skinOptionsToBytes(skinOptions));
                 }
                 return true;
             } catch (Exception exception) {
@@ -47,9 +46,9 @@ public CompletableFuture<Boolean> updateSkin(@NotNull PlayerObject playerObject,
                     skinOverlay.getPluginMessageUtils().setChannel("skinoverlay:bungee");
                     skinOverlay.getPluginMessageUtils().setObject(proxiedPlayer.getServer().getInfo());
                     if (skinOptions.getSkinName().equalsIgnoreCase("default")) {
-                        skinOverlay.getPluginMessageUtils().sendDataToServer("resetWithProperties", playerObject.playerUUID().toString(), Utilities.skinOptionsToBytes(skinOptions), property.name(), property.value(), property.signature());
+                        skinOverlay.getPluginMessageUtils().sendDataToServer("resetWithProperties", playerObject.playerUUID().toString(), SkinOptions.skinOptionsToBytes(skinOptions), property.name(), property.value(), property.signature());
                     } else {
-                        skinOverlay.getPluginMessageUtils().sendDataToServer("changeWithProperties", playerObject.playerUUID().toString(), Utilities.skinOptionsToBytes(skinOptions), property.name(), property.value(), property.signature());
+                        skinOverlay.getPluginMessageUtils().sendDataToServer("changeWithProperties", playerObject.playerUUID().toString(), SkinOptions.skinOptionsToBytes(skinOptions), property.name(), property.value(), property.signature());
                     }
                     return true;
                 } else {

diff --git a/core/src/main/java/com/georgev22/skinoverlay/handler/SkinHandler.java b/core/src/main/java/com/georgev22/skinoverlay/handler/SkinHandler.java
@@ -9,7 +9,6 @@
 import com.georgev22.skinoverlay.utilities.MessagesUtil;
 import com.georgev22.skinoverlay.utilities.OptionsUtil;
 import com.georgev22.skinoverlay.utilities.SkinOptions;
-import com.georgev22.skinoverlay.utilities.Utilities;
 import com.georgev22.skinoverlay.utilities.Utilities.Request;
 import com.georgev22.skinoverlay.utilities.interfaces.ImageSupplier;
 import com.georgev22.skinoverlay.utilities.player.PlayerObject;
@@ -93,11 +92,7 @@ public void setSkin(SkinOptions skinOptions, @NotNull PlayerObject playerObject,
                 skinOverlay.getLogger().log(Level.SEVERE, "User is null");
                 return;
             }
-            try {
-                user.addCustomData("skinOptions", Utilities.skinOptionsToBytes(skinOptions));
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+            user.addCustomData("skinOptions", SkinOptions.skinOptionsToBytes(skinOptions));
             user.addCustomData("skinProperty", new SProperty(properties[0], properties[1], properties[2]));
             updateSkin(playerObject, true);
             if (!skinOverlay.getSkinOverlay().type().isProxy() && OptionsUtil.PROXY.getBooleanValue()) {
@@ -135,7 +130,7 @@ public void setSkin(ImageSupplier imageSupplier, SkinOptions skinOptions, @NotNu
                         SGameProfile gameProfile = getGameProfile(playerObject);
                         gameProfile.removeProperty("textures");
                         gameProfile.addProperty("textures", new SProperty("textures", object.getAsJsonObject().get("value").getAsString(), object.getAsJsonObject().get("signature").getAsString()));
-                        user.addCustomData("skinOptions", Utilities.skinOptionsToBytes(skinOptions));
+                        user.addCustomData("skinOptions", SkinOptions.skinOptionsToBytes(skinOptions));
                         user.addCustomData("skinProperty", new SProperty("textures", object.getAsJsonObject().get("value").getAsString(), object.getAsJsonObject().get("signature").getAsString()));
                         if (commandIssuer == null) {
                             MessagesUtil.RESET.msgConsole(new HashObjectMap<String, String>().append("%player%", playerObject.playerName()), true);
@@ -174,7 +169,7 @@ public void setSkin(ImageSupplier imageSupplier, SkinOptions skinOptions, @NotNu
                             JsonObject texture = response.getAsJsonObject().getAsJsonObject("data").getAsJsonObject("texture");
                             String texturesValue = texture.get("value").getAsString();
                             String texturesSignature = texture.get("signature").getAsString();
-                            user.addCustomData("skinOptions", Utilities.skinOptionsToBytes(skinOptions));
+                            user.addCustomData("skinOptions", SkinOptions.skinOptionsToBytes(skinOptions));
                             user.addCustomData("skinProperty", new SProperty("textures", texturesValue, texturesSignature));
                             if (commandIssuer == null) {
                                 MessagesUtil.DONE.msgConsole(new HashObjectMap<String, String>().append("%player%", playerObject.playerName()).append("%url%", texture.get("url").getAsString()), true);
@@ -220,11 +215,7 @@ public void updateSkin(@NotNull PlayerObject playerObject, boolean forOthers) {
                 return;
             }
             PlayerObjectUpdateSkinEvent event;
-            try {
-                event = new PlayerObjectUpdateSkinEvent(playerObject, user, Utilities.getSkinOptions(user.getCustomData("skinOptions")), true);
-            } catch (IOException | ClassNotFoundException e) {
-                throw new RuntimeException(e);
-            }
+            event = new PlayerObjectUpdateSkinEvent(playerObject, user, SkinOptions.getSkinOptions(user.getCustomData("skinOptions")), true);
             skinOverlay.getEventManager().callEvent(event);
             if (event.isCancelled())
                 return;
@@ -246,16 +237,12 @@ public void updateSkin(@NotNull PlayerObject playerObject, boolean forOthers) {
     protected abstract void updateSkin0(UserManager.User user, PlayerObject playerObject, boolean forOthers);
 
     protected void updateSkin1(UserManager.User user, PlayerObject playerObject, boolean forOthers) {
-        try {
-            updateSkin(playerObject, Utilities.getSkinOptions(user.getCustomData("skinOptions")), user.getCustomData("skinProperty")).handleAsync((unused, throwable) -> {
-                if (throwable != null) {
-                    skinOverlay.getLogger().log(Level.SEVERE, "Error", throwable);
-                }
-                return unused;
-            });
-        } catch (IOException | ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
+        updateSkin(playerObject, SkinOptions.getSkinOptions(user.getCustomData("skinOptions")), user.getCustomData("skinProperty")).handleAsync((unused, throwable) -> {
+            if (throwable != null) {
+                skinOverlay.getLogger().log(Level.SEVERE, "Error", throwable);
+            }
+            return unused;
+        });
     }
 
     /**

diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/Utilities.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/Utilities.java
@@ -1,9 +1,5 @@
 package com.georgev22.skinoverlay.utilities;
 
-import com.georgev22.skinoverlay.handler.SProperty;
-import com.georgev22.skinoverlay.handler.Skin;
-import com.google.gson.internal.LinkedTreeMap;
-import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -24,19 +20,6 @@
 
 public class Utilities {
 
-    /**
-     * Creates an {@link SProperty} object from a {@link LinkedTreeMap} of strings.
-     *
-     * @param linkedTreeMap the linked tree map to create the SProperty object from
-     * @return the created SProperty object
-     * @deprecated This method is deprecated.
-     */
-    @Deprecated
-    @Contract("_ -> new")
-    public static @NotNull SProperty propertyFromLinkedTreeMap(@NotNull LinkedTreeMap<String, String> linkedTreeMap) {
-        return new SProperty(linkedTreeMap.get("name"), linkedTreeMap.get("value"), linkedTreeMap.get("signature"));
-    }
-
     /**
      * Decodes the specified Base64-encoded string into an object.
      *

diff --git a/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java b/core/src/main/java/com/georgev22/skinoverlay/utilities/player/PlayerObject.java
@@ -16,7 +16,6 @@
 import com.georgev22.skinoverlay.utilities.OptionsUtil;
 import com.georgev22.skinoverlay.utilities.SkinOptions;
 import com.georgev22.skinoverlay.utilities.Updater;
-import com.georgev22.skinoverlay.utilities.Utilities;
 import com.georgev22.skinoverlay.utilities.interfaces.SkinOverlayImpl.Type;
 import com.google.common.collect.Lists;
 import net.kyori.adventure.audience.Audience;
@@ -286,21 +285,17 @@ public void playerJoin() {
                     } catch (IOException | ExecutionException | InterruptedException e) {
                         throw new RuntimeException(e);
                     }
-                    try {
-                        UserAddDataEvent event = (UserAddDataEvent) skinOverlay.getEventManager()
-                                .callEvent(new UserAddDataEvent(
-                                        user,
-                                        Pair.create(
-                                                "skinOptions",
-                                                Utilities.skinOptionsToBytes(new SkinOptions("default"))
-                                        ),
-                                        true)
-                                );
-                        if (!event.isCancelled()) {
-                            user.addCustomDataIfNotExists(event.getData().key(), event.getData().value());
-                        }
-                    } catch (IOException e) {
-                        throw new RuntimeException(e);
+                    UserAddDataEvent event = (UserAddDataEvent) skinOverlay.getEventManager()
+                            .callEvent(new UserAddDataEvent(
+                                    user,
+                                    Pair.create(
+                                            "skinOptions",
+                                            SkinOptions.skinOptionsToBytes(new SkinOptions("default"))
+                                    ),
+                                    true)
+                            );
+                    if (!event.isCancelled()) {
+                        user.addCustomDataIfNotExists(event.getData().key(), event.getData().value());
                     }
                     userModifyDataEvent = (UserModifyDataEvent) skinOverlay.getEventManager()
                             .callEvent(new UserModifyDataEvent(user, true));
@@ -400,15 +395,11 @@ public void updateSkin() {
                         .callEvent(new PlayerObjectPreUpdateSkinEvent(this, user, true));
                 if (event.isCancelled())
                     return;
-                try {
-                    SkinOptions skinOptions = Utilities.getSkinOptions(event.getUser().getCustomData("skinOptions"));
-                    if (skinOptions == null)
-                        return;
-                    if (skinOptions.getSkinName().equals("default"))
-                        return;
-                } catch (IOException | ClassNotFoundException e) {
-                    throw new RuntimeException(e);
-                }
+                SkinOptions skinOptions = SkinOptions.getSkinOptions(event.getUser().getCustomData("skinOptions"));
+                if (skinOptions == null)
+                    return;
+                if (skinOptions.getSkinName().equals("default"))
+                    return;
                 skinOverlay.getSkinHandler().updateSkin(event.getPlayerObject(), true);
             }
         }).handleAsync((unused, throwable) -> {