From 42645c79250c1732c984f0e7482bf0d42612e37e Mon Sep 17 00:00:00 2001 From: Ian Rettig Date: Tue, 10 Sep 2024 15:16:39 -0400 Subject: [PATCH] Remove the child level changes classes. Add JsonProperty decorators to all variables in LevelChanges. --- .../class_definitions/LevelChanges.java | 107 +++++++++++++++++- .../BerserkerLevelChanges.java | 15 --- .../ConsularLevelChanges.java | 16 --- .../EngineerLevelChanges.java | 17 --- .../FighterLevelChanges.java | 16 --- .../GuardianLevelChanges.java | 18 --- .../class_level_changes/MonkLevelChanges.java | 16 --- .../OperativeLevelChanges.java | 14 --- .../ScholarLevelChanges.java | 16 --- .../ScoutLevelChanges.java | 18 --- .../SentinelLevelChanges.java | 18 --- 11 files changed, 105 insertions(+), 166 deletions(-) delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/BerserkerLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ConsularLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/EngineerLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/FighterLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/GuardianLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/MonkLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/OperativeLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScholarLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScoutLevelChanges.java delete mode 100644 src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/SentinelLevelChanges.java diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/LevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/LevelChanges.java index 3d0c6b6..c887a9f 100644 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/LevelChanges.java +++ b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/LevelChanges.java @@ -1,5 +1,8 @@ package org.misoenergy.hackday.kessel_run.class_definitions; +import com.fasterxml.jackson.annotation.JsonAlias; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -7,8 +10,108 @@ import lombok.Setter; @Getter @Setter @NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) public class LevelChanges { - private String level; - private String proficiencyBonus; + + @JsonProperty("Aura Radius") + private String auraRadius; + + @JsonProperty("Auras Known") + private String aurasKnown; + + @JsonProperty("Berserker Instincts") + private String berserkerInstincts; + + @JsonProperty("Discoveries") + private String discoveries; + + @JsonProperty("Features") private String features; + + @JsonProperty("Focus Points") + private String focusPoints; + + @JsonProperty("Focused Strikes") + private String focusedStrikes; + + @JsonProperty("Force-Empowered Casting Options") + private String forceEmpoweredCastingOptions; + + @JsonProperty("Force Points") + private String forcePoints; + + @JsonProperty("Force Powers Known") + private String forcePowersKnown; + + @JsonProperty("Ideal Manifests") + private String idealManifests; + + @JsonProperty("Ideals Known") + private String idealsKnown; + + @JsonProperty("Kinetic Combat") + private String kineticCombat; + + @JsonProperty("Level") + private String level; + + @JsonProperty("Maneuvers Known") + private String maneuversKnown; + + @JsonProperty("Martial Arts") + private String martialArts; + + @JsonProperty("Max Power Level") + private String maxPowerLevel; + + @JsonProperty("Modification Slots") + private String modificationSlots; + + @JsonProperty("Monastic Vows") + private String monasticVows; + + @JsonProperty("Operative Exploits") + private String operativeExploits; + + @JsonProperty("Potent Aptitude") + private String potentAptitude; + + @JsonProperty("Proficiency Bonus") + private String proficiencyBonus; + + @JsonProperty("Rage Damage") + private String rageDamage; + + @JsonProperty("Rages") + private String rages; + + @JsonProperty("Ranger's Quarry") + private String rangersQuarry; + + @JsonProperty("Routine Radius") + private String routineRadius; + + @JsonProperty("Routines Known") + private String routinesKnown; + + @JsonProperty("Sneak Attack") + private String sneakAttack; + + @JsonProperty("Strategies Known") + private String strategiesKnown; + + @JsonProperty("Superiority Dice Quantity") + private String superiorityDiceQuantity; + + @JsonProperty("Superiority Dice Size") + private String superiorityDiceSize; + + @JsonProperty("Tech Points") + private String techPoints; + + @JsonProperty("Tech Powers Known") + private String techPowersKnown; + + @JsonProperty("Unarmored Movement") + private String unarmoredMovement; } diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/BerserkerLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/BerserkerLevelChanges.java deleted file mode 100644 index 20b14d7..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/BerserkerLevelChanges.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class BerserkerLevelChanges extends LevelChanges { - private String rages; - private String rageDamage; - private String berserkerInstincts; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ConsularLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ConsularLevelChanges.java deleted file mode 100644 index 7f91256..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ConsularLevelChanges.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class ConsularLevelChanges extends LevelChanges { - private String forcePowersKnown; - private String forcePoints; - private String maxPowerLevel; - private String forceEmpoweredCastingOptions; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/EngineerLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/EngineerLevelChanges.java deleted file mode 100644 index a8a2b25..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/EngineerLevelChanges.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class EngineerLevelChanges extends LevelChanges { - private String techPowersKnown; - private String techPoints; - private String maxPowerLevel; - private String potentAptitude; - private String modificationSlots; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/FighterLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/FighterLevelChanges.java deleted file mode 100644 index 8b821fe..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/FighterLevelChanges.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class FighterLevelChanges extends LevelChanges { - private String maneuversKnown; - private String superiorityDiceQuantity; - private String superiorityDiceSize; - private String strategiesKnown; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/GuardianLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/GuardianLevelChanges.java deleted file mode 100644 index 89bd4aa..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/GuardianLevelChanges.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class GuardianLevelChanges extends LevelChanges { - private String forcePowersKnown; - private String forcePoints; - private String maxPowerLevel; - private String focusedStrikes; - private String aurasKnown; - private String auraRadius; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/MonkLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/MonkLevelChanges.java deleted file mode 100644 index de90557..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/MonkLevelChanges.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class MonkLevelChanges extends LevelChanges { - private String martialArts; - private String focusPoints; - private String monasticVows; - private String unarmoredMovement; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/OperativeLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/OperativeLevelChanges.java deleted file mode 100644 index d4b48ab..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/OperativeLevelChanges.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class OperativeLevelChanges extends LevelChanges { - private String sneakAttack; - private String operativeExploits; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScholarLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScholarLevelChanges.java deleted file mode 100644 index 6700765..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScholarLevelChanges.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class ScholarLevelChanges extends LevelChanges { - private String maneuversKnown; - private String superiorityDiceQuantity; - private String superiorityDiceSize; - private String discoveries; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScoutLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScoutLevelChanges.java deleted file mode 100644 index 48aed36..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/ScoutLevelChanges.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class ScoutLevelChanges extends LevelChanges { - private String rangersQuarry; - private String techPowersKnown; - private String techPoints; - private String maxPowerLevel; - private String routinesKnown; - private String routineRadius; -} diff --git a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/SentinelLevelChanges.java b/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/SentinelLevelChanges.java deleted file mode 100644 index 42c695e..0000000 --- a/src/main/java/org/misoenergy/hackday/kessel_run/class_definitions/class_level_changes/SentinelLevelChanges.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.misoenergy.hackday.kessel_run.class_definitions.class_level_changes; - -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import org.misoenergy.hackday.kessel_run.class_definitions.LevelChanges; - -@Getter -@Setter -@NoArgsConstructor -public class SentinelLevelChanges extends LevelChanges { - private String forcePowersKnown; - private String forcePoints; - private String maxPowerLevel; - private String kineticCombat; - private String idealsKnown; - private String manifests; -}