diff --git a/PCK-Studio/Properties/Resources.resx b/PCK-Studio/Properties/Resources.resx
index e4d8ab0b..ecd55109 100644
--- a/PCK-Studio/Properties/Resources.resx
+++ b/PCK-Studio/Properties/Resources.resx
@@ -173,7 +173,7 @@
..\Resources\iconImageList\GRH ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\tileData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+ ..\Resources\atlases\tileData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
..\Resources\pckClosed.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -227,7 +227,7 @@
..\Resources\iconImageList\INFO ICON.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\terrain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\atlases\terrain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\fileTemplates\tu53colours.col;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -236,7 +236,7 @@
..\Resources\icons\clock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\items.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\atlases\items.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\..\CHANGELOG.md;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
@@ -281,10 +281,10 @@
..\Resources\iconImageList\blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\entities.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\atlases\entities.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\entityData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+ ..\Resources\atlases\entityData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
..\Resources\icons\file_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -329,6 +329,6 @@
..\..\ProjectLogo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
- ..\Resources\moon_phases.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+ ..\Resources\atlases\moon_phases.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/PCK-Studio/Resources/atlases/additional_mapicons.png b/PCK-Studio/Resources/atlases/additional_mapicons.png
new file mode 100644
index 00000000..11b7256a
Binary files /dev/null and b/PCK-Studio/Resources/atlases/additional_mapicons.png differ
diff --git a/PCK-Studio/Resources/entities.png b/PCK-Studio/Resources/atlases/entities.png
similarity index 100%
rename from PCK-Studio/Resources/entities.png
rename to PCK-Studio/Resources/atlases/entities.png
diff --git a/PCK-Studio/Resources/entityData.json b/PCK-Studio/Resources/atlases/entityData.json
similarity index 100%
rename from PCK-Studio/Resources/entityData.json
rename to PCK-Studio/Resources/atlases/entityData.json
diff --git a/PCK-Studio/Resources/items.png b/PCK-Studio/Resources/atlases/items.png
similarity index 100%
rename from PCK-Studio/Resources/items.png
rename to PCK-Studio/Resources/atlases/items.png
diff --git a/PCK-Studio/Resources/atlases/map_icons.png b/PCK-Studio/Resources/atlases/map_icons.png
new file mode 100644
index 00000000..7b6ecd13
Binary files /dev/null and b/PCK-Studio/Resources/atlases/map_icons.png differ
diff --git a/PCK-Studio/Resources/moon_phases.png b/PCK-Studio/Resources/atlases/moon_phases.png
similarity index 100%
rename from PCK-Studio/Resources/moon_phases.png
rename to PCK-Studio/Resources/atlases/moon_phases.png
diff --git a/PCK-Studio/Resources/terrain.png b/PCK-Studio/Resources/atlases/terrain.png
similarity index 100%
rename from PCK-Studio/Resources/terrain.png
rename to PCK-Studio/Resources/atlases/terrain.png
diff --git a/PCK-Studio/Resources/tileData.json b/PCK-Studio/Resources/atlases/tileData.json
similarity index 96%
rename from PCK-Studio/Resources/tileData.json
rename to PCK-Studio/Resources/atlases/tileData.json
index 456dfe04..fd5a2204 100644
--- a/PCK-Studio/Resources/tileData.json
+++ b/PCK-Studio/Resources/atlases/tileData.json
@@ -2282,7 +2282,29 @@
},
{
"internalName": "shulker_top",
- "displayName": "Shulker Box (Break Particles)"
+ "displayName": "Shulker Box (Break Particles)",
+ "hasColourEntry": true,
+ "colourEntry": {
+ "defaultName": "Shulker_Box_Purple",
+ "variants": [
+ "Shulker_Box_Black",
+ "Shulker_Box_Blue",
+ "Shulker_Box_Brown",
+ "Shulker_Box_Cyan",
+ "Shulker_Box_Grey",
+ "Shulker_Box_Green",
+ "Shulker_Box_Light_Blue",
+ "Shulker_Box_Light_Green",
+ "Shulker_Box_Magenta",
+ "Shulker_Box_Orange",
+ "Shulker_Box_Pink",
+ "Shulker_Box_Purple",
+ "Shulker_Box_Red",
+ "Shulker_Box_Silver",
+ "Shulker_Box_White",
+ "Shulker_Box_Yellow"
+ ]
+ }
},
{
"internalName": "",
@@ -4167,6 +4189,138 @@
{
"internalName": "moon_phase_7",
"displayName": "Waxing Gibbous"
+ }
+ ],
+ "map_icons": [
+ {
+ "internalName": "player_1",
+ "displayName": "Player 1"
},
+ {
+ "internalName": "player_2",
+ "displayName": "Player 2"
+ },
+ {
+ "internalName": "player_3",
+ "displayName": "Player 3"
+ },
+ {
+ "internalName": "player_4",
+ "displayName": "Player 4"
+ },
+ {
+ "internalName": "target_x",
+ "displayName": "Unused"
+ },
+ {
+ "internalName": "target_point",
+ "displayName": "Unused"
+ },
+ {
+ "internalName": "player_off_map",
+ "displayName": "Unused"
+ },
+ {
+ "internalName": "frame",
+ "displayName": "Item Frame"
+ },
+ {
+ "internalName": "player_5",
+ "displayName": "Player 5"
+ },
+ {
+ "internalName": "player_6",
+ "displayName": "Player 6"
+ },
+ {
+ "internalName": "player_7",
+ "displayName": "Player 7"
+ },
+ {
+ "internalName": "player_8",
+ "displayName": "Player 8"
+ },
+ {
+ "internalName": "structure",
+ "displayName": "Structure (Explorer Map)"
+ },
+ {
+ "internalName": "player_off_limits",
+ "displayName": "Unused"
+ },
+ {
+ "internalName": "mansion",
+ "displayName": "Woodland Mansion (Explorer Map)"
+ },
+ {
+ "internalName": "monument",
+ "displayName": "Ocean Monument (Explorer Map)"
+ }
+ ],
+ "additional_map_icons": [
+ {
+ "internalName": "player_1_off_map",
+ "displayName": "Player 1 (Off Map)"
+ },
+ {
+ "internalName": "player_2_off_map",
+ "displayName": "Player 2 (Off Map)"
+ },
+ {
+ "internalName": "player_3_off_map",
+ "displayName": "Player 3 (Off Map)"
+ },
+ {
+ "internalName": "player_4_off_map",
+ "displayName": "Player 4 (Off Map)"
+ },
+ {
+ "internalName": "treasure",
+ "displayName": "Buried Treasure"
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ },
+ {
+ "internalName": "player_5_off_map",
+ "displayName": "Player 5 (Off Map)"
+ },
+ {
+ "internalName": "player_6_off_map",
+ "displayName": "Player 6 (Off Map)"
+ },
+ {
+ "internalName": "player_7_off_map",
+ "displayName": "Player 7 (Off Map)"
+ },
+ {
+ "internalName": "player_8_off_map",
+ "displayName": "Player 8 (Off Map)"
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ },
+ {
+ "internalName": "",
+ "displayName": ""
+ }
]
}