refactor/fix: Gson APIs

SkidderMC · Dec 21, 2024 · c0ac3c4 · c0ac3c4
1 parent c418adc
commit c0ac3c4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/config/SettingsUtils.kt b/src/main/java/net/ccbluex/liquidbounce/config/SettingsUtils.kt
@@ -166,7 +166,6 @@ object SettingsUtils {
                         } else (moduleValue as FloatRangeValue).changeValue(min..max)
                     }
                 }
-
                 else -> {}
             }
 

diff --git a/src/main/java/net/ccbluex/liquidbounce/file/configs/FriendsConfig.kt b/src/main/java/net/ccbluex/liquidbounce/file/configs/FriendsConfig.kt
@@ -6,9 +6,10 @@
 package net.ccbluex.liquidbounce.file.configs
 
 import com.google.gson.*
-import com.google.gson.reflect.TypeToken
 import net.ccbluex.liquidbounce.file.FileConfig
-import net.ccbluex.liquidbounce.file.FileManager.PRETTY_GSON
+import net.ccbluex.liquidbounce.utils.io.decode
+import net.ccbluex.liquidbounce.utils.io.readJson
+import net.ccbluex.liquidbounce.utils.io.writeJson
 import java.io.*
 
 class FriendsConfig(file: File) : FileConfig(file) {
@@ -22,8 +23,7 @@ class FriendsConfig(file: File) : FileConfig(file) {
     @Throws(IOException::class)
     override fun loadConfig() {
         clearFriends()
-
-        friends.addAll(PRETTY_GSON.fromJson(file.bufferedReader(), object : TypeToken<List<Friend>>() {}.type))
+        file.readJson().decode<Array<Friend>>().toCollection(friends)
     }
 
     /**
@@ -32,7 +32,7 @@ class FriendsConfig(file: File) : FileConfig(file) {
      * @throws IOException
      */
     @Throws(IOException::class)
-    override fun saveConfig() = file.writeText(PRETTY_GSON.toJson(friends))
+    override fun saveConfig() = file.writeJson(friends)
 
     /**
      * Add friend to config

diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/font/Fonts.kt b/src/main/java/net/ccbluex/liquidbounce/ui/font/Fonts.kt
@@ -143,7 +143,7 @@ object Fonts : MinecraftInstance {
             LOGGER.info("Downloading additional fonts...")
             download("${FONTS}/Font.zip", fontZipFile)
             LOGGER.info("Extracting additional fonts...")
-            outputFile.extractZipTo(fontsDir)
+            fontZipFile.extractZipTo(fontsDir)
         }
     }
 

diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/block/BlockExtension.kt b/src/main/java/net/ccbluex/liquidbounce/utils/block/BlockExtension.kt
@@ -51,4 +51,7 @@ fun BlockPos.canBeClicked(): Boolean {
 val Block.id: Int
     get() = Block.getIdFromBlock(this)
 val Int.blockById: Block
-    get() = Block.getBlockById(this)
+    get() = Block.getBlockById(this)
+
+val String.blockByName: Block?
+    get() = Block.getBlockFromName(this)
diff --git a/src/main/java/net/ccbluex/liquidbounce/utils/io/GsonExtensions.kt b/src/main/java/net/ccbluex/liquidbounce/utils/io/GsonExtensions.kt
@@ -61,4 +61,4 @@ inline fun jsonArray(builderAction: JsonArrayBuilder.() -> Unit): JsonArray {
     return JsonArrayBuilder().apply(builderAction).build()
 }
 
-inline fun <reified T> JsonElement.decode(gson: Gson = PRETTY_GSON): T = gson.fromJson<T>(this, object : TypeToken<T>() {}.type)
+inline fun <reified T> JsonElement.decode(gson: Gson = PRETTY_GSON): T = gson.fromJson<T>(this, object : TypeToken<T>() {}.type)
-Original file line number
+Diff line change
@@ Expand Up / @@ -166,7 +166,6 @@ object SettingsUtils { @@
                             } else (moduleValue as FloatRangeValue).changeValue(min..max)
                         }
                     }
                     else -> {}
                 }
@@ Expand Down @@