Tiled 1.9 Compatibility Update

2026-01-20 01:21:06 +01:00 · 2022-08-02 20:28:19 -04:00
parent ddf314e4f0
commit 54ad83245f
107 changed files with 549 additions and 425 deletions
--- a/tests/test_data/tilesets/image/tileset.json
+++ b/tests/test_data/tilesets/image/tileset.json
@@ -7,7 +7,7 @@
 "objectalignment":"topleft",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.8.5",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
--- a/tests/test_data/tilesets/image/tileset.tsx
+++ b/tests/test_data/tilesets/image/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.5" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" objectalignment="topleft">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" objectalignment="topleft">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image_background_color/tileset.json
+++ b/tests/test_data/tilesets/image_background_color/tileset.json
@@ -7,9 +7,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_background_color/tileset.tsx
+++ b/tests/test_data/tilesets/image_background_color/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" backgroundcolor="#5500ff">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8" backgroundcolor="#5500ff">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image_grid/tileset.json
+++ b/tests/test_data/tilesets/image_grid/tileset.json
@@ -20,9 +20,9 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_grid/tileset.tsx
+++ b/tests/test_data/tilesets/image_grid/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <editorsettings>
  <export target="../tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/image" format=""/>
 </editorsettings>
--- a/tests/test_data/tilesets/image_properties/tileset.json
+++ b/tests/test_data/tilesets/image_properties/tileset.json
@@ -40,9 +40,9 @@
        }],
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_properties/tileset.tsx
+++ b/tests/test_data/tilesets/image_properties/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <editorsettings>
  <export target="../tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/image" format=""/>
 </editorsettings>
--- a/tests/test_data/tilesets/image_tile_offset/tileset.json
+++ b/tests/test_data/tilesets/image_tile_offset/tileset.json
@@ -14,7 +14,7 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tileoffset":
    {
@@ -23,5 +23,5 @@
    },
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_tile_offset/tileset.tsx
+++ b/tests/test_data/tilesets/image_tile_offset/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <editorsettings>
  <export target="../tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/tests/test_data/tilesets/image" format=""/>
 </editorsettings>
--- a/tests/test_data/tilesets/image_transformations/tileset.json
+++ b/tests/test_data/tilesets/image_transformations/tileset.json
@@ -6,7 +6,7 @@
 "name":"tile_set_image",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "transformations":
@@ -17,5 +17,5 @@
     "vflip":false
    },
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_transformations/tileset.tsx
+++ b/tests/test_data/tilesets/image_transformations/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tile_set_image" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <transformations hflip="1" vflip="0" rotate="0" preferuntransformed="0"/>
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/image_transparent_color/tileset.json
+++ b/tests/test_data/tilesets/image_transparent_color/tileset.json
@@ -6,10 +6,10 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "transparentcolor":"#ff00ff",
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/image_transparent_color/tileset.tsx
+++ b/tests/test_data/tilesets/image_transparent_color/tileset.tsx
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" trans="ff00ff" width="265" height="199"/>
 </tileset>
