From e8abfd8f526bc4105c2ce2481628006aedc81b54 Mon Sep 17 00:00:00 2001 From: observer Date: Sun, 13 Sep 2026 22:30:42 +0100 Subject: [PATCH] Move util from com.shr4pnel.ferretirc.irc to top level --- src/main/kotlin/com/shr4pnel/ferretirc/IrcClient.kt | 2 +- src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt | 2 +- src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt | 2 +- src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt | 2 +- .../com/shr4pnel/ferretirc/net/messages/ServerMessage.kt | 3 +++ .../kotlin/com/shr4pnel/ferretirc/{irc => }/util/Helpers.kt | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) rename src/main/kotlin/com/shr4pnel/ferretirc/{irc => }/util/Helpers.kt (70%) diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/IrcClient.kt b/src/main/kotlin/com/shr4pnel/ferretirc/IrcClient.kt index 3ba47b1..9fd1dbc 100644 --- a/src/main/kotlin/com/shr4pnel/ferretirc/IrcClient.kt +++ b/src/main/kotlin/com/shr4pnel/ferretirc/IrcClient.kt @@ -1,7 +1,7 @@ package com.shr4pnel.ferretirc import com.shr4pnel.ferretirc.irc.Server -import com.shr4pnel.ferretirc.irc.util.Helpers +import com.shr4pnel.ferretirc.util.Helpers import com.shr4pnel.ferretirc.net.Connection import com.shr4pnel.ferretirc.net.messages.ClientMessage import com.shr4pnel.ferretirc.net.messages.ServerMessage diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt index f65bb45..3134b94 100644 --- a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt +++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageParser.kt @@ -1,6 +1,6 @@ package com.shr4pnel.ferretirc.net -import com.shr4pnel.ferretirc.irc.util.Helpers +import com.shr4pnel.ferretirc.util.Helpers import com.shr4pnel.ferretirc.net.messages.ServerMessage import io.github.oshai.kotlinlogging.KotlinLogging import io.github.oshai.kotlinlogging.slf4j.logger diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt index f1906cd..eaa73a2 100644 --- a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt +++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageReader.kt @@ -1,6 +1,6 @@ package com.shr4pnel.ferretirc.net -import com.shr4pnel.ferretirc.irc.util.Helpers +import com.shr4pnel.ferretirc.util.Helpers import com.shr4pnel.ferretirc.net.messages.MessageIO import com.shr4pnel.ferretirc.net.messages.ServerMessage import io.github.oshai.kotlinlogging.KotlinLogging diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt index 92021ca..d03a083 100644 --- a/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt +++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/MessageWriter.kt @@ -1,6 +1,6 @@ package com.shr4pnel.ferretirc.net -import com.shr4pnel.ferretirc.irc.util.Helpers +import com.shr4pnel.ferretirc.util.Helpers import com.shr4pnel.ferretirc.net.messages.MessageIO import io.github.oshai.kotlinlogging.KotlinLogging import io.github.oshai.kotlinlogging.slf4j.logger diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt b/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt index e41b6ad..518766c 100644 --- a/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt +++ b/src/main/kotlin/com/shr4pnel/ferretirc/net/messages/ServerMessage.kt @@ -1,5 +1,8 @@ package com.shr4pnel.ferretirc.net.messages +import java.lang.annotation.ElementType +import java.lang.annotation.Inherited + /** * Representation of responses from the IRC server */ diff --git a/src/main/kotlin/com/shr4pnel/ferretirc/irc/util/Helpers.kt b/src/main/kotlin/com/shr4pnel/ferretirc/util/Helpers.kt similarity index 70% rename from src/main/kotlin/com/shr4pnel/ferretirc/irc/util/Helpers.kt rename to src/main/kotlin/com/shr4pnel/ferretirc/util/Helpers.kt index 8fba0c7..5a1af7f 100644 --- a/src/main/kotlin/com/shr4pnel/ferretirc/irc/util/Helpers.kt +++ b/src/main/kotlin/com/shr4pnel/ferretirc/util/Helpers.kt @@ -1,4 +1,4 @@ -package com.shr4pnel.ferretirc.irc.util +package com.shr4pnel.ferretirc.util class Helpers { companion object LoggingConfig {