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

No need to override Read

Browse Source
This commit is contained in:
Brady 2018-10-12 22:13:21 -05:00
parent 917f393f7a
commit 2fc282477d
No known key found for this signature in database
GPG Key ID: 73A788379A197567
1 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
buildSrc/src/main/java/baritone/gradle/util/Determinizer.java
View File

@ -18,7 +18,6 @@
package baritone.gradle.util; package baritone.gradle.util;
import com.google.gson.*; import com.google.gson.*;
import com.google.gson.internal.LazilyParsedNumber;
import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
@ -90,7 +89,7 @@ public class Determinizer {
private static String writeSorted(JsonObject in) throws IOException { private static String writeSorted(JsonObject in) throws IOException {
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
JsonWriter jw = new JsonWriter(writer); JsonWriter jw = new JsonWriter(writer);
JSON_ELEMENT.write(jw, in); ORDERED_JSON_WRITER.write(jw, in);
return writer.toString() + "\n"; return writer.toString() + "\n";
} }
@ -101,44 +100,11 @@ public class Determinizer {
* @see <a href="https://github.com/google/gson/blob/master/LICENSE">GSON License</a> * @see <a href="https://github.com/google/gson/blob/master/LICENSE">GSON License</a>
* @see <a href="https://github.com/google/gson/blob/master/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java#L698">Original Source</a> * @see <a href="https://github.com/google/gson/blob/master/gson/src/main/java/com/google/gson/internal/bind/TypeAdapters.java#L698">Original Source</a>
*/ */
private static final TypeAdapter<JsonElement> JSON_ELEMENT = new TypeAdapter<JsonElement>() { private static final TypeAdapter<JsonElement> ORDERED_JSON_WRITER = new TypeAdapter<JsonElement>() {
@Override @Override
public JsonElement read(JsonReader in) throws IOException { public JsonElement read(JsonReader in) {
switch (in.peek()) { return null;
case STRING:
return new JsonPrimitive(in.nextString());
case NUMBER:
String number = in.nextString();
return new JsonPrimitive(new LazilyParsedNumber(number));
case BOOLEAN:
return new JsonPrimitive(in.nextBoolean());
case NULL:
in.nextNull();
return JsonNull.INSTANCE;
case BEGIN_ARRAY:
JsonArray array = new JsonArray();
in.beginArray();
while (in.hasNext()) {
array.add(read(in));
}
in.endArray();
return array;
case BEGIN_OBJECT:
JsonObject object = new JsonObject();
in.beginObject();
while (in.hasNext()) {
object.add(in.nextName(), read(in));
}
in.endObject();
return object;
case END_DOCUMENT:
case NAME:
case END_OBJECT:
case END_ARRAY:
default:
throw new IllegalArgumentException();
}
} }
@Override @Override