aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
authorAlexia Luna <me@alexia.lol>2024-03-21 17:58:56 +0100
committerGitHub <noreply@github.com>2024-03-21 17:58:56 +0100
commit685c8d232bcef40178d331ad4d3dde7ae0d1c3e9 (patch)
tree37dcc1c511845da79c70503c21882d5cbf7ea4db /src/main/java/at
parent8ef7b4209633e309651382c0bbadafc1aea329a3 (diff)
downloadskyhanni-685c8d232bcef40178d331ad4d3dde7ae0d1c3e9.tar.gz
skyhanni-685c8d232bcef40178d331ad4d3dde7ae0d1c3e9.tar.bz2
skyhanni-685c8d232bcef40178d331ad4d3dde7ae0d1c3e9.zip
Removed Feature: Colored Visitor Name (#1228)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorColorNames.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt12
3 files changed, 0 insertions, 21 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java
index b3f9ab1d8..098eddea1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/VisitorConfig.java
@@ -78,12 +78,6 @@ public class VisitorConfig {
}
@Expose
- @ConfigOption(name = "Colored Name", desc = "Show the visitor name in the color of the rarity.")
- @ConfigEditorBoolean
- @FeatureToggle
- public boolean coloredName = true;
-
- @Expose
@ConfigOption(name = "Hypixel Message", desc = "Hide the chat message from Hypixel that a new visitor has arrived at your garden.")
@ConfigEditorBoolean
@FeatureToggle
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 2a5278c47..3e0b9c7a9 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
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.garden.visitor
import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson
import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -24,8 +23,6 @@ object GardenVisitorColorNames {
}
fun getColoredName(name: String): String {
- if (!GardenAPI.config.visitors.coloredName) return name
-
val cleanName = name.removeColor()
val color = visitorColours[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 b9c88a095..3ebb8e5be 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
@@ -594,18 +594,6 @@ class GardenVisitorFeatures {
return false
}
- @SubscribeEvent(priority = EventPriority.HIGH)
- fun onRenderLiving(event: SkyHanniRenderEntityEvent.Specials.Pre<EntityLivingBase>) {
- if (!config.coloredName) return
- val entity = event.entity
- val entityId = entity.entityId
- for (visitor in VisitorAPI.getVisitors()) {
- if (visitor.nameTagEntityId == entityId) {
- entity.customNameTag = GardenVisitorColorNames.getColoredName(entity.name)
- }
- }
- }
-
@SubscribeEvent
fun onDebugDataCollect(event: DebugDataCollectEvent) {
event.title("Garden Visitor Stats")