refactor(commons): Refactor map controlling operations with util method

TeamKun · Nov 15, 2023 · adbecb5 · adbecb5
1 parent eeefdba
commit adbecb5
Show file tree

Hide file tree

Showing 44 changed files with 161 additions and 376 deletions.
diff --git a/ScenamaticaActionEngine/src/main/java/org/kunlab/scenamatica/action/ActionCompilerImpl.java b/ScenamaticaActionEngine/src/main/java/org/kunlab/scenamatica/action/ActionCompilerImpl.java
@@ -70,11 +70,7 @@ else if (actionToBeNegated instanceof NegateAction)
         {
 
             argument = actionToBeNegated.deserializeArgument(
-                    MapUtils.checkAndCastMap(
-                            arguments.get(NegateAction.Argument.KEY_ARGUMENTS),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(NegateAction.Argument.KEY_ARGUMENTS),
                     engine.getManager().getRegistry().getScenarioFileManager().getSerializer()
             );
         }

diff --git a/...Engine/src/main/java/org/kunlab/scenamatica/action/actions/block/AbstractBlockAction.java b/...Engine/src/main/java/org/kunlab/scenamatica/action/actions/block/AbstractBlockAction.java
@@ -45,11 +45,7 @@ public BlockBean deserializeBlockOrNull(@NotNull Map<String, Object> map, @NotNu
             return null;
 
         return serializer.deserialize(
-                MapUtils.checkAndCastMap(
-                        map.get(AbstractBlockActionArgument.KEY_BLOCK),
-                        String.class,
-                        Object.class
-                ),
+                MapUtils.checkAndCastMap(AbstractBlockActionArgument.KEY_BLOCK),
                 BlockBean.class
         );
     }

diff --git a/.../main/java/org/kunlab/scenamatica/action/actions/entity/AbstractEntityActionArgument.java b/.../main/java/org/kunlab/scenamatica/action/actions/entity/AbstractEntityActionArgument.java
@@ -18,11 +18,6 @@ public abstract class AbstractEntityActionArgument extends AbstractActionArgumen
     @Nullable
     private final EntityArgumentHolder entity;
 
-    public AbstractEntityActionArgument(@Nullable EntityArgumentHolder target)
-    {
-        this.entity = target;
-    }
-
     @Override
     public boolean isSame(TriggerArgument argument)
     {
@@ -75,6 +70,11 @@ public String getArgumentString()
         return this.entity.getArgumentString();
     }
 
+    public EntityArgumentHolder getTargetHolder()
+    {
+        return this.entity;
+    }
+
     public EntityBean getTargetBean()
     {
         return this.entity == null ? null: this.entity.getTargetBean();
@@ -91,6 +91,5 @@ public void throwIfNotSelectable()
     {
         if (!this.isSelectable())
             throw new IllegalArgumentException("Cannot select target for this action, please specify target with valid selector.");
-
     }
 }
diff --git a/...ActionEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityAction.java b/...ActionEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityAction.java
@@ -66,11 +66,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         EntityBean bean;
         if (map.containsKey(Argument.KEY_ENTITY))
             bean = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ENTITY),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_ENTITY),
                     EntityBean.class
             );
         else

diff --git a/...gine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityArgumentHolder.java b/...gine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityArgumentHolder.java
@@ -51,7 +51,7 @@ public static EntityArgumentHolder tryDeserialize(Object obj, BeanSerializer ser
             // noinspection unchecked
             Map<String, Object> map = (Map<String, Object>) obj;
 
-            return new EntityArgumentHolder(serializer.deserializeEntity(map));
+            return new EntityArgumentHolder(serializer.deserialize(map, EntityBean.class));
         }
 
         throw new IllegalArgumentException("Cannot deserialize EntityArgumentHolder from " + obj);

