Update to latest utility version

EsotericFoundation · Nov 3, 2024 · 61fb366 · 61fb366
1 parent ae1c99e
commit 61fb366
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
 
     implementation("commons-io:commons-io:2.17.0")
 
-    implementation("com.github.EsotericFoundation:utility.kt:0.4.1")
+    implementation("com.github.EsotericFoundation:utility.kt:1.0.0")
 }
 
 java {

diff --git a/lib/src/main/kotlin/foundation/esoteric/minecraft/plugins/library/file/FileManager.kt b/lib/src/main/kotlin/foundation/esoteric/minecraft/plugins/library/file/FileManager.kt
@@ -1,6 +1,6 @@
 package foundation.esoteric.minecraft.plugins.library.file
 
-import foundation.esoteric.utility.resource.ResourceUtility
+import foundation.esoteric.utility.resource.resourceFilePaths
 import org.bukkit.plugin.java.JavaPlugin
 import java.io.File
 import java.nio.file.Path
@@ -10,7 +10,7 @@ class FileManager(private val plugin: JavaPlugin) {
     fun saveResourceFolder(resourcePath: Path, replace: Boolean = false): File {
         plugin.dataFolder.mkdir()
 
-        ResourceUtility.getResourceFilePaths(resourcePath).forEach {
+        resourcePath.resourceFilePaths().forEach {
             path -> plugin.saveResource(path.toString(), replace)
         }
 

diff --git a/...otlin/foundation/esoteric/minecraft/plugins/library/pack/resource/ResourcePackListener.kt b/...otlin/foundation/esoteric/minecraft/plugins/library/pack/resource/ResourcePackListener.kt
@@ -1,6 +1,6 @@
 package foundation.esoteric.minecraft.plugins.library.pack.resource
 
-import foundation.esoteric.utility.file.FileUtility
+import foundation.esoteric.utility.file.sha1
 import net.kyori.adventure.resource.ResourcePackInfo
 import net.kyori.adventure.resource.ResourcePackRequest
 import org.bukkit.event.EventHandler
@@ -15,7 +15,7 @@ import java.net.URI
  */
 class ResourcePackListener(plugin: ResourcePackPlugin, resourcePackServer: ResourcePackServer) : Listener {
     private val resourcePackInfo = ResourcePackInfo.resourcePackInfo()
-        .hash(FileUtility.Companion.getSha1Hash(plugin.resourcePackManager.resourcePackZipFile!!))
+        .hash(plugin.resourcePackManager.resourcePackZipFile!!.sha1())
         .uri(URI.create("http://" + resourcePackServer.socketAddress + "/")).build()
 
     @EventHandler

diff --git a/...kotlin/foundation/esoteric/minecraft/plugins/library/pack/resource/ResourcePackManager.kt b/...kotlin/foundation/esoteric/minecraft/plugins/library/pack/resource/ResourcePackManager.kt
@@ -1,7 +1,7 @@
 package foundation.esoteric.minecraft.plugins.library.pack.resource
 
 import foundation.esoteric.minecraft.plugins.library.file.FileManagedPlugin
-import foundation.esoteric.utility.file.FileUtility
+import foundation.esoteric.utility.file.zip
 import org.apache.commons.io.FileUtils
 import java.io.File
 
@@ -27,7 +27,7 @@ class ResourcePackManager(private val plugin: FileManagedPlugin) {
 
         try {
             resourcePackZipFile = File(resourceZipFilePath)
-            FileUtility.zipFolder(resourcePackFolder, resourcePackZipFile!!)
+            resourcePackFolder.zip(resourcePackZipFile!!)
 
             FileUtils.deleteDirectory(resourcePackFolder)
         } catch (exception: Exception) {

diff --git a/lib/src/test/kotlin/foundation/esoteric/minecraft/plugins/library/file/FileManagerTest.kt b/lib/src/test/kotlin/foundation/esoteric/minecraft/plugins/library/file/FileManagerTest.kt
@@ -2,7 +2,7 @@ package foundation.esoteric.minecraft.plugins.library.file
 
 import be.seeseemelk.mockbukkit.MockBukkit
 import foundation.esoteric.minecraft.plugins.library.TestPlugin
-import foundation.esoteric.utility.file.FileUtility
+import foundation.esoteric.utility.file.sha1
 import java.io.File
 import kotlin.test.*
 
@@ -77,7 +77,7 @@ class FileManagerTest {
         assertTrue(resourcePack.isFile)
         assertFalse(resourcePack.isDirectory)
 
-        val hash = FileUtility.getSha1Hash(resourcePack)
+        val hash = resourcePack.sha1()
         assertEquals("c276751b2c56bc44bce393fb3356c0bd9f3a91b4", hash)
     }
 

diff --git a/...st/kotlin/foundation/esoteric/minecraft/plugins/library/pack/resource/ResourcePackTest.kt b/...st/kotlin/foundation/esoteric/minecraft/plugins/library/pack/resource/ResourcePackTest.kt
@@ -2,7 +2,6 @@ package foundation.esoteric.minecraft.plugins.library.pack.resource
 
 import be.seeseemelk.mockbukkit.MockBukkit
 import foundation.esoteric.minecraft.plugins.library.TestPlugin
-import foundation.esoteric.utility.file.FileUtility
 import java.io.File
 import kotlin.test.*