aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/CommandRegistrationEvent.kt (renamed from src/main/java/at/hannibal2/skyhanni/config/commands/RegisterCommandsEvent.kt)2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt18
3 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
index 3aa57db32..12ad96191 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
@@ -5,7 +5,7 @@ import at.hannibal2.skyhanni.config.ConfigFileType
import at.hannibal2.skyhanni.config.ConfigManager
import at.hannibal2.skyhanni.config.Features
import at.hannibal2.skyhanni.config.SackData
-import at.hannibal2.skyhanni.config.commands.RegisterCommandsEvent
+import at.hannibal2.skyhanni.config.commands.CommandRegistrationEvent
import at.hannibal2.skyhanni.data.OtherInventoryData
import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson
import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson
@@ -59,7 +59,7 @@ class SkyHanniMod {
SkyHanniEvents.init(modules)
- RegisterCommandsEvent.post()
+ CommandRegistrationEvent.post()
PreInitFinishedEvent().post()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/RegisterCommandsEvent.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/CommandRegistrationEvent.kt
index 448b5d836..5345b39ae 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/RegisterCommandsEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/CommandRegistrationEvent.kt
@@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.api.event.SkyHanniEvent
import at.hannibal2.skyhanni.config.commands.Commands.commands
import net.minecraftforge.client.ClientCommandHandler
-object RegisterCommandsEvent : SkyHanniEvent() {
+object CommandRegistrationEvent : SkyHanniEvent() {
fun register(name: String, block: CommandBuilder.() -> Unit) {
val info = CommandBuilder(name).apply(block)
if (commands.any { it.name == name }) {
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 89f314135..d6454b2b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
@@ -110,7 +110,7 @@ object Commands {
val commands = mutableListOf<CommandBuilder>()
@HandleEvent
- fun registerCommands(event: RegisterCommandsEvent) {
+ fun onCommandRegistration(event: CommandRegistrationEvent) {
usersMain(event)
usersNormal(event)
usersNormalReset(event)
@@ -121,7 +121,7 @@ object Commands {
shortenedCommands(event)
}
- private fun usersMain(event: RegisterCommandsEvent) {
+ private fun usersMain(event: CommandRegistrationEvent) {
event.register("sh") {
aliases = listOf("skyhanni")
description = "Opens the main SkyHanni config"
@@ -167,7 +167,7 @@ object Commands {
}
@Suppress("LongMethod")
- private fun usersNormal(event: RegisterCommandsEvent) {
+ private fun usersNormal(event: CommandRegistrationEvent) {
event.register("shimportghostcounterdata") {
description = "Manually importing the ghost counter data from GhostCounterV3"
category = CommandCategory.USERS_ACTIVE
@@ -308,7 +308,7 @@ object Commands {
}
}
- private fun usersNormalReset(event: RegisterCommandsEvent) {
+ private fun usersNormalReset(event: CommandRegistrationEvent) {
// Trackers
event.register("shresetslayerprofits") {
@@ -450,7 +450,7 @@ object Commands {
}
}
- private fun usersBugFix(event: RegisterCommandsEvent) {
+ private fun usersBugFix(event: CommandRegistrationEvent) {
event.register("shupdaterepo") {
description = "Download the SkyHanni repo again"
category = CommandCategory.USERS_BUG_FIX
@@ -508,7 +508,7 @@ object Commands {
}
}
- private fun devDebug(event: RegisterCommandsEvent) {
+ private fun devDebug(event: CommandRegistrationEvent) {
event.register("shdebug") {
description = "Copies SkyHanni debug data in the clipboard."
category = CommandCategory.DEVELOPER_DEBUG
@@ -640,7 +640,7 @@ object Commands {
}
@Suppress("LongMethod")
- private fun devTest(event: RegisterCommandsEvent) {
+ private fun devTest(event: CommandRegistrationEvent) {
event.register("shtest") {
description = "Unused test command."
category = CommandCategory.DEVELOPER_TEST
@@ -786,7 +786,7 @@ object Commands {
}
}
- private fun internalCommands(event: RegisterCommandsEvent) {
+ private fun internalCommands(event: CommandRegistrationEvent) {
event.register("shaction") {
description = "Internal command for chat click actions"
category = CommandCategory.INTERNAL
@@ -794,7 +794,7 @@ object Commands {
}
}
- private fun shortenedCommands(event: RegisterCommandsEvent) {
+ private fun shortenedCommands(event: CommandRegistrationEvent) {
event.register("pko") {
description = "Kicks offline party members"
category = CommandCategory.SHORTENED_COMMANDS