azalea/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[F] Fix GSON issue on actual client

Browse Source
This commit is contained in:
Hykilpikonna
2020-02-19 21:16:12 -05:00
parent 61aac18212
commit f553078672
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/hydev/hyritone/SeedServerCache.java
+11 -4
View File
@@ -24,8 +24,9 @@ import baritone.api.utils.BetterBlockPos;
import baritone.api.utils.Helper; import baritone.api.utils.Helper;
import baritone.behavior.Behavior; import baritone.behavior.Behavior;
import baritone.utils.PathRenderer; import baritone.utils.PathRenderer;
import com.google.gson.Gson; import com.google.gson.JsonArray;
import com.google.gson.reflect.TypeToken; import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@@ -37,7 +38,6 @@ import org.apache.http.impl.client.HttpClients;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Type;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@@ -125,10 +125,17 @@ public class SeedServerCache extends Behavior
try (CloseableHttpResponse response = http.execute(get)) try (CloseableHttpResponse response = http.execute(get))
{ {
ArrayList<BlockPos> blocks = new Gson().fromJson(IOUtils.toString(response.getEntity().getContent(), UTF_8), blocksType);
// Exited // Exited
if (mc.world == null) return; if (mc.world == null) return;
ArrayList<BlockPos> blocks = new ArrayList<>();
JsonArray array = new JsonParser().parse(IOUtils.toString(response.getEntity().getContent(), UTF_8)).getAsJsonArray();
array.forEach(j ->
{
JsonObject obj = j.getAsJsonObject();
blocks.add(new BlockPos(obj.get("x").getAsInt(), obj.get("y").getAsInt(), obj.get("z").getAsInt()));
});
// Only add it if it is not air in the client world // Only add it if it is not air in the client world
cacheBlocks = blocks.stream().filter(b -> !mc.world.getBlockState(b).isAir()).collect(toList()); cacheBlocks = blocks.stream().filter(b -> !mc.world.getBlockState(b).isAir()).collect(toList());