refactor commands to own package

10 files changed, 17 insertions, 10 deletions

diff --git a/src/main/kotlin/skytils/skytilsmod/Skytils.kt b/src/main/kotlin/skytils/skytilsmod/Skytils.kt
index aad19bc3..60698694 100644
--- a/src/main/kotlin/skytils/skytilsmod/Skytils.kt
+++ b/src/main/kotlin/skytils/skytilsmod/Skytils.kt
@@ -43,7 +43,7 @@ import net.minecraftforge.fml.common.gameevent.TickEvent
 import net.minecraftforge.fml.common.network.FMLNetworkEvent
 import org.lwjgl.input.Mouse
 import skytils.hylin.HylinAPI.Companion.createHylinAPI
-import skytils.skytilsmod.commands.*
+import skytils.skytilsmod.commands.impl.*
 import skytils.skytilsmod.commands.stats.impl.CataCommand
 import skytils.skytilsmod.commands.stats.impl.SlayerCommand
 import skytils.skytilsmod.core.*
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/ArmorColorCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/ArmorColorCommand.kt
index 84c366be..691e7f65 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/ArmorColorCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/ArmorColorCommand.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import net.minecraft.client.entity.EntityPlayerSP
 import net.minecraft.command.ICommandSender
@@ -23,6 +23,7 @@ import net.minecraft.command.SyntaxErrorException
 import net.minecraft.command.WrongUsageException
 import net.minecraft.item.ItemArmor
 import net.minecraft.util.ChatComponentText
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.core.PersistentSave
 import skytils.skytilsmod.features.impl.handlers.ArmorColor
 import skytils.skytilsmod.utils.ItemUtil
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/CalcXPCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/CalcXPCommand.kt
index 752d2f7a..89cc07fc 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/CalcXPCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/CalcXPCommand.kt
@@ -16,11 +16,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import gg.essential.universal.UChat
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.SyntaxErrorException
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.utils.NumberUtil
 import skytils.skytilsmod.utils.SkillUtils
 
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/GlintCustomizeCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/GlintCustomizeCommand.kt
index 8ea16dab..39a7d841 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/GlintCustomizeCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/GlintCustomizeCommand.kt
@@ -15,13 +15,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import net.minecraft.client.entity.EntityPlayerSP
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.SyntaxErrorException
 import net.minecraft.command.WrongUsageException
 import net.minecraft.util.ChatComponentText
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.core.PersistentSave
 import skytils.skytilsmod.features.impl.handlers.GlintCustomizer
 import skytils.skytilsmod.utils.ItemUtil
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/HollowWaypointCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/HollowWaypointCommand.kt
index ce9e7bbb..b2c21756 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/HollowWaypointCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/HollowWaypointCommand.kt
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import gg.essential.universal.UChat
 import gg.essential.universal.wrappers.message.UMessage
@@ -26,6 +26,7 @@ import net.minecraft.event.ClickEvent
 import net.minecraft.util.BlockPos
 import net.minecraft.util.IChatComponent
 import skytils.skytilsmod.Skytils.Companion.mc
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.features.impl.mining.MiningFeatures
 import skytils.skytilsmod.utils.append
 import skytils.skytilsmod.utils.setHoverText
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/RepartyCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/RepartyCommand.kt
index 8fcdbd08..2584a6a6 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/RepartyCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/RepartyCommand.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.WrongUsageException
@@ -23,6 +23,7 @@ import net.minecraft.util.ChatComponentText
 import net.minecraft.util.EnumChatFormatting
 import skytils.skytilsmod.Skytils
 import skytils.skytilsmod.Skytils.Companion.mc
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.utils.Utils
 
 object RepartyCommand : BaseCommand("reparty", listOf("rp")) {
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/SkytilsCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/SkytilsCommand.kt
index f01ec89d..a9900fbc 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/SkytilsCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/SkytilsCommand.kt
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import gg.essential.universal.UChat
 import kotlinx.coroutines.CoroutineScope
@@ -32,6 +32,7 @@ import net.minecraft.util.ChatComponentText
 import net.minecraft.util.ChatStyle
 import skytils.skytilsmod.Skytils
 import skytils.skytilsmod.Skytils.Companion.mc
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.core.DataFetcher
 import skytils.skytilsmod.core.UpdateChecker
 import skytils.skytilsmod.features.impl.events.GriffinBurrows
diff --git a/src/main/kotlin/skytils/skytilsmod/commands/TrackCooldownCommand.kt b/src/main/kotlin/skytils/skytilsmod/commands/impl/TrackCooldownCommand.kt
index 880ca396..6258de8a 100644
--- a/src/main/kotlin/skytils/skytilsmod/commands/TrackCooldownCommand.kt
+++ b/src/main/kotlin/skytils/skytilsmod/commands/impl/TrackCooldownCommand.kt
@@ -15,11 +15,12 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package skytils.skytilsmod.commands
+package skytils.skytilsmod.commands.impl
 
 import net.minecraft.command.ICommandSender
 import net.minecraft.command.WrongUsageException
 import net.minecraft.util.ChatComponentText
+import skytils.skytilsmod.commands.BaseCommand
 import skytils.skytilsmod.core.PersistentSave
 import skytils.skytilsmod.features.impl.handlers.CooldownTracker
 
diff --git a/src/main/kotlin/skytils/skytilsmod/listeners/ChatListener.kt b/src/main/kotlin/skytils/skytilsmod/listeners/ChatListener.kt
index a2ccf1d1..23fe0db1 100644
--- a/src/main/kotlin/skytils/skytilsmod/listeners/ChatListener.kt
+++ b/src/main/kotlin/skytils/skytilsmod/listeners/ChatListener.kt
@@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import skytils.skytilsmod.Skytils
 import skytils.skytilsmod.Skytils.Companion.mc
-import skytils.skytilsmod.commands.RepartyCommand
+import skytils.skytilsmod.commands.impl.RepartyCommand
 import skytils.skytilsmod.mixins.transformers.accessors.AccessorGuiNewChat
 import skytils.skytilsmod.utils.Utils
 import java.util.regex.Pattern
diff --git a/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt b/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt
index cc007210..29ff8306 100644
--- a/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt
+++ b/src/main/kotlin/skytils/skytilsmod/listeners/DungeonListener.kt
@@ -25,7 +25,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import skytils.skytilsmod.Skytils
 import skytils.skytilsmod.Skytils.Companion.mc
-import skytils.skytilsmod.commands.RepartyCommand
+import skytils.skytilsmod.commands.impl.RepartyCommand
 import skytils.skytilsmod.core.TickTask
 import skytils.skytilsmod.events.PacketEvent
 import skytils.skytilsmod.features.impl.dungeons.DungeonTimer