New method for loading variations and different sizes of an image.

* Only one type of an image is defined in "resources.properties". All variations and different sizes are loaded from the same location as that image.
* An image can have anything from zero to 100 variations.
* Mods can redefine only one mapping in "resource.properties", and optionally provide as many variations and sizes as the author wants.
* Backwards compatible with mods that still redefine ".r0" keys.
* Resources can now again be loaded from ZIP-files. This allows mods to be just placed in the "mods"-directory without being unpacked.

data/base/resources.properties

@@ -58,10 +58,10 @@ image.menuborder.shadow.se=resources/images/ui/menuborder-shadow-blank.png
 image.icon.cursor.go=resources/images/ui/go.png
 
 # Masks
-image.mask.sw=resources/images/masks/mask-center-128x64-sw.png
-image.mask.ne=resources/images/masks/mask-center-128x64-ne.png
-image.mask.nw=resources/images/masks/mask-center-128x64-nw.png
-image.mask.se=resources/images/masks/mask-center-128x64-se.png
+image.mask.sw=resources/images/masks/mask-center-sw.png
+image.mask.ne=resources/images/masks/mask-center-ne.png
+image.mask.nw=resources/images/masks/mask-center-nw.png
+image.mask.se=resources/images/masks/mask-center-se.png
 
 # Miscellaneous
 image.flavor.Canvas.map=resources/images/ui/map.jpg

data/mods/markovoss/resources.properties

@@ -12,116 +12,9 @@ color.politics.MiniMap.model.tile.frozenWater=urn:color:0xffffff
 color.politics.MiniMap.model.tile.sandDesert=urn:color:0x63732b
 color.politics.MiniMap.model.tile.dryDesert=urn:color:0x63732b
 
