diff options
4 files changed, 1 insertions, 10 deletions
diff --git a/build.gradle b/build.gradle index 0874c5be..8b7a6e6d 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ repositories { } dependencies { - implementation 'com.google.code.gson:gson:2.9.0' + implementation 'com.google.code.gson:gson:2.10' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' // To change the versions see the gradle.properties file @@ -61,8 +61,6 @@ dependencies { include(implementation("org.eclipse.jgit:org.eclipse.jgit:6.0.0.202111291000-r")) include(modImplementation ("meteordevelopment:discord-ipc:1.1")) - // allow gson to deserialize the api data into a record - include(implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.2.0")) } processResources { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java index 6fbf740f..dfa6f6dc 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java @@ -3,7 +3,6 @@ package me.xmrvizzy.skyblocker.skyblock.api; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonObject; -import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; import me.xmrvizzy.skyblocker.skyblock.api.records.PlayerProfiles; import me.xmrvizzy.skyblocker.skyblock.itemlist.ItemFixerUpper; import net.minecraft.item.ItemStack; @@ -11,7 +10,6 @@ import net.minecraft.item.Items; import net.minecraft.nbt.*; import net.minecraft.text.Text; -import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.nio.file.Files; @@ -27,7 +25,6 @@ public class ProfileUtils { URL url = new URL("https://sky.shiiyu.moe/api/v2/profile/" + name); InputStreamReader reader = new InputStreamReader(url.openStream()); Gson gson = new GsonBuilder() - .registerTypeAdapterFactory(RecordTypeAdapterFactory.builder().allowMissingComponentValues().create()) .serializeNulls() .create(); return gson.fromJson(reader, PlayerProfiles.class); diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java index 4c4cdae1..4cf6c84d 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java @@ -7,7 +7,6 @@ import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager; import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.text.ClickEvent; -import net.minecraft.text.LiteralTextContent; import net.minecraft.text.Text; public class StatsCommand { diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java index c880f5de..d215c589 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java @@ -1,15 +1,12 @@ package me.xmrvizzy.skyblocker.skyblock.api.records; -import com.google.gson.annotations.JsonAdapter; import com.google.gson.annotations.SerializedName; -import marcono1234.gson.recordadapter.RecordTypeAdapterFactory; import me.xmrvizzy.skyblocker.skyblock.api.records.dungeons.Dungeons; import me.xmrvizzy.skyblocker.skyblock.api.records.mining.Mining; import me.xmrvizzy.skyblocker.skyblock.api.records.misc.Misc; import java.util.HashMap; -@JsonAdapter(RecordTypeAdapterFactory.class) public record PlayerProfiles(HashMap<String, PlayerProfile> profiles) { public record PlayerProfile( @SerializedName("profile_id") String profileId, |