Requested Changes

Author: sovdeeth

src/main/java/org/skriptlang/skript/bukkit/pdc/PDCSerializer.java

@@ -6,6 +6,7 @@
 import ch.njol.skript.variables.Variables;
 import ch.njol.yggdrasil.Fields;
 import ch.njol.yggdrasil.Yggdrasil;
+import com.google.common.primitives.Primitives;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;
 import org.bukkit.persistence.PersistentDataAdapterContext;
@@ -257,9 +258,7 @@ private static Object deserializeFromBase64(@NotNull PersistentDataContainer con
 	}
 
 	private static boolean isPrimitiveWrapper(Class<?> key) {
-		return key == Byte.class || key == Short.class || key == Integer.class ||
-			key == Long.class || key == Double.class || key == Float.class ||
-			key == Boolean.class || key == Character.class;
+		return Primitives.isWrapperType(key);
 	}
 
 }

src/main/java/org/skriptlang/skript/bukkit/pdc/expressions/ExprPersistentData.java

@@ -365,22 +365,27 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 	 * @param consumer Code to run with the container
 	 */
 	private void getPersistentDataContainer(Object holder, Consumer<PersistentDataContainerView> consumer) {
-		if (holder instanceof PersistentDataHolder dataHolder) {
-			consumer.accept(dataHolder.getPersistentDataContainer());
-		} else if (holder instanceof ItemType itemType) {
-			var meta = itemType.getItemMeta();
-			consumer.accept(meta.getPersistentDataContainer());
-		} else if (holder instanceof ItemStack itemStack) {
-			if (!itemStack.hasItemMeta())
-				return;
-			consumer.accept(itemStack.getPersistentDataContainer());
-		} else if (holder instanceof Slot slot) {
-			var item =  slot.getItem();
-			if (item == null || !item.hasItemMeta())
-				return;
-			consumer.accept(item.getPersistentDataContainer());
-		} else if (holder instanceof Block block && block.getState() instanceof TileState tileState) {
-			consumer.accept(tileState.getPersistentDataContainer());
+		switch (holder) {
+			case PersistentDataHolder dataHolder -> consumer.accept(dataHolder.getPersistentDataContainer());
+			case ItemType itemType -> {
+				var meta = itemType.getItemMeta();
+				consumer.accept(meta.getPersistentDataContainer());
+			}
+			case ItemStack itemStack -> {
+				if (!itemStack.hasItemMeta())
+					return;
+				consumer.accept(itemStack.getPersistentDataContainer());
+			}
+			case Slot slot -> {
+				var item = slot.getItem();
+				if (item == null || !item.hasItemMeta())
+					return;
+				consumer.accept(item.getPersistentDataContainer());
+			}
+			case Block block when block.getState() instanceof TileState tileState ->
+				consumer.accept(tileState.getPersistentDataContainer());
+			case null, default -> {
+			}
 		}
 
 	}
@@ -391,25 +396,31 @@ private void getPersistentDataContainer(Object holder, Consumer<PersistentDataCo
 	 * @param consumer The method to run to edit the PDC.
 	 */
 	private void editPersistentDataContainer(Object holder, Consumer<PersistentDataContainer> consumer) {
-		if (holder instanceof PersistentDataHolder dataHolder) {
-			consumer.accept(dataHolder.getPersistentDataContainer());
-		} else if (holder instanceof ItemType itemType) {
-			var meta = itemType.getItemMeta();
-			consumer.accept(meta.getPersistentDataContainer());
-			itemType.setItemMeta(meta);
-		} else if (holder instanceof ItemStack itemStack) {
-			if (!itemStack.hasItemMeta())
-				return;
-			itemStack.editPersistentDataContainer(consumer);
-		} else if (holder instanceof Slot slot) {
-			var item =  slot.getItem();
-			if (item == null || !item.hasItemMeta())
-				return;
-			item.editPersistentDataContainer(consumer);
-			slot.setItem(item);
-		} else if (holder instanceof Block block && block.getState() instanceof TileState tileState) {
-			consumer.accept(tileState.getPersistentDataContainer());
-			tileState.update();
+		switch (holder) {
+			case PersistentDataHolder dataHolder -> consumer.accept(dataHolder.getPersistentDataContainer());
+			case ItemType itemType -> {
+				var meta = itemType.getItemMeta();
+				consumer.accept(meta.getPersistentDataContainer());
+				itemType.setItemMeta(meta);
+			}
+			case ItemStack itemStack -> {
+				if (!itemStack.hasItemMeta())
+					return;
+				itemStack.editPersistentDataContainer(consumer);
+			}
+			case Slot slot -> {
+				var item = slot.getItem();
+				if (item == null || !item.hasItemMeta())
+					return;
+				item.editPersistentDataContainer(consumer);
+				slot.setItem(item);
+			}
+			case Block block when block.getState() instanceof TileState tileState -> {
+				consumer.accept(tileState.getPersistentDataContainer());
+				tileState.update();
+			}
+			case null, default -> {
+			}
 		}
 	}