diff --git a/...rc/main/java/org/kunlab/scenamatica/action/actions/entity/EntityDamageByEntityAction.java b/...rc/main/java/org/kunlab/scenamatica/action/actions/entity/EntityDamageByEntityAction.java
@@ -74,7 +74,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         String damager = MapUtils.getOrNull(map, Argument.KEY_DAMAGER);
 
         return new Argument(
-                base.getTargetRaw(),
+                base.getTargetHolder(),
                 base.getCause(),
                 base.getAmount(),
                 base.getModifiers(),

diff --git a/...nEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityDeathAction.java b/...nEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityDeathAction.java
@@ -98,7 +98,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
             drops = new ArrayList<>();
             List<Map<String, Object>> dropMaps = MapUtils.getAsList(map, Argument.KEY_DROPS);
             for (Map<String, Object> dropMap : dropMaps)
-                drops.add(serializer.deserializeItemStack(dropMap));
+                drops.add(serializer.deserialize(dropMap, ItemStackBean.class));
         }
 
         return new Argument(

diff --git a/...gine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityDropItemAction.java b/...gine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityDropItemAction.java
@@ -86,11 +86,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         EntityItemBean item = null;
         if (map.containsKey(Argument.KEY_DROP_ITEM))
             item = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_DROP_ITEM),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_DROP_ITEM),
                     EntityItemBean.class
             );
 

diff --git a/...ne/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityPickupItemAction.java b/...ne/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityPickupItemAction.java
@@ -138,11 +138,9 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
             return new Argument(
                     super.deserializeTarget(map, serializer),
                     remaining,
-                    serializer.deserializeEntityItem(MapUtils.checkAndCastMap(
-                                    map.get(Argument.KEY_ITEM),
-                                    String.class,
-                                    Object.class
-                            )
+                    serializer.deserialize(
+                            MapUtils.checkAndCastMap(Argument.KEY_ITEM),
+                            EntityItemBean.class
                     )
             );
     }

diff --git a/...nEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityPlaceAction.java b/...nEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntityPlaceAction.java
@@ -156,11 +156,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         BlockBean blockBean = null;
         if (map.containsKey(Argument.KEY_BLOCK))
             blockBean = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_BLOCK),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_BLOCK),
                     BlockBean.class
             );
 

diff --git a/...nEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntitySpawnAction.java b/...nEngine/src/main/java/org/kunlab/scenamatica/action/actions/entity/EntitySpawnAction.java
@@ -91,11 +91,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
 
         return new Argument(
                 serializer.deserialize(
-                        MapUtils.checkAndCastMap(
-                                map.get(Argument.KEY_ENTITY),
-                                String.class,
-                                Object.class
-                        ),
+                        MapUtils.checkAndCastMap(Argument.KEY_ENTITY),
                         EntityBean.class
                 ));
     }

diff --git a/...rc/main/java/org/kunlab/scenamatica/action/actions/inventory/AbstractInventoryAction.java b/...rc/main/java/org/kunlab/scenamatica/action/actions/inventory/AbstractInventoryAction.java
@@ -46,11 +46,7 @@ protected InventoryBean deserializeInventoryIfContains(Map<String, Object> map,
             return null;
 
         return serializer.deserialize(
-                MapUtils.checkAndCastMap(
-                        map.get(AbstractInventoryArgument.KEY_INVENTORY),
-                        String.class,
-                        Object.class
-                ),
+                MapUtils.checkAndCastMap(AbstractInventoryArgument.KEY_INVENTORY),
                 InventoryBean.class
         );
     }

diff --git a/...n/java/org/kunlab/scenamatica/action/actions/inventory/interact/InventoryClickAction.java b/...n/java/org/kunlab/scenamatica/action/actions/inventory/interact/InventoryClickAction.java
@@ -116,22 +116,14 @@ public T deserializeArgument(@NotNull Map<String, Object> map, @NotNull BeanSeri
         ItemStackBean clickedItem = null;
         if (map.containsKey(Argument.KEY_CLICKED_ITEM))
             clickedItem = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_CLICKED_ITEM),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_CLICKED_ITEM),
                     ItemStackBean.class
             );
 
         ItemStackBean cursorItem = null;
         if (map.containsKey(Argument.KEY_CURSOR_ITEM))
             cursorItem = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_CURSOR_ITEM),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_CURSOR_ITEM),
                     ItemStackBean.class
             );
 

