diff options
Diffstat (limited to 'src/main/java')
20 files changed, 23 insertions, 29 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt index 8ff09bba5..1bbb948ce 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt @@ -66,7 +66,7 @@ class GuiPositionEditor(private val positions: List<Position>, private val borde displayPos = hoveredPos } - // When the mouse is not currently hovering over a gui element + // When the mouse isn't currently hovering over a gui element if (displayPos == -1) { GuiRenderUtils.drawStringCentered("§eTo edit hidden GUI elements set a key in /sh edit", getScaledWidth() / 2, 20) GuiRenderUtils.drawStringCentered("§ethen click that key while the GUI element is visible", getScaledWidth() / 2, 32) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java index 342d39aa2..a630f3c7f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java @@ -476,7 +476,7 @@ public class MiscConfig { public static class QuickModMenuSwitch { @Expose - @ConfigOption(name = "Enabled", desc = "Adding a mod list, allowing to quickly switch between different mod menus") + @ConfigOption(name = "Enabled", desc = "Adding a mod list, allowing to fast switch between different mod menus") @ConfigEditorBoolean public boolean enabled = false; diff --git a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt index 87cfdcdc6..54a914e72 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ApiDataLoader.kt @@ -46,7 +46,7 @@ class ApiDataLoader { val jsonObject = withContext(Dispatchers.IO) { APIUtil.getJSONResponse(url) } if (jsonObject["success"]?.asBoolean == false) { - if (jsonObject["throttle"]?.asBoolean == true) return true // 429 Too Many Requests does not make an invalid key. + if (jsonObject["throttle"]?.asBoolean == true) return true // 429 Too Many Requests doesn't make an invalid key. val cause = jsonObject["cause"].asString if (cause == "Invalid API key") { return false diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt index 37b61d5a3..84acf124e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt @@ -314,7 +314,7 @@ class ChatFilter { message == "§7Finding player..." -> true message == "§7Sending a visit request..." -> true - //warp portals on public islands (canvas room - flower house, election room - community center, void sepulture - the end) + //warp portals on public islands (canvas room – flower house, election room – community center, void sepulture – the end) message.matchRegex("§dWarped to (.*)§r§d!") -> true else -> false } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt index 2cd540ea1..60fd79f6d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt @@ -45,7 +45,7 @@ class DungeonBossMessages { } } - //M7 - Dragons + //M7 – Dragons message == "§cThe Crystal withers your soul as you hold it in your hands!" -> return true message == "§cIt doesn't seem like that is supposed to go there." -> return true } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt index a4bce1680..9dca6d59b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt @@ -148,7 +148,6 @@ class DungeonChatFilter { message == "§4[STATUE] Oruo the Omniscient§r§f: §r§fProve your knowledge by answering 3 questions and I shall reward you in ways that transcend time!" -> true message == "§4[STATUE] Oruo the Omniscient§r§f: §r§fAnswer incorrectly, and your moment of ineptitude will live on for generations." -> true -// message == "§4[STATUE] Oruo the Omniscient§r§f: §r§f2 questions §r§fleft...and§r§f you will have proven your worth to me!" -> true message == "§4[STATUE] Oruo the Omniscient§r§f: §r§f2 questions left... Then you will have proven your worth to me!" -> true message == "§4[STATUE] Oruo the Omniscient§r§f: §r§fOne more question!" -> true 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 e7f8e41f7..73a5cee71 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 @@ -239,7 +239,7 @@ object CropMoneyDisplay { for ((internalName, amount) in multipliers.moveEntryToTop { isSeeds(it.key) }) { val crop = cropNames[internalName]!! - // When only the NPC price is shown, display the price exclusively for the base item + // When only the NPC price is shown, display the price only for the base item if (onlyNpcPrice) { if (amount != 1) continue } else { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt index d52535f0d..9f675fe15 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CaptureFarmingGear.kt @@ -108,7 +108,7 @@ class CaptureFarmingGear { } } if (event.inventoryName.contains("Pets")) { - // If they have 2 of same pet, one will be overwritten + // If they've 2 of same pet, one will be overwritten farmingItems[FarmingItems.ELEPHANT] = FFGuideGUI.getFallbackItem(FarmingItems.ELEPHANT) farmingItems[FarmingItems.MOOSHROOM_COW] = FFGuideGUI.getFallbackItem(FarmingItems.MOOSHROOM_COW) farmingItems[FarmingItems.RABBIT] = FFGuideGUI.getFallbackItem(FarmingItems.RABBIT) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt index da5bec218..1b062dc57 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/FortuneUpgrades.kt @@ -81,7 +81,7 @@ object FortuneUpgrades { val visitors = GardenAPI.config?.uniqueVisitors?.toDouble() ?: 0.0 for (piece in equipment) { val item = piece.getItem() - //todo tell them to purchase the missing item + //todo tell them to buy the missing item if (!item.getInternalName().contains("LOTUS")) return val enchantments = item.getEnchantments() ?: emptyMap() val greenThumbLvl = enchantments["green_thumb"] ?: 0 @@ -226,7 +226,7 @@ object FortuneUpgrades { private val cropUpgrades = listOf(5, 10, 20, 50, 100, 500, 1000, 5000, 10000) - // If they unlock in a weird order e.g. getting a corner before a cheaper one won't work properly + // If they unlock in a weird order for example getting a corner before a cheaper one won't work properly private val compostNeeded = listOf(1, 2, 4, 8, 16, 24, 32, 48, 64, 96, 128, 160, 160, 320, 320, 480, 480, 640, 800, 1120, 1280, 1600, 1920, 2400) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 62552bfbf..aee2c85de 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -129,7 +129,7 @@ object GardenVisitorDropStatistics { //8 addAsSingletonList(format(coinsSpent, "Coins Spent", "§6", "")) - //9 - 14 + //9 – 14 for (reward in VisitorReward.values()) { val count = rewardsCount[reward] ?: 0 if (config.displayIcons) {// Icons diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt index 7d5edae2e..1466d7472 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt @@ -586,7 +586,8 @@ class GardenVisitorFeatures { color ) { config.visitorHighlightStatus == 0 || config.visitorHighlightStatus == 2 } } - if (color == -1 || !GardenAPI.inGarden()) RenderLivingEntityHelper.removeEntityColor(entity) // Have not gotten either of the known effected visitors (Vex and Leo) so cannot test for sure + // Haven't gotten either of the known effected visitors (Vex and Leo) so can't test for sure + if (color == -1 || !GardenAPI.inGarden()) RenderLivingEntityHelper.removeEntityColor(entity) } } } 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 ea1548117..a287662bc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HighlightBonzoMasks.kt @@ -21,7 +21,7 @@ class HighlightBonzoMasks { val maskTimers = mutableMapOf<String, CooldownTimer>() - // Technically this timer is overestimating since the cooldown is affected by mage level, however I do not care. + // Technically this timer is overestimating since mage level affects the cooldown, however I don't care. val bonzoMaskCooldown = 360.seconds val bonzoMaskMessage = "^Your (.*Bonzo's Mask) saved your life!$".toRegex() diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCollectLogic.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCollectLogic.kt index 177a0016e..9be2186ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCollectLogic.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionCollectLogic.kt @@ -28,7 +28,7 @@ class MinionCollectLogic { return map } - // hypixel opens a new inventory after clicking on an item in minion inventory, InventoryCloseEvent is not usable here + // hypixel opens a new inventory after clicking on an item in minion inventory, InventoryCloseEvent isn't usable here @SubscribeEvent fun onCloseWindow(event: GuiContainerEvent.CloseWindowEvent) { closeMinion() diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt index 0b6ebef0b..bcc83842c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordLocationKey.kt @@ -29,7 +29,7 @@ class DiscordLocationKey { "dark-thicket", "jungle-island", "gold-mine", - "slimehill" + "slimehill", "the-barn", "mushroom-desert", "the-end", @@ -44,7 +44,7 @@ class DiscordLocationKey { "village-plaza", "wyld-woods" ) - // list of tokens where the name can just be lowercased and spaces can be replaced with dashes + // list of tokens where the name can be lowercased and spaces can be replaced with dashes private val specialRPC = mapOf( "Fisherman's Hut" to "fishermans-hut", diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt index 39f61f74b..4a2ef02c4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt @@ -155,7 +155,7 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?) returnNum = "0$num".toInt() /** * and this is so that if the minute value is ever - * a single digit (0 after being floored), it displays as 00 because 12:0pm just looks bad + * a single digit (0 after being floored), it displays as 00 because 12:0pm looks bad */ } return returnNum @@ -193,7 +193,7 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier<String>?) val fruit = HypixelData.profileName.firstLetterUppercase() if (fruit == "") profile = - lastKnownDisplayStrings[PROFILE] ?: "SkyBlock Level: [$sbLevel]" // profile fruit has not loaded in yet + lastKnownDisplayStrings[PROFILE] ?: "SkyBlock Level: [$sbLevel]" // profile fruit hasn't loaded in yet else profile += fruit lastKnownDisplayStrings[PROFILE] = profile diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt index 279d58e2c..5d36cdb90 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt @@ -238,7 +238,7 @@ object SkyHanniConfigSearchResetCommand { if (this is Runnable) return "Runnable" - // we do not use javaClass.simpleName since we want to catch edge cases + // we don't use javaClass.simpleName since we want to catch edge cases val name = javaClass.name return when (name) { "at.hannibal2.skyhanni.config.core.config.Position" -> "Position" diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyParticlesCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyParticlesCommand.kt index 8e4290434..680f42e6e 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyParticlesCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyNearbyParticlesCommand.kt @@ -7,7 +7,7 @@ import net.minecraft.network.play.server.S2APacketParticles import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -// note: Each particle is copied anywhere between 1-3 times. Different each time. Should not affect using this for debugging or developing +// Note: Each particle is copied anywhere between 1-3 times. Different each time. Shouldn't affect using this for debugging or developing object CopyNearbyParticlesCommand { private var searchRadius = 0 private var saveNextTick = false diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt index b34a5ca4b..6db35d2af 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt @@ -46,7 +46,7 @@ object NumberUtil { //Long.MIN_VALUE == -Long.MIN_VALUE so we need an adjustment here if (value == Long.MIN_VALUE) return format(Long.MIN_VALUE + 1) if (value < 0) return "-" + format(-value) - if (value < 1000) return value.toString() //deal with easy case + if (value < 1000) return value.toString() //deal with small numbers val (divideBy, suffix) = suffixes.floorEntry(value) val truncated = value / (divideBy / 10) //the number part of the output times 10 val truncatedAt = if (suffix == "M") 1000 else 100 diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt index a6efd2355..c72e1f40e 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt @@ -404,7 +404,7 @@ object RenderUtils { pos.z - player.lastTickPosZ + (pos.z - player.posZ - (pos.z - player.lastTickPosZ)) * partialTicks - //7 - 25 + //7 – 25 val translate = LorenzVec(x, y, z) val length = translate.length().toFloat() @@ -413,19 +413,13 @@ object RenderUtils { var factor = 1f var finalScale = scale if (debug) { -// if (tick++ % 60 == 0) { finalText = "$text ${length.toInt()}" -// println("translate: $length") -// } if (length < 8) { factor = 8 / length -// translate = translate.multiply(8 / length) } if (length > 15) { factor = 15 / length -// translate = translate.multiply(15 / length) } -// val finalScale = scale * (1 / factor) finalScale = scale * sqrt(factor.toDouble()).toFloat() } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt index acd1085ba..036c610bc 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt @@ -24,7 +24,7 @@ interface Renderable { && Utils.getMouseY() in (posY..posY + height) // TODO: adjust for variable height? /** - * N.B.: the offset is absolute, not relative to the position and should not be used for rendering + * N.B.: the offset is absolute, not relative to the position and shouldn't be used for rendering * (the GL matrix stack should already be pre transformed) */ fun render(posX: Int, posY: Int) |