fix: Revert "Modify KryoUtils to handle IOExceptions"

This reverts commit 78e1d8e.
GeorgeV220 · Nov 11, 2023 · 0c146a7 · 0c146a7
1 parent fb36753
commit 0c146a7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 26 deletions.
diff --git a/minecraft/bukkit/src/main/java/com/georgev22/library/minecraft/inventory/ItemBuilder.java b/minecraft/bukkit/src/main/java/com/georgev22/library/minecraft/inventory/ItemBuilder.java
@@ -437,11 +437,7 @@ public ItemBuilder skull(String owner) {
     public ItemBuilder colors(@NotNull List<String> colors, boolean kryo) {
         if (colors.size() >= 2) {
             if (kryo) {
-                try {
-                    this.nbtItem.setByteArray("colors", KryoUtils.serialize(colors));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
+                this.nbtItem.setByteArray("colors", KryoUtils.serialize(colors));
             } else {
                 try {
                     this.nbtItem.setString("colors", Utils.serializeObjectToString(colors));
@@ -463,11 +459,7 @@ public ItemBuilder commands(boolean kryo, ItemCommand... itemCommands) {
 
     public ItemBuilder commands(List<ItemCommand> itemCommands, boolean kryo) {
         if (kryo) {
-            try {
-                this.nbtItem.setByteArray("commands", KryoUtils.serialize(itemCommands));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
+            this.nbtItem.setByteArray("commands", KryoUtils.serialize(itemCommands));
         } else {
             try {
                 this.nbtItem.setString("commands", Utils.serializeObjectToString(itemCommands));
@@ -494,11 +486,7 @@ public ItemBuilder frames(List<ItemStack> frames) {
 
     public ItemBuilder customNBT(String key, Object value, boolean kryo) {
         if (kryo) {
-            try {
-                this.nbtItem.setByteArray(key, KryoUtils.serialize(value));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
+            this.nbtItem.setByteArray(key, KryoUtils.serialize(value));
         } else {
             try {
                 this.nbtItem.setString(key, Utils.serializeObjectToString(value));

diff --git a/minecraft/bukkit/src/main/java/com/georgev22/library/minecraft/inventory/PagedInventory.java b/minecraft/bukkit/src/main/java/com/georgev22/library/minecraft/inventory/PagedInventory.java
@@ -296,12 +296,7 @@ public boolean open(Player player, int index, boolean animated) {
 
                         List<String> color;
                         if (registrar.kryo()) {
-                            try {
-                                color = KryoUtils.deserialize(nbtItem.getByteArray("colors"));
-                            } catch (IOException e) {
-                                registrar.getPlugin().getLogger().log(Level.SEVERE, "Error: ", e);
-                                color = Lists.newArrayList();
-                            }
+                            color = KryoUtils.deserialize(nbtItem.getByteArray("colors"));
                         } else {
                             try {
                                 color = (List<String>) Utils.deserializeObjectFromString(nbtItem.getString("colors"));

diff --git a/utilities/src/main/java/com/georgev22/library/utilities/KryoUtils.java b/utilities/src/main/java/com/georgev22/library/utilities/KryoUtils.java
@@ -11,7 +11,6 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.List;
@@ -20,21 +19,22 @@
 public class KryoUtils {
     private static final Kryo kryo = createKryoInstance();
 
-    public static byte[] serialize(Object object) throws IOException {
+    public static byte[] serialize(Object object) {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         Output output = new Output(byteArrayOutputStream);
-        output.close();
         kryo.writeClassAndObject(output, object);
+        output.close();
 
         return byteArrayOutputStream.toByteArray();
     }
 
-    public static <T> T deserialize(byte[] bytes) throws IOException {
+    public static <T> T deserialize(byte[] bytes) {
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
         Input input = new Input(byteArrayInputStream);
+        T object = (T) kryo.readClassAndObject(input);
         input.close();
 
-        return (T) kryo.readClassAndObject(input);
+        return object;
     }
 
     public static void registerClass(Class<?> clazz) {