diff options
author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-07-28 10:00:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-28 10:00:59 +0200 |
commit | b2082d1d6008d943ffa2269cbdddb1b4fc72b8ce (patch) | |
tree | 26806bedd65409c2a00b2ad6fef18ed4dd2dee29 /src/main/java/at/hannibal2/skyhanni/features/garden | |
parent | a4ba470eabdea05c3e2770ce56cd3ec9e0687efc (diff) | |
download | skyhanni-b2082d1d6008d943ffa2269cbdddb1b4fc72b8ce.tar.gz skyhanni-b2082d1d6008d943ffa2269cbdddb1b4fc72b8ce.tar.bz2 skyhanni-b2082d1d6008d943ffa2269cbdddb1b4fc72b8ce.zip |
Backend: Change colour (UK) to color (US) (#2258)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/garden')
3 files changed, 8 insertions, 8 deletions
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) |