-image.tile.model.tile.arcticOcean.center.r0=resources/images/terrain/arcticOcean/center0.png
-image.tile.model.tile.arcticOcean.center.r1=resources/images/terrain/arcticOcean/center1.png
-image.tile.model.tile.arcticOcean.border.N.r0=resources/images/terrain/arcticOcean/border_N_even.png
-image.tile.model.tile.arcticOcean.border.N.r1=resources/images/terrain/arcticOcean/border_N_odd.png
-image.tile.model.tile.arcticOcean.border.NE.r0=resources/images/terrain/arcticOcean/border_NE_even.png
-image.tile.model.tile.arcticOcean.border.NE.r1=resources/images/terrain/arcticOcean/border_NE_odd.png
-image.tile.model.tile.arcticOcean.border.E.r0=resources/images/terrain/arcticOcean/border_E_even.png
-image.tile.model.tile.arcticOcean.border.E.r1=resources/images/terrain/arcticOcean/border_E_odd.png
-image.tile.model.tile.arcticOcean.border.SE.r0=resources/images/terrain/arcticOcean/border_SE_even.png
-image.tile.model.tile.arcticOcean.border.SE.r1=resources/images/terrain/arcticOcean/border_SE_odd.png
-image.tile.model.tile.arcticOcean.border.S.r0=resources/images/terrain/arcticOcean/border_S_even.png
-image.tile.model.tile.arcticOcean.border.S.r1=resources/images/terrain/arcticOcean/border_S_odd.png
-image.tile.model.tile.arcticOcean.border.SW.r0=resources/images/terrain/arcticOcean/border_SW_even.png
-image.tile.model.tile.arcticOcean.border.SW.r1=resources/images/terrain/arcticOcean/border_SW_odd.png
-image.tile.model.tile.arcticOcean.border.W.r0=resources/images/terrain/arcticOcean/border_W_even.png
-image.tile.model.tile.arcticOcean.border.W.r1=resources/images/terrain/arcticOcean/border_W_odd.png
-image.tile.model.tile.arcticOcean.border.NW.r0=resources/images/terrain/arcticOcean/border_NW_even.png
-image.tile.model.tile.arcticOcean.border.NW.r1=resources/images/terrain/arcticOcean/border_NW_odd.png
-
-image.tile.model.tile.arcticOcean2.center.r0=resources/images/terrain/arcticOcean2/center0.png
-image.tile.model.tile.arcticOcean2.center.r1=resources/images/terrain/arcticOcean2/center1.png
-image.tile.model.tile.arcticOcean2.border.N.r0=resources/images/terrain/arcticOcean2/border_N_even.png
-image.tile.model.tile.arcticOcean2.border.N.r1=resources/images/terrain/arcticOcean2/border_N_odd.png
-image.tile.model.tile.arcticOcean2.border.NE.r0=resources/images/terrain/arcticOcean2/border_NE_even.png
-image.tile.model.tile.arcticOcean2.border.NE.r1=resources/images/terrain/arcticOcean2/border_NE_odd.png
-image.tile.model.tile.arcticOcean2.border.E.r0=resources/images/terrain/arcticOcean2/border_E_even.png
-image.tile.model.tile.arcticOcean2.border.E.r1=resources/images/terrain/arcticOcean2/border_E_odd.png
-image.tile.model.tile.arcticOcean2.border.SE.r0=resources/images/terrain/arcticOcean2/border_SE_even.png
-image.tile.model.tile.arcticOcean2.border.SE.r1=resources/images/terrain/arcticOcean2/border_SE_odd.png
-image.tile.model.tile.arcticOcean2.border.S.r0=resources/images/terrain/arcticOcean2/border_S_even.png
-image.tile.model.tile.arcticOcean2.border.S.r1=resources/images/terrain/arcticOcean2/border_S_odd.png
-image.tile.model.tile.arcticOcean2.border.SW.r0=resources/images/terrain/arcticOcean2/border_SW_even.png
-image.tile.model.tile.arcticOcean2.border.SW.r1=resources/images/terrain/arcticOcean2/border_SW_odd.png
-image.tile.model.tile.arcticOcean2.border.W.r0=resources/images/terrain/arcticOcean2/border_W_even.png
-image.tile.model.tile.arcticOcean2.border.W.r1=resources/images/terrain/arcticOcean2/border_W_odd.png
-image.tile.model.tile.arcticOcean2.border.NW.r0=resources/images/terrain/arcticOcean2/border_NW_even.png
-image.tile.model.tile.arcticOcean2.border.NW.r1=resources/images/terrain/arcticOcean2/border_NW_odd.png
-
-image.tile.model.tile.arcticDesert.center.r0=resources/images/terrain/arcticDesert/center0.png
-image.tile.model.tile.arcticDesert.center.r1=resources/images/terrain/arcticDesert/center1.png
-image.tile.model.tile.arcticDesert.border.N.r0=resources/images/terrain/arcticDesert/border_N_even.png
-image.tile.model.tile.arcticDesert.border.N.r1=resources/images/terrain/arcticDesert/border_N_odd.png
-image.tile.model.tile.arcticDesert.border.NE.r0=resources/images/terrain/arcticDesert/border_NE_even.png
-image.tile.model.tile.arcticDesert.border.NE.r1=resources/images/terrain/arcticDesert/border_NE_odd.png
-image.tile.model.tile.arcticDesert.border.E.r0=resources/images/terrain/arcticDesert/border_E_even.png
-image.tile.model.tile.arcticDesert.border.E.r1=resources/images/terrain/arcticDesert/border_E_odd.png
-image.tile.model.tile.arcticDesert.border.SE.r0=resources/images/terrain/arcticDesert/border_SE_even.png
-image.tile.model.tile.arcticDesert.border.SE.r1=resources/images/terrain/arcticDesert/border_SE_odd.png
-image.tile.model.tile.arcticDesert.border.S.r0=resources/images/terrain/arcticDesert/border_S_even.png
-image.tile.model.tile.arcticDesert.border.S.r1=resources/images/terrain/arcticDesert/border_S_odd.png
-image.tile.model.tile.arcticDesert.border.SW.r0=resources/images/terrain/arcticDesert/border_SW_even.png
-image.tile.model.tile.arcticDesert.border.SW.r1=resources/images/terrain/arcticDesert/border_SW_odd.png
-image.tile.model.tile.arcticDesert.border.W.r0=resources/images/terrain/arcticDesert/border_W_even.png
-image.tile.model.tile.arcticDesert.border.W.r1=resources/images/terrain/arcticDesert/border_W_odd.png
-image.tile.model.tile.arcticDesert.border.NW.r0=resources/images/terrain/arcticDesert/border_NW_even.png
-image.tile.model.tile.arcticDesert.border.NW.r1=resources/images/terrain/arcticDesert/border_NW_odd.png
-
-image.tile.model.tile.sandDesert.center.r0=resources/images/terrain/sandDesert/center0.png
-image.tile.model.tile.sandDesert.center.r1=resources/images/terrain/sandDesert/center1.png
-image.tile.model.tile.sandDesert.border.N.r0=resources/images/terrain/sandDesert/border_N_even.png
-image.tile.model.tile.sandDesert.border.N.r1=resources/images/terrain/sandDesert/border_N_odd.png
-image.tile.model.tile.sandDesert.border.NE.r0=resources/images/terrain/sandDesert/border_NE_even.png
-image.tile.model.tile.sandDesert.border.NE.r1=resources/images/terrain/sandDesert/border_NE_odd.png
-image.tile.model.tile.sandDesert.border.E.r0=resources/images/terrain/sandDesert/border_E_even.png
-image.tile.model.tile.sandDesert.border.E.r1=resources/images/terrain/sandDesert/border_E_odd.png
-image.tile.model.tile.sandDesert.border.SE.r0=resources/images/terrain/sandDesert/border_SE_even.png
-image.tile.model.tile.sandDesert.border.SE.r1=resources/images/terrain/sandDesert/border_SE_odd.png
-image.tile.model.tile.sandDesert.border.S.r0=resources/images/terrain/sandDesert/border_S_even.png
-image.tile.model.tile.sandDesert.border.S.r1=resources/images/terrain/sandDesert/border_S_odd.png
-image.tile.model.tile.sandDesert.border.SW.r0=resources/images/terrain/sandDesert/border_SW_even.png
-image.tile.model.tile.sandDesert.border.SW.r1=resources/images/terrain/sandDesert/border_SW_odd.png
-image.tile.model.tile.sandDesert.border.W.r0=resources/images/terrain/sandDesert/border_W_even.png
-image.tile.model.tile.sandDesert.border.W.r1=resources/images/terrain/sandDesert/border_W_odd.png
-image.tile.model.tile.sandDesert.border.NW.r0=resources/images/terrain/sandDesert/border_NW_even.png
-image.tile.model.tile.sandDesert.border.NW.r1=resources/images/terrain/sandDesert/border_NW_odd.png
-
-image.tile.model.tile.dryDesert.center.r0=resources/images/terrain/dryDesert/center0.png
-image.tile.model.tile.dryDesert.center.r1=resources/images/terrain/dryDesert/center1.png
-image.tile.model.tile.dryDesert.border.N.r0=resources/images/terrain/dryDesert/border_N_even.png
-image.tile.model.tile.dryDesert.border.N.r1=resources/images/terrain/dryDesert/border_N_odd.png
-image.tile.model.tile.dryDesert.border.NE.r0=resources/images/terrain/dryDesert/border_NE_even.png
-image.tile.model.tile.dryDesert.border.NE.r1=resources/images/terrain/dryDesert/border_NE_odd.png
-image.tile.model.tile.dryDesert.border.E.r0=resources/images/terrain/dryDesert/border_E_even.png
-image.tile.model.tile.dryDesert.border.E.r1=resources/images/terrain/dryDesert/border_E_odd.png
-image.tile.model.tile.dryDesert.border.SE.r0=resources/images/terrain/dryDesert/border_SE_even.png
-image.tile.model.tile.dryDesert.border.SE.r1=resources/images/terrain/dryDesert/border_SE_odd.png
-image.tile.model.tile.dryDesert.border.S.r0=resources/images/terrain/dryDesert/border_S_even.png
-image.tile.model.tile.dryDesert.border.S.r1=resources/images/terrain/dryDesert/border_S_odd.png
-image.tile.model.tile.dryDesert.border.SW.r0=resources/images/terrain/dryDesert/border_SW_even.png
-image.tile.model.tile.dryDesert.border.SW.r1=resources/images/terrain/dryDesert/border_SW_odd.png
-image.tile.model.tile.dryDesert.border.W.r0=resources/images/terrain/dryDesert/border_W_even.png
-image.tile.model.tile.dryDesert.border.W.r1=resources/images/terrain/dryDesert/border_W_odd.png
-image.tile.model.tile.dryDesert.border.NW.r0=resources/images/terrain/dryDesert/border_NW_even.png
-image.tile.model.tile.dryDesert.border.NW.r1=resources/images/terrain/dryDesert/border_NW_odd.png
-
-image.tile.model.tile.frozenWater.center.r0=resources/images/terrain/frozenWater/center0.png
-image.tile.model.tile.frozenWater.center.r1=resources/images/terrain/frozenWater/center1.png
-image.tile.model.tile.frozenWater.border.N.r0=resources/images/terrain/frozenWater/border_N_even.png
-image.tile.model.tile.frozenWater.border.N.r1=resources/images/terrain/frozenWater/border_N_odd.png
-image.tile.model.tile.frozenWater.border.NE.r0=resources/images/terrain/frozenWater/border_NE_even.png
-image.tile.model.tile.frozenWater.border.NE.r1=resources/images/terrain/frozenWater/border_NE_odd.png
-image.tile.model.tile.frozenWater.border.E.r0=resources/images/terrain/frozenWater/border_E_even.png
-image.tile.model.tile.frozenWater.border.E.r1=resources/images/terrain/frozenWater/border_E_odd.png
-image.tile.model.tile.frozenWater.border.SE.r0=resources/images/terrain/frozenWater/border_SE_even.png
-image.tile.model.tile.frozenWater.border.SE.r1=resources/images/terrain/frozenWater/border_SE_odd.png
-image.tile.model.tile.frozenWater.border.S.r0=resources/images/terrain/frozenWater/border_S_even.png
-image.tile.model.tile.frozenWater.border.S.r1=resources/images/terrain/frozenWater/border_S_odd.png
-image.tile.model.tile.frozenWater.border.SW.r0=resources/images/terrain/frozenWater/border_SW_even.png
-image.tile.model.tile.frozenWater.border.SW.r1=resources/images/terrain/frozenWater/border_SW_odd.png
-image.tile.model.tile.frozenWater.border.W.r0=resources/images/terrain/frozenWater/border_W_even.png
-image.tile.model.tile.frozenWater.border.W.r1=resources/images/terrain/frozenWater/border_W_odd.png
-image.tile.model.tile.frozenWater.border.NW.r0=resources/images/terrain/frozenWater/border_NW_even.png
-image.tile.model.tile.frozenWater.border.NW.r1=resources/images/terrain/frozenWater/border_NW_odd.png
+image.tile.model.tile.arcticOcean.center=resources/images/terrain/arcticOcean/center0.png
+image.tile.model.tile.arcticOcean2.center=resources/images/terrain/arcticOcean2/center0.png
+image.tile.model.tile.arcticDesert.center=resources/images/terrain/arcticDesert/center0.png
+image.tile.model.tile.sandDesert.center=resources/images/terrain/sandDesert/center0.png
+image.tile.model.tile.dryDesert.center=resources/images/terrain/dryDesert/center0.png
+image.tile.model.tile.frozenWater.center=resources/images/terrain/frozenWater/center0.png