--- a/tests/test_data/tilesets/individual_images/expected.py
+++ b/tests/test_data/tilesets/individual_images/expected.py
@@ -28,7 +28,7 @@ EXPECTED = tileset.Tileset(
            image_height=32,
            image_width=32,
            properties={"float property": 2.2},
-            type="tile",
+            class_="tile",
        ),
        1: tileset.Tile(
            id=1,
@@ -46,7 +46,7 @@ EXPECTED = tileset.Tileset(
                        name="",
                        size=common_types.Size(14.4766410408043, 13.7196924896511),
                        rotation=0,
-                        type="",
+                        class_="",
                        visible=True,
                        coordinates=common_types.OrderedPair(
                            13.4358367829687, 13.5304553518628
@@ -57,7 +57,7 @@ EXPECTED = tileset.Tileset(
                        name="",
                        size=common_types.Size(14.287403903016, 11.070372560615),
                        rotation=0,
-                        type="",
+                        class_="",
                        visible=True,
                        coordinates=common_types.OrderedPair(
                            13.8143110585452, 1.98698994677705
@@ -66,7 +66,7 @@ EXPECTED = tileset.Tileset(
                ],
            ),
            properties={"string property": "testing"},
-            type="tile",
+            class_="tile",
        ),
        2: tileset.Tile(
            id=2,
@@ -74,14 +74,14 @@ EXPECTED = tileset.Tileset(
            image_height=32,
            image_width=32,
            properties={"bool property": True},
-            type="tile",
+            class_="tile",
        ),
        3: tileset.Tile(
            id=3,
            image=Path("../../images/tile_04.png"),
            image_height=32,
            image_width=32,
-            type="tile",
+            class_="tile",
        ),
    },
 )
--- a/tests/test_data/tilesets/individual_images/tileset.json
+++ b/tests/test_data/tilesets/individual_images/tileset.json
@@ -9,7 +9,7 @@
 "name":"tileset",
 "spacing":0,
 "tilecount":4,
- "tiledversion":"1.6.0",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tiles":[
        {
@@ -30,6 +30,7 @@
                 "duration":100,
                 "tileid":3
                }],
+         "class":"tile",
         "id":0,
         "image":"..\/..\/images\/tile_01.png",
         "imageheight":32,
@@ -39,10 +40,10 @@
                 "name":"float property",
                 "type":"float",
                 "value":2.2
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":1,
         "image":"..\/..\/images\/tile_02.png",
         "imageheight":32,
@@ -53,23 +54,23 @@
             "name":"",
             "objects":[
                    {
+                     "class":"",
                     "height":13.7196924896511,
                     "id":2,
                     "name":"",
                     "rotation":0,
-                     "type":"",
                     "visible":true,
                     "width":14.4766410408043,
                     "x":13.4358367829687,
                     "y":13.5304553518628
                    }, 
                    {
+                     "class":"",
                     "ellipse":true,
                     "height":11.070372560615,
                     "id":3,
                     "name":"",
                     "rotation":0,
-                     "type":"",
                     "visible":true,
                     "width":14.287403903016,
                     "x":13.8143110585452,
@@ -86,10 +87,10 @@
                 "name":"string property",
                 "type":"string",
                 "value":"testing"
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":2,
         "image":"..\/..\/images\/tile_03.png",
         "imageheight":32,
@@ -99,17 +100,16 @@
                 "name":"bool property",
                 "type":"bool",
                 "value":true
-                }],
-         "type":"tile"
+                }]
        }, 
        {
+         "class":"tile",
         "id":3,
         "image":"..\/..\/images\/tile_04.png",
         "imageheight":32,
-         "imagewidth":32,
-         "type":"tile"
+         "imagewidth":32
        }],
 "tilewidth":32,
 "type":"tileset",
- "version":"1.6"
+ "version":"1.8"
 }
--- a/tests/test_data/tilesets/individual_images/tileset.tsx
+++ b/tests/test_data/tilesets/individual_images/tileset.tsx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.5" tiledversion="1.7.0" name="tileset" tilewidth="32" tileheight="32" tilecount="4" columns="0">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" tilecount="4" columns="0">
 <grid orientation="orthogonal" width="1" height="1"/>
- <tile id="0" type="tile">
+ <tile id="0" class="tile">
  <properties>
   <property name="float property" type="float" value="2.2"/>
  </properties>
@@ -13,7 +13,7 @@
   <frame tileid="3" duration="100"/>
  </animation>
 </tile>
- <tile id="1" type="tile">
+ <tile id="1" class="tile">
  <properties>
   <property name="string property" value="testing"/>
  </properties>
@@ -25,13 +25,13 @@
   </object>
  </objectgroup>
 </tile>
- <tile id="2" type="tile">
+ <tile id="2" class="tile">
  <properties>
   <property name="bool property" type="bool" value="true"/>
  </properties>
  <image width="32" height="32" source="../../images/tile_03.png"/>
 </tile>
- <tile id="3" type="tile">
+ <tile id="3" class="tile">
  <image width="32" height="32" source="../../images/tile_04.png"/>
 </tile>
 </tileset>
--- a/tests/test_data/tilesets/terrain/tileset.json
+++ b/tests/test_data/tilesets/terrain/tileset.json
@@ -6,7 +6,7 @@
 "name":"tileset",
 "spacing":1,
 "tilecount":48,
- "tiledversion":"1.8.5",
+ "tiledversion":"1.9.0",
 "tileheight":32,
 "tilewidth":32,
 "type":"tileset",
--- a/tests/test_data/tilesets/terrain/tileset.tsx
+++ b/tests/test_data/tilesets/terrain/tileset.tsx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<tileset version="1.8" tiledversion="1.8.5" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
+<tileset version="1.9" tiledversion="1.9.0" name="tileset" tilewidth="32" tileheight="32" spacing="1" margin="1" tilecount="48" columns="8">
 <image source="../../images/tmw_desert_spacing.png" width="265" height="199"/>
 <wangsets>
  <wangset name="Terrains" type="mixed" tile="-1">