Backend: Change colour (UK) to color (US) (#2258)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

2 files changed, 15 insertions, 15 deletions

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)
         }