fix: replace CoreBlocks, CoreItems and BlockDropGrammar references

- replaced by `CoreAdvancedAssets` and `DropGrammar` respectively
Terasology · May 10, 2020 · d05fdf2 · d05fdf2
1 parent b90144e
commit d05fdf2
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/assets/blocks/explosives/Tnt.block b/assets/blocks/explosives/Tnt.block
@@ -8,6 +8,6 @@
         "bottom": "CoreAssets:TntBottom"
     },
     "entity": {
-        "prefab": "CoreBlocks:TNT"
+        "prefab": "CoreAdvancedAssets:TNT"
     }
 }
diff --git a/assets/blocks/furnishings/Chest.block b/assets/blocks/furnishings/Chest.block
@@ -12,7 +12,7 @@
         "topBottom": "CoreAssets:ChestTopBottom"
     },
     "entity": {
-        "prefab": "CoreBlocks:chest"
+        "prefab": "CoreAdvancedAssets:chest"
     },
     "inventory": {
         "stackable": false,

diff --git a/assets/blocks/furnishings/Furnace.block b/assets/blocks/furnishings/Furnace.block
@@ -8,6 +8,6 @@
         "topBottom": "CoreAssets:FurnaceTopBottom"
     },
     "entity": {
-        "prefab": "CoreBlocks:chest"
+        "prefab": "CoreAdvancedAssets:chest"
     }
 }
diff --git a/assets/blocks/furnishings/TrunkLeft.block b/assets/blocks/furnishings/TrunkLeft.block
@@ -2,7 +2,7 @@
  * A trunk is interesting for two reasons: they are two blocks wide and are asymmetrical (front texture differs from the sides) 
  */
 {
-    "basedOn": "CoreBlocks:Chest",
+    "basedOn": "CoreAdvancedAssets:Chest",
     "attachmentAllowed": false,
     "family": "horizontal",
     // Graphics

diff --git a/assets/blocks/furnishings/TrunkRight.block b/assets/blocks/furnishings/TrunkRight.block
@@ -2,7 +2,7 @@
  * A trunk is interesting for two reasons: they are two blocks wide and are asymmetrical (front texture differs from the sides) 
  */
 {
-    "basedOn": "CoreBlocks:Chest",
+    "basedOn": "CoreAdvancedAssets:Chest",
     "attachmentAllowed": false,
     "family": "horizontal",
     // Graphics

diff --git a/assets/prefabs/explosives/dynamiteBundle.prefab b/assets/prefabs/explosives/dynamiteBundle.prefab
@@ -10,6 +10,6 @@
     "ExplosionAction": {
         "relativeTo": "Target",
         "maxRange": 256,
-        "damageType": "CoreItems:DestructiveExplosiveDamage"
+        "damageType": "CoreAdvancedAssets:DestructiveExplosiveDamage"
     }
 }
diff --git a/assets/prefabs/explosives/gun.prefab b/assets/prefabs/explosives/gun.prefab
@@ -8,7 +8,7 @@
         "usage": "IN_DIRECTION"
     },
     "TunnelAction": {
-        "damageType": "CoreItems:NonDestructiveExplosiveDamage",
+        "damageType": "CoreAdvancedAssets:NonDestructiveExplosiveDamage",
         "maxDestroyedBlocks": 300
     },
     "PlaySoundAction": {

diff --git a/assets/prefabs/explosives/gunImproved.prefab b/assets/prefabs/explosives/gunImproved.prefab
@@ -8,7 +8,7 @@
         "usage": "IN_DIRECTION"
     },
     "TunnelAction": {
-        "damageType": "CoreItems:DestructiveExplosiveDamage",
+        "damageType": "CoreAdvancedAssets:DestructiveExplosiveDamage",
         "thoroughness": 0.75
     },
     "PlaySoundAction": {

diff --git a/assets/prefabs/furnishings/door.prefab b/assets/prefabs/furnishings/door.prefab
@@ -10,11 +10,11 @@
         "usage": "ON_BLOCK"
     },
     "Door": {
-        "topBlockFamily": "CoreBlocks:DoorTop",
-        "bottomBlockFamily": "CoreBlocks:DoorBottom",
+        "topBlockFamily": "CoreAdvancedAssets:DoorTop",
+        "bottomBlockFamily": "CoreAdvancedAssets:DoorBottom",
         "openSound": "CoreAssets:DoorOpen",
         "closeSound": "CoreAssets:DoorClose",
-        "doorRegionPrefab": "CoreBlocks:doorRegion"
+        "doorRegionPrefab": "CoreAdvancedAssets:doorRegion"
     },
     "Health": {
         "currentHealth": 5,
@@ -23,10 +23,10 @@
         "waitBeforeRegen": 2,
         "destroyEntityOnNoHealth": true
     },
