refactor: move some classes

src/main/kotlin/com/mineinabyss/packy/helpers/PackObfuscator.kt → src/main/kotlin/com/mineinabyss/packy/PackObfuscator.kt

@@ -1,6 +1,7 @@
-package com.mineinabyss.packy.helpers
+package com.mineinabyss.packy
 
 import com.mineinabyss.packy.config.packy
+import com.mineinabyss.packy.helpers.VanillaPackKeys
 import net.kyori.adventure.key.Key
 import team.unnamed.creative.ResourcePack
 import team.unnamed.creative.atlas.AtlasSource
@@ -32,7 +33,7 @@ object PackObfuscator {
 
     fun obfuscatePack(resourcePack: ResourcePack) {
         packy.logger.i("Obfuscating pack...")
-        this.resourcePack = resourcePack
+        PackObfuscator.resourcePack = resourcePack
         obfuscatedModels.clear()
         obfuscatedTextures.clear()
 

src/main/kotlin/com/mineinabyss/packy/PackyCommands.kt

@@ -11,12 +11,9 @@ import com.mineinabyss.idofront.commands.extensions.actions.playerAction
 import com.mineinabyss.idofront.messaging.error
 import com.mineinabyss.idofront.messaging.info
 import com.mineinabyss.idofront.messaging.success
-import com.mineinabyss.idofront.messaging.warn
 import com.mineinabyss.packy.components.packyData
 import com.mineinabyss.packy.config.PackyTemplate
 import com.mineinabyss.packy.config.packy
-import com.mineinabyss.packy.helpers.PackyDownloader
-import com.mineinabyss.packy.helpers.PackyServer
 import com.mineinabyss.packy.menus.picker.PackyMainMenu
 import org.bukkit.command.Command
 import org.bukkit.command.CommandSender

src/main/kotlin/com/mineinabyss/packy/helpers/PackyDownloader.kt → src/main/kotlin/com/mineinabyss/packy/PackyDownloader.kt

@@ -1,11 +1,12 @@
-package com.mineinabyss.packy.helpers
+package com.mineinabyss.packy
 
 import com.github.shynixn.mccoroutine.bukkit.asyncDispatcher
 import com.github.shynixn.mccoroutine.bukkit.launch
 import com.google.gson.JsonParser
 import com.mineinabyss.idofront.textcomponents.miniMsg
 import com.mineinabyss.packy.config.PackyTemplate
 import com.mineinabyss.packy.config.packy
+import com.mineinabyss.packy.helpers.downloadZipFromGithubResponse
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import okhttp3.OkHttpClient

src/main/kotlin/com/mineinabyss/packy/helpers/PackyGenerator.kt → src/main/kotlin/com/mineinabyss/packy/PackyGenerator.kt

@@ -1,19 +1,18 @@
-package com.mineinabyss.packy.helpers
+package com.mineinabyss.packy
 
 import com.github.shynixn.mccoroutine.bukkit.asyncDispatcher
 import com.github.shynixn.mccoroutine.bukkit.launch
 import com.mineinabyss.idofront.textcomponents.miniMsg
 import com.mineinabyss.packy.components.PackyPack
 import com.mineinabyss.packy.config.packy
+import com.mineinabyss.packy.helpers.CacheMap
+import com.mineinabyss.packy.helpers.TemplateIds
+import com.mineinabyss.packy.helpers.readPack
 import kotlinx.coroutines.*
-import net.kyori.adventure.resource.ResourcePackInfo
-import net.minecraft.server.packs.repository.Pack
-import team.unnamed.creative.BuiltResourcePack
 import team.unnamed.creative.ResourcePack
 import team.unnamed.creative.base.Writable
 import team.unnamed.creative.serialize.minecraft.MinecraftResourcePackWriter
 import team.unnamed.creative.sound.SoundRegistry
-import java.util.*
 import kotlin.io.path.div
 import kotlin.io.path.exists
 

src/main/kotlin/com/mineinabyss/packy/PackyPlugin.kt

@@ -6,31 +6,18 @@ import com.charleskorn.kaml.Yaml
 import com.charleskorn.kaml.YamlConfiguration
 import com.github.shynixn.mccoroutine.bukkit.launch
 import com.mineinabyss.geary.autoscan.autoscan
-import com.mineinabyss.geary.datatypes.GearyEntity
-import com.mineinabyss.geary.helpers.entity
-import com.mineinabyss.geary.helpers.temporaryEntity
 import com.mineinabyss.geary.modules.geary
 import com.mineinabyss.geary.papermc.datastore.decode
-import com.mineinabyss.geary.papermc.datastore.remove
-import com.mineinabyss.geary.papermc.tracking.entities.gearyMobs
-import com.mineinabyss.geary.papermc.tracking.entities.toGeary
 import com.mineinabyss.idofront.config.ConfigFormats
 import com.mineinabyss.idofront.config.Format
 import com.mineinabyss.idofront.config.config
 import com.mineinabyss.idofront.di.DI
-import com.mineinabyss.idofront.entities.toOfflinePlayer
-import com.mineinabyss.idofront.messaging.broadcastVal
-import com.mineinabyss.idofront.messaging.logVal
 import com.mineinabyss.idofront.messaging.observeLogger
-import com.mineinabyss.idofront.nms.nbt.WrappedPDC
 import com.mineinabyss.idofront.nms.nbt.getOfflinePDC
 import com.mineinabyss.idofront.plugin.listeners
 import com.mineinabyss.idofront.textcomponents.miniMsg
 import com.mineinabyss.packy.components.PackyData
 import com.mineinabyss.packy.config.*
-import com.mineinabyss.packy.helpers.PackyDownloader
-import com.mineinabyss.packy.helpers.PackyGenerator
-import com.mineinabyss.packy.helpers.PackyServer
 import com.mineinabyss.packy.listener.PlayerListener
 import com.mineinabyss.packy.listener.TemplateLoadTriggers
 import io.netty.channel.Channel
@@ -39,18 +26,13 @@ import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelPromise
 import io.papermc.paper.adventure.PaperAdventure
 import io.papermc.paper.network.ChannelInitializeListenerHolder
-import io.th0rgal.oraxen.OraxenPlugin
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.yield
 import kotlinx.serialization.modules.EmptySerializersModule
-import net.kyori.adventure.resource.ResourcePackInfo
 import net.minecraft.network.Connection
 import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket
 import net.minecraft.network.protocol.common.ServerboundResourcePackPacket
 import net.minecraft.network.protocol.configuration.ClientboundFinishConfigurationPacket
 import org.bukkit.NamespacedKey
-import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
 import team.unnamed.creative.ResourcePack
 import java.util.*

src/main/kotlin/com/mineinabyss/packy/helpers/PackyServer.kt → src/main/kotlin/com/mineinabyss/packy/PackyServer.kt

@@ -1,10 +1,11 @@
-package com.mineinabyss.packy.helpers
+package com.mineinabyss.packy
 
 import com.github.shynixn.mccoroutine.bukkit.launch
 import com.github.shynixn.mccoroutine.bukkit.ticks
 import com.mineinabyss.idofront.textcomponents.miniMsg
 import com.mineinabyss.packy.components.packyData
 import com.mineinabyss.packy.config.packy
+import com.mineinabyss.packy.helpers.TemplateIds
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.isActive
 import net.kyori.adventure.resource.ResourcePackRequest

src/main/kotlin/com/mineinabyss/packy/helpers/PackySquash.kt → src/main/kotlin/com/mineinabyss/packy/PackySquash.kt

@@ -1,7 +1,8 @@
-package com.mineinabyss.packy.helpers
+package com.mineinabyss.packy
 
 import com.mineinabyss.packy.config.PackyTemplate
 import com.mineinabyss.packy.config.packy
+import com.mineinabyss.packy.helpers.unzip
 import okio.Path.Companion.toPath
 import team.unnamed.creative.ResourcePack
 import team.unnamed.creative.serialize.minecraft.MinecraftResourcePackWriter

src/main/kotlin/com/mineinabyss/packy/listener/PlayerListener.kt

@@ -1,10 +1,7 @@
 package com.mineinabyss.packy.listener
 
-import com.github.shynixn.mccoroutine.bukkit.launch
 import com.mineinabyss.packy.components.packyData
 import com.mineinabyss.packy.config.packy
-import com.mineinabyss.packy.helpers.PackyServer
-import kotlinx.coroutines.delay
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener

src/main/kotlin/com/mineinabyss/packy/listener/TemplateLoadTriggers.kt

@@ -1,13 +1,12 @@
 package com.mineinabyss.packy.listener
 
-import com.mineinabyss.idofront.messaging.*
 import com.mineinabyss.idofront.plugin.Plugins
 import com.mineinabyss.idofront.plugin.listeners
 import com.mineinabyss.idofront.plugin.unregisterListeners
 import com.mineinabyss.packy.config.PackyTemplate
 import com.mineinabyss.packy.config.packy
-import com.mineinabyss.packy.helpers.PackyGenerator
-import com.mineinabyss.packy.helpers.PackySquash
+import com.mineinabyss.packy.PackyGenerator
+import com.mineinabyss.packy.PackySquash
 import com.mineinabyss.packy.listener.TemplateLoadTriggers.unregisterTemplateHandlers
 import com.ticxo.modelengine.api.events.ModelRegistrationEvent
 import com.ticxo.modelengine.api.generator.ModelGenerator

src/main/kotlin/com/mineinabyss/packy/menus/picker/PackyNavigation.kt

@@ -12,7 +12,7 @@ import com.mineinabyss.packy.components.PackyData
 import com.mineinabyss.packy.components.packyData
 import com.mineinabyss.packy.config.PackyConfig
 import com.mineinabyss.packy.config.packy
-import com.mineinabyss.packy.helpers.PackyServer
+import com.mineinabyss.packy.PackyServer
 import kotlinx.coroutines.withContext
 import org.bukkit.entity.Player