From a1131f046a112a57613876510b50b43ec4489495 Mon Sep 17 00:00:00 2001 From: Spencer <75862693+TacoMonkey11@users.noreply.github.com> Date: Sat, 29 Oct 2022 12:03:20 -0400 Subject: Update GSON and remove old adapter --- src/main/java/me/xmrvizzy/skyblocker/skyblock/api/ProfileUtils.java | 3 --- src/main/java/me/xmrvizzy/skyblocker/skyblock/api/StatsCommand.java | 1 - .../me/xmrvizzy/skyblocker/skyblock/api/records/PlayerProfiles.java | 3 --- 3 files changed, 7 deletions(-) (limited to 'src/main/java/me/xmrvizzy') 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 profiles) { public record PlayerProfile( @SerializedName("profile_id") String profileId, -- cgit