From ff6dd291a0f89644508171e6b984295de20466ce Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Mon, 8 Apr 2024 18:42:25 +0200 Subject: Bump MoulConfig to 3.0.0 betas (#1382) --- .../at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt | 2 +- .../java/at/hannibal2/skyhanni/config/ConfigGuiManager.kt | 4 ++-- .../java/at/hannibal2/skyhanni/config/ConfigManager.kt | 14 +++++--------- .../java/at/hannibal2/skyhanni/config/FeatureToggle.kt | 2 +- src/main/java/at/hannibal2/skyhanni/config/Features.java | 10 +++++----- .../java/at/hannibal2/skyhanni/config/features/About.java | 12 ++++++------ .../skyhanni/config/features/chat/ChatConfig.java | 10 +++++----- .../skyhanni/config/features/chat/ChatSymbols.java | 6 +++--- .../skyhanni/config/features/chat/CompactPotionConfig.java | 4 ++-- .../skyhanni/config/features/chat/FilterTypesConfig.java | 4 ++-- .../config/features/chat/PlayerMessagesConfig.java | 4 ++-- .../skyhanni/config/features/chroma/ChromaConfig.java | 12 ++++++------ .../skyhanni/config/features/combat/BestiaryConfig.java | 6 +++--- .../skyhanni/config/features/combat/CombatConfig.java | 8 ++++---- .../skyhanni/config/features/combat/EnderNodeConfig.java | 8 ++++---- .../skyhanni/config/features/combat/MobsConfig.java | 4 ++-- .../skyhanni/config/features/combat/SummoningsConfig.java | 4 ++-- .../combat/damageindicator/DamageIndicatorConfig.java | 10 +++++----- .../features/combat/damageindicator/EnderSlayerConfig.java | 4 ++-- .../combat/damageindicator/VampireSlayerConfig.java | 4 ++-- .../features/combat/ghostcounter/GhostCounterConfig.java | 12 ++++++------ .../textformatting/BestiaryFormattingConfig.java | 4 ++-- .../ghostcounter/textformatting/ETAFormattingConfig.java | 4 ++-- .../textformatting/KillHourFormattingConfig.java | 4 ++-- .../ghostcounter/textformatting/TextFormattingConfig.java | 10 +++++----- .../textformatting/XPHourFormattingConfig.java | 4 ++-- .../config/features/commands/BetterWikiCommandConfig.java | 6 +++--- .../skyhanni/config/features/commands/CommandsConfig.java | 6 +++--- .../config/features/commands/TabCompleteConfig.java | 4 ++-- .../config/features/crimsonisle/CrimsonIsleConfig.java | 8 ++++---- .../features/crimsonisle/ReputationHelperConfig.java | 10 +++++----- .../features/crimsonisle/SulphurSkitterBoxConfig.java | 8 ++++---- .../config/features/crimsonisle/ashfang/AshfangConfig.java | 6 +++--- .../features/crimsonisle/ashfang/BlazingSoulsColor.java | 6 +++--- .../features/crimsonisle/ashfang/GravityOrbsConfig.java | 6 +++--- .../features/crimsonisle/ashfang/HideAshfangConfig.java | 4 ++-- .../skyhanni/config/features/dev/DebugConfig.java | 10 +++++----- .../skyhanni/config/features/dev/DebugMobConfig.java | 8 ++++---- .../hannibal2/skyhanni/config/features/dev/DevConfig.java | 12 ++++++------ .../skyhanni/config/features/dev/RepoPatternConfig.java | 6 +++--- .../skyhanni/config/features/dev/WaypointsConfig.java | 6 +++--- .../dev/minecraftconsole/ConsoleFiltersConfig.java | 4 ++-- .../dev/minecraftconsole/MinecraftConsoleConfig.java | 6 +++--- .../skyhanni/config/features/dungeon/CleanEndConfig.java | 4 ++-- .../config/features/dungeon/DungeonChestConfig.java | 4 ++-- .../skyhanni/config/features/dungeon/DungeonConfig.java | 6 +++--- .../config/features/dungeon/DungeonCopilotConfig.java | 4 ++-- .../config/features/dungeon/LividFinderConfig.java | 4 ++-- .../config/features/dungeon/MessageFilterConfig.java | 4 ++-- .../config/features/dungeon/ObjectHiderConfig.java | 4 ++-- .../config/features/dungeon/PartyFinderConfig.java | 6 +++--- .../skyhanni/config/features/dungeon/TabListConfig.java | 4 ++-- .../config/features/dungeon/TerracottaPhaseConfig.java | 4 ++-- .../skyhanni/config/features/event/CenturyConfig.java | 4 ++-- .../skyhanni/config/features/event/CityProjectConfig.java | 4 ++-- .../skyhanni/config/features/event/EventConfig.java | 6 +++--- .../skyhanni/config/features/event/GreatSpookConfig.java | 4 ++-- .../skyhanni/config/features/event/MayorJerryConfig.java | 4 ++-- .../config/features/event/bingo/BingoCardConfig.java | 6 +++--- .../skyhanni/config/features/event/bingo/BingoConfig.java | 6 +++--- .../config/features/event/bingo/CompactChatConfig.java | 4 ++-- .../config/features/event/diana/AllBurrowsListConfig.java | 4 ++-- .../skyhanni/config/features/event/diana/DianaConfig.java | 10 +++++----- .../features/event/diana/DianaProfitTrackerConfig.java | 4 ++-- .../config/features/event/diana/IgnoredWarpsConfig.java | 4 ++-- .../features/event/diana/InquisitorSharingConfig.java | 6 +++--- .../features/event/diana/MythologicalMobTrackerConfig.java | 6 +++--- .../features/event/waypoints/ChristmasPresentConfig.java | 4 ++-- .../config/features/event/waypoints/EasterEggConfig.java | 4 ++-- .../features/event/waypoints/HalloweenBasketConfig.java | 4 ++-- .../features/event/waypoints/LobbyWaypointsConfig.java | 4 ++-- .../config/features/event/winter/FrozenTreasureConfig.java | 6 +++--- .../features/event/winter/GiftingOpportunitiesConfig.java | 4 ++-- .../config/features/event/winter/JyrreTimerConfig.java | 4 ++-- .../config/features/event/winter/UniqueGiftConfig.java | 4 ++-- .../config/features/event/winter/WinterConfig.java | 6 +++--- .../skyhanni/config/features/fishing/BarnTimerConfig.java | 8 ++++---- .../config/features/fishing/ChumBucketHiderConfig.java | 6 +++--- .../config/features/fishing/FishedItemNameConfig.java | 4 ++-- .../config/features/fishing/FishingBaitWarningsConfig.java | 4 ++-- .../skyhanni/config/features/fishing/FishingConfig.java | 8 ++++---- .../config/features/fishing/FishingHookDisplayConfig.java | 6 +++--- .../features/fishing/FishingProfitTrackerConfig.java | 4 ++-- .../config/features/fishing/RareCatchesConfig.java | 4 ++-- .../config/features/fishing/SeaCreatureTrackerConfig.java | 6 +++--- .../config/features/fishing/ThunderSparkConfig.java | 6 +++--- .../config/features/fishing/TotemOfCorruptionConfig.java | 10 +++++----- .../features/fishing/trophyfishing/ChatMessagesConfig.java | 6 +++--- .../fishing/trophyfishing/GeyserFishingConfig.java | 6 +++--- .../fishing/trophyfishing/TrophyFishingConfig.java | 6 +++--- .../skyhanni/config/features/garden/AnitaShopConfig.java | 4 ++-- .../config/features/garden/ArmorDropTrackerConfig.java | 4 ++-- .../features/garden/AtmosphericFilterDisplayConfig.java | 4 ++-- .../config/features/garden/CropStartLocationConfig.java | 4 ++-- .../config/features/garden/DicerRngDropTrackerConfig.java | 4 ++-- .../config/features/garden/EliteFarmingWeightConfig.java | 6 +++--- .../config/features/garden/FarmingFortuneConfig.java | 6 +++--- .../config/features/garden/GardenCommandsConfig.java | 6 +++--- .../skyhanni/config/features/garden/GardenConfig.java | 10 +++++----- .../skyhanni/config/features/garden/GardenLevelConfig.java | 4 ++-- .../skyhanni/config/features/garden/KeyBindConfig.java | 8 ++++---- .../config/features/garden/MoneyPerHourConfig.java | 8 ++++---- .../config/features/garden/NextJacobContestConfig.java | 10 +++++----- .../skyhanni/config/features/garden/NumbersConfig.java | 4 ++-- .../skyhanni/config/features/garden/PlotIconConfig.java | 6 +++--- .../config/features/garden/PlotMenuHighlightingConfig.java | 6 +++--- .../config/features/garden/SensitivityReducerConfig.java | 12 ++++++------ .../skyhanni/config/features/garden/SkyMartConfig.java | 6 +++--- .../config/features/garden/TooltipTweaksConfig.java | 8 ++++---- .../config/features/garden/YawPitchDisplayConfig.java | 6 +++--- .../config/features/garden/composter/ComposterConfig.java | 8 ++++---- .../config/features/garden/composter/NotifyLowConfig.java | 6 +++--- .../garden/cropmilestones/CropMilestonesConfig.java | 14 +++++++------- .../garden/cropmilestones/MushroomPetPerkConfig.java | 6 +++--- .../config/features/garden/cropmilestones/NextConfig.java | 8 ++++---- .../features/garden/laneswitch/FarmingLaneConfig.java | 8 ++++---- .../garden/laneswitch/LaneSwitchNotificationConfig.java | 10 +++++----- .../garden/laneswitch/LaneSwitchSoundSettings.java | 8 ++++---- .../features/garden/optimalspeed/CustomSpeedConfig.java | 6 +++--- .../features/garden/optimalspeed/OptimalSpeedConfig.java | 6 +++--- .../config/features/garden/pests/PestFinderConfig.java | 8 ++++---- .../features/garden/pests/PestProfitTrackerConfig.java | 6 +++--- .../config/features/garden/pests/PestSpawnConfig.java | 6 +++--- .../config/features/garden/pests/PestTimerConfig.java | 4 ++-- .../config/features/garden/pests/PestWaypointConfig.java | 6 +++--- .../skyhanni/config/features/garden/pests/PestsConfig.java | 4 ++-- .../skyhanni/config/features/garden/pests/SprayConfig.java | 4 ++-- .../features/garden/visitor/DropsStatisticsConfig.java | 6 +++--- .../config/features/garden/visitor/InventoryConfig.java | 4 ++-- .../features/garden/visitor/RewardWarningConfig.java | 8 ++++---- .../config/features/garden/visitor/ShoppingListConfig.java | 4 ++-- .../config/features/garden/visitor/TimerConfig.java | 4 ++-- .../config/features/garden/visitor/VisitorConfig.java | 10 +++++----- .../hannibal2/skyhanni/config/features/gui/GUIConfig.java | 14 +++++++------- .../skyhanni/config/features/gui/InGameDateConfig.java | 6 +++--- .../skyhanni/config/features/gui/ModifyWordsConfig.java | 6 +++--- .../skyhanni/config/features/gui/TextBoxConfig.java | 8 ++++---- .../features/gui/customscoreboard/AlignmentConfig.java | 4 ++-- .../config/features/gui/customscoreboard/ArrowConfig.java | 6 +++--- .../features/gui/customscoreboard/BackgroundConfig.java | 10 +++++----- .../gui/customscoreboard/CustomScoreboardConfig.java | 8 ++++---- .../features/gui/customscoreboard/DisplayConfig.java | 10 +++++----- .../config/features/gui/customscoreboard/EventsConfig.java | 6 +++--- .../gui/customscoreboard/InformationFilteringConfig.java | 4 ++-- .../features/gui/customscoreboard/MaxwellConfig.java | 6 +++--- .../config/features/gui/customscoreboard/MayorConfig.java | 4 ++-- .../config/features/gui/customscoreboard/PartyConfig.java | 8 ++++---- .../gui/customscoreboard/TitleAndFooterConfig.java | 10 +++++----- .../config/features/inventory/AuctionHouseConfig.java | 8 ++++---- .../inventory/AuctionHousePriceComparisonConfig.java | 6 +++--- .../skyhanni/config/features/inventory/BazaarConfig.java | 4 ++-- .../config/features/inventory/ChestValueConfig.java | 8 ++++---- .../config/features/inventory/GetFromSackConfig.java | 4 ++-- .../config/features/inventory/HideNotClickableConfig.java | 6 +++--- .../config/features/inventory/InventoryConfig.java | 10 +++++----- .../features/inventory/JacobFarmingContestConfig.java | 6 +++--- .../skyhanni/config/features/inventory/RngMeterConfig.java | 4 ++-- .../config/features/inventory/SackDisplayConfig.java | 8 ++++---- .../config/features/inventory/SkyblockGuideConfig.java | 4 ++-- .../config/features/inventory/StatsTuningConfig.java | 4 ++-- .../features/inventory/helper/HarpConfigKeyBinds.java | 4 ++-- .../config/features/inventory/helper/HelperConfig.java | 6 +++--- .../config/features/inventory/helper/TiaRelayConfig.java | 4 ++-- .../config/features/itemability/ChickenHeadConfig.java | 4 ++-- .../config/features/itemability/FireVeilWandConfig.java | 6 +++--- .../config/features/itemability/ItemAbilityConfig.java | 6 +++--- .../config/features/markedplayer/MarkedPlayerConfig.java | 8 ++++---- .../skyhanni/config/features/mining/AreaWallsConfig.java | 4 ++-- .../config/features/mining/DeepCavernsParkourConfig.java | 10 +++++----- .../config/features/mining/KingTalismanConfig.java | 4 ++-- .../skyhanni/config/features/mining/MiningConfig.java | 8 ++++---- .../skyhanni/config/features/mining/MiningEventConfig.java | 6 +++--- .../config/features/mining/PowderTrackerConfig.java | 8 ++++---- .../skyhanni/config/features/minion/EmptiedTimeConfig.java | 6 +++--- .../config/features/minion/LastClickedMinionConfig.java | 8 ++++---- .../skyhanni/config/features/minion/MinionsConfig.java | 6 +++--- .../skyhanni/config/features/misc/DiscordRPCConfig.java | 12 ++++++------ .../config/features/misc/EstimatedItemValueConfig.java | 10 +++++----- .../config/features/misc/GlowingDroppedItemsConfig.java | 4 ++-- .../skyhanni/config/features/misc/HideArmorConfig.java | 6 +++--- .../config/features/misc/HighlightPartyMembersConfig.java | 6 +++--- .../skyhanni/config/features/misc/KickDurationConfig.java | 8 ++++---- .../skyhanni/config/features/misc/MiscConfig.java | 10 +++++----- .../skyhanni/config/features/misc/ParticleHiderConfig.java | 4 ++-- .../config/features/misc/PetCandyDisplayConfig.java | 4 ++-- .../config/features/misc/PocketSackInASackConfig.java | 4 ++-- .../skyhanni/config/features/misc/PotionEffectsConfig.java | 4 ++-- .../config/features/misc/QuickModMenuSwitchConfig.java | 4 ++-- .../skyhanni/config/features/misc/TeleportPadConfig.java | 4 ++-- .../skyhanni/config/features/misc/TrackerConfig.java | 12 ++++++------ .../config/features/misc/TrevorTheTrapperConfig.java | 8 ++++---- .../misc/compacttablist/AdvancedPlayerListConfig.java | 6 +++--- .../features/misc/compacttablist/CompactTabListConfig.java | 6 +++--- .../config/features/misc/cosmetic/ArrowTrailConfig.java | 8 ++++---- .../config/features/misc/cosmetic/CosmeticConfig.java | 4 ++-- .../config/features/misc/cosmetic/FollowingLineConfig.java | 8 ++++---- .../skyhanni/config/features/misc/pets/PetConfig.java | 10 +++++----- .../features/misc/pets/PetExperienceToolTipConfig.java | 4 ++-- .../config/features/rift/CruxTalismanDisplayConfig.java | 6 +++--- .../skyhanni/config/features/rift/EnigmaSoulConfig.java | 6 +++--- .../skyhanni/config/features/rift/MotesOrbsConfig.java | 6 +++--- .../skyhanni/config/features/rift/RiftConfig.java | 8 ++++---- .../skyhanni/config/features/rift/RiftTimerConfig.java | 6 +++--- .../config/features/rift/area/RiftAreasConfig.java | 4 ++-- .../features/rift/area/colosseum/ColosseumConfig.java | 4 ++-- .../features/rift/area/dreadfarm/DreadfarmConfig.java | 6 +++--- .../features/rift/area/dreadfarm/VoltCruxConfig.java | 6 +++--- .../features/rift/area/dreadfarm/WiltedBerberisConfig.java | 4 ++-- .../features/rift/area/livingcave/DefenseBlockConfig.java | 8 ++++---- .../features/rift/area/livingcave/LivingCaveConfig.java | 4 ++-- .../rift/area/livingcave/LivingCaveLivingMetalConfig.java | 4 ++-- .../area/livingcave/LivingMetalSuitProgressConfig.java | 4 ++-- .../features/rift/area/mirrorverse/LavaMazeConfig.java | 10 +++++----- .../features/rift/area/mirrorverse/MirrorVerseConfig.java | 4 ++-- .../features/rift/area/mirrorverse/TubulatorConfig.java | 10 +++++----- .../rift/area/mirrorverse/UpsideDownParkourConfig.java | 10 +++++----- .../mirrorverse/danceroomhelper/DanceRoomHelperConfig.java | 8 ++++---- .../danceroomhelper/danceroomformatting/ColorConfig.java | 4 ++-- .../danceroomformatting/DanceRoomFormattingConfig.java | 6 +++--- .../rift/area/stillgorechateau/EffigiesConfig.java | 6 +++--- .../rift/area/stillgorechateau/StillgoreChateauConfig.java | 4 ++-- .../features/rift/area/westvillage/KloonHackingConfig.java | 4 ++-- .../rift/area/westvillage/VerminTrackerConfig.java | 4 ++-- .../features/rift/area/westvillage/WestVillageConfig.java | 4 ++-- .../config/features/rift/area/wyldwoods/LarvasConfig.java | 6 +++--- .../config/features/rift/area/wyldwoods/OdonataConfig.java | 6 +++--- .../features/rift/area/wyldwoods/WyldWoodsConfig.java | 6 +++--- .../skyhanni/config/features/rift/motes/MotesConfig.java | 8 ++++---- .../features/rift/motes/RiftInventoryValueConfig.java | 6 +++--- .../features/skillprogress/AllSkillDisplayConfig.java | 8 ++++---- .../config/features/skillprogress/CustomGoalConfig.java | 4 ++-- .../features/skillprogress/SkillETADisplayConfig.java | 8 ++++---- .../config/features/skillprogress/SkillOverflowConfig.java | 6 +++--- .../features/skillprogress/SkillProgressBarConfig.java | 14 +++++++------- .../config/features/skillprogress/SkillProgressConfig.java | 10 +++++----- .../config/features/slayer/ItemProfitTrackerConfig.java | 4 ++-- .../config/features/slayer/ItemsOnGroundConfig.java | 6 +++--- .../config/features/slayer/RngMeterDisplayConfig.java | 4 ++-- .../config/features/slayer/SlayerBossWarningConfig.java | 6 +++--- .../skyhanni/config/features/slayer/SlayerConfig.java | 8 ++++---- .../skyhanni/config/features/slayer/blaze/BlazeConfig.java | 6 +++--- .../config/features/slayer/blaze/BlazeHellionConfig.java | 6 +++--- .../features/slayer/endermen/EndermanBeaconConfig.java | 8 ++++---- .../config/features/slayer/endermen/EndermanConfig.java | 6 +++--- .../config/features/slayer/vampire/BloodIchorConfig.java | 6 +++--- .../features/slayer/vampire/CoopBossHighlightConfig.java | 8 ++++---- .../config/features/slayer/vampire/KillerSpringConfig.java | 6 +++--- .../config/features/slayer/vampire/OthersBossConfig.java | 6 +++--- .../config/features/slayer/vampire/OwnBossConfig.java | 6 +++--- .../config/features/slayer/vampire/VampireConfig.java | 10 +++++----- .../skyhanni/config/features/stranded/StrandedConfig.java | 4 ++-- src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt | 2 +- .../at/hannibal2/skyhanni/features/chat/ChatFilterGui.kt | 4 ++-- .../java/at/hannibal2/skyhanni/features/chat/ChatPeek.kt | 2 +- .../skyhanni/features/garden/GardenOptimalSpeed.kt | 2 +- .../misc/massconfiguration/DefaultConfigFeatures.kt | 6 +++--- .../misc/massconfiguration/DefaultConfigOptionGui.kt | 6 +++--- .../misc/massconfiguration/FeatureToggleProcessor.kt | 10 +++++----- .../features/misc/update/GuiOptionEditorUpdateCheck.kt | 6 +++--- .../skyhanni/features/misc/update/UpdateManager.kt | 2 +- .../skyhanni/test/SkyHanniConfigSearchResetCommand.kt | 6 +++--- .../java/at/hannibal2/skyhanni/utils/ConditionalUtils.kt | 4 ++-- .../java/at/hannibal2/skyhanni/utils/KeyboardManager.kt | 4 ++-- src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt | 2 +- .../at/hannibal2/skyhanni/utils/renderables/Renderable.kt | 2 +- .../skyhanni/utils/repopatterns/RepoPatternGui.kt | 14 +++++++------- 266 files changed, 816 insertions(+), 820 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt index fd1fac07d..0c112d73a 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiForgeInterop.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.config -import io.github.moulberry.moulconfig.gui.GuiScreenElementWrapper +import io.github.notenoughupdates.moulconfig.gui.GuiScreenElementWrapper import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiScreen import net.minecraftforge.fml.client.IModGuiFactory diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiManager.kt index fe43a8f82..ffb3b7256 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigGuiManager.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config import at.hannibal2.skyhanni.SkyHanniMod -import io.github.moulberry.moulconfig.gui.GuiScreenElementWrapper -import io.github.moulberry.moulconfig.gui.MoulConfigEditor +import io.github.notenoughupdates.moulconfig.gui.GuiScreenElementWrapper +import io.github.notenoughupdates.moulconfig.gui.MoulConfigEditor object ConfigGuiManager { diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index 3a38db02a..3fbf41541 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -29,10 +29,10 @@ import com.google.gson.TypeAdapterFactory import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonToken import com.google.gson.stream.JsonWriter -import io.github.moulberry.moulconfig.observer.PropertyTypeAdapterFactory -import io.github.moulberry.moulconfig.processor.BuiltinMoulConfigGuis -import io.github.moulberry.moulconfig.processor.ConfigProcessorDriver -import io.github.moulberry.moulconfig.processor.MoulConfigProcessor +import io.github.notenoughupdates.moulconfig.observer.PropertyTypeAdapterFactory +import io.github.notenoughupdates.moulconfig.processor.BuiltinMoulConfigGuis +import io.github.notenoughupdates.moulconfig.processor.ConfigProcessorDriver +import io.github.notenoughupdates.moulconfig.processor.MoulConfigProcessor import net.minecraft.item.ItemStack import java.io.BufferedReader import java.io.BufferedWriter @@ -213,11 +213,7 @@ class ConfigManager { processor = MoulConfigProcessor(SkyHanniMod.feature) BuiltinMoulConfigGuis.addProcessors(processor) UpdateManager.injectConfigProcessor(processor) - ConfigProcessorDriver.processConfig( - features.javaClass, - features, - processor - ) + ConfigProcessorDriver(processor).processConfig(features) } private fun firstLoadFile(file: File?, fileType: ConfigFileType, defaultValue: Any): Any { diff --git a/src/main/java/at/hannibal2/skyhanni/config/FeatureToggle.kt b/src/main/java/at/hannibal2/skyhanni/config/FeatureToggle.kt index bf9db0553..6f672a743 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/FeatureToggle.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/FeatureToggle.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.config -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean /** * Annotate a [ConfigEditorBoolean] to indicate that it is a feature toggle. diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 7da53c5a2..06eb5c57e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -20,11 +20,11 @@ import at.hannibal2.skyhanni.config.features.slayer.SlayerConfig; import at.hannibal2.skyhanni.config.storage.Storage; import at.hannibal2.skyhanni.utils.LorenzUtils; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.Config; -import io.github.moulberry.moulconfig.Social; -import io.github.moulberry.moulconfig.annotations.Category; -import io.github.moulberry.moulconfig.gui.HorizontalAlign; -import io.github.moulberry.moulconfig.processor.ProcessedCategory; +import io.github.notenoughupdates.moulconfig.Config; +import io.github.notenoughupdates.moulconfig.Social; +import io.github.notenoughupdates.moulconfig.annotations.Category; +import io.github.notenoughupdates.moulconfig.gui.HorizontalAlign; +import io.github.notenoughupdates.moulconfig.processor.ProcessedCategory; import net.minecraft.util.ResourceLocation; import java.util.Arrays; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/About.java b/src/main/java/at/hannibal2/skyhanni/config/features/About.java index 8949bf36f..5e568747c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/About.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/About.java @@ -4,12 +4,12 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.features.misc.update.ConfigVersionDisplay; import at.hannibal2.skyhanni.utils.OSUtils; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.observer.Property; public class About { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java index b4ad57e75..72b21411b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatConfig.java @@ -2,11 +2,11 @@ package at.hannibal2.skyhanni.config.features.chat; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import org.lwjgl.input.Keyboard; import java.util.ArrayList; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatSymbols.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatSymbols.java index 21f49dd1b..ccead7f7b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatSymbols.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/ChatSymbols.java @@ -3,9 +3,9 @@ package at.hannibal2.skyhanni.config.features.chat; import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.HasLegacyId; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class ChatSymbols { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java index c06244b90..ef7b8abbf 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/CompactPotionConfig.java @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.features.chat; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class CompactPotionConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java index 503be4347..37bce7bca 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/FilterTypesConfig.java @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.features.chat; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class FilterTypesConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java index 93c22adab..5ebad3d0c 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chat/PlayerMessagesConfig.java @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.features.chat; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class PlayerMessagesConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java index efd49c545..d3a97bac7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/chroma/ChromaConfig.java @@ -4,12 +4,12 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.HasLegacyId; import at.hannibal2.skyhanni.features.chroma.ChromaManager; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorInfoText; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class ChromaConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/BestiaryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/BestiaryConfig.java index f294e8a45..d77d0585d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/BestiaryConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/BestiaryConfig.java @@ -4,9 +4,9 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.HasLegacyId; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class BestiaryConfig { @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java index 94780f9dd..a05ac751b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/CombatConfig.java @@ -4,10 +4,10 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.features.combat.damageindicator.DamageIndicatorConfig; import at.hannibal2.skyhanni.config.features.combat.ghostcounter.GhostCounterConfig; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.Category; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.Category; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class CombatConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java index d70d51f5a..dc7035985 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/EnderNodeConfig.java @@ -4,10 +4,10 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.HasLegacyId; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.observer.Property; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java index 227e9950c..88e115702 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/MobsConfig.java @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.features.combat; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class MobsConfig { @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java index 9abe2bf8d..87fe89a4b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/SummoningsConfig.java @@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.config.features.combat; import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class SummoningsConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java index cef9fee75..28a1fee53 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/DamageIndicatorConfig.java @@ -3,11 +3,11 @@ package at.hannibal2.skyhanni.config.features.combat.damageindicator; import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.HasLegacyId; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java index 392505686..5f0de9f4b 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/EnderSlayerConfig.java @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config.features.combat.damageindicator; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class EnderSlayerConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java index ec1d07b92..50121d3ed 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/damageindicator/VampireSlayerConfig.java @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config.features.combat.damageindicator; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class VampireSlayerConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java index 504fba9fe..ca2a9ba96 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/GhostCounterConfig.java @@ -6,12 +6,12 @@ import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.config.features.combat.ghostcounter.textformatting.TextFormattingConfig; import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostUtil; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDraggableList; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java index c41b23fe1..5b3a3f001 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/BestiaryFormattingConfig.java @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config.features.combat.ghostcounter.textformatting; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class BestiaryFormattingConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java index 146b56811..59ceb25ac 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/ETAFormattingConfig.java @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config.features.combat.ghostcounter.textformatting; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class ETAFormattingConfig { @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java index 41cf0dcdd..89deac4c5 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/KillHourFormattingConfig.java @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config.features.combat.ghostcounter.textformatting; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class KillHourFormattingConfig { @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java index 1414a986d..ed1864c78 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/TextFormattingConfig.java @@ -2,11 +2,11 @@ package at.hannibal2.skyhanni.config.features.combat.ghostcounter.textformatting import at.hannibal2.skyhanni.features.combat.ghostcounter.GhostFormatting; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorButton; -import io.github.moulberry.moulconfig.annotations.ConfigEditorInfoText; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorInfoText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class TextFormattingConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java index d04f4942a..5c9441532 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/combat/ghostcounter/textformatting/XPHourFormattingConfig.java @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.config.features.combat.ghostcounter.textformatting; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorText; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class XPHourFormattingConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java index a13e5d744..4f79f9076 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/BetterWikiCommandConfig.java @@ -2,9 +2,9 @@ package at.hannibal2.skyhanni.config.features.commands; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import org.lwjgl.input.Keyboard; public class BetterWikiCommandConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java index 01f831246..45f41fdcf 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/CommandsConfig.java @@ -2,9 +2,9 @@ package at.hannibal2.skyhanni.config.features.commands; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class CommandsConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java index b7edd0e07..64970cff6 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/commands/TabCompleteConfig.java @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.features.commands; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class TabCompleteConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java index 968c551cf..2dac04c1d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/CrimsonIsleConfig.java @@ -4,10 +4,10 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.config.features.crimsonisle.ashfang.AshfangConfig; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.Category; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.Category; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class CrimsonIsleConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java index 9e4806408..e6c00d983 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ReputationHelperConfig.java @@ -4,11 +4,11 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.HasLegacyId; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.observer.Property; import org.lwjgl.input.Keyboard; public class ReputationHelperConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/SulphurSkitterBoxConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/SulphurSkitterBoxConfig.java index 7eb2419c2..e033e7a52 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/SulphurSkitterBoxConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/SulphurSkitterBoxConfig.java @@ -2,10 +2,10 @@ package at.hannibal2.skyhanni.config.features.crimsonisle; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class SulphurSkitterBoxConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/AshfangConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/AshfangConfig.java index 6e983e440..77a82a7c6 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/AshfangConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/AshfangConfig.java @@ -3,9 +3,9 @@ package at.hannibal2.skyhanni.config.features.crimsonisle.ashfang; import at.hannibal2.skyhanni.config.FeatureToggle; import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class AshfangConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/BlazingSoulsColor.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/BlazingSoulsColor.java index 6af0547d8..d9cff1c33 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/BlazingSoulsColor.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/BlazingSoulsColor.java @@ -2,9 +2,9 @@ package at.hannibal2.skyhanni.config.features.crimsonisle.ashfang; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class BlazingSoulsColor { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/GravityOrbsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/GravityOrbsConfig.java index a9e1fddf5..4f06b2c31 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/GravityOrbsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/GravityOrbsConfig.java @@ -2,9 +2,9 @@ package at.hannibal2.skyhanni.config.features.crimsonisle.ashfang; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorColour; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorColour; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class GravityOrbsConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/HideAshfangConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/HideAshfangConfig.java index 1160988e5..7dbd29eea 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/HideAshfangConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/crimsonisle/ashfang/HideAshfangConfig.java @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.config.features.crimsonisle.ashfang; import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class HideAshfangConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java index f3548b548..ee78fbf34 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugConfig.java @@ -3,11 +3,11 @@ package at.hannibal2.skyhanni.config.features.dev; import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.data.Mayor; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.observer.Property; import org.lwjgl.input.Keyboard; public class DebugConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java index 9093459a5..709aa883e 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DebugMobConfig.java @@ -1,10 +1,10 @@ package at.hannibal2.skyhanni.config.features.dev; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorDropdown; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDropdown; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class DebugMobConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java index f4cc9943e..be8d085a7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/DevConfig.java @@ -3,12 +3,12 @@ package at.hannibal2.skyhanni.config.features.dev; import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.config.features.dev.minecraftconsole.MinecraftConsoleConfig; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.Accordion; -import io.github.moulberry.moulconfig.annotations.Category; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.Accordion; +import io.github.notenoughupdates.moulconfig.annotations.Category; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import org.lwjgl.input.Keyboard; public class DevConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/RepoPatternConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/RepoPatternConfig.java index d4ac7d4d9..49390201f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/RepoPatternConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/RepoPatternConfig.java @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.config.features.dev; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigOption; -import io.github.moulberry.moulconfig.observer.Property; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.observer.Property; public class RepoPatternConfig { @Expose diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/dev/WaypointsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/dev/WaypointsConfig.java index 2063bd20d..f7802afad 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/dev/WaypointsConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/dev/WaypointsConfig.java @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.config.features.dev; import com.google.gson.annotations.Expose; -import io.github.moulberry.moulconfig.annotations.ConfigEditorBoolean; -import io.github.moulberry.moulconfig.annotations.ConfigEditorKeybind; -import io.github.moulberry.moulconfig.annotations.ConfigOption; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; +import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorKeybind; +import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import org.lwjgl.input.Keyboard; public class WaypointsC