Fixed bugs

Author: GeneralBreddok

src/main/java/me/general_breddok/blockdisplaycreator/data/manager/PersistentDataTypes.java

@@ -204,7 +204,7 @@ public interface PersistentDataTypes {
 
     PersistentDataType<String, UUID> UUID = PersistentDataTypeStore.newPersistentDataType(
             String.class,
-            java.util.UUID.class,
+            UUID.class,
             (complex, context) -> complex.toString(),
             (primitive, context) -> java.util.UUID.fromString(primitive)
     );
@@ -390,10 +390,21 @@ public interface PersistentDataTypes {
                 CommandBundle.CommandSource commandSource = CommandBundle.CommandSource.CONSOLE;
                 List<String> grantedCommandPermissions = new ArrayList<>();
 
-                ArrayList<?> commandList = (ArrayList<?>) primitive.getList("command");
+                Object command = primitive.get("command");
+                ArrayList<Object> commandList = null;
                 ArrayList<?> grantedCommandPermissionList = (ArrayList<?>) primitive.getList("granted-command-permission");
                 String commandSourceStr = primitive.getString("command-source");
 
+                if (command instanceof List) {
+                    commandList = (ArrayList<Object>) command;
+                    if (commandList.isEmpty()) {
+                        return null;
+                    }
+                } else {
+                    commandList = new ArrayList<>();
+                    commandList.add(command);
+                }
+
                 if (commandList != null) {
                     commands = COMMAND_LIST.fromPrimitive(commandList, context);
                 } else {

src/main/java/me/general_breddok/blockdisplaycreator/data/yaml/YamlData.java

@@ -2,8 +2,8 @@
 
 import com.google.common.reflect.TypeToken;
 import me.general_breddok.blockdisplaycreator.data.BukkitData;
-import me.general_breddok.blockdisplaycreator.data.manager.ParameterizedClasses;
 import me.general_breddok.blockdisplaycreator.data.exception.ConfigurationDataTypeMismatchException;
+import me.general_breddok.blockdisplaycreator.data.manager.ParameterizedClasses;
 import me.general_breddok.blockdisplaycreator.data.manager.PersistentDataTypeManager;
 import me.general_breddok.blockdisplaycreator.data.manager.PersistentDataTypeStore;
 import me.general_breddok.blockdisplaycreator.data.manager.TypeTokens;
@@ -201,7 +201,6 @@ public C get(@NotNull String path) throws ConfigurationDataTypeMismatchException
             return null;
         }
 
-
         if (!(result instanceof String)) {
             if (result instanceof Number number) {
                 if (NumberUtil.isNumberClass(primitiveType)) {
@@ -213,7 +212,7 @@ public C get(@NotNull String path) throws ConfigurationDataTypeMismatchException
             }
         }
 
-        if (!(result instanceof ArrayList<?>) && primitiveType.equals(ArrayList.class)) {
+        if (!(result instanceof List<?>) && primitiveType.isAssignableFrom(List.class)) {
             List<Object> list = new ArrayList<>();
             list.add(result);
             result = list;

src/main/java/me/general_breddok/blockdisplaycreator/event/custom/block/CustomBlockInteractEvent.java

@@ -28,7 +28,6 @@ public class CustomBlockInteractEvent extends CustomBlockPlayerEvent implements
     @NonFinal
     boolean cancelled = false;
     Interaction interactionEntity;
-    @Nullable
     ConfiguredInteraction configuredInteraction;
     EquipmentSlot hand;
 
@@ -45,7 +44,7 @@ public class CustomBlockInteractEvent extends CustomBlockPlayerEvent implements
 
     public CustomBlockInteractEvent(@NotNull CustomBlock block, @NotNull Player player,
                                     @NotNull Interaction interactionEntity,
-                                    @Nullable ConfiguredInteraction configuredInteraction,
+                                    @NotNull ConfiguredInteraction configuredInteraction,
                                     @NotNull EquipmentSlot hand) {
         super(block, player);
         this.interactionEntity = interactionEntity;

src/main/java/me/general_breddok/blockdisplaycreator/listener/entity/EntityDamageByEntityListener.java

@@ -105,7 +105,7 @@ public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
 
         CustomBlockOption[] options = new CustomBlockOption[5];
 
-        if (player.getGameMode() != GameMode.CREATIVE || player.getGameMode() != GameMode.SPECTATOR) {
+        if (!(player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR)) {
             options[0] = CustomBlockBreakOption.DROP_ITEM;
         }
 

src/main/java/me/general_breddok/blockdisplaycreator/listener/player/PlayerInteractEntityListener.java

@@ -91,13 +91,13 @@ public void onPlayerInteractAtEntity(PlayerInteractEntityEvent event) {
 
         ConfiguredInteraction configuredInteraction = customBlock.getConfiguredInteraction(interaction);
 
-        CustomBlockInteractEvent customBlockInteractEvent = new CustomBlockInteractEvent(customBlock, player, interaction, configuredInteraction, hand);
-
-        if (!EventUtil.call(customBlockInteractEvent)) {
+        if (configuredInteraction == null) {
             return;
         }
 
-        if (configuredInteraction == null) {
+        CustomBlockInteractEvent customBlockInteractEvent = new CustomBlockInteractEvent(customBlock, player, interaction, configuredInteraction, hand);
+
+        if (!EventUtil.call(customBlockInteractEvent)) {
             return;
         }
 

src/main/java/me/general_breddok/blockdisplaycreator/listener/player/PlayerInteractListener.java

@@ -121,7 +121,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 
         CustomBlock customBlock = customBlockService.placeBlock(abstractCustomBlock, blockLocation, customBlockRotation, player);
 
-        if (customBlock != null && player.getGameMode() != GameMode.CREATIVE && player.getGameMode() != GameMode.SPECTATOR) {
+        if (customBlock != null && !(player.getGameMode() == GameMode.CREATIVE || player.getGameMode() == GameMode.SPECTATOR)) {
             item.setAmount(item.getAmount() - 1);
         }
     }