Skip to content

Commit 63d7b00

Browse files
committed
fix: fixing some properties
Any catches will be in patch release
1 parent 7e8ad2a commit 63d7b00

File tree

3 files changed

+103
-25
lines changed

3 files changed

+103
-25
lines changed

api/src/main/java/hirez/api/object/PlayerIdPortal.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
package hirez.api.object;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4+
import hirez.api.object.adapters.TextToBoolean;
45
import lombok.Data;
56

67
@Data
78
public class PlayerIdPortal {
9+
@JsonProperty("Name")
10+
private final String name;
811
private final long playerId;
912
private final String portal;
1013
private final int portalId;
14+
@TextToBoolean
15+
private final boolean privacyFlag;
1116
@JsonProperty("ret_msg")
1217
private final String returnedMessage;
1318

paladins/src/main/java/hirez/paladins/object/Champion.java

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,49 @@ public class Champion implements ReturnedMessage {
1818
@JsonProperty("Ability_5")
1919
private final Ability ability5;
2020

21-
private final String abilityDescription1;
22-
private final String abilityDescription2;
23-
private final String abilityDescription3;
24-
private final String abilityDescription4;
25-
private final String abilityDescription5;
21+
@JsonProperty("Ability1")
22+
private final String ability1Name;
23+
@JsonProperty("Ability2")
24+
private final String ability2Name;
25+
@JsonProperty("Ability3")
26+
private final String ability3Name;
27+
@JsonProperty("Ability4")
28+
private final String ability4Name;
29+
@JsonProperty("Ability5")
30+
private final String ability5Name;
31+
32+
@JsonProperty("abilityDescription1")
33+
private final String ability1Description;
34+
@JsonProperty("abilityDescription2")
35+
private final String ability2Description;
36+
@JsonProperty("abilityDescription3")
37+
private final String ability3Description;
38+
@JsonProperty("abilityDescription4")
39+
private final String ability4Description;
40+
@JsonProperty("abilityDescription5")
41+
private final String ability5Description;
2642

2743
@JsonProperty("AbilityId1")
28-
private final long abilityId1;
44+
private final long ability1Id;
2945
@JsonProperty("AbilityId2")
30-
private final long abilityId2;
46+
private final long ability2Id;
3147
@JsonProperty("AbilityId3")
32-
private final long abilityId3;
48+
private final long ability3Id;
3349
@JsonProperty("AbilityId4")
34-
private final long abilityId4;
50+
private final long ability4Id;
3551
@JsonProperty("AbilityId5")
36-
private final long abilityId5;
52+
private final long ability5Id;
3753

3854
@JsonProperty("ChampionAbility1_URL")
39-
private final String championAbility1URL;
55+
private final String ability1URL;
4056
@JsonProperty("ChampionAbility2_URL")
41-
private final String championAbility2URL;
57+
private final String ability2URL;
4258
@JsonProperty("ChampionAbility3_URL")
43-
private final String championAbility3URL;
59+
private final String ability3URL;
4460
@JsonProperty("ChampionAbility4_URL")
45-
private final String championAbility4URL;
61+
private final String ability4URL;
4662
@JsonProperty("ChampionAbility5_URL")
47-
private final String championAbility5URL;
63+
private final String ability5URL;
4864

4965
@JsonProperty("ChampionCard_URL")
5066
private final String championCardURL;
@@ -57,11 +73,14 @@ public class Champion implements ReturnedMessage {
5773
private final int health;
5874
private final long id;
5975
@TextToBoolean
76+
@JsonProperty("latestChampion")
6077
private final boolean latestChampion;
6178
@JsonProperty("Lore")
6279
private final String lore;
6380
@JsonProperty("Name")
6481
private final String name;
82+
@JsonProperty("Name_English")
83+
private final String nameEnglish;
6584
@TextToBoolean
6685
@JsonProperty("OnFreeRotation")
6786
private final boolean onFreeRotation;
@@ -89,12 +108,15 @@ public class Champion implements ReturnedMessage {
89108
private final String type;
90109

91110
@Data
92-
public class Ability {
111+
public static class Ability {
93112
@JsonProperty("Description")
94113
private final String description;
114+
@JsonProperty("rechargeSeconds")
95115
private final long rechargeSeconds;
96116
@JsonProperty("Summary")
97117
private final String name;
118+
@JsonProperty("damageType")
119+
private final String damageType;
98120
@JsonProperty("Id")
99121
private final long id;
100122
@JsonProperty("URL")

smite/src/main/java/hirez/smite/object/God.java

Lines changed: 60 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package hirez.smite.object;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.fasterxml.jackson.annotation.JsonRootName;
54
import hirez.api.object.adapters.TextToBoolean;
65
import hirez.api.object.interfaces.ReturnedMessage;
76
import lombok.Data;
@@ -21,11 +20,27 @@ public class God implements ReturnedMessage {
2120
@JsonProperty("Ability_5")
2221
private final Ability ability5;
2322

24-
private final Description abilityDescription1;
25-
private final Description abilityDescription2;
26-
private final Description abilityDescription3;
27-
private final Description abilityDescription4;
28-
private final Description abilityDescription5;
23+
@JsonProperty("Ability1")
24+
private final String ability1Name;
25+
@JsonProperty("Ability2")
26+
private final String ability2Name;
27+
@JsonProperty("Ability3")
28+
private final String ability3Name;
29+
@JsonProperty("Ability4")
30+
private final String ability4Name;
31+
@JsonProperty("Ability5")
32+
private final String ability5Name;
33+
34+
@JsonProperty("abilityDescription1")
35+
private final ItemDescription abilityDescription1;
36+
@JsonProperty("abilityDescription2")
37+
private final ItemDescription abilityDescription2;
38+
@JsonProperty("abilityDescription3")
39+
private final ItemDescription abilityDescription3;
40+
@JsonProperty("abilityDescription4")
41+
private final ItemDescription abilityDescription4;
42+
@JsonProperty("abilityDescription5")
43+
private final ItemDescription abilityDescription5;
2944

3045
@JsonProperty("AbilityId1")
3146
private final long ability1Id;
@@ -38,9 +53,13 @@ public class God implements ReturnedMessage {
3853
@JsonProperty("AbilityId5")
3954
private final long ability5Id;
4055

56+
@JsonProperty("AttackSpeed")
4157
private final double attackSpeed;
58+
@JsonProperty("AttackSpeedPerLevel")
4259
private final double attackSpeedPerLevel;
43-
private final Description basicAttack;
60+
@JsonProperty("basicAttack")
61+
private final ItemDescription basicAttack;
62+
@JsonProperty("Cons")
4463
private final String cons;
4564

4665
@JsonProperty("godAbility1_URL")
@@ -59,41 +78,65 @@ public class God implements ReturnedMessage {
5978
@JsonProperty("godIcon_URL")
6079
private final String iconURL;
6180

81+
@JsonProperty("HP5PerLevel")
6282
private final double hp5PerLevel;
83+
@JsonProperty("Health")
6384
private final int health;
85+
@JsonProperty("HealthPerFive")
6486
private final int healthPerFive;
87+
@JsonProperty("HealthPerLevel")
6588
private final int healthPerLevel;
6689
private final long id;
6790
@TextToBoolean
91+
@JsonProperty("latestGod")
6892
private final boolean latestGod;
93+
@JsonProperty("Lore")
6994
private final String lore;
7095
@JsonProperty("MP5PerLevel")
7196
private final double mp5PerLevel;
97+
@JsonProperty("MagicProtection")
7298
private final int magicProtection;
99+
@JsonProperty("MagicProtectionPerLevel")
73100
private final double magicProtectionPerLevel;
101+
@JsonProperty("MagicalPower")
74102
private final int magicalPower;
103+
@JsonProperty("MagicalPowerPerLevel")
75104
private final int magicalPowerPerLevel;
105+
@JsonProperty("Mana")
76106
private final int mana;
107+
@JsonProperty("ManaPerFive")
77108
private final double manaPerFive;
109+
@JsonProperty("ManaPerLevel")
78110
private final int manaPerLevel;
111+
@JsonProperty("Name")
79112
private final String name;
80113
@TextToBoolean
114+
@JsonProperty("OnFreeRotation")
81115
private final boolean onFreeRotation;
116+
@JsonProperty("Pantheon")
82117
private final String pantheon;
118+
@JsonProperty("PhysicalPower")
83119
private final int physicalPower;
120+
@JsonProperty("PhysicalPowerPerLevel")
84121
private final int physicalPowerPerLevel;
122+
@JsonProperty("PhysicalProtection")
85123
private final int physicalProtection;
124+
@JsonProperty("PhysicalProtectionPerLevel")
86125
private final int physicalProtectionPerLevel;
126+
@JsonProperty("Pros")
87127
private final String pros;
88128
@JsonProperty("ret_msg")
89129
private final String returnedMessage;
130+
@JsonProperty("Roles")
90131
private final String roles;
132+
@JsonProperty("Speed")
91133
private final int speed;
134+
@JsonProperty("Title")
92135
private final String title;
136+
@JsonProperty("Type")
93137
private final String type;
94138

95139
@Data
96-
@JsonRootName("itemDescription")
97140
public static class Description {
98141
private final String cooldown;
99142
private final String cost;
@@ -105,9 +148,17 @@ public static class Description {
105148
private final String secondaryDescription;
106149
}
107150

151+
@Data
152+
public static class ItemDescription {
153+
@JsonProperty("itemDescription")
154+
private final Description itemDescription;
155+
}
156+
108157
@Data
109158
public static class Ability {
110-
private final Description description;
159+
@JsonProperty("Description")
160+
private final ItemDescription description;
161+
@JsonProperty("Id")
111162
private final long id;
112163
@JsonProperty("Summary")
113164
private final String name;

0 commit comments

Comments
 (0)