diff options
89 files changed, 100 insertions, 108 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt index 89ccfd656..9da50e13e 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt @@ -163,7 +163,7 @@ object GetFromSackAPI { } private fun bazaarMessage(item: String, amount: Int, isRemaining: Boolean = false) = ChatUtils.clickableChat( - "§lCLICK §r§eto get the ${if (isRemaining) "remaining " else ""}§ax${amount} §9$item §efrom bazaar", + "§lCLICK §r§eto get the ${if (isRemaining) "remaining " else ""}§ax$amount §9$item §efrom bazaar", onClick = { HypixelCommands.bazaar(item.removeColor()) }, "§eClick to find on the bazaar!", ) diff --git a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt index 6217c56c2..f2b275655 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/HotmAPI.kt @@ -74,7 +74,7 @@ object HotmAPI { /** Use when new powder gets collected*/ fun gain(difference: Long) { - ChatUtils.debug("Gained §a${difference.addSeparators()} §e${displayName} Powder") + ChatUtils.debug("Gained §a${difference.addSeparators()} §e$displayName Powder") addTotal(difference) addCurrent(difference) PowderGainEvent(this, difference).post() diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt index 94bc665b6..edc4f65b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt @@ -214,7 +214,7 @@ object PlayerNameFormatter { val color = rawColor ?: return null val level = rawLevel?.getText() ?: error("level is null, color is not null") val levelData = "$color$level" - val result = if (config.hideLevelBrackets) levelData else "§8[${levelData}§8]" + val result = if (config.hideLevelBrackets) levelData else "§8[$levelData§8]" return result.applyFormattingFrom(rawLevel) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt index a26af584b..e2b9e04ef 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PartyChatEvent.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.data.hypixel.chat.event -import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName import at.hannibal2.skyhanni.utils.ComponentSpan +import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName import net.minecraft.util.IChatComponent class PartyChatEvent( diff --git a/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt index 10efc2823..42a827123 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt @@ -2,5 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData -class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : - LorenzEvent()
\ No newline at end of file +class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt index cca221932..26e13c42d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.event.diana.BurrowType import at.hannibal2.skyhanni.utils.LorenzVec -class BurrowDetectEvent(val burrowLocation: LorenzVec, val type: BurrowType) : LorenzEvent()
\ No newline at end of file +class BurrowDetectEvent(val burrowLocation: LorenzVec, val type: BurrowType) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt index d362cca09..3f601fd2b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.utils.LorenzVec -class BurrowDugEvent(val burrowLocation: LorenzVec) : LorenzEvent()
\ No newline at end of file +class BurrowDugEvent(val burrowLocation: LorenzVec) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt index b62dcb149..f4c46d0b7 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class CollectionUpdateEvent : LorenzEvent()
\ No newline at end of file +class CollectionUpdateEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt index b5afff547..4f1efeb9c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class ConfigLoadEvent : LorenzEvent()
\ No newline at end of file +class ConfigLoadEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt index 9ca3bd56b..8da8b20f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class CropMilestoneUpdateEvent : LorenzEvent()
\ No newline at end of file +class CropMilestoneUpdateEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt index 141f293a3..95b08ec51 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt @@ -4,3 +4,4 @@ import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData import net.minecraft.entity.EntityLivingBase class DamageIndicatorDeathEvent(val entity: EntityLivingBase, val data: EntityData) : LorenzEvent() + diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt index dbf2fd130..2ca276e4c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData -class DamageIndicatorDetectedEvent(val entityData: EntityData) : LorenzEvent()
\ No newline at end of file +class DamageIndicatorDetectedEvent(val entityData: EntityData) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt index 88e41538a..0d2564005 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class DamageIndicatorFinalBossEvent(val id: Int) : LorenzEvent()
\ No newline at end of file +class DamageIndicatorFinalBossEvent(val id: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt index ba278df24..822b80419 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import org.spongepowered.asm.mixin.injection.callback.CallbackInfo -class DrawScreenAfterEvent(val mouseX: Int, val mouseY: Int, val ci: CallbackInfo) : LorenzEvent()
\ No newline at end of file +class DrawScreenAfterEvent(val mouseX: Int, val mouseY: Int, val ci: CallbackInfo) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt index 9a7f5119a..84d1b822f 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonBlockClickEvent.kt @@ -5,3 +5,4 @@ import at.hannibal2.skyhanni.data.ClickedBlockType import at.hannibal2.skyhanni.utils.LorenzVec class DungeonBlockClickEvent(val position: LorenzVec, val blockType: ClickedBlockType) : SkyHanniEvent() + diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt index 243268181..9f372d5c3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class DungeonBossRoomEnterEvent : LorenzEvent()
\ No newline at end of file +class DungeonBossRoomEnterEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt index b980c7595..3b0f09c4a 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class DungeonEnterEvent(dungeonFloor: String) : LorenzEvent()
\ No newline at end of file +class DungeonEnterEvent(dungeonFloor: String) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt index b4de1e6c9..a2b127371 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class DungeonStartEvent(dungeonFloor: String) : LorenzEvent()
\ No newline at end of file +class DungeonStartEvent(dungeonFloor: String) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt index 5fbcfb9d7..162efd9ca 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import net.minecraft.entity.EntityLivingBase -class EntityHealthUpdateEvent(val entity: EntityLivingBase, val health: Int) : LorenzEvent()
\ No newline at end of file +class EntityHealthUpdateEvent(val entity: EntityLivingBase, val health: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt index 116e81797..943a11cc3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import net.minecraft.entity.EntityLivingBase -class EntityMaxHealthUpdateEvent(val entity: EntityLivingBase, val maxHealth: Int) : LorenzEvent()
\ No newline at end of file +class EntityMaxHealthUpdateEvent(val entity: EntityLivingBase, val maxHealth: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt index 75521bacd..5a4a83c1f 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.features.garden.contest.FarmingContestPhase -class FarmingContestEvent(val crop: CropType, val phase: FarmingContestPhase) : LorenzEvent()
\ No newline at end of file +class FarmingContestEvent(val crop: CropType, val phase: FarmingContestPhase) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt index 742dac58d..2ad07aad8 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.features.garden.CropType import net.minecraft.item.ItemStack -class GardenToolChangeEvent(val crop: CropType?, val toolItem: ItemStack?) : LorenzEvent()
\ No newline at end of file +class GardenToolChangeEvent(val crop: CropType?, val toolItem: ItemStack?) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt index a9d190f89..954bd0733 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events open class GuiRenderEvent : LorenzEvent() { class ChestGuiOverlayRenderEvent : GuiRenderEvent() class GuiOverlayRenderEvent : GuiRenderEvent() -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt index 044d63daa..6f7711118 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class HypixelJoinEvent : LorenzEvent()
\ No newline at end of file +class HypixelJoinEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt index 291ccd995..ae22a4c75 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events import at.hannibal2.skyhanni.data.IslandType -class IslandChangeEvent(val newIsland: IslandType, val oldIsland: IslandType) : LorenzEvent()
\ No newline at end of file +class IslandChangeEvent(val newIsland: IslandType, val oldIsland: IslandType) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt index 70997f0c1..e5af23d22 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class LorenzKeyPressEvent(val keyCode: Int) : LorenzEvent()
\ No newline at end of file +class LorenzKeyPressEvent(val keyCode: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt index 5ce44df0d..f61f0e16d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class LorenzRenderWorldEvent(val partialTicks: Float) : LorenzEvent()
\ No newline at end of file +class LorenzRenderWorldEvent(val partialTicks: Float) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt index c815e9630..de6718027 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class LorenzWorldChangeEvent : LorenzEvent()
\ No newline at end of file +class LorenzWorldChangeEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt index 4aa3ef9dc..395d1be2d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt @@ -6,5 +6,4 @@ import net.minecraft.world.IBlockAccess import net.minecraftforge.fml.common.eventhandler.Cancelable @Cancelable -data class RenderBlockInWorldEvent(@JvmField var state: IBlockState?, var world: IBlockAccess, var pos: BlockPos?) : - LorenzEvent()
\ No newline at end of file +data class RenderBlockInWorldEvent(@JvmField var state: IBlockState?, var world: IBlockAccess, var pos: BlockPos?) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt index 7bb4692ec..0f16dad2a 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt @@ -11,4 +11,4 @@ class RenderInventoryItemTipEvent( var offsetX: Int = 0, var offsetY: Int = 0, var alignLeft: Boolean = true, -) : LorenzEvent()
\ No newline at end of file +) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt index 7c70dde5d..c7da7f7bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : LorenzEvent()
\ No newline at end of file +class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt index 95ecf447f..b87a854e1 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : LorenzEvent()
\ No newline at end of file +class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt index 8c7aa753e..b7e0edfed 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class SlayerQuestCompleteEvent : LorenzEvent()
\ No newline at end of file +class SlayerQuestCompleteEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt index 8916c55fa..474789592 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class TabListLineRenderEvent(var text: String) : LorenzEvent()
\ No newline at end of file +class TabListLineRenderEvent(var text: String) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt index b3ab18bab..a1b36a667 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.events -class TabListUpdateEvent(val tabList: List<String>) : LorenzEvent()
\ No newline at end of file +class TabListUpdateEvent(val tabList: List<String>) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt index 2576809cc..912a4d8d6 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events import net.minecraftforge.fml.common.eventhandler.Cancelable @Cancelable -class TitleReceivedEvent(val title: String) : LorenzEvent()
\ No newline at end of file +class TitleReceivedEvent(val title: String) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt index 4a494f353..41a429cfd 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file +class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt index e3bffed8b..5b894768f 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file +class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt index 673f45e20..f26dbb971 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.Visitor -class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent()
\ No newline at end of file +class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt index f906364ce..f5673decd 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file +class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt index 6abec9865..c2e7a40b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file +class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt index fea24fba9..94de16081 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt @@ -3,4 +3,4 @@ package at.hannibal2.skyhanni.events.garden.visitor import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent()
\ No newline at end of file +class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt index 7cbdc8224..9282d3e04 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt @@ -5,5 +5,4 @@ import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI import at.hannibal2.skyhanni.utils.LorenzVec -class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: LorenzRenderWorldEvent) : - LorenzEvent()
\ No newline at end of file +class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: LorenzRenderWorldEvent) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt index 25c1c04cb..d6e992738 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PowderMiningChatFilter.kt @@ -359,7 +359,7 @@ object PowderMiningChatFilter { else -> { ErrorManager.logErrorWithData( NoSuchElementException(), - "Unknown Goblin Egg color detected in Powder Mining Filter: '${colorStr}' - please report this in the Discord!", + "Unknown Goblin Egg color detected in Powder Mining Filter: '$colorStr' - please report this in the Discord!", noStackTrace = true, ) "no_filter" diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt index 77ca2c6c9..5067bac01 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/OldDamage.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.features.combat.damageindicator -class OldDamage(val time: Long, val damage: Long, val healing: Long)
\ No newline at end of file +class OldDamage(val time: Long, val damage: Long, val healing: Long) 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 b8e14d280..af56be8e7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/commands/WikiManager.kt @@ -84,7 +84,7 @@ object WikiManager { } var search = "" - for (arg in args) search = "$search${arg}" + for (arg in args) search = "$search$arg" if (wikithis) { val itemInHand = InventoryUtils.getItemInHand() ?: run { diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt index a710e4fd0..9151c1d9e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt @@ -291,7 +291,7 @@ object DungeonFinderFeatures { val name = stack.getLore().firstOrNull()?.removeColor() if (config.showMissingClasses && dungeonFloorPattern.matches(name)) { if (classNames.contains(selectedClass)) { - classNames[classNames.indexOf(selectedClass)] = "§a${selectedClass}§7" + classNames[classNames.indexOf(selectedClass)] = "§a$selectedClass§7" } toolTip.add("") toolTip.add("§cMissing: §7" + classNames.createCommaSeparatedList()) diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt index e1e8fbaf9..474e8367f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLividFinder.kt @@ -59,7 +59,7 @@ object DungeonLividFinder { val chatColor = color.getChatColor() lividArmorStand = EntityUtils.getEntities<EntityArmorStand>() - .firstOrNull { it.name.startsWith("${chatColor}﴾ ${chatColor}§lLivid") } + .firstOrNull { it.name.startsWith("$chatColor﴾ $chatColor§lLivid") } if (event.isMod(20)) { if (lividArmorStand == null) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt index b49eb0642..9edf05b7b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt @@ -127,7 +127,7 @@ object CarnivalZombieShootout { content = Renderable.horizontalContainer( listOf( Renderable.itemStack(lamp), - Renderable.string("§6Disappears in $prefix${timer}"), + Renderable.string("§6Disappears in $prefix$timer"), ), spacing = 1, verticalAlign = RenderUtils.VerticalAlignment.CENTER, diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt index 0803cd0ea..9b9276420 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsCompactChat.kt @@ -105,7 +105,7 @@ object HoppityEggsCompactChat { "$mealNameFormat! §7Duplicate ${if (showDupeRarity) "$lastRarity " else ""}$lastName$dupeNumberFormat §7(§6+$format Chocolate§7$timeStr)" } else if (newRabbit) { val showNewRarity = rarityConfig.let { it == RarityType.BOTH || it == RarityType.NEW } - "$mealNameFormat! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7(${lastProfit}§7)" + "$mealNameFormat! §d§lNEW ${if (showNewRarity) "$lastRarity " else ""}$lastName §7($lastProfit§7)" } else "?" } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt index 7a0e2d65f..b7c67034f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/GoldenFishTimer.kt @@ -35,9 +35,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.SoundUtils -import at.hannibal2.skyhanni.utils.TimeLimitedSet import at.hannibal2.skyhanni.utils.TimeUtils.format -import at.hannibal2.skyhanni.utils.getLorenzVec import at.hannibal2.skyhanni.utils.renderables.Renderable import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.entity.EntityLivingBase diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt index 3c34c262c..26e41f7ee 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt @@ -106,7 +106,7 @@ object AnitaMedalProfit { "§7Item price: §6${itemPrice.shortFormat()} ", // TODO add more exact material cost breakdown "§7Material cost: §6${fullCost.shortFormat()} ", - "§7Final profit: §6${profitFormat} ", + "§7Final profit: §6$profitFormat ", ) table.add( DisplayTableEntry( 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 4285a24af..c79bbb461 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -441,7 +441,7 @@ object GardenNextJacobContest { SkyHanniMod.coroutineScope.launch { openPopupWindow( "<html>Farming Contest soon!<br />" + - "Crops: ${cropTextNoColor}</html>" + "Crops: $cropTextNoColor</html>" ) } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 6faa7746a..22e9c12f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -39,8 +39,8 @@ import at.hannibal2.skyhanni.utils.NEUItems.getItemStack import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary -import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat import at.hannibal2.skyhanni.utils.NumberUtil.roundTo +import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.SimpleTimeMark @@ -488,7 +488,7 @@ object ComposterOverlay { } val havingInInventory = internalName.getAmountInInventory() if (havingInInventory >= itemsNeeded) { - ChatUtils.chat("$itemName §8x${itemsNeeded} §ealready found in inventory!") + ChatUtils.chat("$itemName §8x$itemsNeeded §ealready found in inventory!") return } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt index 5bf2da85c..d3bdcf071 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContest.kt @@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.features.garden.contest import at.hannibal2.skyhanni.features.garden.CropType -data class FarmingContest(val time: Long, val crop: CropType, val brackets: Map<ContestBracket, Int>)
\ No newline at end of file +data class FarmingContest(val time: Long, val crop: CropType, val brackets: Map<ContestBracket, Int>) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt index 5d280a960..e1667a20b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestPhase.kt @@ -4,4 +4,4 @@ enum class FarmingContestPhase { START, STOP, CHANGE -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index 141c93ff1..0ef02361f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.ClickType import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter import at.hannibal2.skyhanni.data.GardenCropMilestones.setCounter -import at.hannibal2.skyhanni.data.Perk import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerDropsJson import at.hannibal2.skyhanni.data.jsonobjects.repo.DicerType import at.hannibal2.skyhanni.events.CropClickEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt index 078ef1672..ea893ecd1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt @@ -16,8 +16,8 @@ import at.hannibal2.skyhanni.utils.NEUItems.getPrice import at.hannibal2.skyhanni.utils.NEUItems.getPriceOrNull import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.NumberUtil.formatInt -import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat import at.hannibal2.skyhanni.utils.NumberUtil.roundTo +import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables import at.hannibal2.skyhanni.utils.renderables.Renderable @@ -72,7 +72,7 @@ object SkyMartCopperPrice { add("§7Profit per purchase: §6${profit.shortFormat()} ") add("") add("§7Copper amount: §c${copper.addSeparators()} ") - add("§7Profit per copper: §6${perFormat} ") + add("§7Profit per copper: §6$perFormat ") } table.add( DisplayTableEntry( 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 70392bb46..9fc0e7664 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 @@ -682,7 +682,7 @@ object GardenVisitorFeatures { add("shoppingList: '${visitor.shoppingList}'") } visitor.offer?.offerItem?.getInternalName()?.let { - add("offer: '${it}'") + add("offer: '$it'") } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt index 68dba3eee..ce4b5a4fa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardEvent.kt @@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.features.combat.SpidersDenAPI.isAtTopOfNest import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.eventsConfig import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardEvent.VOTING -import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern import at.hannibal2.skyhanni.features.misc.ServerRestartTitle import at.hannibal2.skyhanni.features.rift.area.stillgorechateau.RiftBloodEffigies import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter @@ -347,7 +346,7 @@ private fun getTrapperLines() = buildList { } private fun getTrapperShowWhen(): Boolean = - getSbLines().any { ScoreboardPattern.peltsPattern.matches(it) || ScoreboardPattern.mobLocationPattern.matches(it) } + getSbLines().any { SbPattern.peltsPattern.matches(it) || SbPattern.mobLocationPattern.matches(it) } private fun getGardenCleanUpLines(): List<String> = listOf(getSbLines().first { SbPattern.cleanUpPattern.matches(it) }.trim()) @@ -374,9 +373,9 @@ private fun getWinterLines() = buildList { } private fun getWinterShowWhen(): Boolean = getSbLines().any { - ScoreboardPattern.winterEventStartPattern.matches(it) || - (ScoreboardPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!")) || - ScoreboardPattern.winterWavePattern.matches(it) + SbPattern.winterEventStartPattern.matches(it) + || (SbPattern.winterNextWavePattern.matches(it) && !it.endsWith("Soon!")) + || SbPattern.winterWavePattern.matches(it) } private fun getNewYearLines() = listOf(getSbLines().first { SbPattern.newYearPattern.matches(it) }) @@ -395,7 +394,7 @@ private fun getSpookyLines() = buildList { ) // Candy } -private fun getSpookyShowWhen(): Boolean = getSbLines().any { ScoreboardPattern.spookyPattern.matches(it) } +private fun getSpookyShowWhen(): Boolean = getSbLines().any { SbPattern.spookyPattern.matches(it) } private fun getTablistEvent(): String? = TabListData.getTabList().firstOrNull { SbPattern.eventNamePattern.matches(it) } @@ -413,7 +412,7 @@ private fun getActiveEventLine(): List<String> { val blockedEvents = listOf("Spooky Festival", "Carnival", "5th SkyBlock Anniversary", "New Year Celebration") if (blockedEvents.contains(currentActiveEvent.removeColor())) return emptyList() - val currentActiveEventTime = ScoreboardPattern.eventTimeEndsPattern.firstMatcher(TabWidget.EVENT.lines) { + val currentActiveEventTime = SbPattern.eventTimeEndsPattern.firstMatcher(TabWidget.EVENT.lines) { group("time") } ?: return emptyList() @@ -425,7 +424,7 @@ private fun getActiveEventShowWhen(): Boolean = private fun getSoonEventLine(): List<String> { val soonActiveEvent = getTablistEvent() ?: return emptyList() - val soonActiveEventTime = ScoreboardPattern.eventTimeStartsPattern.firstMatcher(TabWidget.EVENT.lines) { + val soonActiveEventTime = SbPattern.eventTimeStartsPattern.firstMatcher(TabWidget.EVENT.lines) { group("time") } ?: return emptyList() diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt index 9ed2621bb..78e6063ee 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemPickupLog.kt @@ -42,7 +42,7 @@ object ItemPickupLog { "§a+256", { entry, prefix -> val formattedAmount = if (config.shorten) entry.amount.shortFormat() else entry.amount.addSeparators() - Renderable.string("${prefix}${formattedAmount}") + Renderable.string("$prefix$formattedAmount") }, ), ICON( diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt index 26de0fa1c..4856c65c1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -143,7 +143,7 @@ object SackDisplay { add( Renderable.hoverTips( Renderable.string( - "§d${magmaFish}", + "§d$magmaFish", horizontalAlign = config.alignment ), listOf( diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt index ed7e35691..52a3c5f1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateFactoryStrayTracker.kt @@ -152,7 +152,7 @@ object ChocolateFactoryStrayTracker { add( Renderable.hoverTips( "§6§lStray Tracker", - tips = listOf("§a+§b${formattedExtraTime} §afrom strays§7"), + tips = listOf("§a+§b$formattedExtraTime §afrom strays§7"), ).toSearchable(), ) HoppityAPI.hoppityRarities.forEach { rarity -> @@ -169,7 +169,7 @@ object ChocolateFactoryStrayTracker { val colorCode = rarity.chatColorCode val lineHeader = "$colorCode${rarity.toString().lowercase().replaceFirstChar { it.uppercase() }}§7: §r$colorCode" - val lineFormat = "${lineHeader}${caughtString}" + val lineFormat = "$lineHeader$caughtString" val renderable = rarityExtraChocMs?.let { var tip = "§a+§b$extraChocFormat §afrom $colorCode${rarity.toString().lowercase()} strays§7" diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt index 277532aaa..13757d1b3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/chocolatefactory/ChocolateShopPrice.kt @@ -132,7 +132,7 @@ object ChocolateShopPrice { add("§7Profit per purchase: §6${profit.shortFormat()} ") add("") add("§7Chocolate amount: §c${product.chocolate.shortFormat()} ") - add("§7Profit per million chocolate: §6${perFormat} ") + add("§7Profit per million chocolate: §6$perFormat ") add("") val formattedTimeUntilGoal = ChocolateAmount.CURRENT.formattedTimeUntilGoal(product.chocolate) add("§7Time until affordable: §6$formattedTimeUntilGoal ") diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt index eb89da696..19383d4fa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt @@ -330,7 +330,7 @@ object TunnelsMaps { Renderable.horizontalContainer( listOf(Renderable.string("§dFairy Souls")) + fairySouls.map { val name = it.key.removePrefix("§dFairy Soul ") - Renderable.clickable(Renderable.string("§d[${name}]"), onClick = guiSetActive(it.key)) + Renderable.clickable(Renderable.string("§d[$name]"), onClick = guiSetActive(it.key)) }, ), Renderable.string("§dFairy Souls"), diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt index fcf876c21..2749404be 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt @@ -333,7 +333,7 @@ object PowderTracker { } val (flawless, fine, flawed, rough) = convert(totalGemstone) - addSearchString("§5${flawless}§7-§9${fine}§7-§a${flawed}§f-${rough} $color$gem Gemstone", "Gemstone") + addSearchString("§5$flawless§7-§9$fine§7-§a$flawed§f-$rough $color$gem Gemstone", "Gemstone") } var totalParts = 0L diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt index bfecbc48f..a5062ee1d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CarryTracker.kt @@ -14,10 +14,10 @@ import at.hannibal2.skyhanni.utils.CollectionUtils.addString import at.hannibal2.skyhanni.utils.HypixelCommands import at.hannibal2.skyhanni.utils.KeyboardManager import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat import at.hannibal2.skyhanni.utils.NumberUtil.formatDouble import at.hannibal2.skyhanni.utils.NumberUtil.formatDoubleOrUserError import at.hannibal2.skyhanni.utils.NumberUtil.formatIntOrUserError +import at.hannibal2.skyhanni.utils.NumberUtil.shortFormat import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName @@ -228,7 +228,7 @@ object CarryTracker { add("§7Missing: §e$missing") add("") if (cost != "") { - add("§7Total cost: §e${cost}") + add("§7Total cost: §e$cost") add("§7Cost per carry: §e${formatCost(carry.type.pricePer)}") } else { add("§cNo price set for this carry!") @@ -264,7 +264,7 @@ object CarryTracker { val missingFormat = formatCost(totalCost - customer.alreadyPaid) list.add( Renderable.clickAndHover( - Renderable.string("§b$customerName $paidFormat§8/${totalCostFormat}"), + Renderable.string("§b$customerName $paidFormat§8/$totalCostFormat"), tips = listOf( "§7Carries for §b$customerName", "", diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt index cddbd201d..faf3130b5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/IslandAreas.kt @@ -144,7 +144,7 @@ object IslandAreas { val isTarget = node.name == targetNode?.name val color = if (isTarget) LorenzColor.GOLD else tag.color - val coloredName = "${color.getChatColor()}${name}" + val coloredName = "${color.getChatColor()}$name" var suffix = "" paths[node]?.let { path -> @@ -161,7 +161,7 @@ object IslandAreas { } val distance = difference.roundTo(1) - val text = "${coloredName}§7: §e$distance$suffix" + val text = "$coloredName§7: §e$distance$suffix" if (!foundCurrentArea) { foundCurrentArea = true diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt index e7b8ea26c..dedfe3473 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MagicalPowerDisplay.kt @@ -93,7 +93,7 @@ object MagicalPowerDisplay { else -> if (internalName.isAbicase()) endMP += (contactAmount ?: 0) / 2 } - event.stackTip = "${if (config.colored) rarity.chatColorCode else "§7"}${endMP}" + event.stackTip = "${if (config.colored) rarity.chatColorCode else "§7"}$endMP" } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt index c34a49a7d..98d420525 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MiscFeatures.kt @@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.events.ReceiveParticleEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule -import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraft.util.EnumParticleTypes import net.minecraftforge.client.event.RenderBlockOverlayEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt index ea8770081..2a5e131fa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/RoundedRectangleOutlineShader.kt @@ -27,4 +27,4 @@ object RoundedRectangleOutlineShader : Shader("rounded_rect_outline", "rounded_r registerUniform(Uniform.UniformType.FLOAT, "borderThickness") { borderThickness } registerUniform(Uniform.UniformType.FLOAT, "borderBlur") { borderBlur } } -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt index 96b89ce17..a2c227bd7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt @@ -35,4 +35,4 @@ class TabLine(val text: String, val type: TabStringType, val customName: String this.entity = entity return entity } -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt index 3f56230c4..2f58a4fd1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt @@ -920,11 +920,11 @@ object EstimatedItemValueCalculator { fun Pair<String, Int>.getAttributeName(): String { val name = first.fixMending().allLettersFirstUppercase() - return "§b$name ${second} Shard" + return "§b$name $second Shard" } fun Pair<String, Int>.getAttributePrice(): Double? = EstimatedItemValueCalculator.getPriceOrCompositePriceForAttribute( - "ATTRIBUTE_SHARD+ATTRIBUTE_" + first, + "ATTRIBUTE_SHARD+ATTRIBUTE_$first", second, ) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt index 244cc54be..6432be2f6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/Enchant.kt @@ -10,8 +10,8 @@ import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.StringUtils.removeColor import com.google.gson.annotations.Expose import io.github.notenoughupdates.moulconfig.observer.Property -import java.util.TreeSet import net.minecraft.item.ItemStack +import java.util.TreeSet open class Enchant : Comparable<Enchant> { @Expose @@ -110,7 +110,7 @@ open class Enchant : Comparable<Enchant> { @Expose private var stackLevel: TreeSet<Int>? = null - override fun toString() = "$nbtNum ${stackLevel.toString()} ${super.toString()}" + override fun toString() = "$nbtNum $stackLevel ${super.toString()}" } class Dummy(name: String) : Enchant() { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt index 66c4c0407..162d2adee 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/enchants/EnchantParser.kt @@ -22,7 +22,6 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getEnchantments import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getExtraAttributes import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import java.lang.ArithmeticException import net.minecraft.event.HoverEvent import net.minecraft.item.ItemStack import net.minecraft.util.ChatComponentText diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt index 3172df6e0..b69e5913d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/Category.kt @@ -1,3 +1,3 @@ package at.hannibal2.skyhanni.features.misc.massconfiguration -data class Category(val name: String, val description: String)
\ No newline at end of file +data class Category(val name: String, val description: String) diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt index 30a78a7b2..60d809633 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/massconfiguration/ResetSuggestionState.kt @@ -7,4 +7,4 @@ enum class ResetSuggestionState(val label: String) { ; val next get() = entries[(ordinal + 1) % entries.size] -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt index f56185aba..84d86615d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/update/GuiOptionEditorUpdateCheck.kt @@ -49,7 +49,7 @@ class GuiOptionEditorUpdateCheck(option: ProcessedOption) : GuiOptionEditor(opti val sameVersion = currentVersion.equals(nextVersion, true) TextRenderUtils.drawStringCenteredScaledMaxWidth( "${if (UpdateManager.updateState == UpdateManager.UpdateState.NONE) GREEN else RED}$currentVersion" + - if (nextVersion != null && !sameVersion) "➜ ${GREEN}${nextVersion}" else "", + if (nextVersion != null && !sameVersion) "➜ $GREEN$nextVersion" else "", fr, widthRemaining / 4F, 10F, diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt index 389f1ccc0..d531aa8f4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/FactionType.kt @@ -5,4 +5,4 @@ enum class FactionType { MAGE, NONE -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt index 914f1e921..609a22a0f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/MiniBossQuest.kt @@ -10,4 +10,4 @@ class MiniBossQuest(val miniBoss: CrimsonMiniBoss, state: QuestState, needAmount miniBoss.displayName, state, needAmount - )
\ No newline at end of file + ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt index f9987fe1c..379f0c26b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestCategory.kt @@ -9,4 +9,4 @@ enum class QuestCategory(val displayName: String) { KUUDRA("Kuudra Kill"), UNKNOWN("§4Unknown"), -}
\ No newline at end of file +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt index acde3785d..f98514a66 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/quest/QuestState.kt @@ -5,4 +5,4 @@ enum class QuestState(val displayName: String, val color: String) { ACCEPTED("Accepted", "§b"), READY_TO_COLLECT("Ready to collect", "§a"), COLLECTED("Collected", "§7"), -}
\ No newline at end of file +} 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 a16f78b52..9a01a9729 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt @@ -291,7 +291,7 @@ object SkillProgress { ) } else { val tips = buildList { - add("§6Level: §b${level}") + add("§6Level: §b$level") add("§6Current XP: §b${currentXp.addSeparators()}") add("§6Needed XP: §b${currentXpMax.addSeparators()}") add("§6Total XP: §b${totalXp.addSeparators()}") diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt index 6396b2876..d2c161eba 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt @@ -123,7 +123,7 @@ object SlayerRngMeterDisplay { var rawPercentage = old.toDouble() / storage.goalNeeded if (rawPercentage > 1) rawPercentage = 1.0 val percentage = LorenzUtils.formatPercentage(rawPercentage) - ChatUtils.chat("§dRNG Meter §7dropped at §e$percentage §7XP ($from/${to}§7)") + ChatUtils.chat("§dRNG Meter §7dropped at §e$percentage §7XP ($from/$to§7)") lastItemDroppedTime = SimpleTimeMark.now() } if (blockChat) { diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt index 55f88d2bf..3fc4e265d 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt @@ -378,7 +378,7 @@ object SkyHanniDebugsAndTests { add("§eitem name -> internalName: '§7${internalName.asString()}§e'") add(" §eitemName: '${internalName.itemName}§e'") val price = internalName.getPriceOrNull()?.let { "§6" + it.addSeparators() } ?: "§7null" - add(" §eprice: '§6${price}§e'") + add(" §eprice: '§6$price§e'") return@buildList } @@ -388,7 +388,7 @@ object SkyHanniDebugsAndTests { add("§einternal name: §7${internalName.asString()}") add("§einternal name -> item name: '$itemName§e'") val price = internalName.getPriceOrNull()?.let { "§6" + it.addSeparators() } ?: "§7null" - add(" §eprice: '§6${price}§e'") + add(" §eprice: '§6$price§e'") return@buildList } diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt index d038d7759..9b23b47a9 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/command/CopyItemCommand.kt @@ -26,10 +26,10 @@ object CopyItemCommand { val tag = compound.getTag(s) if (tag !is NBTTagCompound) { - list.add("${text}${s}: $tag") + list.add("$text$s: $tag") } else { val element = compound.getCompoundTag(s) - list.add("${text}${s}:") + list.add("$text$s:") recurseTag(element, "$text ", list) } } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt index 5f52508f2..198f7c0a0 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt @@ -27,7 +27,6 @@ import net.minecraft.entity.monster.EntityEnderman import net.minecraft.entity.player.EntityPlayer import net.minecraft.item.ItemStack import net.minecraft.potion.Potion -import net.minecraft.scoreboard.ScorePlayerTeam import net.minecraft.tileentity.TileEntity import net.minecraft.util.AxisAlignedBB import net.minecraftforge.client.event.RenderLivingEvent diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt index 2975d57e2..cd8564634 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniBucketedItemTracker.kt @@ -193,7 +193,7 @@ class SkyHanniBucketedItemTracker<E : Enum<E>, BucketedData : BucketedItemTracke add("§eControl + Click to remove this item!") if (SkyHanniMod.feature.dev.debug.enabled) { add("") - add("§7${internalName}") + add("§7$internalName") } } 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 3cadd767b..3295880b9 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt @@ -189,7 +189,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>( if (SkyHanniMod.feature.dev.debug.enabled) { add("") - add("§7${internalName}") + add("§7$internalName") } } |