diff --git a/src/main/java/cloudburst/rejects/commands/SaveSkinCommand.java b/src/main/java/cloudburst/rejects/commands/SaveSkinCommand.java index ce6d6bd..7ddbe02 100644 --- a/src/main/java/cloudburst/rejects/commands/SaveSkinCommand.java +++ b/src/main/java/cloudburst/rejects/commands/SaveSkinCommand.java @@ -6,7 +6,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import meteordevelopment.meteorclient.systems.commands.Command; import meteordevelopment.meteorclient.systems.commands.arguments.PlayerArgumentType; -import meteordevelopment.meteorclient.utils.network.HttpUtils; +import meteordevelopment.meteorclient.utils.network.Http; import net.minecraft.command.CommandSource; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.text.LiteralText; @@ -59,7 +59,7 @@ public class SaveSkinCommand extends Command { //request their minecraft profile, all so we can get a base64 encoded string that contains ANOTHER json that then has the skin URL String PROFILE_REQUEST_URL = "https://sessionserver.mojang.com/session/minecraft/profile/%s"; - JsonObject object = HttpUtils.get(String.format(PROFILE_REQUEST_URL, uuid),JsonObject.class); + JsonObject object = Http.get(String.format(PROFILE_REQUEST_URL, uuid)).sendJson(JsonObject.class); //Get the properties array which has what we need JsonArray array = object.getAsJsonArray("properties"); JsonObject property = array.get(0).getAsJsonObject(); diff --git a/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java b/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java index 2558b1a..ca93578 100644 --- a/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java +++ b/src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java @@ -15,21 +15,16 @@ import meteordevelopment.meteorclient.settings.EnumSetting; import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.meteorclient.settings.Settings; -import meteordevelopment.meteorclient.utils.network.HttpUtils; +import meteordevelopment.meteorclient.utils.network.Http; import meteordevelopment.meteorclient.utils.network.MeteorExecutor; import meteordevelopment.meteorclient.utils.player.ChatUtils; import static meteordevelopment.meteorclient.utils.Utils.mc; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.StandardCharsets; import java.util.*; import java.lang.reflect.Type; import com.google.common.reflect.TypeToken; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.mojang.brigadier.exceptions.CommandSyntaxException; public class HeadScreen extends WindowScreen { @@ -59,9 +54,6 @@ public class HeadScreen extends WindowScreen { .build() ); - private static final Gson gson = new GsonBuilder() - .create(); - public HeadScreen(GuiTheme theme) { super(theme, "Heads"); loadHeads(); @@ -80,8 +72,7 @@ public class HeadScreen extends WindowScreen { private void loadHeads() { MeteorExecutor.execute(() -> { - InputStream in = HttpUtils.get("https://minecraft-heads.com/scripts/api.php?cat="+getCat()); - List> res = gson.fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), gsonType); + List> res = Http.get("https://minecraft-heads.com/scripts/api.php?cat="+getCat()).sendJson(gsonType); List heads = new ArrayList<>(); res.forEach(a -> { try {