-    "BlockDropGrammar": {
-        "itemDrops": ["CoreBlocks:door"]
+    "DropGrammar": {
+        "itemDrops": ["CoreAdvancedAssets:door"]
     },
     "ActAsBlock": {
-        "block": "CoreBlocks:DoorTop"
+        "block": "CoreAdvancedAssets:DoorTop"
     }
 }
diff --git a/assets/prefabs/furnishings/doorRegion.prefab b/assets/prefabs/furnishings/doorRegion.prefab
@@ -3,8 +3,8 @@
         "name": "Door"
     },
     "Door": {
-        "topBlockFamily": "CoreBlocks:DoorTop",
-        "bottomBlockFamily": "CoreBlocks:DoorBottom",
+        "topBlockFamily": "CoreAdvancedAssets:DoorTop",
+        "bottomBlockFamily": "CoreAdvancedAssets:DoorBottom",
         "openSound": "CoreAssets:DoorOpen",
         "closeSound": "CoreAssets:DoorClose"
     },
@@ -15,13 +15,13 @@
         "waitBeforeRegen": 2,
         "destroyEntityOnNoHealth": true
     },
-    "BlockDropGrammar": {
+    "DropGrammar": {
         "itemDrops": [
-            "CoreBlocks:door"
+            "CoreAdvancedAssets:door"
         ]
     },
     "ActAsBlock": {
-        "block": "CoreBlocks:DoorTop"
+        "block": "CoreAdvancedAssets:DoorTop"
     },
     "Network": {}
 }
diff --git a/assets/prefabs/furnishings/trunk.prefab b/assets/prefabs/furnishings/trunk.prefab
@@ -10,14 +10,14 @@
         "usage": "ON_BLOCK"
     },
     "Trunk": {
-        "leftBlockFamily": "CoreBlocks:TrunkLeft",
-        "rightBlockFamily": "CoreBlocks:TrunkRight",
+        "leftBlockFamily": "CoreAdvancedAssets:TrunkLeft",
+        "rightBlockFamily": "CoreAdvancedAssets:TrunkRight",
         "openSound": "CoreAssets:DoorOpen",
         "closeSound": "CoreAssets:DoorClose",
-        "trunkRegionPrefab": "CoreBlocks:trunkRegion"
+        "trunkRegionPrefab": "CoreAdvancedAssets:trunkRegion"
     },
-    "BlockDropGrammar": {
-        "itemDrops": ["CoreBlocks:trunk"]
+    "DropGrammar": {
+        "itemDrops": ["CoreAdvancedAssets:trunk"]
     },
     "Network": {
     }

diff --git a/assets/prefabs/furnishings/trunkRegion.prefab b/assets/prefabs/furnishings/trunkRegion.prefab
@@ -9,13 +9,13 @@
         "waitBeforeRegen": 2,
         "destroyEntityOnNoHealth": true
     },
-    "BlockDropGrammar": {
+    "DropGrammar": {
         "itemDrops": [
-            "CoreBlocks:trunk"
+            "CoreAdvancedAssets:trunk"
         ]
     },
     "ActAsBlock": {
-        "block": "CoreBlocks:TrunkLeft"
+        "block": "CoreAdvancedAssets:TrunkLeft"
     },
     "InventoryAccess": {
         "input": {