Skip to content

Commit d7f1396

Browse files
committed
* update: bump to v1.1.0
1 parent 6b65307 commit d7f1396

29 files changed

+106
-105
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'java-library'
33
apply plugin: 'maven-publish'
44
apply plugin: 'signing'
55

6-
version = '1.0.0'
6+
version = '1.1.0'
77

88
repositories {
99
mavenLocal()

src/main/java/io/github/joafalves/ldtk/model/AutoLayerRuleDefinition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class AutoLayerRuleDefinition {
2424
private double pivotX;
2525
private double pivotY;
2626
private long size;
27-
private long[] tileIDS;
27+
private long[] tileIds;
2828
private TileMode tileMode;
2929
private long uid;
3030
private long xModulo;
@@ -148,9 +148,9 @@ public class AutoLayerRuleDefinition {
148148
* Array of all the tile IDs. They are used randomly or as stamps, based on `tileMode` value.
149149
*/
150150
@JsonProperty("tileIds")
151-
public long[] getTileIDS() { return tileIDS; }
151+
public long[] getTileIds() { return tileIds; }
152152
@JsonProperty("tileIds")
153-
public void setTileIDS(long[] value) { this.tileIDS = value; }
153+
public void setTileIds(long[] value) { this.tileIds = value; }
154154

155155
/**
156156
* Defines how tileIds array is used Possible values: `Single`, `Stamp`

src/main/java/io/github/joafalves/ldtk/model/Coordinate.java

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@JsonIgnoreProperties(ignoreUnknown = true)
1313
public class Coordinate {
1414
private ForcedRefs forcedRefs;
15-
private double appBuildID;
15+
private double appBuildId;
1616
private long backupLimit;
1717
private boolean backupOnSave;
1818
private String bgColor;
@@ -23,7 +23,7 @@ public class Coordinate {
2323
private double defaultPivotX;
2424
private double defaultPivotY;
2525
private Definitions defs;
26-
private Boolean exportPNG;
26+
private Boolean exportPng;
2727
private boolean exportTiled;
2828
private boolean externalLevels;
2929
private Flag[] flags;
@@ -32,9 +32,10 @@ public class Coordinate {
3232
private String jsonVersion;
3333
private String levelNamePattern;
3434
private Level[] levels;
35-
private boolean minifyJSON;
35+
private boolean minifyJson;
3636
private long nextUid;
3737
private String pngFilePattern;
38+
private boolean simplifiedExport;
3839
private String tutorialDesc;
3940
private Long worldGridHeight;
4041
private Long worldGridWidth;
@@ -52,16 +53,16 @@ public class Coordinate {
5253
public void setForcedRefs(ForcedRefs value) { this.forcedRefs = value; }
5354

5455
/**
55-
* LDtk application build identifier. This is only used to identify the LDtk version
56+
* LDtk application build identifier. This is only used to identify the LDtk version
5657
* that generated this particular project file, which can be useful for specific bug fixing.
5758
* Note that the build identifier is just the date of the release, so it's not unique to
5859
* each user (one single global ID per LDtk public release), and as a result, completely
5960
* anonymous.
6061
*/
6162
@JsonProperty("appBuildId")
62-
public double getAppBuildID() { return appBuildID; }
63+
public double getAppBuildId() { return appBuildId; }
6364
@JsonProperty("appBuildId")
64-
public void setAppBuildID(double value) { this.appBuildID = value; }
65+
public void setAppBuildId(double value) { this.appBuildId = value; }
6566

6667
/**
6768
* Number of backup files to keep, if the `backupOnSave` is TRUE
@@ -152,9 +153,9 @@ public class Coordinate {
152153
* by: `imageExportMode`
153154
*/
154155
@JsonProperty("exportPng")
155-
public Boolean getExportPNG() { return exportPNG; }
156+
public Boolean getExportPng() { return exportPng; }
156157
@JsonProperty("exportPng")
157-
public void setExportPNG(Boolean value) { this.exportPNG = value; }
158+
public void setExportPng(Boolean value) { this.exportPng = value; }
158159

159160
/**
160161
* If TRUE, a Tiled compatible file will also be generated along with the LDtk JSON file
@@ -195,7 +196,7 @@ public class Coordinate {
195196

196197
/**
197198
* "Image export" option when saving project. Possible values: `None`, `OneImagePerLayer`,
198-
* `OneImagePerLevel`
199+
* `OneImagePerLevel`, `LayersAndLevels`
199200
*/
200201
@JsonProperty("imageExportMode")
201202
public ImageExportMode getImageExportMode() { return imageExportMode; }
@@ -206,9 +207,9 @@ public class Coordinate {
206207
* File format version
207208
*/
208209
@JsonProperty("jsonVersion")
209-
public String getJSONVersion() { return jsonVersion; }
210+
public String getjsonVersion() { return jsonVersion; }
210211
@JsonProperty("jsonVersion")
211-
public void setJSONVersion(String value) { this.jsonVersion = value; }
212+
public void setjsonVersion(String value) { this.jsonVersion = value; }
212213

213214
/**
214215
* The default naming convention for level identifiers.
@@ -220,7 +221,7 @@ public class Coordinate {
220221

221222
/**
222223
* All levels. The order of this array is only relevant in `LinearHorizontal` and
223-
* `linearVertical` world layouts (see `worldLayout` value). Otherwise, you should
224+
* `linearVertical` world layouts (see `worldLayout` value). Otherwise, you should
224225
* refer to the `worldX`,`worldY` coordinates of each Level.
225226
*/
226227
@JsonProperty("levels")
@@ -233,9 +234,9 @@ public class Coordinate {
233234
* FALSE)
234235
*/
235236
@JsonProperty("minifyJson")
236-
public boolean getMinifyJSON() { return minifyJSON; }
237+
public boolean getMinifyJson() { return minifyJson; }
237238
@JsonProperty("minifyJson")
238-
public void setMinifyJSON(boolean value) { this.minifyJSON = value; }
239+
public void setMinifyJson(boolean value) { this.minifyJson = value; }
239240

240241
/**
241242
* Next Unique integer ID available
@@ -249,12 +250,21 @@ public class Coordinate {
249250
* File naming pattern for exported PNGs
250251
*/
251252
@JsonProperty("pngFilePattern")
252-
public String getPNGFilePattern() { return pngFilePattern; }
253+
public String getpngFilePattern() { return pngFilePattern; }
253254
@JsonProperty("pngFilePattern")
254-
public void setPNGFilePattern(String value) { this.pngFilePattern = value; }
255+
public void setpngFilePattern(String value) { this.pngFilePattern = value; }
255256

256257
/**
257-
* This optional description is used by LDtk Samples to show up some informations and
258+
* If TRUE, a very simplified will be generated on saving, for quicker and easier engine
259+
* integration.
260+
*/
261+
@JsonProperty("simplifiedExport")
262+
public boolean getSimplifiedExport() { return simplifiedExport; }
263+
@JsonProperty("simplifiedExport")
264+
public void setSimplifiedExport(boolean value) { this.simplifiedExport = value; }
265+
266+
/**
267+
* This optional description is used by LDtk Samples to show up some information and
258268
* instructions.
259269
*/
260270
@JsonProperty("tutorialDesc")
@@ -265,7 +275,7 @@ public class Coordinate {
265275
/**
266276
* **WARNING**: this field will move to the `worlds` array after the "multi-worlds" update.
267277
* It will then be `null`. You can enable the Multi-worlds advanced project option to enable
268-
* the change immediately. Height of the world grid in pixels.
278+
* the change immediately. Height of the world grid in pixels.
269279
*/
270280
@JsonProperty("worldGridHeight")
271281
public Long getWorldGridHeight() { return worldGridHeight; }
@@ -275,7 +285,7 @@ public class Coordinate {
275285
/**
276286
* **WARNING**: this field will move to the `worlds` array after the "multi-worlds" update.
277287
* It will then be `null`. You can enable the Multi-worlds advanced project option to enable
278-
* the change immediately. Width of the world grid in pixels.
288+
* the change immediately. Width of the world grid in pixels.
279289
*/
280290
@JsonProperty("worldGridWidth")
281291
public Long getWorldGridWidth() { return worldGridWidth; }
@@ -285,7 +295,7 @@ public class Coordinate {
285295
/**
286296
* **WARNING**: this field will move to the `worlds` array after the "multi-worlds" update.
287297
* It will then be `null`. You can enable the Multi-worlds advanced project option to enable
288-
* the change immediately.An enum that describes how levels are organized in
298+
* the change immediately. An enum that describes how levels are organized in
289299
* this project (ie. linearly or in a 2D space). Possible values: <`null`>, `Free`,
290300
* `GridVania`, `LinearHorizontal`, `LinearVertical`
291301
*/
@@ -298,9 +308,9 @@ public class Coordinate {
298308
* This array is not used yet in current LDtk version (so, for now, it's always
299309
* empty).In a later update, it will be possible to have multiple Worlds in a
300310
* single project, each containing multiple Levels.What will change when "Multiple
301-
* worlds" support will be added to LDtk:- in current version, a LDtk project
311+
* worlds" support will be added to LDtk: - in current version, a LDtk project
302312
* file can only contain a single world with multiple levels in it. In this case, levels and
303-
* world layout related settings are stored in the root of the JSON.- after the
313+
* world layout related settings are stored in the root of the JSON. - after the
304314
* "Multiple worlds" update, there will be a `worlds` array in root, each world containing
305315
* levels and layout settings. Basically, it's pretty much only about moving the `levels`
306316
* array to the `worlds` array, along with world layout related values (eg. `worldGridWidth`

src/main/java/io/github/joafalves/ldtk/model/EntityDefinition.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.joafalves.ldtk.model;
22

33
import com.fasterxml.jackson.annotation.*;
4-
@JsonIgnoreProperties(ignoreUnknown = true)
4+
55
public class EntityDefinition {
66
private String color;
77
private FieldDefinition[] fieldDefs;
@@ -22,11 +22,11 @@ public class EntityDefinition {
2222
private boolean resizableY;
2323
private boolean showName;
2424
private String[] tags;
25-
private Long tileID;
25+
private Long tileId;
2626
private double tileOpacity;
2727
private TilesetRectangle tileRect;
2828
private TileRenderMode tileRenderMode;
29-
private Long tilesetID;
29+
private Long tilesetId;
3030
private long uid;
3131
private long width;
3232

@@ -113,8 +113,8 @@ public class EntityDefinition {
113113

114114
/**
115115
* An array of 4 dimensions for the up/right/down/left borders (in this order) when using
116-
* 9-slice mode for `tileRenderMode`. If the tileRenderMode is not NineSlice, then
117-
* this array is empty. See: https://en.wikipedia.org/wiki/9-slice_scaling
116+
* 9-slice mode for `tileRenderMode`. If the tileRenderMode is not NineSlice, then
117+
* this array is empty. See: https://en.wikipedia.org/wiki/9-slice_scaling
118118
*/
119119
@JsonProperty("nineSliceBorders")
120120
public long[] getNineSliceBorders() { return nineSliceBorders; }
@@ -182,9 +182,9 @@ public class EntityDefinition {
182182
* Replaced by: `tileRect`
183183
*/
184184
@JsonProperty("tileId")
185-
public Long getTileID() { return tileID; }
185+
public Long getTileId() { return tileId; }
186186
@JsonProperty("tileId")
187-
public void setTileID(Long value) { this.tileID = value; }
187+
public void setTileId(Long value) { this.tileId = value; }
188188

189189
@JsonProperty("tileOpacity")
190190
public double getTileOpacity() { return tileOpacity; }
@@ -213,9 +213,9 @@ public class EntityDefinition {
213213
* Tileset ID used for optional tile display
214214
*/
215215
@JsonProperty("tilesetId")
216-
public Long getTilesetID() { return tilesetID; }
216+
public Long getTilesetId() { return tilesetId; }
217217
@JsonProperty("tilesetId")
218-
public void setTilesetID(Long value) { this.tilesetID = value; }
218+
public void setTilesetId(Long value) { this.tilesetId = value; }
219219

220220
/**
221221
* Unique Int identifier

src/main/java/io/github/joafalves/ldtk/model/EntityInstance.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.fasterxml.jackson.annotation.*;
44

5-
@JsonIgnoreProperties(ignoreUnknown = true)
65
public class EntityInstance {
76
private long[] grid;
87
private String identifier;

src/main/java/io/github/joafalves/ldtk/model/EnumTagValue.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@
55
/**
66
* In a tileset definition, enum based tag infos
77
*/
8-
@JsonIgnoreProperties(ignoreUnknown = true)
98
public class EnumTagValue {
10-
private String enumValueID;
11-
private long[] tileIDS;
9+
private String enumValueId;
10+
private long[] tileIds;
1211

1312
@JsonProperty("enumValueId")
14-
public String getEnumValueID() { return enumValueID; }
13+
public String getEnumValueId() { return enumValueId; }
1514
@JsonProperty("enumValueId")
16-
public void setEnumValueID(String value) { this.enumValueID = value; }
15+
public void setEnumValueId(String value) { this.enumValueId = value; }
1716

1817
@JsonProperty("tileIds")
19-
public long[] getTileIDS() { return tileIDS; }
18+
public long[] getTileIds() { return tileIds; }
2019
@JsonProperty("tileIds")
21-
public void setTileIDS(long[] value) { this.tileIDS = value; }
20+
public void setTileIds(long[] value) { this.tileIds = value; }
2221
}

src/main/java/io/github/joafalves/ldtk/model/EnumValueDefinition.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
import com.fasterxml.jackson.annotation.*;
44

5-
@JsonIgnoreProperties(ignoreUnknown = true)
65
public class EnumValueDefinition {
76
private long[] tileSrcRect;
87
private long color;
98
private String id;
10-
private Long tileID;
9+
private Long tileId;
1110

1211
/**
1312
* An array of 4 Int values that refers to the tile in the tileset image: `[ x, y, width,
@@ -30,15 +29,15 @@ public class EnumValueDefinition {
3029
* Enum value
3130
*/
3231
@JsonProperty("id")
33-
public String getID() { return id; }
32+
public String getid() { return id; }
3433
@JsonProperty("id")
35-
public void setID(String value) { this.id = value; }
34+
public void setid(String value) { this.id = value; }
3635

3736
/**
3837
* The optional ID of the tile
3938
*/
4039
@JsonProperty("tileId")
41-
public Long getTileID() { return tileID; }
40+
public Long getTileId() { return tileId; }
4241
@JsonProperty("tileId")
43-
public void setTileID(Long value) { this.tileID = value; }
42+
public void setTileId(Long value) { this.tileId = value; }
4443
}

0 commit comments

Comments
 (0)