diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
36 files changed, 120 insertions, 53 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt index 5516cbe77..05b4a0cd7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt @@ -41,12 +41,12 @@ class PlayerDeathMessages { val message = event.message deathMessagePattern.matchMatcher(message) { val name = group("name") - if (SkyHanniMod.feature.markedPlayers.highlightInChat && + if (MarkedPlayerManager.config.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(name) ) { val reason = group("reason").removeColor() - val color = SkyHanniMod.feature.markedPlayers.chatColor.getChatColor() + val color = MarkedPlayerManager.config.chatColor.getChatColor() ChatUtils.chat(" §c☠ $color$name §7$reason", false) event.blockedReason = "marked_player_death" return diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt index a9c302021..a8b7cdada 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt @@ -78,8 +78,8 @@ class PlayerChatModifier { string = string.replace("§r§f: ", "§r§7: ") } - if (SkyHanniMod.feature.markedPlayers.highlightInChat) { - val color = SkyHanniMod.feature.markedPlayers.chatColor.getChatColor() + if (MarkedPlayerManager.config.highlightInChat) { + val color = MarkedPlayerManager.config.chatColor.getChatColor() for (markedPlayer in MarkedPlayerManager.playerNamesToMark) { string = string.replace(markedPlayer, "$color$markedPlayer§r") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaManager.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaManager.kt new file mode 100644 index 000000000..dab2f2cf4 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaManager.kt @@ -0,0 +1,28 @@ +package at.hannibal2.skyhanni.features.chroma + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator +import at.hannibal2.skyhanni.config.features.chroma.ChromaConfig +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent + +object ChromaManager { + + val config get() = SkyHanniMod.feature.gui.chroma + + @JvmStatic + fun resetChromaSettings() { + with(config) { + chromaSize = 30f + chromaSpeed = 6f + chromaSaturation = 0.75f + allChroma = false + ignoreChat = false + chromaDirection = ChromaConfig.Direction.FORWARD_RIGHT + } + } + + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(31, "chroma", "gui.chroma") + } +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt index 96b6d24b7..cfa0ba5ff 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt @@ -1,6 +1,5 @@ package at.hannibal2.skyhanni.features.chroma -import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.features.chroma.ChromaConfig.Direction import at.hannibal2.skyhanni.data.MinecraftData import at.hannibal2.skyhanni.mixins.transformers.AccessorMinecraft @@ -15,30 +14,29 @@ import net.minecraft.client.Minecraft */ abstract class ChromaShader(vertex: String, fragment: String) : Shader(vertex, fragment) { - val config get() = SkyHanniMod.feature.chroma override fun registerUniforms() { registerUniform(Uniform.UniformType.FLOAT, "chromaSize") { - config.chromaSize * (Minecraft.getMinecraft().displayWidth / 100f) + ChromaManager.config.chromaSize * (Minecraft.getMinecraft().displayWidth / 100f) } registerUniform(Uniform.UniformType.FLOAT, "timeOffset") { var ticks = (MinecraftData.totalTicks / 2) + (Minecraft.getMinecraft() as AccessorMinecraft).timer.renderPartialTicks - ticks = when (config.chromaDirection) { + ticks = when (ChromaManager.config.chromaDirection) { Direction.FORWARD_RIGHT, Direction.BACKWARD_RIGHT -> ticks Direction.FORWARD_LEFT, Direction.BACKWARD_LEFT -> -ticks else -> ticks } - val chromaSpeed = config.chromaSpeed / 360f + val chromaSpeed = ChromaManager.config.chromaSpeed / 360f ticks * chromaSpeed } registerUniform(Uniform.UniformType.FLOAT, "saturation") { - config.chromaSaturation + ChromaManager.config.chromaSaturation } registerUniform(Uniform.UniformType.BOOL, "forwardDirection") { - when (config.chromaDirection) { + when (ChromaManager.config.chromaDirection) { Direction.FORWARD_RIGHT, Direction.FORWARD_LEFT -> true Direction.BACKWARD_RIGHT, Direction.BACKWARD_LEFT -> false else -> true diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt index 25101ce62..2d595eef7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/PartyCommands.kt @@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object PartyCommands { - private val config get() = SkyHanniMod.feature.commands + private val config get() = SkyHanniMod.feature.misc.commands fun kickOffline() { if (!config.shortCommands) return @@ -107,6 +107,8 @@ object PartyCommands { @SubscribeEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(5, "commands.usePartyTransferAlias", "commands.shortCommands") + + event.move(31, "commands", "misc.commands") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt index 084060e23..204c39eaa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/ViewRecipeCommand.kt @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object ViewRecipeCommand { - private val config get() = SkyHanniMod.feature.commands + private val config get() = SkyHanniMod.feature.misc.commands @SubscribeEvent fun onMessageSendToServer(event: MessageSendToServerEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WarpIsCommand.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WarpIsCommand.kt index 09dad822c..7d46dbec5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/WarpIsCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WarpIsCommand.kt @@ -11,7 +11,7 @@ class WarpIsCommand { @SubscribeEvent fun onMessageSendToServer(event: MessageSendToServerEvent) { if (!LorenzUtils.inSkyBlock) return - if (!SkyHanniMod.feature.commands.replaceWarpIs) return + if (!SkyHanniMod.feature.misc.commands.replaceWarpIs) return if (event.message.lowercase() == "/warp is") { event.isCanceled = true diff --git a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt index 7671ef5a4..ed210ef2b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt @@ -22,7 +22,7 @@ object WikiManager { private const val FANDOM_URL_PREFIX = "https://hypixel-skyblock.fandom.com/wiki/" private const val FANDOM_SEARCH_PREFIX = "Special:Search?query=" - private val config get() = SkyHanniMod.feature.commands.betterWiki + private val config get() = SkyHanniMod.feature.misc.commands.betterWiki @SubscribeEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { 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 331c19fb0..d6c2e85c2 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 @@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils object GetFromSacksTabComplete { - private val config get() = SkyHanniMod.feature.commands.tabComplete + private val config get() = SkyHanniMod.feature.misc.commands.tabComplete fun handleTabComplete(command: String): List<String>? { if (!isEnabled()) return null 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 3384db554..014df63f7 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 @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object PlayerTabComplete { - private val config get() = SkyHanniMod.feature.commands.tabComplete + private val config get() = SkyHanniMod.feature.misc.commands.tabComplete private var vipVisits = listOf<String>() @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 53a0a8f84..4651040b8 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 @@ -8,7 +8,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent object WarpTabComplete { - private val config get() = SkyHanniMod.feature.commands.tabComplete + private val config get() = SkyHanniMod.feature.misc.commands.tabComplete private var warps = listOf<String>() @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt index 90ec54196..d5999c721 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/ArrowTrail.kt @@ -22,7 +22,7 @@ import kotlin.time.toDuration class ArrowTrail { - private val config get() = SkyHanniMod.feature.misc.cosmetic.arrowTrail + private val config get() = SkyHanniMod.feature.gui.cosmetic.arrowTrail private data class Line(val start: LorenzVec, val end: LorenzVec, val deathTime: SimpleTimeMark) diff --git a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt index 8f6dd1430..a2dab30cf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt @@ -22,7 +22,7 @@ import kotlin.time.Duration.Companion.seconds class CosmeticFollowingLine { - private val config get() = SkyHanniMod.feature.misc.cosmetic.followingLine + private val config get() = SkyHanniMod.feature.gui.cosmetic.followingLine private var locations = mapOf<LorenzVec, LocationSpot>() private var latestLocations = mapOf<LorenzVec, LocationSpot>() @@ -130,5 +130,6 @@ class CosmeticFollowingLine { event.move(9, "misc.cosmeticConfig", "misc.cosmetic") event.move(9, "misc.cosmeticConfig.followingLineConfig", "misc.cosmetic.followingLine") event.move(9, "misc.cosmeticConfig.arrowTrailConfig", "misc.cosmetic.arrowTrail") + event.move(31, "misc.cosmetic", "gui.cosmetic") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt index f850b410c..ff9a33587 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt @@ -25,7 +25,7 @@ import kotlin.time.TimeSource @OptIn(ExperimentalTime::class) class HighlightBonzoMasks { - private val config get() = SkyHanniMod.feature.itemAbilities + private val config get() = SkyHanniMod.feature.inventory.itemAbilities private val maskTimers = mutableMapOf<String, CooldownTimer>() diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt index bdac13de2..70e458f33 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt @@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.data.PetAPI import at.hannibal2.skyhanni.events.RenderItemTipEvent import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.features.garden.pests.PestAPI +import at.hannibal2.skyhanni.features.skillprogress.SkillProgress import at.hannibal2.skyhanni.features.skillprogress.SkillType import at.hannibal2.skyhanni.utils.ConfigUtils import at.hannibal2.skyhanni.utils.InventoryUtils @@ -168,7 +169,7 @@ object ItemDisplayOverlayFeatures { val level = "" + text.romanToDecimalIfNecessary() val skill = SkillType.getByNameOrNull(skillName) ?: return level val skillInfo = SkillAPI.storage?.get(skill) ?: return level - return if (SkyHanniMod.feature.skillProgress.overflowConfig.enableInSkillMenuAsStackSize) + return if (SkillProgress.config.overflowConfig.enableInSkillMenuAsStackSize) "" + skillInfo.overflowLevel else level } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt index 643e15623..88a44640a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/ChickenHeadTimer.kt @@ -16,7 +16,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds class ChickenHeadTimer { - private val config get() = SkyHanniMod.feature.itemAbilities.chickenHead + private val config get() = SkyHanniMod.feature.inventory.itemAbilities.chickenHead private var hasChickenHead = false private var lastTime = SimpleTimeMark.farPast() diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt index b5e7fc313..8e6b92bed 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt @@ -22,7 +22,7 @@ import kotlin.time.Duration.Companion.seconds class FireVeilWandParticles { - private val config get() = SkyHanniMod.feature.itemAbilities.fireVeilWands + private val config get() = SkyHanniMod.feature.inventory.itemAbilities.fireVeilWands private val item by lazy { "FIRE_VEIL_WAND".asInternalName() } private var lastClick = SimpleTimeMark.farPast() diff --git a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt index 180a09ca2..c7c146ffc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background import at.hannibal2.skyhanni.events.ActionBarUpdateEvent import at.hannibal2.skyhanni.events.ItemClickEvent @@ -34,7 +35,7 @@ import kotlin.math.max class ItemAbilityCooldown { - private val config get() = SkyHanniMod.feature.itemAbilities + private val config get() = SkyHanniMod.feature.inventory.itemAbilities private val patternGroup = RepoPattern.group("item.abilities.cooldown") private val youAlignedOthersPattern by patternGroup.pattern( @@ -348,6 +349,11 @@ class ItemAbilityCooldown { } } + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(31, "itemAbilities", "inventory.itemAbilities") + } + private fun hasAbility(stack: ItemStack): MutableList<ItemAbility> { val itemName: String = stack.cleanName() val internalName = stack.getInternalName() diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/InfernoMinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/InfernoMinionFeatures.kt index 388941263..e8b317803 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/InfernoMinionFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/InfernoMinionFeatures.kt @@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class InfernoMinionFeatures { - private val config get() = SkyHanniMod.feature.minions + private val config get() = SkyHanniMod.feature.misc.minions private val infernoMinionTitlePattern by RepoPattern.pattern( "minion.infernominiontitle", "Inferno Minion .*" diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt index 93ba7e540..1f82f52ac 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt @@ -59,7 +59,7 @@ import java.awt.Color class MinionFeatures { - private val config get() = SkyHanniMod.feature.minions + private val config get() = SkyHanniMod.feature.misc.minions private var lastClickedEntity: LorenzVec? = null private var newMinion: LorenzVec? = null private var newMinionName: String? = null @@ -397,5 +397,7 @@ class MinionFeatures { event.move(3, "minions.lastOpenedMinionTime", "minions.lastClickedMinion.time") event.move(3, "minions.emptiedTimeDisplay", "minions.emptiedTime.display") event.move(3, "minions.distance", "minions.emptiedTime.distance") + + event.move(31, "minions", "misc.minions") } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt index 2f1c14f53..56dddeb13 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt @@ -28,7 +28,7 @@ import java.util.EnumMap class MinionXp { - private val config get() = SkyHanniMod.feature.minions + private val config get() = SkyHanniMod.feature.misc.minions private val xpItemMap: MutableMap<PrimitiveItemStack, String> = mutableMapOf() private val collectItemXpList: MutableList<String> = mutableListOf() diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt index 187641835..97f1ccd5c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/AuctionHousePriceComparison.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryOpenEvent import at.hannibal2.skyhanni.events.LorenzToolTipEvent @@ -20,7 +21,7 @@ import java.awt.Color class AuctionHousePriceComparison { - private val config get() = SkyHanniMod.feature.inventory.auctionsPriceComparison + private val config get() = SkyHanniMod.feature.inventory.auctions.auctionsPriceComparison private var slotPriceMap = mapOf<Int, Long>() private var bestPrice = 0L @@ -117,6 +118,11 @@ class AuctionHousePriceComparison { } } + @SubscribeEvent + fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { + event.move(31, "inventory.auctionsPriceComparison", "inventory.auctions.auctionsPriceComparison") + } + private fun getColorInBetween(color1: Color, color2: Color, percentage: Double): Color { val r1 = color1.red val g1 = color1.green diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt index 26addd367..653684d08 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt @@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class BetterWikiFromMenus { - private val config get() = SkyHanniMod.feature.commands.betterWiki + private val config get() = SkyHanniMod.feature.misc.commands.betterWiki @SubscribeEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt index 86c7ffc92..0adf1d5ec 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.config.enums.OutsideSbFeature import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.LorenzTickEvent @@ -18,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class MarkedPlayerManager { |