aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal002@users.noreply.github.com>2024-03-14 12:13:15 +0100
committerGitHub <noreply@github.com>2024-03-14 12:13:15 +0100
commitbc30d882209649bac956ed46641b76b8fc1522d9 (patch)
tree441aa1afaeccb1f0575ebb3683c814052f8c702c /src
parentc9e1fa7de70fd17f4ff49717cdf12a25cdae4823 (diff)
downloadskyhanni-bc30d882209649bac956ed46641b76b8fc1522d9.tar.gz
skyhanni-bc30d882209649bac956ed46641b76b8fc1522d9.tar.bz2
skyhanni-bc30d882209649bac956ed46641b76b8fc1522d9.zip
Removed Feature: Plot Name in Scoreboard (#1168)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/garden/GardenConfig.java6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiIngameHook.kt23
2 files changed, 0 insertions, 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
@@ -230,12 +230,6 @@ public class GardenConfig {
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
@FeatureToggle
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)) {