summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/utils
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-11-26 07:42:00 +0000
committerGitHub <noreply@github.com>2023-11-26 08:42:00 +0100
commit67b05d2bc69cfed5b84c125d51af2bc31d85f1f9 (patch)
tree49d8e6e5bceb95aba4369955b5743fa6c98258e5 /src/main/java/at/hannibal2/skyhanni/utils
parent6012c5051f1e656b93b088c089325a91663d92a7 (diff)
downloadskyhanni-67b05d2bc69cfed5b84c125d51af2bc31d85f1f9.tar.gz
skyhanni-67b05d2bc69cfed5b84c125d51af2bc31d85f1f9.tar.bz2
skyhanni-67b05d2bc69cfed5b84c125d51af2bc31d85f1f9.zip
Internal Change: Refactor JsonObjects to be in data package (#680)
Moved the json object files into another package. #680
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/AnitaUpgradeCostsJson.java18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoJson.java19
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoRanksJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/CrimsonIsleReputationJson.java34
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DanceRoomInstructionsJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DicerDropsJson.java31
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DisabledFeaturesJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java20
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FishingProfitItemsJson.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FriendsJson.java24
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/GardenJson.java58
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/HideNotClickableItemsJson.java30
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ItemsJson.java14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/JacobContestsJson.java13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/KnownFeaturesJson.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/LocationFixJson.java27
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java70
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModGuiSwitcherJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MultiFilterJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ParkourJson.java23
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/PlayerChatFilterJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffigiesJson.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SacksJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java33
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SlayerProfitTrackerItemsJson.java12
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TrophyFishJson.java25
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/VipVisitsJson.java10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/WarpsJson.java10
33 files changed, 3 insertions, 649 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt
index ab9817ef4..bc3b1789e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MultiFilter.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.utils
import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace
-import at.hannibal2.skyhanni.utils.jsonobjects.MultiFilterJson
+import at.hannibal2.skyhanni.data.jsonobjects.repo.MultiFilterJson
class MultiFilter {
@@ -56,4 +56,4 @@ class MultiFilter {
fun count(): Int {
return equals.size + startsWith.size + endsWith.size + contains.size + containsWord.size
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
index 68f7a0d49..068f2340d 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
@@ -11,7 +11,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea
import at.hannibal2.skyhanni.utils.RenderUtils.drawString
import at.hannibal2.skyhanni.utils.RenderUtils.expandBlock
import at.hannibal2.skyhanni.utils.RenderUtils.outlineTopFace
-import at.hannibal2.skyhanni.utils.jsonobjects.ParkourJson.ShortCut
+import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson.ShortCut
import net.minecraft.client.Minecraft
import java.awt.Color
import kotlin.time.Duration.Companion.seconds
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/AnitaUpgradeCostsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/AnitaUpgradeCostsJson.java
deleted file mode 100644
index 09a2de7db..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/AnitaUpgradeCostsJson.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.Map;
-
-public class AnitaUpgradeCostsJson {
- @Expose
- public Map<Integer, Price> level_price;
-
- public static class Price {
- @Expose
- public Integer gold_medals;
-
- @Expose
- public Integer jacob_tickets;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java
deleted file mode 100644
index 698bad3db..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Map;
-
-public class ArmorDropsJson {
- @Expose
- public Map<String, DropInfo> special_crops;
-
- public static class DropInfo {
- @Expose
- public String armor_type;
-
- @Expose
- public List<Double> chance;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoJson.java
deleted file mode 100644
index 810f6d3ab..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoJson.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Map;
-
-public class BingoJson {
- @Expose
- public Map<String, BingoTip> bingo_tips;
-
- public static class BingoTip {
- @Expose
- public String difficulty;
-
- @Expose
- public List<String> note;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoRanksJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoRanksJson.java
deleted file mode 100644
index 49d7e662f..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoRanksJson.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.Map;
-
-public class BingoRanksJson {
- @Expose
- public Map<String, Integer> ranks;
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java
deleted file mode 100644
index 8e5648f5e..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-
-public class ContributorListJson {
- @Expose
- public List<String> usernames;
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/CrimsonIsleReputationJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/CrimsonIsleReputationJson.java
deleted file mode 100644
index 9235680fb..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/CrimsonIsleReputationJson.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Map;
-
-public class CrimsonIsleReputationJson {
- @Expose
- public Map<String, ReputationQuest> FISHING;
-
- @Expose
- public Map<String, ReputationQuest> RESCUE;
-
- @Expose
- public Map<String, ReputationQuest> FETCH;
-
- @Expose
- public Map<String, ReputationQuest> DOJO;
-
- @Expose
- public Map<String, ReputationQuest> MINIBOSS;
-
- @Expose
- public Map<String, ReputationQuest> KUUDRA;
-
- public static class ReputationQuest {
- @Expose
- public String item;
-
- @Expose
- public List<Double> location;
- }
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DanceRoomInstructionsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DanceRoomInstructionsJson.java
deleted file mode 100644
index 9316d8671..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DanceRoomInstructionsJson.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-
-public class DanceRoomInstructionsJson {
- @Expose
- public List<String> instructions;
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DicerDropsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DicerDropsJson.java
deleted file mode 100644
index 996a558ea..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DicerDropsJson.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-import com.google.gson.annotations.SerializedName;
-
-import java.util.List;
-
-public class DicerDropsJson {
- @Expose
- public DicerType MELON;
-
- @Expose
- public DicerType PUMPKIN;
-
- public static class DicerType {
- @Expose
- @SerializedName("total chance")
- public Integer totalChance;
-
- @Expose
- public List<DropInfo> drops;
- }
-
- public static class DropInfo {
- @Expose
- public Integer chance;
-
- @Expose
- public List<Integer> amount;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DisabledFeaturesJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DisabledFeaturesJson.java
deleted file mode 100644
index 45abedfa3..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DisabledFeaturesJson.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.Map;
-
-public class DisabledFeaturesJson {
- @Expose
- public Map<String, Boolean> features;
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java
deleted file mode 100644
index 5769520f5..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import at.hannibal2.skyhanni.utils.LorenzVec;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Map;
-
-public class EnigmaSoulsJson {
- @Expose
- public Map<String, List<EnigmaPosition>> areas;
-
- public static class EnigmaPosition {
- @Expose
- public String name;
-
- @Expose
- public LorenzVec position;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FishingProfitItemsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FishingProfitItemsJson.java
deleted file mode 100644
index d17fd7d30..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FishingProfitItemsJson.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import at.hannibal2.skyhanni.utils.NEUInternalName;
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Map;
-
-public class FishingProfitItemsJson {
- @Expose
- public Map<String, List<NEUInternalName>> categories;
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FriendsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FriendsJson.java
deleted file mode 100644
index 82482b6a6..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FriendsJson.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.Map;
-import java.util.UUID;
-
-public class FriendsJson {
- @Expose
- public Map<UUID, PlayerFriends> players;
-
- public static class PlayerFriends {
-
- @Expose
- public Map<UUID, Friend> friends;
-
- public static class Friend {
- @Expose
- public String name;
- @Expose
- public boolean bestFriend;
- }
- }
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/GardenJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/GardenJson.java
deleted file mode 100644
index 7bc9cf7fa..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/GardenJson.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import at.hannibal2.skyhanni.features.garden.CropType;
-import at.hannibal2.skyhanni.utils.LorenzRarity;
-import at.hannibal2.skyhanni.utils.LorenzVec;
-import com.google.gson.annotations.Expose;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Map;
-
-public class GardenJson {
- @Expose
- public List<Integer> garden_exp;
-
- @Expose
- public Map<CropType, List<Integer>> crop_milestones;
-
- @Expose
- public Map<String, Boolean> crop_milestone_community_help;
-
- @Expose
- public Map<String, GardenVisitor> visitors;
-
- @Expose
- public Map<String, Double> organic_matter;
-
- @Expose
- public Map<String, Double> fuel;
-
- public static class GardenVisitor {
- @Expose
- public LorenzRarity rarity;
-
- @Expose
- public LorenzRarity new_rarity;
-
- @Nullable
- @Expose
- public LorenzVec position;
-
- /**
- * Formatted as follows:
- * - If this visitor is a player, get the encoded skin value
- * - If this visitor is a mob, get their mob class name
- */
- @Nullable
- @Expose
- public String skinOrType;
-
- @Nullable
- @Expose
- public String mode;
-
- @Expose
- public List<String> need_items;
- }
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/HideNotClickableItemsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/HideNotClickableItemsJson.java
deleted file mode 100644
index d4ac9c52b..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/HideNotClickableItemsJson.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-
-public class HideNotClickableItemsJson {
- @Expose
- public MultiFilterJson hide_npc_sell;
-
- @Expose
- public MultiFilterJson hide_in_storage;
-
- @Expose
- public MultiFilterJson hide_player_trade;
-
- @Expose
- public MultiFilterJson not_auctionable;
-
- @Expose
- public SalvageFilter salvage;
-
- public static class SalvageFilter {
- @Expose
- public List<String> armor;
-
- @Expose
- public List<String> items;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ItemsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ItemsJson.java
deleted file mode 100644
index f37671913..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ItemsJson.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-import java.util.Map;
-
-public class ItemsJson {
- @Expose
- public List<String> crimson_armors;
-
- @Expose
- public Map<String, Integer> crimson_tiers;
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/JacobContestsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/JacobContestsJson.java
deleted file mode 100644
index 87d1e9a22..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/JacobContestsJson.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import at.hannibal2.skyhanni.features.garden.CropType;
-import com.google.gson.annotations.Expose;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class JacobContestsJson {
- @Expose
- public Map<Long, List<CropType>> contestTimes = new HashMap<>();
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/KnownFeaturesJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/KnownFeaturesJson.java
deleted file mode 100644
index bd5048cfb..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/KnownFeaturesJson.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class KnownFeaturesJson {
- @Expose
- public Map<String, List<String>> knownFeatures = new HashMap<>();
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/LocationFixJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/LocationFixJson.java
deleted file mode 100644
index 802627e7a..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/LocationFixJson.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import at.hannibal2.skyhanni.utils.LorenzVec;
-import com.google.gson.annotations.Expose;
-
-import java.util.Map;
-
-public class LocationFixJson {
-
- @Expose
- public Map<String, LocationFix> locationFixes;
-
- public static class LocationFix {
- @Expose
- public LorenzVec a;
-
- @Expose
- public LorenzVec b;
-
- @Expose
- public String island_name;
-
- @Expose
- public String real_location;
- }
-
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
deleted file mode 100644
index d2173c74b..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.ArrayList;
-
-public class MayorJson {
- @Expose
- public boolean success;
- @Expose
- public long lastUpdated;
- @Expose
- public Mayor mayor;
- @Expose
- public Election current;
-
- public class Candidate {
- @Expose
- public String key;
- @Expose
- public String name;
- @Expose
- public ArrayList<Perk> perks;
- @Expose
- public int votes;
-
- @Override
- public String toString() {
- return "Candidate{" +
- "key='" + key + '\'' +
- ", name='" + name + '\'' +
- ", perks=" + perks +
- ", votes=" + votes +
- '}';
- }
- }
-
- public class Election {
- @Expose
- public int year;
- @Expose
- public ArrayList<Candidate> candidates;
- }
-
- public class Mayor {
- @Expose
- public String key;
- @Expose
- public String name;
- @Expose
- public ArrayList<Perk> perks;
- @Expose
- public Election election;
- }
-
- public static class Perk {
- @Expose
- public String name;
- @Expose
- public String description;
-
- @Override
- public String toString() {
- return "Perk{" +
- "name='" + name + '\'' +
- ", description='" + description + '\'' +
- '}';
- }
- }
-}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModGuiSwitcherJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModGuiSwitcherJson.java
deleted file mode 100644
index 078b1f6ad..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModGuiSwitcherJson.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ModGuiSwitcherJson {
-
- @Expose
- public Map<String, Mod> mods = new HashMap<>();
-
- public static class Mod {
- @Expose
- public List<String> description = new ArrayList<>();
-
- @Expose
- public String command = "";
-
- @Expose
- public List<String> guiPath = new ArrayList<>();
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MultiFilterJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MultiFilterJson.java
deleted file mode 100644
index 8704f91fb..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MultiFilterJson.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-
-public class MultiFilterJson {
- @Expose
- public List<String> equals;
-
- @Expose
- public List<String> startsWith;
-
- @Expose
- public List<String> endsWith;
-
- @Expose
- public List<String> contains;
-
- @Expose
- public List<String> containsWord;
-
- @Expose
- public String description;
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ParkourJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ParkourJson.java
deleted file mode 100644
index 5ae2d40ca..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ParkourJson.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import at.hannibal2.skyhanni.utils.LorenzVec;
-import com.google.gson.annotations.Expose;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ParkourJson {
- @Expose
- public List<LorenzVec> locations;
-
- @Expose
- public List<ShortCut> shortCuts = new ArrayList<>();
-
- public static class ShortCut {
- @Expose
- public int from;
-
- @Expose
- public int to;
- }
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/PlayerChatFilterJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/PlayerChatFilterJson.java
deleted file mode 100644
index a65a2f8a1..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/PlayerChatFilterJson.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;
-
-import com.google.gson.annotations.Expose;
-
-import java.util.List;
-
-public class PlayerChatFilterJson {
- @Expose
- public List<MultiFilterJson> filters;
-} \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffigiesJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffigiesJson.java
deleted file mode 100644
index d914ef934..000000000
--- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffigiesJson.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package at.hannibal2.skyhanni.utils.jsonobjects;