diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
20 files changed, 68 insertions, 68 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt index 4be042b43..7245ab8f5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt @@ -94,7 +94,7 @@ object DungeonDeathCounter { if (!isEnabled()) return config.deathCounterPos.renderString( - DungeonMilestonesDisplay.colour + display, + DungeonMilestonesDisplay.color + display, posLabel = "Dungeon Death Counter" ) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt index 3f00775d9..ea65b2e00 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt @@ -27,7 +27,7 @@ object DungeonMilestonesDisplay { private var display = "" private var currentMilestone = 0 private var timeReached = SimpleTimeMark.farPast() - var colour = "" + var color = "" @SubscribeEvent fun onTick(event: LorenzTickEvent) { @@ -54,7 +54,7 @@ object DungeonMilestonesDisplay { timeReached = SimpleTimeMark.now() } - colour = when (currentMilestone) { + color = when (currentMilestone) { 0, 1 -> "§c" 2 -> "§e" else -> "§a" @@ -79,7 +79,7 @@ object DungeonMilestonesDisplay { if (!isEnabled()) return config.showMileStonesDisplayPos.renderString( - colour + display, + color + display, posLabel = "Dungeon Milestone" ) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt index 87df6c3cb..2846262e6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggType.kt @@ -6,7 +6,7 @@ import kotlin.time.Duration enum class HoppityEggType( val mealName: String, - private val mealColour: String, + private val mealColor: String, val resetsAt: Int, var lastResetDay: Int = -1, private var claimed: Boolean = false, @@ -34,8 +34,8 @@ enum class HoppityEggType( } fun isClaimed() = claimed - val formattedName get() = "${if (isClaimed()) "§7§m" else mealColour}$mealName:$mealColour" - val coloredName get() = "$mealColour$mealName" + val formattedName get() = "${if (isClaimed()) "§7§m" else mealColor}$mealName:$mealColor" + val coloredName get() = "$mealColor$mealName" companion object { fun allFound() = entries.forEach { it.markClaimed() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt index 91801f169..d1220d7e3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/ThunderSparksHighlight.kt @@ -16,7 +16,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.RenderUtils.drawString import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.entity.item.EntityArmorStand import net.minecraft.init.Blocks @@ -45,7 +45,7 @@ object ThunderSparksHighlight { if (!isEnabled()) return val special = config.color - val color = Color(SpecialColour.specialToChromaRGB(special), true) + val color = Color(SpecialColor.specialToChromaRGB(special), true) val playerLocation = LocationUtils.playerLocation() for (spark in sparks) { 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 24f52e0b2..ee3838335 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 @@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import net.minecraft.util.AxisAlignedBB import net.minecraft.util.EnumParticleTypes import net.minecraftforge.fml.common.eventhandler.EventPriority @@ -63,7 +63,7 @@ object GeyserFishing { if (!IslandType.CRIMSON_ISLE.isInIsland()) return if (config.onlyWithRod && !FishingAPI.holdingLavaRod) return - val color = Color(SpecialColour.specialToChromaRGB(config.boxColor), true) + val color = Color(SpecialColor.specialToChromaRGB(config.boxColor), true) event.drawFilledBoundingBox_nea(geyserBox, color) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt index 9b1a30c4b..0759f7020 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/fortuneguide/CarrolynTable.kt @@ -32,12 +32,12 @@ enum class CarrolynTable(val crop: CropType, val label: String, completeMessage: ), ; - /** Pattern without colour codes */ + /** Pattern without color codes */ val completeMessagePattern by RepoPattern.pattern( "garden.ff.carrolyn.complete.${crop.patternKeyName}", completeMessage, ) - /** Pattern without colour codes */ + /** Pattern without color codes */ val thxMessagePattern by RepoPattern.pattern( "garden.ff.carrolyn.thx.${crop.patternKeyName}", thxMessage, ) diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt index fa847703f..cd815edd6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt @@ -9,23 +9,23 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object GardenVisitorColorNames { - private var visitorColours = mutableMapOf<String, String>() // name -> color code + private var visitorColors = mutableMapOf<String, String>() // name -> color code var visitorItems = mutableMapOf<String, List<String>>() @SubscribeEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant<GardenJson>("Garden") - visitorColours.clear() + visitorColors.clear() visitorItems.clear() for ((visitor, visitorData) in data.visitors) { - visitorColours[visitor] = visitorData.rarity.color.getChatColor() + visitorColors[visitor] = visitorData.rarity.color.getChatColor() visitorItems[visitor] = visitorData.needItems } } fun getColoredName(name: String): String { val cleanName = name.removeColor() - val color = visitorColours[cleanName] ?: return name + val color = visitorColors[cleanName] ?: return name return color + cleanName } } 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 151ec4caa..3372c2abd 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 @@ -234,8 +234,8 @@ object GardenVisitorFeatures { var amountInSacks = 0 internalName.getAmountInSacksOrNull()?.let { amountInSacks = it - val textColour = if (it >= amount) "a" else "e" - list.add(" §7(§${textColour}x${it.addSeparators()} §7in sacks)") + val textColor = if (it >= amount) "a" else "e" + list.add(" §7(§${textColor}x${it.addSeparators()} §7in sacks)") } val ingredients = NEUItems.getRecipes(internalName) diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt index d1826b481..fcd940d02 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ReforgeHelper.kt @@ -236,7 +236,7 @@ object ReforgeHelper { this.addAll(list) } - private fun getReforgeColour(reforge: ReforgeAPI.Reforge) = when { + private fun getReforgeColor(reforge: ReforgeAPI.Reforge) = when { currentReforge == reforge -> "§6" reforgeToSearch == reforge -> "§3" reforge.isReforgeStone -> "§9" @@ -244,7 +244,7 @@ object ReforgeHelper { } private fun getReforgeView(itemRarity: LorenzRarity): (ReforgeAPI.Reforge) -> Renderable = { reforge -> - val text = getReforgeColour(reforge) + reforge.name + val text = getReforgeColor(reforge) + reforge.name val tips = getReforgeTips(reforge, itemRarity) val onHover = if (!isInHexReforgeMenu) { {} diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt index 312f291de..eb56a0dd3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/eventtracker/MiningEventType.kt @@ -21,7 +21,7 @@ enum class MiningEventType( val eventName: String, private val shortName: String, val defaultLength: Duration, - private val colourCode: Char, + private val colorCode: Char, val dwarvenSpecific: Boolean, iconInput: Renderable, ) { @@ -101,18 +101,18 @@ enum class MiningEventType( eventName: String, shortName: String, defaultLength: Duration, - colourCode: Char, + colorCode: Char, dwarvenSpecific: Boolean, iconInput: ItemStack, ) : this( - eventName, shortName, defaultLength, colourCode, dwarvenSpecific, Renderable.itemStack( + eventName, shortName, defaultLength, colorCode, dwarvenSpecific, Renderable.itemStack( iconInput, xSpacing = 0 ) ) val icon = Renderable.hoverTips(iconInput, listOf(eventName)) - val compactText = Renderable.string("§$colourCode$shortName") - val normalText = Renderable.string("§$colourCode$eventName") + val compactText = Renderable.string("§$colorCode$shortName") + val normalText = Renderable.string("§$colorCode$eventName") val compactTextWithIcon = Renderable.horizontalContainer(listOf(icon, compactText), 0) val normalTextWithIcon = Renderable.horizontalContainer(listOf(icon, normalText), 0) diff --git a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt index 2ccaba2e5..c0a9c1212 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/minion/MinionFeatures.kt @@ -46,7 +46,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawString import at.hannibal2.skyhanni.utils.RenderUtils.drawWaypointFilled import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.SimpleTimeMark -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import at.hannibal2.skyhanni.utils.TimeUtils.format import at.hannibal2.skyhanni.utils.getLorenzVec import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern @@ -143,7 +143,7 @@ object MinionFeatures { if (!config.lastClickedMinion.display) return val special = config.lastClickedMinion.color - val color = Color(SpecialColour.specialToChromaRGB(special), true) + val color = Color(SpecialColor.specialToChromaRGB(special), true) val loc = lastMinion if (loc != null) { 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 e463549bc..05b1eaf35 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt @@ -63,7 +63,7 @@ object MarkedPlayerManager { } } - private fun refreshColours() = + private fun refreshColors() = markedPlayers.forEach { it.value.setColor() } @@ -104,7 +104,7 @@ object MarkedPlayerManager { playerNamesToMark.remove(name) } } - config.entityColor.onToggle(::refreshColours) + config.entityColor.onToggle(::refreshColors) } @SubscribeEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt index af2221a55..0d1f96d13 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PartyMemberOutlines.kt @@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.events.RenderEntityOutlineEvent import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import net.minecraft.client.entity.EntityOtherPlayerMP import net.minecraft.entity.Entity import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -30,6 +30,6 @@ object PartyMemberOutlines { private fun getEntityOutlineColor(entity: Entity): Int? { if (entity !is EntityOtherPlayerMP || !PartyAPI.partyMembers.contains(entity.name)) return null - return SpecialColour.specialToChromaRGB(config.outlineColor) + return SpecialColor.specialToChromaRGB(config.outlineColor) } } 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 d010198dd..697a58ebb 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 @@ -29,7 +29,7 @@ open class Enchant : Comparable<Enchant> { val config = SkyHanniMod.feature.inventory.enchantParsing // TODO change color to string (support for bold) - val colour = when { + val color = when { level >= maxLevel -> config.perfectEnchantColor level > goodLevel -> config.greatEnchantColor level == goodLevel -> config.goodEnchantColor @@ -37,8 +37,8 @@ open class Enchant : Comparable<Enchant> { } // TODO when chroma is disabled maybe use the neu chroma style instead of gold - if (colour.get() == LorenzColor.CHROMA && !(ChromaManager.config.enabled.get() || EnchantParser.isSbaLoaded)) return "§6§l" - return colour.get().getChatColor() + if (color.get() == LorenzColor.CHROMA && !(ChromaManager.config.enabled.get() || EnchantParser.isSbaLoaded)) return "§6§l" + return color.get().getChatColor() } override fun toString() = "$nbtName $goodLevel $maxLevel\n" diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt index 9cc4f8e34..b8de2eca6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/visualwords/VisualWordGui.kt @@ -112,8 +112,8 @@ open class VisualWordGui : GuiScreen() { val y = guiTop + 170 drawUnmodifiedStringCentered("§aAdd New", x, y) - val colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB - drawRect(x - 30, y - 10, x + 30, y + 10, colour) + val color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB + drawRect(x - 30, y - 10, x + 30, y + 10, color) if (shouldDrawImport) { val importX = guiLeft + sizeX - 45 @@ -250,12 +250,12 @@ open class VisualWordGui : GuiScreen() { var x = guiLeft + 180 var y = guiTop + 140 drawUnmodifiedStringCentered("§cDelete", x, y) - var colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB - drawRect(x - 30, y - 10, x + 30, y + 10, colour) + var color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB + drawRect(x - 30, y - 10, x + 30, y + 10, color) y += 30 drawUnmodifiedStringCentered("§eBack", x, y) - colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB - drawRect(x - 30, y - 10, x + 30, y + 10, colour) + color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB + drawRect(x - 30, y - 10, x + 30, y + 10, color) if (currentIndex < modifiedWords.size && currentIndex != -1) { val currentPhrase = modifiedWords[currentIndex] @@ -264,15 +264,15 @@ open class VisualWordGui : GuiScreen() { drawUnmodifiedStringCentered("§bReplacement Enabled", x, y - 20) var status = if (currentPhrase.enabled) "§2Enabled" else "§4Disabled" drawUnmodifiedStringCentered(status, x, y) - colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB - drawRect(x - 30, y - 10, x + 30, y + 10, colour) + color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB + drawRect(x - 30, y - 10, x + 30, y + 10, color) x += 200 drawUnmodifiedStringCentered("§bCase Sensitive", x, y - 20) status = if (!currentPhrase.isCaseSensitive()) "§2True" else "§4False" drawUnmodifiedStringCentered(status, x, y) - colour = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB - drawRect(x - 30, y - 10, x + 30, y + 10, colour) + color = if (isPointInMousePos(x - 30, y - 10, 60, 20)) colorA else colorB + drawRect(x - 30, y - 10, x + 30, y + 10, color) drawUnmodifiedString("§bIs replaced by:", guiLeft + 30, guiTop + 75) diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt index daed44c07..388e6bf23 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/SulphurSkitterBox.kt @@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.RenderUtils import at.hannibal2.skyhanni.utils.RenderUtils.expandBlock -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import at.hannibal2.skyhanni.utils.toLorenzVec import net.minecraft.init.Blocks import net.minecraft.util.AxisAlignedBB @@ -78,7 +78,7 @@ object SulphurSkitterBox { } private fun drawBox(axis: AxisAlignedBB, partialTicks: Float) { - val color = Color(SpecialColour.specialToChromaRGB(config.boxColor), true) + val color = Color(SpecialColor.specialToChromaRGB(config.boxColor), true) when (config.boxType) { SulphurSkitterBoxConfig.BoxType.FULL -> { RenderUtils.drawFilledBoundingBox_nea( diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt index 10c58b485..6a4b02416 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangGravityOrbs.kt @@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils import at.hannibal2.skyhanni.utils.RenderUtils.drawString -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.entity.item.EntityArmorStand import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @@ -42,7 +42,7 @@ object AshfangGravityOrbs { fun onRenderWorld(event: LorenzRenderWorldEvent) { if (!isEnabled()) return - val color = Color(SpecialColour.specialToChromaRGB(config.color), true) + val color = Color(SpecialColor.specialToChromaRGB(config.color), true) val playerLocation = LocationUtils.playerLocation() for (orb in orbs) { if (orb.isDead) continue diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt index 442dcadfa..4ff57d73d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/VoltHighlighter.kt @@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText import at.hannibal2.skyhanni.utils.RenderUtils.exactLocation import at.hannibal2.skyhanni.utils.SimpleTimeMark -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import at.hannibal2.skyhanni.utils.TimeUtils.format import net.minecraft.client.Minecraft import net.minecraft.entity.Entity @@ -65,7 +65,7 @@ object VoltHighlighter { ) { config.voltMoodMeter } if (state == VoltState.DOING_LIGHTNING && config.voltRange) { RenderUtils.drawCylinderInWorld( - Color(SpecialColour.specialToChromaRGB(config.voltColour), true), + Color(SpecialColor.specialToChromaRGB(config.voltColour), true), entity.posX, entity.posY - 4f, entity.posZ, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt index bc79a1b02..637fdfd15 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/kloon/KloonHacking.kt @@ -29,14 +29,14 @@ object KloonHacking { private val config get() = RiftAPI.config.area.westVillage.hacking - private val colourPattern by RepoPattern.pattern( - "rift.area.westvillage.kloon.colour", - "You've set the color of this terminal to (?<colour>.*)!" + private val colorPattern by RepoPattern.pattern( + "rift.area.westvillage.kloon.color", + "You've set the color of this terminal to (?<color>.*)!" ) private var wearingHelmet = false private var inTerminalInventory = false - private var inColourInventory = false + private var inColorInventory = false private val correctButtons = mutableListOf<String>() private var nearestTerminal: KloonTerminal? = null @@ -53,7 +53,7 @@ object KloonHacking { @SubscribeEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { inTerminalInventory = false - inColourInventory = false + inColorInventory = false nearestTerminal = null if (!RiftAPI.inRift()) return if (!config.solver) return @@ -67,14 +67,14 @@ object KloonHacking { } } if (event.inventoryName == "Hacked Terminal Color Picker") { - inColourInventory = true + inColorInventory = true } } @SubscribeEvent fun onInventoryClose(event: InventoryCloseEvent) { inTerminalInventory = false - inColourInventory = false + inColorInventory = false } @SubscribeEvent @@ -97,11 +97,11 @@ object KloonHacking { } } } - if (inColourInventory) { + if (inColorInventory) { if (!config.colour) return - val targetColour = nearestTerminal ?: getNearestTerminal() + val targetColor = nearestTerminal ?: getNearestTerminal() for (slot in InventoryUtils.getItemsInOpenChest()) { - if (slot.stack.getLore().any { it.contains(targetColour?.name ?: "") }) { + if (slot.stack.getLore().any { it.contains(targetColor?.name ?: "") }) { slot highlight LorenzColor.GREEN } } @@ -131,10 +131,10 @@ object KloonHacking { fun onChat(event: LorenzChatEvent) { if (!RiftAPI.inRift()) return if (!wearingHelmet) return - colourPattern.matchMatcher(event.message.removeColor()) { + colorPattern.matchMatcher(event.message.removeColor()) { val storage = ProfileStorageData.profileSpecific?.rift ?: return - val colour = group("colour") - val completedTerminal = KloonTerminal.entries.firstOrNull { it.name == colour } ?: return + val color = group("color") + val completedTerminal = KloonTerminal.entries.firstOrNull { it.name == color } ?: return if (completedTerminal != nearestTerminal) return storage.completedKloonTerminals.add(completedTerminal) } 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 d2a98daed..87228447f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/skillprogress/SkillProgress.kt @@ -30,7 +30,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.SoundUtils import at.hannibal2.skyhanni.utils.SoundUtils.playSound -import at.hannibal2.skyhanni.utils.SpecialColour +import at.hannibal2.skyhanni.utils.SpecialColor import at.hannibal2.skyhanni.utils.TimeUnit import at.hannibal2.skyhanni.utils.TimeUtils.format import at.hannibal2.skyhanni.utils.renderables.Renderable @@ -112,7 +112,7 @@ object SkillProgress { maxWidth = 182 Renderable.progressBar( percent = factor.toDouble(), - startColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)), + startColor = Color(SpecialColor.specialToChromaRGB(barConfig.barStartColor)), texture = barConfig.texturedBar.usedTexture.get(), useChroma = barConfig.useChroma.get() ) @@ -122,8 +122,8 @@ object SkillProgress { val factor = skillExpPercentage.coerceAtMost(1.0) Renderable.progressBar( percent = factor, - startColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)), - endColor = Color(SpecialColour.specialToChromaRGB(barConfig.barStartColor)), + startColor = Color(SpecialColor.specialToChromaRGB(barConfig.barStartColor)), + endColor = Color(SpecialColor.specialToChromaRGB(barConfig.barStartColor)), width = maxWidth, height = barConfig.regularBar.height, useChroma = barConfig.useChroma.get() |