morpheus/Meteor-Rejects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

HttpUtils -> Http

Browse Source
This commit is contained in:
Cloudburst
2021-06-25 14:15:16 +02:00
parent ffbe441c21
commit 875b22c308
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cloudburst/rejects/commands/SaveSkinCommand.java
View File

@@ -6,7 +6,7 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import meteordevelopment.meteorclient.systems.commands.Command; import meteordevelopment.meteorclient.systems.commands.Command;
import meteordevelopment.meteorclient.systems.commands.arguments.PlayerArgumentType; 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.command.CommandSource;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.text.LiteralText; 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 //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"; 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 //Get the properties array which has what we need
JsonArray array = object.getAsJsonArray("properties"); JsonArray array = object.getAsJsonArray("properties");
JsonObject property = array.get(0).getAsJsonObject(); JsonObject property = array.get(0).getAsJsonObject();

13
src/main/java/cloudburst/rejects/gui/screens/HeadScreen.java
View File

@@ -15,21 +15,16 @@ import meteordevelopment.meteorclient.settings.EnumSetting;
import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.Setting;
import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.meteorclient.settings.SettingGroup;
import meteordevelopment.meteorclient.settings.Settings; 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.network.MeteorExecutor;
import meteordevelopment.meteorclient.utils.player.ChatUtils; import meteordevelopment.meteorclient.utils.player.ChatUtils;
import static meteordevelopment.meteorclient.utils.Utils.mc; 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.util.*;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import com.google.common.reflect.TypeToken; import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
public class HeadScreen extends WindowScreen { public class HeadScreen extends WindowScreen {
@@ -59,9 +54,6 @@ public class HeadScreen extends WindowScreen {
.build() .build()
); );
private static final Gson gson = new GsonBuilder()
.create();
public HeadScreen(GuiTheme theme) { public HeadScreen(GuiTheme theme) {
super(theme, "Heads"); super(theme, "Heads");
loadHeads(); loadHeads();
@@ -80,8 +72,7 @@ public class HeadScreen extends WindowScreen {
private void loadHeads() { private void loadHeads() {
MeteorExecutor.execute(() -> { MeteorExecutor.execute(() -> {
InputStream in = HttpUtils.get("https://minecraft-heads.com/scripts/api.php?cat="+getCat()); List<Map<String, String>> res = Http.get("https://minecraft-heads.com/scripts/api.php?cat="+getCat()).sendJson(gsonType);
List<Map<String, String>> res = gson.fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), gsonType);
List<ItemStack> heads = new ArrayList<>(); List<ItemStack> heads = new ArrayList<>();
res.forEach(a -> { res.forEach(a -> {
try { try {