diff --git a/...ava/org/kunlab/scenamatica/action/actions/inventory/interact/InventoryCreativeAction.java b/...ava/org/kunlab/scenamatica/action/actions/inventory/interact/InventoryCreativeAction.java
@@ -70,11 +70,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         ItemStackBean stack = null;
         if (map.containsKey(Argument.KEY_ITEM))
             stack = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ITEM),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_ITEM),
                     ItemStackBean.class
             );
 

diff --git a/.../src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerBucketEntityAction.java b/.../src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerBucketEntityAction.java
@@ -117,21 +117,17 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
     {
         ItemStackBean originalBucket = null;
         if (map.containsKey(Argument.KEY_ORIGINAL_BUCKET))
-            originalBucket = serializer.deserializeItemStack(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ORIGINAL_BUCKET),
-                            String.class,
-                            Object.class
-                    ));
+            originalBucket = serializer.deserialize(
+                    MapUtils.checkAndCastMap(Argument.KEY_ORIGINAL_BUCKET),
+                    ItemStackBean.class
+            );
 
         ItemStackBean entityBucket = null;
         if (map.containsKey(Argument.KEY_ENTITY_BUCKET))
-            entityBucket = serializer.deserializeItemStack(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ENTITY_BUCKET),
-                            String.class,
-                            Object.class
-                    ));
+            entityBucket = serializer.deserialize(
+                    MapUtils.checkAndCastMap(Argument.KEY_ENTITY_BUCKET),
+                    ItemStackBean.class
+            );
 
         return new Argument(
                 super.deserializeTarget(map),

diff --git a/...gine/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerDropItemAction.java b/...gine/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerDropItemAction.java
@@ -75,10 +75,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         EntityItemBean item = null;
         if (map.containsKey(Argument.KEY_ITEM))
             item = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ITEM),
-                            String.class, Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_ITEM),
                     EntityItemBean.class
             );
 

diff --git a/.../src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerHarvestBlockAction.java b/.../src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerHarvestBlockAction.java
@@ -91,20 +91,17 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
     {
         BlockBean block = null;
         if (map.containsKey(Argument.KEY_HARVESTED_BLOCK))
-            block = serializer.deserializeBlock(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_HARVESTED_BLOCK),
-                            String.class,
-                            Object.class
-                    )
+            block = serializer.deserialize(
+                    MapUtils.checkAndCastMap(Argument.KEY_HARVESTED_BLOCK),
+                    BlockBean.class
             );
 
         List<ItemStackBean> items = new ArrayList<>();
         if (map.containsKey(Argument.KEY_ITEMS_HARVESTED))
         {
             List<Map<String, Object>> itemMaps = MapUtils.getAsList(map, Argument.KEY_ITEMS_HARVESTED);
             for (Map<String, Object> itemMap : itemMaps)
-                items.add(serializer.deserializeItemStack(itemMap));
+                items.add(serializer.deserialize(itemMap, ItemStackBean.class));
         }
 
         return new Argument(

diff --git a/...ne/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerHotbarSlotAction.java b/...ne/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerHotbarSlotAction.java
@@ -87,11 +87,8 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         ItemStackBean item = null;
         if (map.containsKey(Argument.KEY_CURRENT_ITEM))
         {
-            Map<String, Object> itemMap = MapUtils.checkAndCastMap(
-                    map.get(Argument.KEY_CURRENT_ITEM),
-                    String.class,
-                    Object.class
-            );
+            Map<String, Object> itemMap =
+                    MapUtils.checkAndCastMap(Argument.KEY_CURRENT_ITEM);
 
             serializer.validate(itemMap, ItemStackBean.class);
 

diff --git a/...src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerInteractBlockAction.java b/...src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerInteractBlockAction.java
@@ -110,11 +110,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         BlockBean block = null;
         if (map.containsKey(Argument.KEY_BLOCK))
             block = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_BLOCK),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_BLOCK),
                     BlockBean.class
             );
 

