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 --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 6 +- .../at/hannibal2/skyhanni/config/ConfigManager.kt | 6 +- .../java/at/hannibal2/skyhanni/data/BingoAPI.kt | 2 +- .../java/at/hannibal2/skyhanni/data/FriendAPI.kt | 4 +- .../skyhanni/data/GardenCropMilestones.kt | 2 +- .../data/GardenCropMilestonesCommunityFix.kt | 2 +- .../at/hannibal2/skyhanni/data/LocationFixData.kt | 2 +- .../at/hannibal2/skyhanni/data/MayorElection.kt | 4 +- .../data/jsonobjects/local/FriendsJson.java | 24 ++++++++ .../data/jsonobjects/local/JacobContestsJson.java | 13 ++++ .../data/jsonobjects/local/KnownFeaturesJson.java | 12 ++++ .../skyhanni/data/jsonobjects/local/MayorJson.java | 70 ++++++++++++++++++++++ .../jsonobjects/repo/AnitaUpgradeCostsJson.java | 18 ++++++ .../data/jsonobjects/repo/ArmorDropsJson.java | 19 ++++++ .../skyhanni/data/jsonobjects/repo/BingoJson.java | 19 ++++++ .../data/jsonobjects/repo/BingoRanksJson.java | 10 ++++ .../data/jsonobjects/repo/ContributorListJson.java | 9 +++ .../repo/CrimsonIsleReputationJson.java | 34 +++++++++++ .../repo/DanceRoomInstructionsJson.java | 10 ++++ .../data/jsonobjects/repo/DicerDropsJson.java | 31 ++++++++++ .../jsonobjects/repo/DisabledFeaturesJson.java | 10 ++++ .../data/jsonobjects/repo/EnigmaSoulsJson.java | 20 +++++++ .../jsonobjects/repo/FishingProfitItemsJson.java | 12 ++++ .../skyhanni/data/jsonobjects/repo/GardenJson.java | 58 ++++++++++++++++++ .../repo/HideNotClickableItemsJson.java | 30 ++++++++++ .../skyhanni/data/jsonobjects/repo/ItemsJson.java | 14 +++++ .../data/jsonobjects/repo/LocationFixJson.java | 27 +++++++++ .../data/jsonobjects/repo/ModGuiSwitcherJson.java | 25 ++++++++ .../data/jsonobjects/repo/MultiFilterJson.java | 25 ++++++++ .../data/jsonobjects/repo/ParkourJson.java | 23 +++++++ .../jsonobjects/repo/PlayerChatFilterJson.java | 10 ++++ .../data/jsonobjects/repo/RiftEffigiesJson.java | 11 ++++ .../skyhanni/data/jsonobjects/repo/SacksJson.java | 10 ++++ .../data/jsonobjects/repo/SeaCreatureJson.java | 33 ++++++++++ .../repo/SlayerProfitTrackerItemsJson.java | 12 ++++ .../data/jsonobjects/repo/TabListJson.java | 11 ++++ .../data/jsonobjects/repo/TrophyFishJson.java | 25 ++++++++ .../data/jsonobjects/repo/VipVisitsJson.java | 10 ++++ .../skyhanni/data/jsonobjects/repo/WarpsJson.java | 10 ++++ .../skyhanni/features/bingo/BingoCardTips.kt | 4 +- .../features/chat/playerchat/PlayerChatFilter.kt | 2 +- .../tabcomplete/GetFromSacksTabComplete.kt | 2 +- .../commands/tabcomplete/PlayerTabComplete.kt | 2 +- .../commands/tabcomplete/WarpTabComplete.kt | 2 +- .../features/fishing/SeaCreatureManager.kt | 2 +- .../tracker/FishingTrackerCategoryManager.kt | 2 +- .../features/fishing/trophy/TrophyFishManager.kt | 4 +- .../skyhanni/features/garden/GardenAPI.kt | 2 +- .../features/garden/composter/ComposterOverlay.kt | 2 +- .../features/garden/farming/ArmorDropTracker.kt | 4 +- .../features/garden/farming/GardenCropSpeed.kt | 4 +- .../garden/inventory/AnitaExtraFarmingFortune.kt | 4 +- .../garden/visitor/GardenVisitorColorNames.kt | 2 +- .../visitor/HighlightVisitorsOutsideOfGarden.kt | 2 +- .../features/inventory/HideNotClickableItems.kt | 6 +- .../skyhanni/features/inventory/ItemStars.kt | 2 +- .../skyhanni/features/misc/InGameDateDisplay.kt | 2 +- .../skyhanni/features/misc/QuickModMenuSwitch.kt | 2 +- .../misc/compacttablist/AdvancedPlayerList.kt | 2 +- .../CrimsonIsleReputationHelper.kt | 2 +- .../dailykuudra/DailyKuudraBossHelper.kt | 2 +- .../reputationhelper/dailyquest/QuestLoader.kt | 2 +- .../miniboss/DailyMiniBossHelper.kt | 2 +- .../rift/area/mirrorverse/DanceRoomHelper.kt | 2 +- .../rift/area/mirrorverse/RiftLavaMazeParkour.kt | 2 +- .../rift/area/mirrorverse/RiftUpsideDownParkour.kt | 2 +- .../rift/area/mirrorverse/TubulatorParkour.kt | 2 +- .../area/stillgorechateau/RiftBloodEffigies.kt | 2 +- .../rift/everywhere/EnigmaSoulWaypoints.kt | 2 +- .../features/slayer/SlayerProfitTracker.kt | 2 +- .../skyhanni/test/HighlightMissingRepoItems.kt | 2 +- .../at/hannibal2/skyhanni/utils/MultiFilter.kt | 4 +- .../at/hannibal2/skyhanni/utils/ParkourHelper.kt | 2 +- .../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 ---- 104 files changed, 701 insertions(+), 702 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/FriendsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/JacobContestsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/KnownFeaturesJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ContributorListJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java create mode 100644 src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java 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') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index bc173c5d4..18105ec96 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -41,6 +41,9 @@ import at.hannibal2.skyhanni.data.SlayerAPI import at.hannibal2.skyhanni.data.TitleData import at.hannibal2.skyhanni.data.TitleManager import at.hannibal2.skyhanni.data.ToolTipData +import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson +import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson +import at.hannibal2.skyhanni.data.jsonobjects.local.KnownFeaturesJson import at.hannibal2.skyhanni.data.repo.RepoManager import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper @@ -314,9 +317,6 @@ import at.hannibal2.skyhanni.utils.KeyboardManager import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter.Companion.initLogging import at.hannibal2.skyhanni.utils.NEUVersionCheck.checkIfNeuIsLoaded import at.hannibal2.skyhanni.utils.TabListData -import at.hannibal2.skyhanni.utils.jsonobjects.FriendsJson -import at.hannibal2.skyhanni.utils.jsonobjects.JacobContestsJson -import at.hannibal2.skyhanni.utils.jsonobjects.KnownFeaturesJson import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Job diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index 5893fbf06..b59bf1141 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -2,6 +2,9 @@ package at.hannibal2.skyhanni.config import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType +import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson +import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson +import at.hannibal2.skyhanni.data.jsonobjects.local.KnownFeaturesJson import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity import at.hannibal2.skyhanni.features.misc.update.UpdateManager import at.hannibal2.skyhanni.utils.LorenzLogger @@ -10,9 +13,6 @@ import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName import at.hannibal2.skyhanni.utils.NEUItems -import at.hannibal2.skyhanni.utils.jsonobjects.FriendsJson -import at.hannibal2.skyhanni.utils.jsonobjects.JacobContestsJson -import at.hannibal2.skyhanni.utils.jsonobjects.KnownFeaturesJson import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker import com.google.gson.GsonBuilder import com.google.gson.JsonObject diff --git a/src/main/java/at/hannibal2/skyhanni/data/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/BingoAPI.kt index 5b32a1d15..5ba6c84dd 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BingoAPI.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.RepositoryReloadEvent -import at.hannibal2.skyhanni.utils.jsonobjects.BingoRanksJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoRanksJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object BingoAPI { diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt index f6c9b4e56..e3d256b21 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt @@ -8,8 +8,8 @@ import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher -import at.hannibal2.skyhanni.utils.jsonobjects.FriendsJson -import at.hannibal2.skyhanni.utils.jsonobjects.FriendsJson.PlayerFriends.Friend +import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson +import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson.PlayerFriends.Friend import net.minecraft.util.ChatStyle import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.UUID diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt index 610393906..34baceb0b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt @@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher -import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt index f9990685d..028c58000 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigManager +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.utils.ItemUtils.getLore @@ -16,7 +17,6 @@ import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson import kotlinx.coroutines.launch import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt index 2bd6a9dcb..f32256031 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside -import at.hannibal2.skyhanni.utils.jsonobjects.LocationFixJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.LocationFixJson import net.minecraft.util.AxisAlignedBB import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt index d4ad57e2d..53ffdae71 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.utils.APIUtil import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.put -import at.hannibal2.skyhanni.utils.jsonobjects.MayorJson +import at.hannibal2.skyhanni.data.jsonobjects.local.MayorJson import io.github.moulberry.notenoughupdates.util.SkyBlockTime import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -73,4 +73,4 @@ class MayorElection { private fun MayorJson.Election.getPairs() = year + 1 to candidates.bestCandidate() private fun List.bestCandidate() = maxBy { it.votes } -} \ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/FriendsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/FriendsJson.java new file mode 100644 index 000000000..d95cea3bd --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/FriendsJson.java @@ -0,0 +1,24 @@ +package at.hannibal2.skyhanni.data.jsonobjects.local; + +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/data/jsonobjects/local/JacobContestsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/JacobContestsJson.java new file mode 100644 index 000000000..0eb31c5fd --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/JacobContestsJson.java @@ -0,0 +1,13 @@ +package at.hannibal2.skyhanni.data.jsonobjects.local; + +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/data/jsonobjects/local/KnownFeaturesJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/KnownFeaturesJson.java new file mode 100644 index 000000000..e72400c9e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/KnownFeaturesJson.java @@ -0,0 +1,12 @@ +package at.hannibal2.skyhanni.data.jsonobjects.local; + +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/data/jsonobjects/local/MayorJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java new file mode 100644 index 000000000..6525e59d3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/local/MayorJson.java @@ -0,0 +1,70 @@ +package at.hannibal2.skyhanni.data.jsonobjects.local; + +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/data/jsonobjects/repo/AnitaUpgradeCostsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java new file mode 100644 index 000000000..a1122eec3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/AnitaUpgradeCostsJson.java @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java new file mode 100644 index 000000000..c8038c49f --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ArmorDropsJson.java @@ -0,0 +1,19 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java new file mode 100644 index 000000000..eb0fe5e40 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoJson.java @@ -0,0 +1,19 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java new file mode 100644 index 000000000..98f2a4695 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/BingoRanksJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.Map; + +public class BingoRanksJson { + @Expose + public Map ranks; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ContributorListJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ContributorListJson.java new file mode 100644 index 000000000..dc2b4a5ac --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ContributorListJson.java @@ -0,0 +1,9 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; +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/data/jsonobjects/repo/CrimsonIsleReputationJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java new file mode 100644 index 000000000..f349aef9a --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/CrimsonIsleReputationJson.java @@ -0,0 +1,34 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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/data/jsonobjects/repo/DanceRoomInstructionsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java new file mode 100644 index 000000000..e7c167e53 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DanceRoomInstructionsJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class DanceRoomInstructionsJson { + @Expose + public List instructions; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java new file mode 100644 index 000000000..00a662768 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DicerDropsJson.java @@ -0,0 +1,31 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java new file mode 100644 index 000000000..1099cf782 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/DisabledFeaturesJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.Map; + +public class DisabledFeaturesJson { + @Expose + public Map features; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java new file mode 100644 index 000000000..cd17d1744 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/EnigmaSoulsJson.java @@ -0,0 +1,20 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java new file mode 100644 index 000000000..47f7fc0bb --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/FishingProfitItemsJson.java @@ -0,0 +1,12 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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/data/jsonobjects/repo/GardenJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java new file mode 100644 index 000000000..acb8e08ba --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/GardenJson.java @@ -0,0 +1,58 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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/data/jsonobjects/repo/HideNotClickableItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java new file mode 100644 index 000000000..8877e596e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/HideNotClickableItemsJson.java @@ -0,0 +1,30 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java new file mode 100644 index 000000000..c6bfc90f3 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ItemsJson.java @@ -0,0 +1,14 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java new file mode 100644 index 000000000..0df76b4a9 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/LocationFixJson.java @@ -0,0 +1,27 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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/data/jsonobjects/repo/ModGuiSwitcherJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java new file mode 100644 index 000000000..cf0b0656d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ModGuiSwitcherJson.java @@ -0,0 +1,25 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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<>(); + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java new file mode 100644 index 000000000..0d0c0d6e1 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/MultiFilterJson.java @@ -0,0 +1,25 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java new file mode 100644 index 000000000..0dd511430 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/ParkourJson.java @@ -0,0 +1,23 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java new file mode 100644 index 000000000..708ac24e0 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/PlayerChatFilterJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class PlayerChatFilterJson { + @Expose + public List filters; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java new file mode 100644 index 000000000..ad94c374d --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/RiftEffigiesJson.java @@ -0,0 +1,11 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import at.hannibal2.skyhanni.utils.LorenzVec; +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class RiftEffigiesJson { + @Expose + public List locations; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java new file mode 100644 index 000000000..8a2765210 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SacksJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class SacksJson { + @Expose + public List sackList; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java new file mode 100644 index 000000000..3f8449fb6 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SeaCreatureJson.java @@ -0,0 +1,33 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java new file mode 100644 index 000000000..f9c91bdfc --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/SlayerProfitTrackerItemsJson.java @@ -0,0 +1,12 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java new file mode 100644 index 000000000..2c475679e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TabListJson.java @@ -0,0 +1,11 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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/data/jsonobjects/repo/TrophyFishJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java new file mode 100644 index 000000000..c15adf1b8 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/TrophyFishJson.java @@ -0,0 +1,25 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +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; + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java new file mode 100644 index 000000000..d2a4a0562 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/VipVisitsJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class VipVisitsJson { + @Expose + public List vipVisits; +} diff --git a/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java new file mode 100644 index 000000000..ef81b052a --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/data/jsonobjects/repo/WarpsJson.java @@ -0,0 +1,10 @@ +package at.hannibal2.skyhanni.data.jsonobjects.repo; + +import com.google.gson.annotations.Expose; + +import java.util.List; + +public class WarpsJson { + @Expose + public List warpCommands; +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardTips.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardTips.kt index 318888fec..2486166a5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardTips.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardTips.kt @@ -9,8 +9,8 @@ import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.highlight import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.BingoJson -import at.hannibal2.skyhanni.utils.jsonobjects.BingoJson.BingoTip +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoJson.BingoTip import net.minecraft.inventory.ContainerChest import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt index ed1a256d5..4a80f8084 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatFilter.kt @@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.features.chat.playerchat import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.MultiFilter -import at.hannibal2.skyhanni.utils.jsonobjects.PlayerChatFilterJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.PlayerChatFilterJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class PlayerChatFilter { diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt index 97a110508..b3770c6cc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/GetFromSacksTabComplete.kt @@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.jsonobjects.SacksJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.SacksJson import net.minecraft.network.play.client.C01PacketChatMessage import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt index e6b2baaf8..9df128920 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/PlayerTabComplete.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.data.FriendAPI import at.hannibal2.skyhanni.data.PartyAPI import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.EntityUtils.isNPC -import at.hannibal2.skyhanni.utils.jsonobjects.VipVisitsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.VipVisitsJson import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/WarpTabComplete.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/WarpTabComplete.kt index ea76e03ea..c5487fdb8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/WarpTabComplete.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/tabcomplete/WarpTabComplete.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.commands.tabcomplete import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.jsonobjects.WarpsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.WarpsJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object WarpTabComplete { diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt index f0a3c54b1..b3e0670fe 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt @@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.SeaCreatureFishEvent import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.jsonobjects.SeaCreatureJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.SeaCreatureJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class SeaCreatureManager { diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingTrackerCategoryManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingTrackerCategoryManager.kt index a1a1067ed..2006975ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingTrackerCategoryManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/FishingTrackerCategoryManager.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.features.fishing.tracker +import at.hannibal2.skyhanni.data.jsonobjects.repo.FishingProfitItemsJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName -import at.hannibal2.skyhanni.utils.jsonobjects.FishingProfitItemsJson import io.github.moulberry.notenoughupdates.NotEnoughUpdates import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt index 5f576ae46..6be896fb3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishManager.kt @@ -5,8 +5,8 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.StringUtils.splitLines -import at.hannibal2.skyhanni.utils.jsonobjects.TrophyFishJson -import at.hannibal2.skyhanni.utils.jsonobjects.TrophyFishJson.TrophyFishInfo +import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.TrophyFishJson.TrophyFishInfo import net.minecraft.event.HoverEvent import net.minecraft.util.ChatComponentText import net.minecraft.util.ChatStyle diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt index ee590806a..b0a925b66 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenAPI.kt @@ -32,7 +32,7 @@ import at.hannibal2.skyhanni.utils.MinecraftDispatcher import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getCultivatingCounter import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getHoeCounter -import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index b99f059da..daabaec80 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -34,7 +34,7 @@ import at.hannibal2.skyhanni.utils.SoundUtils import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.TimeUtils -import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import at.hannibal2.skyhanni.utils.renderables.Renderable import io.github.moulberry.notenoughupdates.NotEnoughUpdates import net.minecraftforge.event.entity.player.ItemTooltipEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt index 21c271e49..908707311 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/ArmorDropTracker.kt @@ -16,8 +16,8 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addOrPut import at.hannibal2.skyhanni.utils.LorenzUtils.sortedDesc import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.SimpleTimeMark -import at.hannibal2.skyhanni.utils.jsonobjects.ArmorDropsJson -import at.hannibal2.skyhanni.utils.jsonobjects.ArmorDropsJson.DropInfo +import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ArmorDropsJson.DropInfo import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker import at.hannibal2.skyhanni.utils.tracker.TrackerData import com.google.gson.JsonObject diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index 0f10ed883..6868596d4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -15,8 +15,8 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy -import at.hannibal2.skyhanni.utils.jsonobjects.DicerDropsJson -import at.hannibal2.skyhanni.utils.jsonobjects.DicerDropsJson.DicerType +import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson.DicerType import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.concurrent.fixedRateTimer diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt index 2af928a30..1e83d8aa7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/AnitaExtraFarmingFortune.kt @@ -12,8 +12,8 @@ import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher -import at.hannibal2.skyhanni.utils.jsonobjects.AnitaUpgradeCostsJson -import at.hannibal2.skyhanni.utils.jsonobjects.AnitaUpgradeCostsJson.Price +import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradeCostsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.AnitaUpgradeCostsJson.Price import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt index 9fa465a47..5d4937f71 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt @@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.garden.visitor import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object GardenVisitorColorNames { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt index a4d370e62..00fb62be2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/HighlightVisitorsOutsideOfGarden.kt @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.getLorenzVec -import at.hannibal2.skyhanni.utils.jsonobjects.GardenJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import at.hannibal2.skyhanni.utils.toLorenzVec import io.github.moulberry.notenoughupdates.util.SBInfo import net.minecraft.client.Minecraft diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt index a8880aefd..d0c6d91f8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt @@ -27,9 +27,9 @@ import at.hannibal2.skyhanni.utils.MultiFilter import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRiftExportable import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRiftTransferable import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.HideNotClickableItemsJson -import at.hannibal2.skyhanni.utils.jsonobjects.HideNotClickableItemsJson.SalvageFilter -import at.hannibal2.skyhanni.utils.jsonobjects.MultiFilterJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.HideNotClickableItemsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.HideNotClickableItemsJson.SalvageFilter +import at.hannibal2.skyhanni.data.jsonobjects.repo.MultiFilterJson import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.inventory.ContainerChest diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt index c5335b3c5..9b6e4c8bf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt @@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.StringUtils.matches -import at.hannibal2.skyhanni.utils.jsonobjects.ItemsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ItemsJson import net.minecraftforge.event.entity.player.ItemTooltipEvent import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt index 5bacfd047..0d87bb767 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/InGameDateDisplay.kt @@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.TimeUtils.formatted -import at.hannibal2.skyhanni.utils.jsonobjects.TabListJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.TabListJson import io.github.moulberry.notenoughupdates.util.SkyBlockTime import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt index 9b6987fad..fceb8563e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt @@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.makeAccessible import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems -import at.hannibal2.skyhanni.utils.jsonobjects.ModGuiSwitcherJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ModGuiSwitcherJson import at.hannibal2.skyhanni.utils.renderables.Renderable import net.minecraft.client.Minecraft import net.minecraft.client.renderer.GlStateManager diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt index 7c96f4efa..9275b6ea7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/AdvancedPlayerList.kt @@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.ContributorListJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ContributorListJson import com.google.common.cache.CacheBuilder import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.concurrent.TimeUnit diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt index ec03ad514..d6f8d8e05 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt @@ -19,7 +19,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.TabListData -import at.hannibal2.skyhanni.utils.jsonobjects.CrimsonIsleReputationJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt index a14da5859..bf88fb865 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailykuudra/DailyKuudraBossHelper.kt @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText -import at.hannibal2.skyhanni.utils.jsonobjects.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class DailyKuudraBossHelper(private val reputationHelper: CrimsonIsleReputationHelper) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt index 6184fd51e..47a8716fd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt @@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.features.nether.reputationhelper.dailyquest.quest.U import at.hannibal2.skyhanni.utils.ItemUtils.getLore import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.TabListData -import at.hannibal2.skyhanni.utils.jsonobjects.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt index 52f5c23f4..87ab3ae5f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt @@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList import at.hannibal2.skyhanni.utils.NEUItems.getItemStack import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher -import at.hannibal2.skyhanni.utils.jsonobjects.CrimsonIsleReputationJson.ReputationQuest +import at.hannibal2.skyhanni.data.jsonobjects.repo.CrimsonIsleReputationJson.ReputationQuest import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class DailyMiniBossHelper(private val reputationHelper: CrimsonIsleReputationHelper) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt index 524e1b354..a2b337668 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt @@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.StringUtils.firstLetterUppercase -import at.hannibal2.skyhanni.utils.jsonobjects.DanceRoomInstructionsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.DanceRoomInstructionsJson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt index efaf77163..2ffcb7928 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftLavaMazeParkour.kt @@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor import at.hannibal2.skyhanni.utils.ParkourHelper -import at.hannibal2.skyhanni.utils.jsonobjects.ParkourJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class RiftLavaMazeParkour { diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt index 18a09709d..1826a5e38 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/RiftUpsideDownParkour.kt @@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.features.rift.RiftAPI import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor import at.hannibal2.skyhanni.utils.ParkourHelper -import at.hannibal2.skyhanni.utils.jsonobjects.ParkourJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class RiftUpsideDownParkour { diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt index 567f2bf2e..281643bfc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/TubulatorParkour.kt @@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor import at.hannibal2.skyhanni.utils.ParkourHelper -import at.hannibal2.skyhanni.utils.jsonobjects.ParkourJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.ParkourJson import net.minecraft.util.AxisAlignedBB import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt index d10aac4ca..9fc00b99a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt @@ -19,7 +19,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.TimeUtils import at.hannibal2.skyhanni.utils.getLorenzVec -import at.hannibal2.skyhanni.utils.jsonobjects.RiftEffigiesJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.RiftEffigiesJson import net.minecraft.entity.item.EntityArmorStand import net.minecraftforge.fml.common.eventhandler.SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt index 983df0d88..063d16beb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/EnigmaSoulWaypoints.kt @@ -17,7 +17,7 @@ import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.RenderUtils.highlight import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.EnigmaSoulsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.EnigmaSoulsJson import io.github.moulberry.notenoughupdates.events.ReplaceItemEvent import io.github.moulberry.notenoughupdates.events.SlotClickEvent import io.github.moulberry.notenoughupdates.util.Utils diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt index 7a49e4ddd..52e27d305 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt @@ -18,7 +18,7 @@ import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NumberUtil import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.StringUtils.removeColor -import at.hannibal2.skyhanni.utils.jsonobjects.SlayerProfitTrackerItemsJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.SlayerProfitTrackerItemsJson import at.hannibal2.skyhanni.utils.renderables.Renderable import at.hannibal2.skyhanni.utils.tracker.ItemTrackerData import at.hannibal2.skyhanni.utils.tracker.SkyHanniItemTracker diff --git a/src/main/java/at/hannibal2/skyhanni/test/HighlightMissingRepoItems.kt b/src/main/java/at/hannibal2/skyhanni/test/HighlightMissingRepoItems.kt index 28e657c1e..2419d6161 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/HighlightMissingRepoItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/HighlightMissingRepoItems.kt @@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.MultiFilter import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.RenderUtils.highlight -import at.hannibal2.skyhanni.utils.jsonobjects.MultiFilterJson +import at.hannibal2.skyhanni.data.jsonobjects.repo.MultiFilterJson import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.client.gui.inventory.GuiInventory 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 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