diff options
53 files changed, 245 insertions, 106 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index 07635af14..68f3f1acc 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -258,17 +258,28 @@ object Commands { "shofficialwikithis", "Searches the official wiki with SkyHanni's own method." ) { WikiManager.otherWikiCommands(it, false, true) } - registerCommand0("shcalccrop", "Calculate how many crops need to be farmed between different crop milestones.", { - FarmingMilestoneCommand.onCommand(it.getOrNull(0), it.getOrNull(1), it.getOrNull(2), false) - }, FarmingMilestoneCommand::onComplete) - registerCommand0("shcalccroptime", "Calculate how long you need to farm crops between different crop milestones.", { - FarmingMilestoneCommand.onCommand(it.getOrNull(0), it.getOrNull(1), it.getOrNull(2), true) - }, FarmingMilestoneCommand::onComplete) + registerCommand0( + "shcalccrop", + "Calculate how many crops need to be farmed between different crop milestones.", + { + FarmingMilestoneCommand.onCommand(it.getOrNull(0), it.getOrNull(1), it.getOrNull(2), false) + }, + FarmingMilestoneCommand::onComplete + ) + registerCommand0( + "shcalccroptime", + "Calculate how long you need to farm crops between different crop milestones.", + { + FarmingMilestoneCommand.onCommand(it.getOrNull(0), it.getOrNull(1), it.getOrNull(2), true) + }, + FarmingMilestoneCommand::onComplete + ) registerCommand0( "shskills", "Skills XP/Level related command", { SkillAPI.onCommand(it) }, - SkillAPI::onComplete) + SkillAPI::onComplete + ) } private fun usersBugFix() { @@ -358,7 +369,10 @@ object Commands { private fun developersCodingHelp() { registerCommand("shrepopatterns", "See where regexes are loaded from") { RepoPatternGui.open() } registerCommand("shtest", "Unused test command.") { SkyHanniDebugsAndTests.testCommand(it) } - registerCommand("shtestitem", "test item internal name resolving") { SkyHanniDebugsAndTests.testItemCommand(it) } + registerCommand( + "shtestitem", + "test item internal name resolving" + ) { SkyHanniDebugsAndTests.testItemCommand(it) } registerCommand( "shfindnullconfig", "Find config elements that are null and prints them into the console" diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/SensitivityReducerConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/SensitivityReducerConfig.java index d20993c09..d9b16e482 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/SensitivityReducerConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/SensitivityReducerConfig.java @@ -27,6 +27,7 @@ public class SensitivityReducerConfig { Mode(String str) { this.str = str; } + @Override public String toString() { return str; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java index 172907150..e82ca2827 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/inventory/InventoryConfig.java @@ -187,7 +187,7 @@ public class InventoryConfig { @ConfigEditorBoolean @FeatureToggle public boolean shiftClickForEquipment = false; - + @Expose @ConfigOption(name = "Shift Click NPC sell", desc = "Makes normal clicks to shift clicks in npc inventory for selling.") @ConfigEditorBoolean diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java index 261283c7b..7ee18deb9 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningEventConfig.java @@ -44,8 +44,7 @@ public class MiningEventConfig { public enum ShowType { BOTH("Both Mining Islands"), CRYSTAL("Crystal Hollows Only"), - DWARVEN("Dwarven Mines Only") - ; + DWARVEN("Dwarven Mines Only"); private final String str; diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillETADisplayConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillETADisplayConfig.java index 37ea0430c..54a22ce77 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillETADisplayConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/skillprogress/SkillETADisplayConfig.java @@ -4,7 +4,6 @@ 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.ConfigEditorSlider; -import io.github.moulberry.moulconfig.annotations.ConfigEditorText; import io.github.moulberry.moulconfig.annotations.ConfigOption; import io.github.moulberry.moulconfig.observer.Property; diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt index 77f334fc6..4fbebe958 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt @@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzKeyPressEvent import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests import at.hannibal2.skyhanni.utils.ChatUtils -import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isRancherSign import at.hannibal2.skyhanni.utils.NEUItems import at.hannibal2.skyhanni.utils.ReflectionUtils.getPropertiesWithType diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt index 3290c216b..bac3b6594 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt @@ -29,8 +29,11 @@ class ItemClickData { } if (packet is C07PacketPlayerDigging && packet.status == C07PacketPlayerDigging.Action.START_DESTROY_BLOCK) { val position = packet.position.toLorenzVec() - val blockClickCancelled = BlockClickEvent(ClickType.LEFT_CLICK, position, InventoryUtils.getItemInHand()).postAndCatch() - event.isCanceled = ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).also { it.isCanceled = blockClickCancelled }.postAndCatch() + val blockClickCancelled = + BlockClickEvent(ClickType.LEFT_CLICK, position, InventoryUtils.getItemInHand()).postAndCatch() + event.isCanceled = ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).also { + it.isCanceled = blockClickCancelled + }.postAndCatch() } if (packet is C0APacketAnimation) { event.isCanceled = ItemClickEvent(InventoryUtils.getItemInHand(), ClickType.LEFT_CLICK).postAndCatch() diff --git a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt index 2a0f97ae2..d4aa147e8 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PetAPI.kt @@ -51,7 +51,7 @@ object PetAPI { } fun getPetLevel(nameWithLevel: String): Int? = petItemName.matchMatcher(nameWithLevel) { - group("level").toInt() + group("level").toInt() } fun hasPetName(name: String): Boolean = petItemName.matches(name) && !ignoredPetStrings.any { name.contains(it) } diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt index ec9785fce..d0cf14214 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityClickEvent.kt @@ -6,4 +6,5 @@ import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.Cancelable @Cancelable -class EntityClickEvent(clickType: ClickType, val clickedEntity: Entity?, itemInHand: ItemStack?) : WorldClickEvent(itemInHand, clickType) +class EntityClickEvent(clickType: ClickType, val clickedEntity: Entity?, itemInHand: ItemStack?) : + WorldClickEvent(itemInHand, clickType) diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt index a4a25a314..ac9d14662 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelupEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.skillprogress.SkillType -class SkillOverflowLevelupEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int): LorenzEvent() +class SkillOverflowLevelupEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt index 60b748d33..db6e06d25 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShaderManager.kt @@ -50,6 +50,7 @@ enum class ChromaType(val shaderName: String) { * See [StandardChromaShader] */ STANDARD("standard_chroma"), + /** * See [TexturedChromaShader] */ diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt index c4eb1f074..dd226d800 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostCounter.kt @@ -182,7 +182,7 @@ object GhostCounter { val bestiary = if (config.showMax) { when (nextLevel) { 26 -> bestiaryFormatting.maxed.replace("%currentKill%", currentKill.addSeparators()) - in 1 .. 25 -> { + in 1..25 -> { val sum = bestiaryData.filterKeys { it <= nextLevel - 1 }.values.sum() val cKill = sum + currentKill @@ -195,7 +195,7 @@ object GhostCounter { } else { when (nextLevel) { 26 -> bestiaryFormatting.maxed - in 1 .. 25 -> bestiaryFormatting.progress + in 1..25 -> bestiaryFormatting.progress else -> bestiaryFormatting.openMenu } } @@ -301,7 +301,7 @@ object GhostCounter { val res = current.formatNumber().toString() gain = (res.toLong() - lastXp.toLong()).toDouble().roundToInt() num = (gain.toDouble() / gained) - if (gained in 150.0 .. 450.0 && lastXp != "0" && num >= 0) { + if (gained in 150.0..450.0 && lastXp != "0" && num >= 0) { KILLS.add(num) KILLS.add(num, true) Option.GHOSTSINCESORROW.add(num) 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 1515e9a11..8f6dd1430 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.features.cosmetics import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.config.enums.OutsideSbFeature import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator +import at.hannibal2.skyhanni.config.enums.OutsideSbFeature import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt index 534dc4c91..51a3def55 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt @@ -21,7 +21,10 @@ class HighlightInquisitors { val entity = event.entity if (entity is EntityPlayer && entity.name == "Minos Inquisitor") { - RenderLivingEntityHelper.setEntityColor(entity, LorenzColor.AQUA.toColor().withAlpha(127)) { config.highlightInquisitors } + RenderLivingEntityHelper.setEntityColor( + entity, + LorenzColor.AQUA.toColor().withAlpha(127) + ) { config.highlightInquisitors } RenderLivingEntityHelper.setNoHurtTime(entity) { config.highlightInquisitors } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt index 001a96c4a..bfb849ff1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/MythologicalCreatureTracker.kt @@ -49,8 +49,9 @@ object MythologicalCreatureTracker { ".* §r§eYou dug out a §r§2Minos Inquisitor§r§e!" ) - private val tracker = SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker }) - { drawDisplay(it) } + private val tracker = + SkyHanniTracker("Mythological Creature Tracker", { Data() }, { it.diana.mythologicalMobTracker }) + { drawDisplay(it) } class Data : TrackerData() { diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt index 257e69f3d..97da18d3c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt @@ -32,7 +32,7 @@ class PresentWaypoints { private val presentEntranceSet get() = presentEntranceLocations[HypixelData.lobbyType] private val patternGroup = RepoPattern.group("event.lobby.waypoint.presents") - private val presentAlreadyFoundPattern by patternGroup.pattern( + private val presentAlreadyFoundPattern by patternGroup.pattern( "foundalready", "§cYou have already found this present!" ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt index fb0b591cd..deb699327 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GeyserFishing.kt @@ -28,7 +28,12 @@ class GeyserFishing { @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true) fun onReceiveParticle(event: ReceiveParticleEvent) { if (!shouldProcessParticles()) return - if (event.type != EnumParticleTypes.CLOUD || event.count != 15 || event.speed != 0.05f || event.offset != LorenzVec(0.1f, 0.6f, 0.1f)) return + if (event.type != EnumParticleTypes.CLOUD || event.count != 15 || event.speed != 0.05f || event.offset != LorenzVec( + 0.1f, + 0.6f, + 0.1f + ) + ) return geyser = event.location val potentialGeyser = geyser ?: return @@ -71,5 +76,6 @@ class GeyserFishing { } } - private fun shouldProcessParticles() = IslandType.CRIMSON_ISLE.isInIsland() && LorenzUtils.skyBlockArea == "Blazing Volcano" && (config.hideParticles || config.drawBox) + private fun shouldProcessParticles() = + IslandType.CRIMSON_ISLE.isInIsland() && LorenzUtils.skyBlockArea == "Blazing Volcano" && (config.hideParticles || config.drawBox) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt index bbecb3d55..d6c4ab6b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt @@ -64,6 +64,7 @@ object FarmingFortuneDisplay { "lotusability", "§7Piece Bonus: §6+(?<bonus>.*)☘" ) + // todo make pattern work on Melon and Cropie armor private val armorAbilityFortunePattern by patternGroup.pattern( "armorabilityfortune", diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt index b114d5ab4..76e1395ab 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -613,8 +613,10 @@ object GardenNextJacobContest { if (result) { ChatUtils.chat("Successfully submitted this years upcoming contests, thank you for helping everyone out!") } else { - ErrorManager.logErrorStateWithData("Something went wrong submitting upcoming contests!", - "submitContestsToElite not sucessful") + ErrorManager.logErrorStateWithData( + "Something went wrong submitting upcoming contests!", + "submitContestsToElite not sucessful" + ) } } catch (e: Exception) { ErrorManager.logErrorWithData( diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index 3f1021bcb..586906554 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -14,8 +14,8 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.renderables.Renderable -import io.github.moulberry.moulconfig.observer.Property import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern +import io.github.moulberry.moulconfig.observer.Property import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiEditSign import net.minecraftforge.client.event.GuiOpenEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt index f9a0f558e..ba9638711 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt @@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.features.garden.CropType.Companion.getByNameOrNull import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest -import at.hannibal2.skyhanni.features.garden.composter.ComposterOverlay import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.isSpeedDataEmpty import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarApi.Companion.getBazaarData diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt index 6baa0970f..5147df33b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingWeightDisplay.kt @@ -86,7 +86,11 @@ class FarmingWeightDisplay { event.move(3, "garden.eliteFarmingWeightPos", "garden.eliteFarmingWeights.pos") event.move(3, "garden.eliteFarmingWeightLeaderboard", "garden.eliteFarmingWeights.leaderboard") event.move(3, "garden.eliteFarmingWeightOvertakeETA", "garden.eliteFarmingWeights.overtakeETA") - event.move(3, "garden.eliteFarmingWeightOffScreenDropMessage", "garden.eliteFarmingWeights.offScreenDropMessage") + event.move( + 3, + "garden.eliteFarmingWeightOffScreenDropMessage", + "garden.eliteFarmingWeights.offScreenDropMessage" + ) event.move(3, "garden.eliteFarmingWeightOvertakeETAAlways", "garden.eliteFarmingWeights.overtakeETAAlways") event.move(3, "garden.eliteFarmingWeightETAGoalRank", "garden.eliteFarmingWeights.ETAGoalRank") event.move(3, "garden.eliteFarmingWeightIgnoreLow", "garden.eliteFarmingWeights.ignoreLow") @@ -538,7 +542,10 @@ class FarmingWeightDisplay { val apiResponse = APIUtil.getJSONResponse(url) try { - val apiData = ConfigManager.gson.fromJson<Map<String, Double>>(apiResponse, object : TypeToken<Map<String, Double>>() {}.type) + val apiData = ConfigManager.gson.fromJson<Map<String, Double>>( + apiResponse, + object : TypeToken<Map<String, Double>>() {}.type + ) for (crop in apiData) { val cropType = CropType.getByName(crop.key) factorPerCrop[cropType] = crop.value 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 35f0c6f4a..ab7154e44 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt @@ -212,9 +212,9 @@ object ItemDisplayOverlayFeatures { item.name?.let { dungeonPotionPattern.matchMatcher(it.removeColor()) { return when (val level = group("level").romanToDecimal()) { - in 1 .. 2 -> "§f$level" - in 3 .. 4 -> "§a$level" - in 5 .. 6 -> "§9$level" + in 1..2 -> "§f$level" + in 3..4 -> "§a$level" + in 5..6 -> "§9$level" else -> "§5$level" } } @@ -286,4 +286,4 @@ object ItemDisplayOverlayFeatures { } fun ItemNumberEntry.isSelected() = config.itemNumberAsStackSize.contains(this) -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt index 72296ff4b..d835fc5a8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/MaxPurseItems.kt @@ -34,7 +34,7 @@ class MaxPurseItems { "createinstant", "§aBuy Instantly" ) - + private var buyOrderPrice: Double? = null private var instantBuyPrice: Double? = null diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt index d80ef783c..3bcd6e43b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/QuiverNotification.kt @@ -14,6 +14,7 @@ object QuiverNotification { "inventory.quiver.chat.low", "§cYou only have (?<arrowsLeft>.*) arrows left in your Quiver!" ) + @SubscribeEvent fun onChatMessage(event: LorenzChatEvent) { if (!SkyHanniMod.configManager.features.inventory.quiverAlert) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt index 86c51f365..010c62615 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventTracker.kt @@ -137,7 +137,7 @@ class MiningEventTracker { } private fun isEnabled() = (IslandType.DWARVEN_MINES.isInIsland() || IslandType.CRYSTAL_HOLLOWS.isInIsland()) - && config.sendData + && config.sendData // && config.enabled private fun sendData(json: String) { 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 37593552d..c07c351d2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/InfernoMinionFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/InfernoMinionFeatures.kt @@ -46,7 +46,8 @@ class InfernoMinionFeatures { if (!config.infernoFuelBlocker) return if (!inInventory) return - val containsFuel = NEUInternalName.fromItemNameOrNull(event.container.getSlot(19).stack.name.toString()) in fuelItemIds + val containsFuel = + NEUInternalName.fromItemNameOrNull(event.container.getSlot(19).stack.name.toString()) in fuelItemIds if (!containsFuel) return if (event.slot?.slotNumber == 19 || event.slot?.slotNumber == 53) { 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 22969de1c..086f4816d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionXp.kt @@ -47,7 +47,7 @@ class MinionXp { private fun toPrimitiveItemStack(itemStack: ItemStack) = PrimitiveItemStack(itemStack.getInternalName(), itemStack.stackSize) - + @SubscribeEvent fun onMinionOpen(event: MinionOpenEvent) { if (!config.xpDisplay) return @@ -92,7 +92,7 @@ class MinionXp { private fun handleItems(inventoryItems: Map<Int, ItemStack>, isMinion: Boolean): EnumMap<SkillType, Double> { val xpTotal = EnumMap<SkillType, Double>(SkillType::class.java) inventoryItems.filter { - it.value.getLore().isNotEmpty() && (!isMinion || it.key in listOf(21 .. 26, 30 .. 35, 39 .. 44).flatten()) + it.value.getLore().isNotEmpty() && (!isMinion || it.key in listOf(21..26, 30..35, 39..44).flatten()) }.forEach { (_, itemStack) -> val item = toPrimitiveItemStack(itemStack) val name = item.internalName 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 a0ead6b7c..8c931dfab 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BetterWikiFromMenus.kt @@ -35,7 +35,8 @@ class BetterWikiFromMenus { val isWiki = event.slotId == 11 && itemClickedName.contains("Wiki Command") val isWikithis = event.slotId == 15 && itemClickedName.contains("Wikithis Command") val inBiblioInventory = chestName == "SkyBlock Wiki" && (isWiki || isWikithis) - val inSBGuideInventory = (itemClickedStack.getLore().let { it.any { line -> line == "§7§eClick to view on the SkyBlock Wiki!" } }) + val inSBGuideInventory = + (itemClickedStack.getLore().let { it.any { line -> line == "§7§eClick to view on the SkyBlock Wiki!" } }) if (inBiblioInventory) { if (isWiki) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt index cfecac7e0..c5dde5ffb 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt @@ -42,7 +42,8 @@ class CustomTextBox { config.position.renderStrings(display, posLabel = "Custom Text Box") } - private fun isEnabled() = config.enabled && (LorenzUtils.inSkyBlock || OutsideSbFeature.CUSTOM_TEXT_BOX.isSelected()) + private fun isEnabled() = + config.enabled && (LorenzUtils.inSkyBlock || OutsideSbFeature.CUSTOM_TEXT_BOX.isSelected()) @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 8d647c9d0..b8a57856c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt @@ -106,7 +106,8 @@ class MarkedPlayerManager { } } - private fun isEnabled() = config.highlightInWorld && (LorenzUtils.inSkyBlock || OutsideSbFeature.MARKED_PLAYERS.isSelected()) + private fun isEnabled() = + config.highlightInWorld && (LorenzUtils.inSkyBlock || OutsideSbFeature.MARKED_PLAYERS.isSelected()) @SubscribeEvent fun onWorldChange(event: LorenzWorldChangeEvent) { 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 a0ce295b5..8a4d3eebe 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator -import at.hannibal2.skyhanni.data.jsonobjects.repo.ModGuiSwitcherJson import at.hannibal2.skyhanni.config.enums.OutsideSbFeature +import at.hannibal2.skyhanni.data.jsonobjects.repo.ModGuiSwitcherJson import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.test.command.ErrorManager diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index f350991ae..e5da89e83 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -54,7 +54,10 @@ object EstimatedItemValue { ErrorManager.skyHanniError("Gemstone Slot Unlock Costs failed to load from neu repo!") } - gemstoneUnlockCosts = ConfigManager.gson.fromJson(data, object : TypeToken<HashMap<NEUInternalName, HashMap<String, List<String>>>>() {}.type) + gemstoneUnlockCosts = ConfigManager.gson.fromJson( + data, + object : TypeToken<HashMap<NEUInternalName, HashMap<String, List<String>>>>() {}.type + ) } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt index cb012f728..87ff3b5f0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt @@ -10,8 +10,8 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher -import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import at.hannibal2.skyhanni.utils.TimeUtils.format +import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt index 393889467..1ec2a08d5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt @@ -95,8 +95,16 @@ object SkillProgress { SkillProgressConfig.TextAlignment.RIGHT, -> { config.displayPosition.renderRenderables( - listOf(Renderable.fixedSizeLine(horizontalContainer(display, horizontalAlign = textAlignment.alignment), maxWidth)), - posLabel = "Skill Progress") + listOf( + Renderable.fixedSizeLine( + horizontalContainer( + display, + horizontalAlign = textAlignment.alignment + ), maxWidth + ) + ), + posLabel = "Skill Progress" + ) } else -> {} @@ -111,7 +119,8 @@ object SkillProgress { percent = factor.toDouble(), startColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)), texture = barConfig.texturedBar.usedTexture.get(), - useChroma = barConfig.useChroma.get()) + useChroma = barConfig.useChroma.get() + ) } else { maxWidth = barConfig.regularBar.width @@ -122,7 +131,8 @@ object SkillProgress { endColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)), width = maxWidth, height = barConfig.regularBar.height, - useChroma = barConfig.useChroma.get()) + useChroma = barConfig.useChroma.get() + ) } config.barPosition.renderRenderables(listOf(progress), posLabel = "Skill Progress Bar") @@ -255,22 +265,28 @@ object SkillProgress { for (skill in sortedMap) { val skillInfo = skillMap[skill] ?: SkillAPI.SkillInfo(level = -1, overflowLevel = -1) val lockedLevels = skillInfo.overflowCurrentXp > skillInfo.overflowCurrentXpMax - val useCustomGoalLevel = skillInfo.customGoalLevel != 0 && skillInfo.customGoalLevel > skillInfo.overflowLevel && customGoalConfig.enableInAllDisplay + val useCustomGoalLevel = + skillInfo.customGoalLevel != 0 && skillInfo.customGoalLevel > skillInfo.overflowLevel && customGoalConfig.enableInAllDisplay val targetLevel = skillInfo.customGoalLevel var xp = skillInfo.overflowTotalXp - if (targetLevel in 50 .. 60 && skillInfo.overflowLevel >= 50) xp += SkillUtil.xpRequiredForLevel(50.0) + if (targetLevel in 50..60 && skillInfo.overflowLevel >= 50) xp += SkillUtil.xpRequiredForLevel(50.0) else if (targetLevel > 60 && skillInfo.overflowLevel >= 60) xp += SkillUtil.xpRequiredForLevel(60.0) var have = skillInfo.overflowTotalXp val need = SkillUtil.xpRequiredForLevel(targetLevel.toDouble()) - if (targetLevel in 51 .. 59) have += SkillUtil.xpRequiredForLevel(50.0) + if (targetLevel in 51..59) have += SkillUtil.xpRequiredForLevel(50.0) else if (targetLevel > 60) have += SkillUtil.xpRequiredForLevel(60.0) val (level, currentXp, currentXpMax, totalXp) = if (useCustomGoalLevel) Quad(skillInfo.overflowLevel, have, need, xp) else if (config.overflowConfig.enableInAllDisplay.get() && !lockedLevels) - Quad(skillInfo.overflowLevel, skillInfo.overflowCurrentXp, skillInfo.overflowCurrentXpMax, skillInfo.overflowTotalXp) + Quad( + skillInfo.overflowLevel, + skillInfo.overflowCurrentXp, + skillInfo.overflowCurrentXpMax, + skillInfo.overflowTotalXp + ) else Quad(skillInfo.level, skillInfo.currentXp, skillInfo.currentXpMax, skillInfo.totalXp) @@ -308,9 +324,11 @@ object SkillProgress { val xpInfo = skillXPInfoMap[activeSkill] ?: return@buildList val skillInfoLast = oldSkillInfoMap[activeSkill] ?: return@buildList oldSkillInfoMap[activeSkill] = skillInfo - val level = if (config.overflowConfig.enableInEtaDisplay.get() || config.customGoalConfig.enableInETADisplay) skillInfo.overflowLevel else skillInfo.level + val level = + if (config.overflowConfig.enableInEtaDisplay.get() || config.customGoalConfig.enableInETADisplay) skillInfo.overflowLevel else skillInfo.level - val useCustomGoalLevel = skillInfo.customGoalLevel != 0 && skillInfo.customGoalLevel > skillInfo.overflowLevel && customGoalConfig.enableInETADisplay + val useCustomGoalLevel = + skillInfo.customGoalLevel != 0 && skillInfo.customGoalLevel > skillInfo.overflowLevel && customGoalConfig.enableInETADisplay var targetLevel = if (useCustomGoalLevel) skillInfo.customGoalLevel else level + 1 if (targetLevel <= level || targetLevel > 400) targetLevel = (level + 1) @@ -324,7 +342,8 @@ object SkillProgress { if (!useCustomGoalLevel && have < need) { if (skillInfo.overflowCurrentXpMax == skillInfoLast.overflowCurrentXpMax) { - remaining = interpolate(remaining.toFloat(), (need - have).toFloat(), lastGainUpdate.toMillis()).toLong() + remaining = + interpolate(remaining.toFloat(), (need - have).toFloat(), lastGainUpdate.toMillis()).toLong() } } @@ -342,22 +361,33 @@ object SkillProgress { } else { val duration = ((remaining) * 1000 * 60 * 60 / xpInterp.toLong()).milliseconds val format = duration.format(TimeUnit.DAY) - add(Renderable.string("§7In §b$format " + - if (xpInfo.isActive) "" else "§c(PAUSED)")) + add( + Renderable.string( + "§7In §b$format " + + if (xpInfo.isActive) "" else "§c(PAUSED)" + ) + ) } if (xpInfo.xpGainLast == xpInfo.xpGainHour && xpInfo.xpGainHour <= 0) { add(Renderable.string("§7XP/h: §cN/A")) } else { xpInterp = interpolate(xpInfo.xpGainHour, xpInfo.xpGainLast, lastGainUpdate.toMillis()) - add(Renderable.string("§7XP/h: §e${xpInterp.toLong().addSeparators()} " + - if (xpInfo.isActive) "" else "§c(PAUSED)")) + add( + Renderable.string( + "§7XP/h: §e${xpInterp.toLong().addSeparators()} " + + if (xpInfo.isActive) "" else "§c(PAUSED)" + ) + ) } val session = xpInfo.timeActive.seconds.format(TimeUnit.HOUR) - add(Renderable.clickAndHover("§7Session: §e$session ${if (xpInfo.sessionTimerActive) "" else "§c(PAUSED)"}", - listOf("§eClick to reset!")) { + add( + Renderable.clickAndHover( + "§7Session: §e$session ${if (xpInfo.sessionTimerActive) "" else "§c(PAUSED)"}", + listOf("§eClick to reset!") + ) { xpInfo.sessionTimerActive = false xpInfo.timeActive = 0L chat("Timer for §b${activeSkill.displayName} §ehas been reset!") @@ -378,7 +408,7 @@ object SkillProgress { } var have = skill.overflowTotalXp val need = SkillUtil.xpRequiredForLevel(targetLevel.toDouble()) - if (targetLevel in 51 .. 59) have += SkillUtil.xpRequiredForLevel(50.0) + if (targetLevel in 51..59) have += SkillUtil.xpRequiredForLevel(50.0) else if (targetLevel > 60) have += SkillUtil.xpRequiredForLevel(60.0) diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt index 4945a2c55..d9aba8d20 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillTooltip.kt @@ -66,9 +66,9 @@ class SkillTooltip { val xpFor50 = SkillUtil.xpRequiredForLevel(50.0) val xpFor60 = SkillUtil.xpRequiredForLevel(60.0) - have += if (skillInfo.overflowLevel >= 60 && skill in excludedSkills || skillInfo.overflowLevel in 50 .. 59) xpFor50 - else if (skillInfo.overflowLevel >= 60 && skill !in excludedSkills) xpFor60 - else 0 + have += if (skillInfo.overflowLevel >= 60 && skill in excludedSkills || skillInfo.overflowLevel in 50..59) xpFor50 + else if (skillInfo.overflowLevel >= 60 && skill !in excludedSkills) xpFor60 + else 0 val progress = have.toDouble() / need val progressBar = StringUtils.progressBar(progress) diff --git a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillUtil.kt b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillUtil.kt index 54ea4bdc9..127f9459d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillUtil.kt @@ -90,7 +90,7 @@ object SkillUtil { var xpForCurr = 7000000 + slope var totalXpRequired = 0L - for (i in 61 .. level) { + for (i in 61..level) { totalXpRequired += xpForCurr xpForCurr += slope if (i % 10 == 0) slope *= 2 diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt index 618e238bc..331d3f111 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt @@ -21,7 +21,7 @@ class SlayerQuestWarning { private val config get() = SkyHanniMod.feature.slayer - private val talkToMaddoxPattern by RepoPattern.pattern( + private val talkToMaddoxPattern by RepoPattern.pattern( "slayer.questwarning.talkto", " {3}§r§5§l» §r§7Talk to Maddox to claim your .+ Slayer XP!" ) diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt index d855c6e5a..8c8ed5ab8 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt +++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt @@ -40,7 +40,16 @@ class GuiContainerHook(guiAny: Any) { } fun onMouseClick(slot: Slot?, slotId: Int, clickedButton: Int, clickType: Int, ci: CallbackInfo) { - if (SlotClickEvent(gui, gui.inventorySlots, gui.inventorySlots?.inventory?.takeIf { it.size > slotId && slotId >= 0 }?.get(slotId), slot, slotId, clickedButton, clickType).postAndCatch()) ci.cancel() + if (SlotClickEvent( + gui, + gui.inventorySlots, + gui.inventorySlots?.inventory?.takeIf { it.size > slotId && slotId >= 0 }?.get(slotId), + slot, + slotId, + clickedButton, + clickType + ).postAndCatch() + ) ci.cancel() } fun onDrawScreenAfter( diff --git a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt index 536f96dd4..3ffe8f8e6 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/DebugCommand.kt @@ -6,7 +6,6 @@ import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.OSUtils import at.hannibal2.skyhanni.utils.StringUtils.equalsIgnoreColor diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt index c403e09a6..3f4afe94f 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt @@ -123,7 +123,7 @@ object SkyHanniConfigSearchResetCommand { "term" to term, "rawJson" to rawJson, "args" to args.joinToString(" ") - ) + ) "§cCould not change config element '$term' to '$rawJson'" } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt index 054e5e19f..36263195d 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ColorUtils.kt @@ -27,6 +27,7 @@ object ColorUtils { max((red * factor).toInt(), 0), max((green * factor).toInt(), 0), max((blue * factor).toInt(), 0), - alpha) + alpha + ) } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt index af893d7dc..41bed3290 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRenderUtils.kt @@ -302,7 +302,16 @@ object GuiRenderUtils { } // Taken and edited from NEU <- it's broken - fun renderTexturedBar(x: Float, y: Float, xSize: Float, completed: Float, color: Color, useChroma: Boolean, texture: SkillProgressBarConfig.TexturedBar.UsedTexture, height: Float) { + fun renderTexturedBar( + x: Float, + y: Float, + xSize: Float, + completed: Float, + color: Color, + useChroma: Boolean, + texture: SkillProgressBarConfig.TexturedBar.UsedTexture, + height: Float + ) { GlStateManager.pushMatrix() GlStateManager.translate(x, y, 0f) val w = xSize.toInt() @@ -316,13 +325,28 @@ object GuiRenderUtils { if (useChroma) { ChromaShaderManager.begin(ChromaType.TEXTURED) - GlStateManager.color(Color.LIGHT_GRAY.darker().red / 255f, Color.LIGHT_GRAY.darker().green / 255f, Color.LIGHT_GRAY.darker().blue / 255f, 1f) + GlStateManager.color( + Color.LIGHT_GRAY.darker().red / 255f, + Color.LIGHT_GRAY.darker().green / 255f, + Color.LIGHT_GRAY.darker().blue / 255f, + 1f + ) } else { GlStateManager.color(color.darker().red / 255f, color.darker().green / 255f, color.darker().blue / 255f, 1f) } Utils.drawTexturedRect(x, y, w_2.toFloat(), height, 0f, w_2 / xSize, vMinEmpty, vMaxEmpty, GL11.GL_NEAREST) - Utils.drawTexturedRect(x + w_2, y, w_2.toFloat(), height, 1 - w_2 / xSize, 1f, vMinEmpty, vMaxEmpty, GL11.GL_NEAREST) + Utils.drawTexturedRect( + x + w_2, + y, + w_2.toFloat(), + height, + 1 - w_2 / xSize, + 1f, + vMinEmpty, + vMaxEmpty, + GL11.GL_NEAREST + ) if (useChroma) { GlStateManager.color(Color.WHITE.red / 255f, Color.WHITE.green / 255f, Color.WHITE.blue / 255f, 1f) @@ -330,10 +354,30 @@ object GuiRenderUtils { GlStateManager.color(color.red / 255f, color.green / 255f, color.blue / 255f, 1f) } - if (k > 0) { - Utils.drawTexturedRect(x, y, w_2.coerceAtMost(k).toFloat(), height, 0f, w_2.toDouble().coerceAtMost(k.toDouble() / xSize).toFloat(), vMinFilled, vMaxFilled, GL11.GL_NEAREST) + if (k > 0) { + Utils.drawTexturedRect( + x, + y, + w_2.coerceAtMost(k).toFloat(), + height, + 0f, + w_2.toDouble().coerceAtMost(k.toDouble() / xSize).toFloat(), + vMinFilled, + vMaxFilled, + GL11.GL_NEAREST + ) if (completed > 0.5f) { - Utils.drawTexturedRect(x + w_2, y, (k - w_2).toFloat(), height, 1 - w_2 / xSize, 1 + (k - w) / xSize, vMinFilled, vMaxFilled, GL11.GL_NEAREST) + Utils.drawTexturedRect( + x + w_2, + y, + (k - w_2).toFloat(), + height, + 1 - w_2 / xSize, + 1 + (k - w) / xSize, + vMinFilled, + vMaxFilled, + GL11.GL_NEAREST + ) } } if (useChroma) { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt index baf9ee8ea..3a3bc9397 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemNameResolver.kt @@ -16,7 +16,7 @@ object ItemNameResolver { } if (itemName == "§cmissing repo item") { - return itemNameCache.getOrPut(lowercase) { NEUInternalName.MISSING_ITEM } + return itemNameCache.getOrPut(lowercase) { NEUInternalName.MISSING_ITEM } } resolveEnchantmentByName(itemName)?.let { diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index 29700e684..60a466b98 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -27,14 +27,12 @@ import net.minecraft.entity.SharedMonsterAttributes import net.minecraft.launchwrapper.Launch import net.minecraft.util.ChatComponentText import net.minecraftforge.fml.common.FMLCommonHandler -import java.io.Serializable import java.text.DecimalFormat import java.text.SimpleDateFormat import java.util.Timer import java.util.TimerTask import java.util.regex.Matcher import kotlin.time.Duration -import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds object LorenzUtils { @@ -144,7 +142,7 @@ object LorenzUtils { fun getSBMonthByName(month: String): Int { var monthNr = 0 - for (i in 1 .. 12) { + for (i in 1..12) { val monthName = SkyBlockTime.monthName(i) if (month == monthName) { monthNr = i @@ -372,5 +370,5 @@ object LorenzUtils { fun sendMessageToServer(message: String) = ChatUtils.sendMessageToServer(message) fun inMiningIsland() = IslandType.GOLD_MINES.isInIsland() || IslandType.DEEP_CAVERNS.isInIsland() - || IslandType.DWARVEN_MINES.isInIsland() || IslandType.CRYSTAL_HOLLOWS.isInIsland() + || IslandType.DWARVEN_MINES.isInIsland() || IslandType.CRYSTAL_HOLLOWS.isInIsland() } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index 6b25d2992..32ea32329 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -544,7 +544,7 @@ object RenderUtils { val z: Double = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * partialTicks - renderManager.viewerPosZ val pix2 = Math.PI * 2.0 - for (i in 0 .. 90) { + for (i in 0..90) { color.bindColor() worldRenderer.pos(x + rad * cos(i * pix2 / 45.0), y + il, z + rad * sin(i * pix2 / 45.0)).endVertex() } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt index 404a3a258..6ca2dd629 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SkyBlockItemModifierUtils.kt @@ -92,7 +92,7 @@ object SkyBlockItemModifierUtils { @Suppress("CAST_NEVER_SUCCEEDS") inline val ItemStack.cachedData get() = (this as ItemStackCachedData).skyhanni_cachedData - fun ItemStack.getPetLevel(): Int = PetAPI.getPetLevel(displayName)?: 0 + fun ItemStack.getPetLevel(): Int = PetAPI.getPetLevel(displayName) ?: 0 fun ItemStack.getMaxPetLevel() = if (this.getInternalName() == "GOLDEN_DRAGON;4".asInternalName()) 200 else 100 diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt index 645471087..9398d0e53 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt @@ -5,12 +5,12 @@ import at.hannibal2.skyhanni.features.chroma.TexturedChromaShader import at.hannibal2.skyhanni.features.misc.RoundedRectangleShader import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.LorenzUtils -import java.io.BufferedReader -import java.io.InputStreamReader import net.minecraft.client.Minecraft import net.minecraft.util.ResourceLocation import org.apache.commons.lang3.StringUtils import org.lwjgl.opengl.OpenGLException +import java.io.BufferedReader +import java.io.InputStreamReader /** * Object to handle shaders for SkyHanni diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt index 496d9c46c..78f9ef569 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt @@ -37,14 +37,17 @@ class Uniform<T>( UniformType.FLOAT -> { ShaderHelper.glUniform1f(uniformID, (newUniformValue as Float)) } + UniformType.VEC2 -> { val values = newUniformValue as FloatArray ShaderHelper.glUniform2f(uniformID, values[0], values[1]) } + UniformType.VEC3 -> { val values = newUniformValue as FloatArray ShaderHelper.glUniform3f(uniformID, values[0], values[1], values[2]) } + UniformType.BOOL -> ShaderHelper.glUniform1f(uniformID, if (newUniformValue as Boolean) 1f else 0f) } previousUniformValue = newUniformValue diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt index e2e7b5ae2..535298543 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt @@ -148,7 +148,12 @@ class SkyHanniItemTracker<Data : ItemTrackerData>( lists.addAsSingletonList(renderable) } if (hiddenItemTexts.size > 0) { - lists.addAsSingletonList(Renderable.hoverTips(" §7${hiddenItemTexts.size} cheap items are hidden.", hiddenItemTexts)) + lists.addAsSingletonList( + Renderable.hoverTips( + " §7${hiddenItemTexts.size} cheap items are hidden.", + hiddenItemTexts + ) + ) } return profit diff --git a/src/main/resources/assets/skyhanni/sounds.json b/src/main/resources/assets/skyhanni/sounds.json index 7c017cb0d..4a7c79770 100644 --- a/src/main/resources/assets/skyhanni/sounds.json +++ b/src/main/resources/assets/skyhanni/sounds.json @@ -1,11 +1,11 @@ { - "centurytimer.active": { - "category": "neutral", - "sounds": [ - { - "name": "itstimetopunchwheat", - "stream": false - } - ] - } -}
\ No newline at end of file + "centurytimer.active": { + "category": "neutral", + "sounds": [ + { + "name": "itstimetopunchwheat", + "stream": false + } + ] + } +} diff --git a/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorToolTipParserTest.kt b/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorToolTipParserTest.kt index cdb171aa6..3a4a08c47 100644 --- a/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorToolTipParserTest.kt +++ b/src/test/java/at/hannibal2/skyhanni/test/garden/VisitorToolTipParserTest.kt @@ -22,7 +22,8 @@ class VisitorToolTipParserTest { @Test fun testParseItemsNeeded() { - val parsedData = VisitorTooltipParser.parse(lore, + val parsedData = VisitorTooltipParser.parse( + lore, GardenConfig() ) assert(parsedData.itemsNeeded.isNotEmpty()) { @@ -35,7 +36,8 @@ class VisitorToolTipParserTest { @Test fun testParseRewards() { - val parsedData = VisitorTooltipParser.parse(lore, + val parsedData = VisitorTooltipParser.parse( + lore, GardenConfig() ) assert(parsedData.rewards.isNotEmpty()) { @@ -60,7 +62,8 @@ class VisitorToolTipParserTest { @Test fun testParseCopper() { - val parsedData = VisitorTooltipParser.parse(lore, + val parsedData = VisitorTooltipParser.parse( + lore, GardenConfig() ) val copper = parsedData.rewards["Copper"] diff --git a/src/test/resources/testdata/Item/10starnecronhead.json b/src/test/resources/testdata/Item/10starnecronhead.json index 1e5bbe7b0..6c3123c6e 100644 --- a/src/test/resources/testdata/Item/10starnecronhead.json +++ b/src/test/resources/testdata/Item/10starnecronhead.json @@ -1 +1,4 @@ -{"type":"Item","data":"H4sIAAAAAAAAAHVW227bRhBdW7Eju0mdXoACRYFu2rSIIUsmRV3dCyBLskXHlBxJli0FgbAkl9TavKjk0rL8EQX6loei6JuBfoY/JR9SdJaULwlQwebuzp6ZOTO7M+Q6Qmm0zEy04TKPGgGx+E54HjnOElqp+5HHl9ZRihN7DT2injFZRwgtL6OUc+Gg1HKsuIIW66VkvYpSaK3FTLrnEDsE/L/raL0nTHZmHg3Am2qiF9QicknSq9myVSlkFUk2s0TXS9mKXLHKumxI1VIB9I4Cf0oDzmi4htKcXvIooKEgsZRGKwPiRHTpHZ35tlo/kMiJ7BhKd6Kf1pja8G2tP5y1+8eydmbP2w1N1tjslVqvMaN1cDFynXB07JyrrFYC3YnmDgva1Wu50x+cdRrn0rCvKsOT7rl2VZM6feOy7bYnnX5zNpyrYZ3VbNXbnev50VTfH3SG4Hdhhx23BtEwb7PDWszpipyY0fC0KxvuoDc63ZPJ6YEzqqt2h+1KhjdwFjhpdDqRTNgz5vFeOfYBXI8lftBnH8gEHuzN4hhVF/RatdLhvPrARpGTk6IzVA4mI+91pLsD6VDpOrQleBxfdPbVSw3iHO1rUvtkdN5pdF3tbM8duk2IWZuNzg7Y8MpQhq52NTwbXmmNAzbqDxWtYUuQp/yo37wcncF4osrtvulq/bYz6qmvYm4tCcbdat2TfoFTWkePTRZOHTKH+3PoBzQNwh/RtzfX5X1KAtwzQLaDb67NalmCofJSqZZKm2gTAD0eUM/mE7FtZMpVGKovM0pxM8ZlFCWfyxc3URag9YBxXJ8Qz6AJWi7+kMBhssDn8zmYo+1beIO4xF7AleoCDpMFXC7nc+UyKPwECi1KnIQIyRTKFRjpy0xJElDjTaYgvU20y7eutqS8lJMqm0gG5Qa1qBfSRFsuFhNtJdZ+oFQqyrm8vIm2QEX1OHUcZtNFQCRTlBJ0vngXjpyD6L+7Y4e7FPALL0kuM4VCTtmEjP8KCb65dpLnIbWZ7+EB2NsSRmu/RQTXLIt5jM+xeiveZTbeDQgDJNqB9R4NfIP5UYg14hE8UNU76H7gz4DA4F7SogbhvqvjU/QzLKGKOTV47PYe1KVn0QX1CKf3ZLo0nLKAxFDwgF6ArD/xAy/EDxz2A+KFc+eCeIwIfijOQ0fnQJea2Ap8F58zyKBniyPSyKUfbAmM0eN+4G7hfd8xQYSJZ+I2dD3wBgaYh36AAWD9CcV1wokBMYRiy/F5iH0Lc+bSMBe72wcSXGyS/KWAhJwIjLAk9NHXMN7b2HN8P0iiL+eA8Pexo0qDhQabOjQxDl5PGDwD/Aqo50SdVFQP1oxDWPwDUtT3QvQcAMT2cxDEBWiZcNUgneYWhjEAFX2OvhEQb84nIhkOuxBDrd0ALDEFkWfiCngGox7Hu74XhR8Fl5FFxt+/+xs/KBskZACD3ow/CFOkCqg4wjIkgBzRwIKTx2VJ/PD2YiJYGXAXe0fNulo7xI3j9n6z08at5qHW7KOvgPPNtZv9+BdnrQelQQNx0fU32uDo5trKwPQtMKNh5NnjGLQbzTGw9fyZAJYqlcrW4h8bPvPEa+lzgDU9M8QsrhoqKyZIv4RZ3WHGOeY+7IRTYP88jR61iUsRHJ4V/xm3GWsw4vr3lwhK0RT+3v/5z/8/jfd//Q6dcaN5yQNS4zxgesRpmELPJj4fT324R/7YEO9e4LORQhuTRTWNw3EQCe6rfyyhJyYEC5dgDHfDhbdh2vVNZjEaoMckIZdCT6OpHRCTjuMzEf04edd/0VBrWqfdGLeb9W6nPW41a4119ES84OHYXdAFNms6s8e66ACguJJCqzyuQ1ikgFPkQCnAXQPTop0kkPQtU+EqhT61bnvG2IWeAcJ0Cq0Hd2W/sGvH7QMWj2F3etcqEsEnwX1HSFw/5Q+rP7HxlEATG5NFExOfB/BV8yiKINYX+Yos6WWLZhWFWNmCSfSsrhfkrF6oyEWrWCmUiZVCn5GAd6wjSgxam04dRs3kI2MtrnhO3CnaqGzL0nY+j4s7ShHXNPgSQquLekih/wC9UQK7SQkAAA\u003d\u003d"}
\ No newline at end of file +{ + "type": "Item", + "data": "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\u003d\u003d" +} |