From 67b05d2bc69cfed5b84c125d51af2bc31d85f1f9 Mon Sep 17 00:00:00 2001 From: Walker Selby Date: Sun, 26 Nov 2023 07:42:00 +0000 Subject: Internal Change: Refactor JsonObjects to be in data package (#680) Moved the json object files into another package. #680 --- .../utils/jsonobjects/AnitaUpgradeCostsJson.java | 18 ------ .../skyhanni/utils/jsonobjects/ArmorDropsJson.java | 19 ------ .../skyhanni/utils/jsonobjects/BingoJson.java | 19 ------ .../skyhanni/utils/jsonobjects/BingoRanksJson.java | 10 ---- .../utils/jsonobjects/ContributorListJson.java | 10 ---- .../jsonobjects/CrimsonIsleReputationJson.java | 34 ----------- .../jsonobjects/DanceRoomInstructionsJson.java | 10 ---- .../skyhanni/utils/jsonobjects/DicerDropsJson.java | 31 ---------- .../utils/jsonobjects/DisabledFeaturesJson.java | 10 ---- .../utils/jsonobjects/EnigmaSoulsJson.java | 20 ------- .../utils/jsonobjects/FishingProfitItemsJson.java | 12 ---- .../skyhanni/utils/jsonobjects/FriendsJson.java | 24 -------- .../skyhanni/utils/jsonobjects/GardenJson.java | 58 ------------------ .../jsonobjects/HideNotClickableItemsJson.java | 30 ---------- .../skyhanni/utils/jsonobjects/ItemsJson.java | 14 ----- .../utils/jsonobjects/JacobContestsJson.java | 13 ---- .../utils/jsonobjects/KnownFeaturesJson.java | 12 ---- .../utils/jsonobjects/LocationFixJson.java | 27 --------- .../skyhanni/utils/jsonobjects/MayorJson.java | 70 ---------------------- .../utils/jsonobjects/ModGuiSwitcherJson.java | 25 -------- .../utils/jsonobjects/MultiFilterJson.java | 25 -------- .../skyhanni/utils/jsonobjects/ParkourJson.java | 23 ------- .../utils/jsonobjects/PlayerChatFilterJson.java | 10 ---- .../utils/jsonobjects/RiftEffigiesJson.java | 11 ---- .../skyhanni/utils/jsonobjects/SacksJson.java | 10 ---- .../utils/jsonobjects/SeaCreatureJson.java | 33 ---------- .../jsonobjects/SlayerProfitTrackerItemsJson.java | 12 ---- .../skyhanni/utils/jsonobjects/TabListJson.java | 11 ---- .../skyhanni/utils/jsonobjects/TrophyFishJson.java | 25 -------- .../skyhanni/utils/jsonobjects/VipVisitsJson.java | 10 ---- .../skyhanni/utils/jsonobjects/WarpsJson.java | 10 ---- 31 files changed, 646 deletions(-) delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/AnitaUpgradeCostsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ArmorDropsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/BingoRanksJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ContributorListJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/CrimsonIsleReputationJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DanceRoomInstructionsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DicerDropsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/DisabledFeaturesJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/EnigmaSoulsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FishingProfitItemsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/FriendsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/GardenJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/HideNotClickableItemsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ItemsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/JacobContestsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/KnownFeaturesJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/LocationFixJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MayorJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ModGuiSwitcherJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/MultiFilterJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/ParkourJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/PlayerChatFilterJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/RiftEffigiesJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SacksJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SlayerProfitTrackerItemsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TrophyFishJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/VipVisitsJson.java delete mode 100644 src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/WarpsJson.java (limited to 'src/main/java/at/hannibal2/skyhanni/utils/jsonobjects') 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 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 special_crops; - - public static class DropInfo { - @Expose - public String armor_type; - - @Expose - public List 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 bingo_tips; - - public static class BingoTip { - @Expose - public String difficulty; - - @Expose - public List 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 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 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 FISHING; - - @Expose - public Map RESCUE; - - @Expose - public Map FETCH; - - @Expose - public Map DOJO; - - @Expose - public Map MINIBOSS; - - @Expose - public Map KUUDRA; - - public static class ReputationQuest { - @Expose - public String item; - - @Expose - public List 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 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 drops; - } - - public static class DropInfo { - @Expose - public Integer chance; - - @Expose - public List 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 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> 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> 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 players; - - public static class PlayerFriends { - - @Expose - public Map 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 garden_exp; - - @Expose - public Map> crop_milestones; - - @Expose - public Map crop_milestone_community_help; - - @Expose - public Map visitors; - - @Expose - public Map organic_matter; - - @Expose - public Map 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 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 armor; - - @Expose - public List 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 crimson_armors; - - @Expose - public Map 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> 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> 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 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 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 candidates; - } - - public class Mayor { - @Expose - public String key; - @Expose - public String name; - @Expose - public ArrayList 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 mods = new HashMap<>(); - - public static class Mod { - @Expose - public List description = new ArrayList<>(); - - @Expose - public String command = ""; - - @Expose - public List 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 equals; - - @Expose - public List startsWith; - - @Expose - public List endsWith; - - @Expose - public List contains; - - @Expose - public List 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 locations; - - @Expose - public List 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 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; - -import at.hannibal2.skyhanni.utils.LorenzVec; -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class RiftEffigiesJson { - @Expose - public List locations; -} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SacksJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SacksJson.java deleted file mode 100644 index dfd2103ef..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SacksJson.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 SacksJson { - @Expose - public List sackList; -} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java deleted file mode 100644 index 8053e87cb..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SeaCreatureJson.java +++ /dev/null @@ -1,33 +0,0 @@ -package at.hannibal2.skyhanni.utils.jsonobjects; - -import at.hannibal2.skyhanni.utils.LorenzRarity; -import com.google.gson.annotations.Expose; -import com.google.gson.reflect.TypeToken; - -import java.lang.reflect.Type; -import java.util.Map; - -public class SeaCreatureJson { - - public static Type TYPE = new TypeToken>() { - }.getType(); - - public static class Variant { - @Expose - public String chat_color; - @Expose - public Map sea_creatures; - } - - public static class SeaCreature { - @Expose - public String chat_message; - @Expose - public int fishing_experience; - @Expose - public Boolean rare; - @Expose - public LorenzRarity rarity; - } - -} diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SlayerProfitTrackerItemsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SlayerProfitTrackerItemsJson.java deleted file mode 100644 index 377582200..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/SlayerProfitTrackerItemsJson.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 SlayerProfitTrackerItemsJson { - @Expose - public Map> slayers; -} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java deleted file mode 100644 index 03c256256..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TabListJson.java +++ /dev/null @@ -1,11 +0,0 @@ -package at.hannibal2.skyhanni.utils.jsonobjects; - -import com.google.gson.annotations.Expose; - -import java.util.List; - -public class TabListJson { - - @Expose - public List sun_moon_symbols; -} diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TrophyFishJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TrophyFishJson.java deleted file mode 100644 index 6303c16be..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/TrophyFishJson.java +++ /dev/null @@ -1,25 +0,0 @@ -package at.hannibal2.skyhanni.utils.jsonobjects; - -import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity; -import com.google.gson.annotations.Expose; - -import java.util.Map; - -public class TrophyFishJson { - @Expose - public Map trophy_fish; - - public static class TrophyFishInfo { - @Expose - public String displayName; - - @Expose - public String description; - - @Expose - public Integer rate; - - @Expose - public Map fillet; - } -} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/VipVisitsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/VipVisitsJson.java deleted file mode 100644 index c80f4953f..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/VipVisitsJson.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 VipVisitsJson { - @Expose - public List vipVisits; -} \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/WarpsJson.java b/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/WarpsJson.java deleted file mode 100644 index e09bf3c9d..000000000 --- a/src/main/java/at/hannibal2/skyhanni/utils/jsonobjects/WarpsJson.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 WarpsJson { - @Expose - public List warpCommands; -} \ No newline at end of file -- cgit