diff --git a/...ine/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerItemBreakAction.java b/...ine/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerItemBreakAction.java
@@ -160,11 +160,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         ItemStackBean item = null;
         if (map.containsKey(Argument.KEY_ITEM))
             item = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ITEM),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_ITEM),
                     ItemStackBean.class
             );
 

diff --git a/...e/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerItemConsumeAction.java b/...e/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerItemConsumeAction.java
@@ -90,22 +90,14 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         ItemStackBean item = null;
         if (map.containsKey(Argument.KEY_ITEM))
             item = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ITEM),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_ITEM),
                     ItemStackBean.class
             );
 
         ItemStackBean replacement = null;
         if (map.containsKey(Argument.KEY_REPLACEMENT))
             replacement = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_REPLACEMENT),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(Argument.KEY_REPLACEMENT),
                     ItemStackBean.class
             );
 

diff --git a/...ne/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerItemDamageAction.java b/...ne/src/main/java/org/kunlab/scenamatica/action/actions/player/PlayerItemDamageAction.java
@@ -88,12 +88,9 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
     {
         ItemStackBean item = null;
         if (map.containsKey(Argument.KEY_ITEM))
-            item = serializer.deserializeItemStack(
-                    MapUtils.checkAndCastMap(
-                            map.get(Argument.KEY_ITEM),
-                            String.class,
-                            Object.class
-                    )
+            item = serializer.deserialize(
+                    MapUtils.checkAndCastMap(Argument.KEY_ITEM),
+                    ItemStackBean.class
             );
 
         return new Argument(

diff --git a/.../main/java/org/kunlab/scenamatica/action/actions/player/PlayerLaunchProjectileAction.java b/.../main/java/org/kunlab/scenamatica/action/actions/player/PlayerLaunchProjectileAction.java
@@ -95,9 +95,7 @@ public Argument deserializeArgument(@NotNull Map<String, Object> map, @NotNull B
         MapUtils.checkTypeIfContains(map, Argument.KEY_PROJECTILE_EPSILON, Double.class);
         // ItemStackBeanImpl.checkMap(map, PlayerLaunchProjectileActionArgument.KEY_PROJECTILE_SHOOTER);
 
-        Map<String, Object> velocityMap = MapUtils.checkAndCastMap(map.get(Argument.KEY_PROJECTILE_VELOCITY),
-                String.class, Object.class
-        );
+        Map<String, Object> velocityMap = MapUtils.checkAndCastMap(map.get(Argument.KEY_PROJECTILE_VELOCITY));
 
         double epsilon;
         if (map.containsKey(Argument.KEY_PROJECTILE_EPSILON) && map.get(Argument.KEY_PROJECTILE_EPSILON) != null)

diff --git a/...c/main/java/org/kunlab/scenamatica/action/actions/player/bucket/BucketActionArgument.java b/...c/main/java/org/kunlab/scenamatica/action/actions/player/bucket/BucketActionArgument.java
@@ -60,33 +60,21 @@ public static BucketActionArgument deserialize(Map<String, Object> map, BeanSeri
         ItemStackBean itemStack = null;
         if (map.containsKey(BucketActionArgument.KEY_ITEM_STACK))
             itemStack = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(BucketActionArgument.KEY_ITEM_STACK),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(BucketActionArgument.KEY_ITEM_STACK),
                     ItemStackBean.class
             );
 
         BlockBean block = null;
         if (map.containsKey(BucketActionArgument.KEY_BLOCK))
             block = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(BucketActionArgument.KEY_BLOCK),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(BucketActionArgument.KEY_BLOCK),
                     BlockBean.class
             );
 
         BlockBean blockClicked = null;
         if (map.containsKey(BucketActionArgument.KEY_BLOCK_CLICKED))
             blockClicked = serializer.deserialize(
-                    MapUtils.checkAndCastMap(
-                            map.get(BucketActionArgument.KEY_BLOCK_CLICKED),
-                            String.class,
-                            Object.class
-                    ),
+                    MapUtils.checkAndCastMap(BucketActionArgument.KEY_BLOCK_CLICKED),
                     BlockBean.class
             );