aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-14 16:27:10 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-14 16:27:10 +0200
commit7b5f78fe30e2c84ea5a9bf01f92bb8ea4397a19a (patch)
tree3af4a0a6955e4ea81f7e008ded4f196c01fb4998 /src/main/java/at/hannibal2
parentb4648fe70ce0538325ed6df3ad068e9fe9237c0c (diff)
downloadskyhanni-7b5f78fe30e2c84ea5a9bf01f92bb8ea4397a19a.tar.gz
skyhanni-7b5f78fe30e2c84ea5a9bf01f92bb8ea4397a19a.tar.bz2
skyhanni-7b5f78fe30e2c84ea5a9bf01f92bb8ea4397a19a.zip
renamed CopyErrorCommand to ErrorManager
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishInfo.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt8
-rw-r--r--src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt (renamed from src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt)2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt6
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt6
27 files changed, 62 insertions, 62 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
index 57f95b56b..f7929c46b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -34,12 +34,12 @@ import at.hannibal2.skyhanni.test.PacketTest
import at.hannibal2.skyhanni.test.SkyHanniConfigSearchResetCommand
import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests
import at.hannibal2.skyhanni.test.TestBingo
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
import at.hannibal2.skyhanni.test.command.CopyItemCommand
import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand
import at.hannibal2.skyhanni.test.command.CopyNearbyParticlesCommand
import at.hannibal2.skyhanni.test.command.CopyScoreboardCommand
import at.hannibal2.skyhanni.test.command.CopyTabListCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.test.command.TestChatCommand
import at.hannibal2.skyhanni.utils.APIUtil
import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -270,7 +270,7 @@ object Commands {
private fun internalCommands() {
registerCommand("shshareinquis", "") { InquisitorWaypointShare.sendInquisitor() }
- registerCommand("shcopyerror", "") { CopyErrorCommand.command(it) }
+ registerCommand("shcopyerror", "") { ErrorManager.command(it) }
registerCommand("shstopcityprojectreminder", "") { CityProjectFeatures.disable() }
registerCommand("shsendcontests", "") { GardenNextJacobContest.shareContestConfirmed(it) }
registerCommand("shstopaccountupgradereminder", "") { AccountUpgradeReminder.disable() }
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java b/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java
index 9ff8ade64..0bb0bd664 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.config.commands;
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand;
+import at.hannibal2.skyhanni.test.command.ErrorManager;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.BlockPos;
@@ -54,7 +54,7 @@ public class SimpleCommand extends CommandBase {
try {
runnable.processCommand(sender, args);
} catch (Throwable e) {
- CopyErrorCommand.INSTANCE.logError(e, "Error while running command /" + commandName);
+ ErrorManager.INSTANCE.logError(e, "Error while running command /" + commandName);
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt
index a9e5da9b5..26a4046dd 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.data
import at.hannibal2.skyhanni.config.ConfigManager
import at.hannibal2.skyhanni.events.HypixelJoinEvent
import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName
import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
@@ -114,7 +114,7 @@ class FriendAPI {
try {
UUID.fromString(it)
} catch (e: IllegalArgumentException) {
- CopyErrorCommand.logError(e, "Error reading friend list.")
+ ErrorManager.logError(e, "Error reading friend list.")
return
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index 21102c934..ed35272cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.data.repo
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.config.ConfigManager
import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils
import com.google.gson.JsonObject
import net.minecraft.client.Minecraft
@@ -128,7 +128,7 @@ class RepoManager(private val configLocation: File) {
LorenzUtils.chat("§e[SkyHanni] §a$answerMessage")
}
} catch (e: java.lang.Exception) {
- CopyErrorCommand.logError(e, "Error reading repo data!")
+ ErrorManager.logError(e, "Error reading repo data!")
}
}
return comp
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
index 4b2466a96..6e49b53d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.data.repo
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import com.google.gson.Gson
import java.io.BufferedReader
import java.io.File
@@ -88,7 +88,7 @@ object RepoUtils {
val jsonFile = File(repo, "constants/$constant.json")
if (!jsonFile.isFile) {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
Error("File '$jsonFile' not found!"),
"File in repo missing! ($jsonFile). Try §e/shupdaterepo"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
index 62376c698..32c552221 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.events
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import net.minecraftforge.common.MinecraftForge
import net.minecraftforge.fml.common.eventhandler.Event
@@ -14,7 +14,7 @@ abstract class LorenzEvent : Event() {
return runCatching {
postWithoutCatch()
}.onFailure {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
it,
"Caught an ${it::class.simpleName ?: "error"} at ${eventName}: '${it.message}'"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
index 06d10f505..18ff50b0a 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.events
import at.hannibal2.skyhanni.data.repo.RepoUtils
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import com.google.gson.Gson
import com.google.gson.JsonObject
import java.io.File
@@ -12,7 +12,7 @@ class RepositoryReloadEvent(val repoLocation: File, val gson: Gson) : LorenzEven
inline fun <reified T : Any> getConstant(constant: String) = try {
RepoUtils.getConstant(repoLocation, constant, gson, T::class.java)
} catch (e: Exception) {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
Exception("Repo parsing error while trying to read constant '$constant'", e),
"Error reading repo data"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishInfo.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishInfo.kt
index 984f9c9dd..aba9f5c5f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishInfo.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/TrophyFishInfo.kt
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.features.fishing.trophy
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
import at.hannibal2.skyhanni.utils.StringUtils.splitLines
import com.google.gson.annotations.Expose
@@ -41,7 +41,7 @@ data class TrophyFishInfo(
fun getFilletValue(rarity: TrophyRarity): Int {
if (fillet == null) {
- CopyErrorCommand.logError(Error("fillet is null for '$displayName'"), "Error trying to read trophy fish info")
+ ErrorManager.logError(Error("fillet is null for '$displayName'"), "Error trying to read trophy fish info")
return -1
}
return fillet.getOrDefault(rarity, -1)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
index 4bf29f93a..12e9c2f80 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
@@ -14,7 +14,7 @@ import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.features.garden.GardenNextJacobContest
import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed
import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.isSpeedDataEmpty
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.InventoryUtils
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
import at.hannibal2.skyhanni.utils.ItemUtils.getItemNameOrNull
@@ -144,7 +144,7 @@ object CropMoneyDisplay {
CropType.MELON -> GardenCropSpeed.latestMelonDicer to "ENCHANTED_MELON".asInternalName()
CropType.PUMPKIN -> GardenCropSpeed.latestPumpkinDicer to "ENCHANTED_PUMPKIN".asInternalName()
- else -> CopyErrorCommand.skyHanniError("Unknown dicer: $it")
+ else -> ErrorManager.skyHanniError("Unknown dicer: $it")
}
val bazaarData = internalName.getBazaarData()
val price =
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
index 69031505a..7391bbdd6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt
@@ -9,7 +9,7 @@ import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.PreProfileSwitchEvent
import at.hannibal2.skyhanni.events.VisitorAcceptEvent
import at.hannibal2.skyhanni.features.garden.GardenAPI
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils.addAsSingletonList
import at.hannibal2.skyhanni.utils.LorenzUtils.addOrPut
import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
@@ -136,7 +136,7 @@ object GardenVisitorDropStatistics {
)
} else {
addAsSingletonList("§c?")
- CopyErrorCommand.logError(
+ ErrorManager.logError(
RuntimeException("visitorRarities is empty, maybe visitor refusing was the cause?"),
"Error rendering visitor drop statistics"
)
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 f0be3ce86..a276348e8 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
@@ -22,7 +22,7 @@ import at.hannibal2.skyhanni.features.garden.CropType.Companion.getByNameOrNull
import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed.getSpeed
import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.EntityUtils
import at.hannibal2.skyhanni.utils.InventoryUtils
import at.hannibal2.skyhanni.utils.ItemBlink
@@ -167,7 +167,7 @@ class GardenVisitorFeatures {
println("visitors: $visitors")
println("name: $name")
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Error finding the visitor `$name§c`. Try to reopen the inventory",
"visitor is null! name='$name', visitors=`$visitors`"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
index ca36bb5a1..2bdbdb091 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
import at.hannibal2.skyhanni.events.PreProfileSwitchEvent
import at.hannibal2.skyhanni.events.VisitorArrivalEvent
import at.hannibal2.skyhanni.features.garden.GardenAPI
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.RenderUtils.renderString
import at.hannibal2.skyhanni.utils.SoundUtils
@@ -53,7 +53,7 @@ class GardenVisitorTimer {
try {
updateVisitorDisplay()
} catch (error: Throwable) {
- CopyErrorCommand.logError(error, "Encountered an error when updating visitor display")
+ ErrorManager.logError(error, "Encountered an error when updating visitor display")
}
try {
GardenVisitorDropStatistics.saveAndUpdate()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt
index 6d1aeb9cc..23d7af564 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt
@@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.events.InventoryCloseEvent
import at.hannibal2.skyhanni.events.InventoryOpenEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.APIUtil
import at.hannibal2.skyhanni.utils.InventoryUtils
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
@@ -259,7 +259,7 @@ class ChestValue {
json["storageGUI"].asJsonObject["enableStorageGUI3"].asBoolean
} else false
} catch (e: Exception) {
- CopyErrorCommand.logError(e, "Could not read NEU config to determine if the neu storage is emabled.")
+ ErrorManager.logError(e, "Could not read NEU config to determine if the neu storage is emabled.")
false
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index ba71aeb9e..c94cecee9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -8,7 +8,7 @@ import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
import at.hannibal2.skyhanni.events.PacketEvent
import at.hannibal2.skyhanni.features.rift.RiftAPI
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.ItemUtils.getLore
import at.hannibal2.skyhanni.utils.ItemUtils.name
import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -164,7 +164,7 @@ class NonGodPotEffectDisplay {
val duration = try {
TimeUtils.getMillis(line.split("§f")[1])
} catch (e: IndexOutOfBoundsException) {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
Exception("'§f' not found in line '$line'", e),
"Error while reading Non God-Potion effects from tab list"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
index 31530d5ee..a18faef7c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.features.misc
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.RepositoryReloadEvent
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.makeAccessible
import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
@@ -176,7 +176,7 @@ object QuickModMenuSwitch {
}
}
} catch (e: Exception) {
- CopyErrorCommand.logError(e, "Error trying to open the gui for mod " + mod.name)
+ ErrorManager.logError(e, "Error trying to open the gui for mod " + mod.name)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
index 0386300e6..f75b49bca 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt
@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.events.ConfigLoadEvent
import at.hannibal2.skyhanni.events.GuiRenderEvent
import at.hannibal2.skyhanni.events.InventoryCloseEvent
import at.hannibal2.skyhanni.events.RenderItemTooltipEvent
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalNameOrNull
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
@@ -326,7 +326,7 @@ object EstimatedItemValue {
if (stack.isRecombobulated()) {
val oneBelow = itemRarity.oneBelow()
if (oneBelow == null) {
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Wrong item rarity detected in estimated item value for item ${stack.name}",
"Recombobulated item is common: ${stack.getInternalName()}, name:${stack.name}"
)
@@ -338,7 +338,7 @@ object EstimatedItemValue {
val rarityName = itemRarity.name
if (!reforgeCosts.has(rarityName)) {
val reforgesFound = reforgeCosts.entrySet().map { it.key }
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Can not calculate reforge cost for item ${stack.name}",
"item rarity '$itemRarity' is not in NEU repo reforge cost for reforge stone$reforgeStone ($reforgesFound)"
)
@@ -748,7 +748,7 @@ object EstimatedItemValue {
if (gemstoneUnlockCosts.isEmpty()) return 0.0
if (internalName !in gemstoneUnlockCosts) {
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Could not find gemstone slot price for ${stack.name}",
"EstimatedItemValue has no gemstoneUnlockCosts for $internalName"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
index 9dbf257c4..e4d1133ba 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt
@@ -13,7 +13,7 @@ import at.hannibal2.skyhanni.events.withAlpha
import at.hannibal2.skyhanni.features.garden.farming.GardenCropSpeed
import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper
import at.hannibal2.skyhanni.test.GriffinUtils.drawWaypointFilled
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -72,7 +72,7 @@ object TrevorFeatures {
if (questActive) TrevorSolver.findMob()
}
} catch (error: Throwable) {
- CopyErrorCommand.logError(error, "Encountered an error when updating the trapper solver")
+ ErrorManager.logError(error, "Encountered an error when updating the trapper solver")
}
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
index 72a364ec1..bc5a6c25d 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniConfigSearchResetCommand.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.config.ConfigManager
import at.hannibal2.skyhanni.config.Features
import at.hannibal2.skyhanni.config.core.config.Position
import at.hannibal2.skyhanni.data.ProfileStorageData
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.makeAccessible
import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -57,7 +57,7 @@ object SkyHanniConfigSearchResetCommand {
field.set(parent, defaultObject)
"§eSuccessfully reset config element '$term'"
} catch (e: Exception) {
- CopyErrorCommand.logError(e, "Could not reset config element '$term'")
+ ErrorManager.logError(e, "Could not reset config element '$term'")
"§cCould not reset config element '$term'"
}
}
@@ -68,7 +68,7 @@ object SkyHanniConfigSearchResetCommand {
return try {
startSearch(args)
} catch (e: Exception) {
- CopyErrorCommand.logError(e, "Error while trying to search config")
+ ErrorManager.logError(e, "Error while trying to search config")
"§cError while trying to search config"
}
}
@@ -108,7 +108,7 @@ object SkyHanniConfigSearchResetCommand {
shimmy.setJson(element)
"§eChanged config element $term."
} catch (e: Exception) {
- CopyErrorCommand.logError(e, "Could not change config element '$term' to '$rawJson'")
+ ErrorManager.logError(e, "Could not change config element '$term' to '$rawJson'")
"§cCould not change config element '$term' to '$rawJson'"
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
index 8c713558f..c0d3fd169 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/command/CopyErrorCommand.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/command/ErrorManager.kt
@@ -10,7 +10,7 @@ import net.minecraft.client.Minecraft
import java.util.UUID
import java.util.concurrent.TimeUnit
-object CopyErrorCommand {
+object ErrorManager {
// random id -> error message
private val errorMessages = mutableMapOf<String, String>()
private val fullErrorMessages = mutableMapOf<String, String>()
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
index 7f9de6685..c0116f57c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.utils
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import com.google.gson.JsonElement
import com.google.gson.JsonObject
import com.google.gson.JsonParser
@@ -67,7 +67,7 @@ object APIUtil {
e.printStackTrace()
} else {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
Error("$apiName error for url: '$urlString'", e),
"Failed to load data from $apiName"
)
@@ -79,7 +79,7 @@ object APIUtil {
if (silentError) {
throw throwable
} else {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
Error("$apiName error for url: '$urlString'", throwable),
"Failed to load data from $apiName"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt
index 09ce8a835..fb47fc521 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ClipboardUtils.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.utils
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -44,7 +44,7 @@ object ClipboardUtils {
getClipboard()?.setContents(StringSelection(text), null)
} catch (e: Exception) {
if (step == 3) {
- CopyErrorCommand.logError(e, "Error while trying to access the clipboard.")
+ ErrorManager.logError(e, "Error while trying to access the clipboard.")
} else {
copyToClipboard(text, step + 1)
}
@@ -63,7 +63,7 @@ object ClipboardUtils {
}
} catch (e: Exception) {
return if (step == 3) {
- CopyErrorCommand.logError(e, "Error while trying to access the clipboard.")
+ ErrorManager.logError(e, "Error while trying to access the clipboard.")
null
} else {
readFromClipboard(step + 1)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
index 30853c9ca..0bdf25a71 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityOutlineRenderer.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.RenderEntityOutlineEvent
import at.hannibal2.skyhanni.mixins.transformers.CustomRenderGlobal
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import net.minecraft.client.Minecraft
import net.minecraft.client.renderer.GlStateManager
import net.minecraft.client.renderer.OpenGlHelper
@@ -366,7 +366,7 @@ object EntityOutlineRenderer {
val renderGlobal = try {
mc.renderGlobal as CustomRenderGlobal
} catch (e: NoClassDefFoundError) {
- CopyErrorCommand.logError(e, "Unable to enable entity outlines, the required mixin is not loaded")
+ ErrorManager.logError(e, "Unable to enable entity outlines, the required mixin is not loaded")
isMissingMixin = true
return
}
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index d3298e0b0..4b405d1cc 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.utils
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
import at.hannibal2.skyhanni.utils.NEUItems.getItemStack
import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
@@ -217,7 +217,7 @@ object ItemUtils {
val rarity = LorenzRarity.readItemRarity(this)
data.itemRarity = rarity
if (rarity == null && logError) {
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Could not read rarity for item $name",
"getItemRarityOrNull not found for: $internalName, name:'$name''"
)
@@ -310,7 +310,7 @@ object ItemUtils {
val rarity = LorenzRarity.getById(rarityId)
val name = pet.name
if (rarity == null) {
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Could not read rarity for pet $name",
"getPetRarity not found for: ${pet.getInternalName()}, name:'$name'"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt
index 6fdfaa2af..fe3c3bc94 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzColor.kt
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.utils
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import net.minecraft.item.EnumDyeColor
import java.awt.Color
@@ -49,7 +49,7 @@ enum class LorenzColor(private var chatColorCode: Char, private val color: Color
EnumDyeColor.PURPLE -> DARK_PURPLE
EnumDyeColor.YELLOW -> YELLOW
else -> {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
Exception("Unknown dye color: $this"),
"Unknown dye color: $this"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
index 58370bc80..306a54c50 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzRarity.kt
@@ -1,6 +1,6 @@
package at.hannibal2.skyhanni.utils
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.ItemUtils.getLore
import net.minecraft.item.ItemStack
@@ -29,7 +29,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
fun oneBelow(logError: Boolean = true): LorenzRarity? {
val rarityBelow = getById(ordinal - 1)
if (rarityBelow == null && logError) {
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Problem with item rarity detected.",
"Trying to get an item rarity below common"
)
@@ -40,7 +40,7 @@ enum class LorenzRarity(val color: LorenzColor, val id: Int) {
fun oneAbove(logError: Boolean = true): LorenzRarity? {
val rarityBelow = getById(ordinal + 1)
if (rarityBelow == null && logError) {
- CopyErrorCommand.logErrorState(
+ ErrorManager.logErrorState(
"Problem with item rarity detected.",
"Trying to get an item rarity above special"
)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
index 6e943b059..ab21c47b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NEUItems.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.utils
import at.hannibal2.skyhanni.config.ConfigManager
import at.hannibal2.skyhanni.features.bazaar.BazaarDataHolder
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.ItemBlink.checkBlinkItem
import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName_old
import at.hannibal2.skyhanni.utils.NEUInternalName.Companion.asInternalName
@@ -182,7 +182,7 @@ object NEUItems {
if (definite) {
Utils.showOutdatedRepoNotification()
}
- CopyErrorCommand.logError(
+ ErrorManager.logError(
IllegalStateException("Something went wrong!"),
"Encountered an error getting the item for §7$this§c. " +
"This may be because your NEU repo is outdated. Please ask in the SkyHanni " +
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
index 385a40619..416b7dfd3 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ParkourHelper.kt
@@ -2,7 +2,7 @@ package at.hannibal2.skyhanni.utils
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent
-import at.hannibal2.skyhanni.test.command.CopyErrorCommand
+import at.hannibal2.skyhanni.test.command.ErrorManager
import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
import at.hannibal2.skyhanni.utils.LorenzUtils.toSingletonListOrEmpty
import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine_nea
@@ -40,7 +40,7 @@ class ParkourHelper(
fun render(event: LorenzRenderWorldEvent) {
if (locations.isEmpty()) {
- CopyErrorCommand.logError(
+ ErrorManager.logError(
IllegalArgumentException("locations is empty"),
"Trying to render an empty parkour"
)
@@ -118,7 +118,7 @@ class ParkourHelper(
}
}
} catch (e: Throwable) {
- CopyErrorCommand.logError(e, "Error while rendering a parkour")
+ ErrorManager.logError(e, "Error while rendering a parkour")
}
}