From bc30d882209649bac956ed46641b76b8fc1522d9 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:13:15 +0100
Subject: Removed Feature: Plot Name in Scoreboard (#1168)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../config/features/garden/GardenConfig.java       |  6 ------
 .../skyhanni/mixins/hooks/GuiIngameHook.kt         | 23 ----------------------
 2 files changed, 29 deletions(-)

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
index cd1abbc14..b0a831e34 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java
@@ -229,12 +229,6 @@ public class GardenConfig {
     @FeatureToggle
     public boolean plotBorders = true;
 
-    @Expose
-    @ConfigOption(name = "Plot Name in Scoreboard", desc = "Showing a more compact plot name in scoreboard. Updates faster and doesnt hide when pests are spawned.")
-    @ConfigEditorBoolean
-    @FeatureToggle
-    public boolean plotNameInScoreboard = true;
-
     @Expose
     @ConfigOption(name = "Copy Milestone Data", desc = "Copy wrong crop milestone data in clipboard when opening the crop milestone menu. Please share this data in SkyHanni discord.")
     @ConfigEditorBoolean
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiIngameHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiIngameHook.kt
index 35220e27b..190594883 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiIngameHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiIngameHook.kt
@@ -2,10 +2,6 @@ package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.data.PurseAPI
-import at.hannibal2.skyhanni.features.garden.GardenAPI
-import at.hannibal2.skyhanni.features.garden.GardenPlotAPI
-import at.hannibal2.skyhanni.features.garden.GardenPlotAPI.isBarn
-import at.hannibal2.skyhanni.features.garden.GardenPlotAPI.name
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
 import net.minecraft.client.gui.FontRenderer
@@ -48,25 +44,6 @@ private fun tryToReplaceScoreboardLineHarder(text: String): String? {
         }
     }
 
-    if (SkyHanniMod.feature.garden.plotNameInScoreboard && GardenAPI.inGarden()) {
-        if (text.contains("⏣")) {
-            val plot = GardenPlotAPI.getCurrentPlot()
-            val hasPests = text.contains("ൠ")
-            val pestSuffix = if (hasPests) {
-                val pests = text.last().digitToInt()
-                val color = if (pests >= 4) "§c" else "§6"
-                " §7(${color}${pests}ൠ§7)"
-            } else ""
-            val name = plot?.let {
-                if (it.isBarn()) "§aThe Barn" else {
-                    val namePrefix = if (hasPests) "" else "§aPlot §7- "
-                    "$namePrefix§b" + it.name
-                }
-            } ?: "§aGarden §coutside"
-            return " §7⏣ $name$pestSuffix"
-        }
-    }
-
     if (SkyHanniMod.feature.misc.colorMonthNames) {
         for (season in Season.entries) {
             if (text.trim().startsWith(season.prefix)) {
-- 
cgit