Made game config more customizable
This commit is contained in:
parent
f6dbb74cc2
commit
a88c4221f9
File diff suppressed because one or more lines are too long
|
@ -16,6 +16,7 @@ import net.minecraft.src.GLAllocation;
|
||||||
import net.minecraft.src.GameSettings;
|
import net.minecraft.src.GameSettings;
|
||||||
import net.minecraft.src.GuiChat;
|
import net.minecraft.src.GuiChat;
|
||||||
import net.minecraft.src.GuiConflictWarning;
|
import net.minecraft.src.GuiConflictWarning;
|
||||||
|
import net.minecraft.src.GuiConnecting;
|
||||||
import net.minecraft.src.GuiGameOver;
|
import net.minecraft.src.GuiGameOver;
|
||||||
import net.minecraft.src.GuiIngame;
|
import net.minecraft.src.GuiIngame;
|
||||||
import net.minecraft.src.GuiIngameMenu;
|
import net.minecraft.src.GuiIngameMenu;
|
||||||
|
@ -154,7 +155,11 @@ public class Minecraft implements Runnable {
|
||||||
|
|
||||||
this.checkGLError("Post startup");
|
this.checkGLError("Post startup");
|
||||||
this.ingameGUI = new GuiIngame(this);
|
this.ingameGUI = new GuiIngame(this);
|
||||||
this.displayGuiScreen(new GuiMainMenu());
|
if(GL11.forcedUser != null & GL11.forcedServer != null & GL11.joinServerOnLaunch) {
|
||||||
|
this.displayGuiScreen(new GuiConnecting(this, GL11.forcedServer));
|
||||||
|
} else {
|
||||||
|
this.displayGuiScreen(new GuiMainMenu());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void loadScreen() {
|
private void loadScreen() {
|
||||||
|
@ -190,7 +195,7 @@ public class Minecraft implements Runnable {
|
||||||
GL11.glDisable(2896 /* GL_LIGHTING */);
|
GL11.glDisable(2896 /* GL_LIGHTING */);
|
||||||
GL11.glDisable(2912 /* GL_FOG */);
|
GL11.glDisable(2912 /* GL_FOG */);
|
||||||
GL11.glEnable(3008 /* GL_ALPHA_TEST */);
|
GL11.glEnable(3008 /* GL_ALPHA_TEST */);
|
||||||
GL11.glAlphaFunc(516, 0.1F);
|
GL11.glAlphaFunc(516, 1.0F);
|
||||||
GL11.glFlush();
|
GL11.glFlush();
|
||||||
GL11.updateDisplay();
|
GL11.updateDisplay();
|
||||||
GL11.optimize();
|
GL11.optimize();
|
||||||
|
@ -444,7 +449,6 @@ public class Minecraft implements Runnable {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_6259_e() {
|
public void func_6259_e() {
|
||||||
awaitMousePointer = true;
|
|
||||||
if(GL11.isFocused()) {
|
if(GL11.isFocused()) {
|
||||||
if(!this.field_6289_L) {
|
if(!this.field_6289_L) {
|
||||||
this.field_6289_L = true;
|
this.field_6289_L = true;
|
||||||
|
@ -456,7 +460,6 @@ public class Minecraft implements Runnable {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void func_6273_f() {
|
public void func_6273_f() {
|
||||||
awaitMousePointer = false;
|
|
||||||
if(this.field_6289_L) {
|
if(this.field_6289_L) {
|
||||||
if(this.thePlayer != null) {
|
if(this.thePlayer != null) {
|
||||||
this.thePlayer.func_458_k();
|
this.thePlayer.func_458_k();
|
||||||
|
@ -590,39 +593,7 @@ public class Minecraft implements Runnable {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean pauseFlag = false;
|
|
||||||
public boolean justLeftWorld = true;
|
|
||||||
public boolean awaitMousePointer = false;
|
|
||||||
public int prevPauseTicks = 0;
|
|
||||||
|
|
||||||
public void runTick() {
|
public void runTick() {
|
||||||
if(GL11.isWebGL) {
|
|
||||||
if((this.theWorld == null || justLeftWorld) && (GL11.isPointerLocked() || GL11.isPointerLocked2())) {
|
|
||||||
mouseHelper.func_773_b();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(this.currentScreen == null && this.theWorld != null && pauseFlag && (!GL11.isPointerLocked() || !GL11.isPointerLocked2()) && awaitMousePointer) {
|
|
||||||
mouseHelper.func_774_a();
|
|
||||||
}
|
|
||||||
|
|
||||||
if(GL11.isPointerLocked2() && this.currentScreen == null) {
|
|
||||||
if(!pauseFlag) {
|
|
||||||
if(prevPauseTicks == 0) {
|
|
||||||
prevPauseTicks = this.ticksRan;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(this.ticksRan >= prevPauseTicks + 1 && prevPauseTicks != 0) {
|
|
||||||
pauseFlag = true;
|
|
||||||
prevPauseTicks = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(currentScreen == null && !Mouse.isPointerLocked2() && pauseFlag) {
|
|
||||||
func_6252_g();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.ingameGUI.func_555_a();
|
this.ingameGUI.func_555_a();
|
||||||
this.field_9243_r.func_910_a(1.0F);
|
this.field_9243_r.func_910_a(1.0F);
|
||||||
if(this.thePlayer != null) {
|
if(this.thePlayer != null) {
|
||||||
|
|
|
@ -16,8 +16,6 @@ public class GuiChat extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateScreen() {
|
public void updateScreen() {
|
||||||
Minecraft.getMinecraft().pauseFlag = false;
|
|
||||||
Minecraft.getMinecraft().prevPauseTicks = 0;
|
|
||||||
++this.updateCounter;
|
++this.updateCounter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,6 @@ public abstract class GuiContainer extends GuiScreen {
|
||||||
protected List inventorySlots = new ArrayList();
|
protected List inventorySlots = new ArrayList();
|
||||||
|
|
||||||
public void drawScreen(int var1, int var2, float var3) {
|
public void drawScreen(int var1, int var2, float var3) {
|
||||||
Minecraft.getMinecraft().pauseFlag = false;
|
|
||||||
Minecraft.getMinecraft().prevPauseTicks = 0;
|
|
||||||
this.drawDefaultBackground();
|
this.drawDefaultBackground();
|
||||||
int var4 = (this.width - this.xSize) / 2;
|
int var4 = (this.width - this.xSize) / 2;
|
||||||
int var5 = (this.height - this.ySize) / 2;
|
int var5 = (this.height - this.ySize) / 2;
|
||||||
|
|
|
@ -15,8 +15,6 @@ public class GuiEditSign extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
Minecraft.getMinecraft().pauseFlag = false;
|
|
||||||
Minecraft.getMinecraft().prevPauseTicks = 0;
|
|
||||||
this.controlList.clear();
|
this.controlList.clear();
|
||||||
Keyboard.enableRepeatEvents(true);
|
Keyboard.enableRepeatEvents(true);
|
||||||
this.controlList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120, "Done"));
|
this.controlList.add(new GuiButton(0, this.width / 2 - 100, this.height / 4 + 120, "Done"));
|
||||||
|
@ -27,8 +25,6 @@ public class GuiEditSign extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateScreen() {
|
public void updateScreen() {
|
||||||
Minecraft.getMinecraft().pauseFlag = false;
|
|
||||||
Minecraft.getMinecraft().prevPauseTicks = 0;
|
|
||||||
++this.updateCounter;
|
++this.updateCounter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,8 +7,6 @@ public class GuiIngameMenu extends GuiScreen {
|
||||||
private int updateCounter = 0;
|
private int updateCounter = 0;
|
||||||
|
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
Minecraft.getMinecraft().prevPauseTicks = 0;
|
|
||||||
Minecraft.getMinecraft().pauseFlag = false;
|
|
||||||
this.updateCounter2 = 0;
|
this.updateCounter2 = 0;
|
||||||
this.controlList.clear();
|
this.controlList.clear();
|
||||||
this.controlList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 48, "Save and quit to title"));
|
this.controlList.add(new GuiButton(1, this.width / 2 - 100, this.height / 4 + 48, "Save and quit to title"));
|
||||||
|
@ -26,7 +24,6 @@ public class GuiIngameMenu extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
if(var1.id == 1) {
|
if(var1.id == 1) {
|
||||||
Minecraft.getMinecraft().justLeftWorld = true;
|
|
||||||
if(this.mc.isMultiplayerWorld()) {
|
if(this.mc.isMultiplayerWorld()) {
|
||||||
this.mc.theWorld.sendQuittingDisconnectingPacket();
|
this.mc.theWorld.sendQuittingDisconnectingPacket();
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,6 @@ public class GuiMainMenu extends GuiScreen {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
Minecraft.getMinecraft().justLeftWorld = false;
|
|
||||||
Calendar var1 = Calendar.getInstance();
|
Calendar var1 = Calendar.getInstance();
|
||||||
var1.setTime(new Date());
|
var1.setTime(new Date());
|
||||||
if(var1.get(2) + 1 == 11 && var1.get(5) == 9) {
|
if(var1.get(2) + 1 == 11 && var1.get(5) == 9) {
|
||||||
|
|
|
@ -27,13 +27,9 @@ public class Client {
|
||||||
public static Minecraft instance = null;
|
public static Minecraft instance = null;
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
registerErrorHandler();
|
registerErrorHandler();
|
||||||
String[] e = getOpts();
|
|
||||||
try {
|
try {
|
||||||
try {
|
JSONObject e = new JSONObject(getOpts());
|
||||||
EaglerAdapterImpl2.initializeContext(rootElement = Window.current().getDocument().getElementById(e[0]), e[1]);
|
EaglerAdapterImpl2.initializeContext(rootElement = Window.current().getDocument().getElementById(e.getString("gameContainer")), e.getString("assetsLocation"), e);
|
||||||
}catch(AbortedLaunchException ex) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}catch(Throwable ex2) {
|
}catch(Throwable ex2) {
|
||||||
StringWriter s = new StringWriter();
|
StringWriter s = new StringWriter();
|
||||||
ex2.printStackTrace(new PrintWriter(s));
|
ex2.printStackTrace(new PrintWriter(s));
|
||||||
|
@ -55,8 +51,8 @@ public class Client {
|
||||||
instance.run();
|
instance.run();
|
||||||
}
|
}
|
||||||
|
|
||||||
@JSBody(params = { }, script = "return window.classicConfig;")
|
@JSBody(params = { }, script = "return JSON.stringify(window.config);")
|
||||||
public static native String[] getOpts();
|
public static native String getOpts();
|
||||||
|
|
||||||
@JSBody(params = { }, script = "window.minecraftError = null; window.onerror = function(message, file, line, column, errorObj) { if(errorObj) { window.minecraftError = errorObj; window.minecraftErrorL = \"\"+line+\":\"+column; javaMethods.get(\"net.lax1dude.eaglercraft.Client.handleNativeError()V\").invoke(); } else { alert(\"a native browser exception was thrown but your browser does not support fith argument in onerror\"); } };")
|
@JSBody(params = { }, script = "window.minecraftError = null; window.onerror = function(message, file, line, column, errorObj) { if(errorObj) { window.minecraftError = errorObj; window.minecraftErrorL = \"\"+line+\":\"+column; javaMethods.get(\"net.lax1dude.eaglercraft.Client.handleNativeError()V\").invoke(); } else { alert(\"a native browser exception was thrown but your browser does not support fith argument in onerror\"); } };")
|
||||||
public static native void registerErrorHandler();
|
public static native void registerErrorHandler();
|
||||||
|
|
1716
src/teavm/java/net/lax1dude/eaglercraft/JSONArray.java
Normal file
1716
src/teavm/java/net/lax1dude/eaglercraft/JSONArray.java
Normal file
File diff suppressed because it is too large
Load Diff
69
src/teavm/java/net/lax1dude/eaglercraft/JSONException.java
Normal file
69
src/teavm/java/net/lax1dude/eaglercraft/JSONException.java
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2002 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The JSONException is thrown by the JSON.org classes when things are amiss.
|
||||||
|
*
|
||||||
|
* @author JSON.org
|
||||||
|
* @version 2015-12-09
|
||||||
|
*/
|
||||||
|
public class JSONException extends RuntimeException {
|
||||||
|
/** Serialization ID */
|
||||||
|
private static final long serialVersionUID = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a JSONException with an explanatory message.
|
||||||
|
*
|
||||||
|
* @param message
|
||||||
|
* Detail about the reason for the exception.
|
||||||
|
*/
|
||||||
|
public JSONException(final String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a JSONException with an explanatory message and cause.
|
||||||
|
*
|
||||||
|
* @param message
|
||||||
|
* Detail about the reason for the exception.
|
||||||
|
* @param cause
|
||||||
|
* The cause.
|
||||||
|
*/
|
||||||
|
public JSONException(final String message, final Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs a new JSONException with the specified cause.
|
||||||
|
*
|
||||||
|
* @param cause
|
||||||
|
* The cause.
|
||||||
|
*/
|
||||||
|
public JSONException(final Throwable cause) {
|
||||||
|
super(cause.getMessage(), cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
2732
src/teavm/java/net/lax1dude/eaglercraft/JSONObject.java
Normal file
2732
src/teavm/java/net/lax1dude/eaglercraft/JSONObject.java
Normal file
File diff suppressed because it is too large
Load Diff
295
src/teavm/java/net/lax1dude/eaglercraft/JSONPointer.java
Normal file
295
src/teavm/java/net/lax1dude/eaglercraft/JSONPointer.java
Normal file
|
@ -0,0 +1,295 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
import static java.lang.String.format;
|
||||||
|
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.URLDecoder;
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2002 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A JSON Pointer is a simple query language defined for JSON documents by
|
||||||
|
* <a href="https://tools.ietf.org/html/rfc6901">RFC 6901</a>.
|
||||||
|
*
|
||||||
|
* In a nutshell, JSONPointer allows the user to navigate into a JSON document
|
||||||
|
* using strings, and retrieve targeted objects, like a simple form of XPATH.
|
||||||
|
* Path segments are separated by the '/' char, which signifies the root of
|
||||||
|
* the document when it appears as the first char of the string. Array
|
||||||
|
* elements are navigated using ordinals, counting from 0. JSONPointer strings
|
||||||
|
* may be extended to any arbitrary number of segments. If the navigation
|
||||||
|
* is successful, the matched item is returned. A matched item may be a
|
||||||
|
* JSONObject, a JSONArray, or a JSON value. If the JSONPointer string building
|
||||||
|
* fails, an appropriate exception is thrown. If the navigation fails to find
|
||||||
|
* a match, a JSONPointerException is thrown.
|
||||||
|
*
|
||||||
|
* @author JSON.org
|
||||||
|
* @version 2016-05-14
|
||||||
|
*/
|
||||||
|
public class JSONPointer {
|
||||||
|
|
||||||
|
// used for URL encoding and decoding
|
||||||
|
private static final String ENCODING = "utf-8";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class allows the user to build a JSONPointer in steps, using
|
||||||
|
* exactly one segment in each step.
|
||||||
|
*/
|
||||||
|
public static class Builder {
|
||||||
|
|
||||||
|
// Segments for the eventual JSONPointer string
|
||||||
|
private final List<String> refTokens = new ArrayList<String>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a {@code JSONPointer} instance using the tokens previously set using the
|
||||||
|
* {@link #append(String)} method calls.
|
||||||
|
* @return a JSONPointer object
|
||||||
|
*/
|
||||||
|
public JSONPointer build() {
|
||||||
|
return new JSONPointer(this.refTokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds an arbitrary token to the list of reference tokens. It can be any non-null value.
|
||||||
|
*
|
||||||
|
* Unlike in the case of JSON string or URI fragment representation of JSON pointers, the
|
||||||
|
* argument of this method MUST NOT be escaped. If you want to query the property called
|
||||||
|
* {@code "a~b"} then you should simply pass the {@code "a~b"} string as-is, there is no
|
||||||
|
* need to escape it as {@code "a~0b"}.
|
||||||
|
*
|
||||||
|
* @param token the new token to be appended to the list
|
||||||
|
* @return {@code this}
|
||||||
|
* @throws NullPointerException if {@code token} is null
|
||||||
|
*/
|
||||||
|
public Builder append(String token) {
|
||||||
|
if (token == null) {
|
||||||
|
throw new NullPointerException("token cannot be null");
|
||||||
|
}
|
||||||
|
this.refTokens.add(token);
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds an integer to the reference token list. Although not necessarily, mostly this token will
|
||||||
|
* denote an array index.
|
||||||
|
*
|
||||||
|
* @param arrayIndex the array index to be added to the token list
|
||||||
|
* @return {@code this}
|
||||||
|
*/
|
||||||
|
public Builder append(int arrayIndex) {
|
||||||
|
this.refTokens.add(String.valueOf(arrayIndex));
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Static factory method for {@link Builder}. Example usage:
|
||||||
|
*
|
||||||
|
* <pre><code>
|
||||||
|
* JSONPointer pointer = JSONPointer.builder()
|
||||||
|
* .append("obj")
|
||||||
|
* .append("other~key").append("another/key")
|
||||||
|
* .append("\"")
|
||||||
|
* .append(0)
|
||||||
|
* .build();
|
||||||
|
* </code></pre>
|
||||||
|
*
|
||||||
|
* @return a builder instance which can be used to construct a {@code JSONPointer} instance by chained
|
||||||
|
* {@link Builder#append(String)} calls.
|
||||||
|
*/
|
||||||
|
public static Builder builder() {
|
||||||
|
return new Builder();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Segments for the JSONPointer string
|
||||||
|
private final List<String> refTokens;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pre-parses and initializes a new {@code JSONPointer} instance. If you want to
|
||||||
|
* evaluate the same JSON Pointer on different JSON documents then it is recommended
|
||||||
|
* to keep the {@code JSONPointer} instances due to performance considerations.
|
||||||
|
*
|
||||||
|
* @param pointer the JSON String or URI Fragment representation of the JSON pointer.
|
||||||
|
* @throws IllegalArgumentException if {@code pointer} is not a valid JSON pointer
|
||||||
|
*/
|
||||||
|
public JSONPointer(final String pointer) {
|
||||||
|
if (pointer == null) {
|
||||||
|
throw new NullPointerException("pointer cannot be null");
|
||||||
|
}
|
||||||
|
if (pointer.isEmpty() || pointer.equals("#")) {
|
||||||
|
this.refTokens = Collections.emptyList();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
String refs;
|
||||||
|
if (pointer.startsWith("#/")) {
|
||||||
|
refs = pointer.substring(2);
|
||||||
|
try {
|
||||||
|
refs = URLDecoder.decode(refs, ENCODING);
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
} else if (pointer.startsWith("/")) {
|
||||||
|
refs = pointer.substring(1);
|
||||||
|
} else {
|
||||||
|
throw new IllegalArgumentException("a JSON pointer should start with '/' or '#/'");
|
||||||
|
}
|
||||||
|
this.refTokens = new ArrayList<String>();
|
||||||
|
int slashIdx = -1;
|
||||||
|
int prevSlashIdx = 0;
|
||||||
|
do {
|
||||||
|
prevSlashIdx = slashIdx + 1;
|
||||||
|
slashIdx = refs.indexOf('/', prevSlashIdx);
|
||||||
|
if(prevSlashIdx == slashIdx || prevSlashIdx == refs.length()) {
|
||||||
|
// found 2 slashes in a row ( obj//next )
|
||||||
|
// or single slash at the end of a string ( obj/test/ )
|
||||||
|
this.refTokens.add("");
|
||||||
|
} else if (slashIdx >= 0) {
|
||||||
|
final String token = refs.substring(prevSlashIdx, slashIdx);
|
||||||
|
this.refTokens.add(unescape(token));
|
||||||
|
} else {
|
||||||
|
// last item after separator, or no separator at all.
|
||||||
|
final String token = refs.substring(prevSlashIdx);
|
||||||
|
this.refTokens.add(unescape(token));
|
||||||
|
}
|
||||||
|
} while (slashIdx >= 0);
|
||||||
|
// using split does not take into account consecutive separators or "ending nulls"
|
||||||
|
//for (String token : refs.split("/")) {
|
||||||
|
// this.refTokens.add(unescape(token));
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
|
||||||
|
public JSONPointer(List<String> refTokens) {
|
||||||
|
this.refTokens = new ArrayList<String>(refTokens);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @see <a href="https://tools.ietf.org/html/rfc6901#section-3">rfc6901 section 3</a>
|
||||||
|
*/
|
||||||
|
private static String unescape(String token) {
|
||||||
|
return token.replace("~1", "/").replace("~0", "~");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Evaluates this JSON Pointer on the given {@code document}. The {@code document}
|
||||||
|
* is usually a {@link JSONObject} or a {@link JSONArray} instance, but the empty
|
||||||
|
* JSON Pointer ({@code ""}) can be evaluated on any JSON values and in such case the
|
||||||
|
* returned value will be {@code document} itself.
|
||||||
|
*
|
||||||
|
* @param document the JSON document which should be the subject of querying.
|
||||||
|
* @return the result of the evaluation
|
||||||
|
* @throws JSONPointerException if an error occurs during evaluation
|
||||||
|
*/
|
||||||
|
public Object queryFrom(Object document) throws JSONPointerException {
|
||||||
|
if (this.refTokens.isEmpty()) {
|
||||||
|
return document;
|
||||||
|
}
|
||||||
|
Object current = document;
|
||||||
|
for (String token : this.refTokens) {
|
||||||
|
if (current instanceof JSONObject) {
|
||||||
|
current = ((JSONObject) current).opt(unescape(token));
|
||||||
|
} else if (current instanceof JSONArray) {
|
||||||
|
current = readByIndexToken(current, token);
|
||||||
|
} else {
|
||||||
|
throw new JSONPointerException(format(
|
||||||
|
"value [%s] is not an array or object therefore its key %s cannot be resolved", current,
|
||||||
|
token));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return current;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Matches a JSONArray element by ordinal position
|
||||||
|
* @param current the JSONArray to be evaluated
|
||||||
|
* @param indexToken the array index in string form
|
||||||
|
* @return the matched object. If no matching item is found a
|
||||||
|
* @throws JSONPointerException is thrown if the index is out of bounds
|
||||||
|
*/
|
||||||
|
private static Object readByIndexToken(Object current, String indexToken) throws JSONPointerException {
|
||||||
|
try {
|
||||||
|
int index = Integer.parseInt(indexToken);
|
||||||
|
JSONArray currentArr = (JSONArray) current;
|
||||||
|
if (index >= currentArr.length()) {
|
||||||
|
throw new JSONPointerException(format("index %s is out of bounds - the array has %d elements", indexToken,
|
||||||
|
Integer.valueOf(currentArr.length())));
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return currentArr.get(index);
|
||||||
|
} catch (JSONException e) {
|
||||||
|
throw new JSONPointerException("Error reading value at index position " + index, e);
|
||||||
|
}
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
throw new JSONPointerException(format("%s is not an array index", indexToken), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a string representing the JSONPointer path value using string
|
||||||
|
* representation
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
StringBuilder rval = new StringBuilder("");
|
||||||
|
for (String token: this.refTokens) {
|
||||||
|
rval.append('/').append(escape(token));
|
||||||
|
}
|
||||||
|
return rval.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Escapes path segment values to an unambiguous form.
|
||||||
|
* The escape char to be inserted is '~'. The chars to be escaped
|
||||||
|
* are ~, which maps to ~0, and /, which maps to ~1.
|
||||||
|
* @param token the JSONPointer segment value to be escaped
|
||||||
|
* @return the escaped value for the token
|
||||||
|
*
|
||||||
|
* @see <a href="https://tools.ietf.org/html/rfc6901#section-3">rfc6901 section 3</a>
|
||||||
|
*/
|
||||||
|
private static String escape(String token) {
|
||||||
|
return token.replace("~", "~0")
|
||||||
|
.replace("/", "~1");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a string representing the JSONPointer path value using URI
|
||||||
|
* fragment identifier representation
|
||||||
|
* @return a uri fragment string
|
||||||
|
*/
|
||||||
|
public String toURIFragment() {
|
||||||
|
try {
|
||||||
|
StringBuilder rval = new StringBuilder("#");
|
||||||
|
for (String token : this.refTokens) {
|
||||||
|
rval.append('/').append(URLEncoder.encode(token, ENCODING));
|
||||||
|
}
|
||||||
|
return rval.toString();
|
||||||
|
} catch (UnsupportedEncodingException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,45 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2002 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The JSONPointerException is thrown by {@link JSONPointer} if an error occurs
|
||||||
|
* during evaluating a pointer.
|
||||||
|
*
|
||||||
|
* @author JSON.org
|
||||||
|
* @version 2016-05-13
|
||||||
|
*/
|
||||||
|
public class JSONPointerException extends JSONException {
|
||||||
|
private static final long serialVersionUID = 8872944667561856751L;
|
||||||
|
|
||||||
|
public JSONPointerException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
public JSONPointerException(String message, Throwable cause) {
|
||||||
|
super(message, cause);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -0,0 +1,43 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2018 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import static java.lang.annotation.ElementType.METHOD;
|
||||||
|
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||||
|
|
||||||
|
import java.lang.annotation.Documented;
|
||||||
|
import java.lang.annotation.Retention;
|
||||||
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
|
@Documented
|
||||||
|
@Retention(RUNTIME)
|
||||||
|
@Target({METHOD})
|
||||||
|
/**
|
||||||
|
* Use this annotation on a getter method to override the Bean name
|
||||||
|
* parser for Bean -> JSONObject mapping. If this annotation is
|
||||||
|
* present at any level in the class hierarchy, then the method will
|
||||||
|
* not be serialized from the bean into the JSONObject.
|
||||||
|
*/
|
||||||
|
public @interface JSONPropertyIgnore { }
|
|
@ -0,0 +1,47 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2018 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import static java.lang.annotation.ElementType.METHOD;
|
||||||
|
import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
||||||
|
|
||||||
|
import java.lang.annotation.Documented;
|
||||||
|
import java.lang.annotation.Retention;
|
||||||
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
|
@Documented
|
||||||
|
@Retention(RUNTIME)
|
||||||
|
@Target({METHOD})
|
||||||
|
/**
|
||||||
|
* Use this annotation on a getter method to override the Bean name
|
||||||
|
* parser for Bean -> JSONObject mapping. A value set to empty string <code>""</code>
|
||||||
|
* will have the Bean parser fall back to the default field name processing.
|
||||||
|
*/
|
||||||
|
public @interface JSONPropertyName {
|
||||||
|
/**
|
||||||
|
* @return The name of the property as to be used in the JSON Object.
|
||||||
|
*/
|
||||||
|
String value();
|
||||||
|
}
|
43
src/teavm/java/net/lax1dude/eaglercraft/JSONString.java
Normal file
43
src/teavm/java/net/lax1dude/eaglercraft/JSONString.java
Normal file
|
@ -0,0 +1,43 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2002 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The <code>JSONString</code> interface allows a <code>toJSONString()</code>
|
||||||
|
* method so that a class can change the behavior of
|
||||||
|
* <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
|
||||||
|
* and <code>JSONWriter.value(</code>Object<code>)</code>. The
|
||||||
|
* <code>toJSONString</code> method will be used instead of the default behavior
|
||||||
|
* of using the Object's <code>toString()</code> method and quoting the result.
|
||||||
|
*/
|
||||||
|
public interface JSONString {
|
||||||
|
/**
|
||||||
|
* The <code>toJSONString</code> method allows a class to produce its own JSON
|
||||||
|
* serialization.
|
||||||
|
*
|
||||||
|
* @return A strictly syntactically correct JSON text.
|
||||||
|
*/
|
||||||
|
public String toJSONString();
|
||||||
|
}
|
545
src/teavm/java/net/lax1dude/eaglercraft/JSONTokener.java
Normal file
545
src/teavm/java/net/lax1dude/eaglercraft/JSONTokener.java
Normal file
|
@ -0,0 +1,545 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.io.Reader;
|
||||||
|
import java.io.StringReader;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2002 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A JSONTokener takes a source string and extracts characters and tokens from
|
||||||
|
* it. It is used by the JSONObject and JSONArray constructors to parse
|
||||||
|
* JSON source strings.
|
||||||
|
* @author JSON.org
|
||||||
|
* @version 2014-05-03
|
||||||
|
*/
|
||||||
|
public class JSONTokener {
|
||||||
|
/** current read character position on the current line. */
|
||||||
|
private long character;
|
||||||
|
/** flag to indicate if the end of the input has been found. */
|
||||||
|
private boolean eof;
|
||||||
|
/** current read index of the input. */
|
||||||
|
private long index;
|
||||||
|
/** current line of the input. */
|
||||||
|
private long line;
|
||||||
|
/** previous character read from the input. */
|
||||||
|
private char previous;
|
||||||
|
/** Reader for the input. */
|
||||||
|
private final Reader reader;
|
||||||
|
/** flag to indicate that a previous character was requested. */
|
||||||
|
private boolean usePrevious;
|
||||||
|
/** the number of characters read in the previous line. */
|
||||||
|
private long characterPreviousLine;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a JSONTokener from a Reader. The caller must close the Reader.
|
||||||
|
*
|
||||||
|
* @param reader A reader.
|
||||||
|
*/
|
||||||
|
public JSONTokener(Reader reader) {
|
||||||
|
this.reader = reader.markSupported()
|
||||||
|
? reader
|
||||||
|
: new BufferedReader(reader);
|
||||||
|
this.eof = false;
|
||||||
|
this.usePrevious = false;
|
||||||
|
this.previous = 0;
|
||||||
|
this.index = 0;
|
||||||
|
this.character = 1;
|
||||||
|
this.characterPreviousLine = 0;
|
||||||
|
this.line = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a JSONTokener from an InputStream. The caller must close the input stream.
|
||||||
|
* @param inputStream The source.
|
||||||
|
*/
|
||||||
|
public JSONTokener(InputStream inputStream) {
|
||||||
|
this(new InputStreamReader(inputStream));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a JSONTokener from a string.
|
||||||
|
*
|
||||||
|
* @param s A source string.
|
||||||
|
*/
|
||||||
|
public JSONTokener(String s) {
|
||||||
|
this(new StringReader(s));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Back up one character. This provides a sort of lookahead capability,
|
||||||
|
* so that you can test for a digit or letter before attempting to parse
|
||||||
|
* the next number or identifier.
|
||||||
|
* @throws JSONException Thrown if trying to step back more than 1 step
|
||||||
|
* or if already at the start of the string
|
||||||
|
*/
|
||||||
|
public void back() throws JSONException {
|
||||||
|
if (this.usePrevious || this.index <= 0) {
|
||||||
|
throw new JSONException("Stepping back two steps is not supported");
|
||||||
|
}
|
||||||
|
this.decrementIndexes();
|
||||||
|
this.usePrevious = true;
|
||||||
|
this.eof = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decrements the indexes for the {@link #back()} method based on the previous character read.
|
||||||
|
*/
|
||||||
|
private void decrementIndexes() {
|
||||||
|
this.index--;
|
||||||
|
if(this.previous=='\r' || this.previous == '\n') {
|
||||||
|
this.line--;
|
||||||
|
this.character=this.characterPreviousLine ;
|
||||||
|
} else if(this.character > 0){
|
||||||
|
this.character--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the hex value of a character (base16).
|
||||||
|
* @param c A character between '0' and '9' or between 'A' and 'F' or
|
||||||
|
* between 'a' and 'f'.
|
||||||
|
* @return An int between 0 and 15, or -1 if c was not a hex digit.
|
||||||
|
*/
|
||||||
|
public static int dehexchar(char c) {
|
||||||
|
if (c >= '0' && c <= '9') {
|
||||||
|
return c - '0';
|
||||||
|
}
|
||||||
|
if (c >= 'A' && c <= 'F') {
|
||||||
|
return c - ('A' - 10);
|
||||||
|
}
|
||||||
|
if (c >= 'a' && c <= 'f') {
|
||||||
|
return c - ('a' - 10);
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the end of the input has been reached.
|
||||||
|
*
|
||||||
|
* @return true if at the end of the file and we didn't step back
|
||||||
|
*/
|
||||||
|
public boolean end() {
|
||||||
|
return this.eof && !this.usePrevious;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if the source string still contains characters that next()
|
||||||
|
* can consume.
|
||||||
|
* @return true if not yet at the end of the source.
|
||||||
|
* @throws JSONException thrown if there is an error stepping forward
|
||||||
|
* or backward while checking for more data.
|
||||||
|
*/
|
||||||
|
public boolean more() throws JSONException {
|
||||||
|
if(this.usePrevious) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
this.reader.mark(1);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new JSONException("Unable to preserve stream position", e);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
// -1 is EOF, but next() can not consume the null character '\0'
|
||||||
|
if(this.reader.read() <= 0) {
|
||||||
|
this.eof = true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
this.reader.reset();
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new JSONException("Unable to read the next character from the stream", e);
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next character in the source string.
|
||||||
|
*
|
||||||
|
* @return The next character, or 0 if past the end of the source string.
|
||||||
|
* @throws JSONException Thrown if there is an error reading the source string.
|
||||||
|
*/
|
||||||
|
public char next() throws JSONException {
|
||||||
|
int c;
|
||||||
|
if (this.usePrevious) {
|
||||||
|
this.usePrevious = false;
|
||||||
|
c = this.previous;
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
c = this.reader.read();
|
||||||
|
} catch (IOException exception) {
|
||||||
|
throw new JSONException(exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (c <= 0) { // End of stream
|
||||||
|
this.eof = true;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
this.incrementIndexes(c);
|
||||||
|
this.previous = (char) c;
|
||||||
|
return this.previous;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the last character read from the input or '\0' if nothing has been read yet.
|
||||||
|
* @return the last character read from the input.
|
||||||
|
*/
|
||||||
|
protected char getPrevious() { return this.previous;}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Increments the internal indexes according to the previous character
|
||||||
|
* read and the character passed as the current character.
|
||||||
|
* @param c the current character read.
|
||||||
|
*/
|
||||||
|
private void incrementIndexes(int c) {
|
||||||
|
if(c > 0) {
|
||||||
|
this.index++;
|
||||||
|
if(c=='\r') {
|
||||||
|
this.line++;
|
||||||
|
this.characterPreviousLine = this.character;
|
||||||
|
this.character=0;
|
||||||
|
}else if (c=='\n') {
|
||||||
|
if(this.previous != '\r') {
|
||||||
|
this.line++;
|
||||||
|
this.characterPreviousLine = this.character;
|
||||||
|
}
|
||||||
|
this.character=0;
|
||||||
|
} else {
|
||||||
|
this.character++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Consume the next character, and check that it matches a specified
|
||||||
|
* character.
|
||||||
|
* @param c The character to match.
|
||||||
|
* @return The character.
|
||||||
|
* @throws JSONException if the character does not match.
|
||||||
|
*/
|
||||||
|
public char next(char c) throws JSONException {
|
||||||
|
char n = this.next();
|
||||||
|
if (n != c) {
|
||||||
|
if(n > 0) {
|
||||||
|
throw this.syntaxError("Expected '" + c + "' and instead saw '" +
|
||||||
|
n + "'");
|
||||||
|
}
|
||||||
|
throw this.syntaxError("Expected '" + c + "' and instead saw ''");
|
||||||
|
}
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next n characters.
|
||||||
|
*
|
||||||
|
* @param n The number of characters to take.
|
||||||
|
* @return A string of n characters.
|
||||||
|
* @throws JSONException
|
||||||
|
* Substring bounds error if there are not
|
||||||
|
* n characters remaining in the source string.
|
||||||
|
*/
|
||||||
|
public String next(int n) throws JSONException {
|
||||||
|
if (n == 0) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
char[] chars = new char[n];
|
||||||
|
int pos = 0;
|
||||||
|
|
||||||
|
while (pos < n) {
|
||||||
|
chars[pos] = this.next();
|
||||||
|
if (this.end()) {
|
||||||
|
throw this.syntaxError("Substring bounds error");
|
||||||
|
}
|
||||||
|
pos += 1;
|
||||||
|
}
|
||||||
|
return new String(chars);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next char in the string, skipping whitespace.
|
||||||
|
* @throws JSONException Thrown if there is an error reading the source string.
|
||||||
|
* @return A character, or 0 if there are no more characters.
|
||||||
|
*/
|
||||||
|
public char nextClean() throws JSONException {
|
||||||
|
for (;;) {
|
||||||
|
char c = this.next();
|
||||||
|
if (c == 0 || c > ' ') {
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the characters up to the next close quote character.
|
||||||
|
* Backslash processing is done. The formal JSON format does not
|
||||||
|
* allow strings in single quotes, but an implementation is allowed to
|
||||||
|
* accept them.
|
||||||
|
* @param quote The quoting character, either
|
||||||
|
* <code>"</code> <small>(double quote)</small> or
|
||||||
|
* <code>'</code> <small>(single quote)</small>.
|
||||||
|
* @return A String.
|
||||||
|
* @throws JSONException Unterminated string.
|
||||||
|
*/
|
||||||
|
public String nextString(char quote) throws JSONException {
|
||||||
|
char c;
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (;;) {
|
||||||
|
c = this.next();
|
||||||
|
switch (c) {
|
||||||
|
case 0:
|
||||||
|
case '\n':
|
||||||
|
case '\r':
|
||||||
|
throw this.syntaxError("Unterminated string");
|
||||||
|
case '\\':
|
||||||
|
c = this.next();
|
||||||
|
switch (c) {
|
||||||
|
case 'b':
|
||||||
|
sb.append('\b');
|
||||||
|
break;
|
||||||
|
case 't':
|
||||||
|
sb.append('\t');
|
||||||
|
break;
|
||||||
|
case 'n':
|
||||||
|
sb.append('\n');
|
||||||
|
break;
|
||||||
|
case 'f':
|
||||||
|
sb.append('\f');
|
||||||
|
break;
|
||||||
|
case 'r':
|
||||||
|
sb.append('\r');
|
||||||
|
break;
|
||||||
|
case 'u':
|
||||||
|
try {
|
||||||
|
sb.append((char)Integer.parseInt(this.next(4), 16));
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
throw this.syntaxError("Illegal escape.", e);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case '"':
|
||||||
|
case '\'':
|
||||||
|
case '\\':
|
||||||
|
case '/':
|
||||||
|
sb.append(c);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw this.syntaxError("Illegal escape.");
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (c == quote) {
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
sb.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the text up but not including the specified character or the
|
||||||
|
* end of line, whichever comes first.
|
||||||
|
* @param delimiter A delimiter character.
|
||||||
|
* @return A string.
|
||||||
|
* @throws JSONException Thrown if there is an error while searching
|
||||||
|
* for the delimiter
|
||||||
|
*/
|
||||||
|
public String nextTo(char delimiter) throws JSONException {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (;;) {
|
||||||
|
char c = this.next();
|
||||||
|
if (c == delimiter || c == 0 || c == '\n' || c == '\r') {
|
||||||
|
if (c != 0) {
|
||||||
|
this.back();
|
||||||
|
}
|
||||||
|
return sb.toString().trim();
|
||||||
|
}
|
||||||
|
sb.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the text up but not including one of the specified delimiter
|
||||||
|
* characters or the end of line, whichever comes first.
|
||||||
|
* @param delimiters A set of delimiter characters.
|
||||||
|
* @return A string, trimmed.
|
||||||
|
* @throws JSONException Thrown if there is an error while searching
|
||||||
|
* for the delimiter
|
||||||
|
*/
|
||||||
|
public String nextTo(String delimiters) throws JSONException {
|
||||||
|
char c;
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (;;) {
|
||||||
|
c = this.next();
|
||||||
|
if (delimiters.indexOf(c) >= 0 || c == 0 ||
|
||||||
|
c == '\n' || c == '\r') {
|
||||||
|
if (c != 0) {
|
||||||
|
this.back();
|
||||||
|
}
|
||||||
|
return sb.toString().trim();
|
||||||
|
}
|
||||||
|
sb.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the next value. The value can be a Boolean, Double, Integer,
|
||||||
|
* JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
|
||||||
|
* @throws JSONException If syntax error.
|
||||||
|
*
|
||||||
|
* @return An object.
|
||||||
|
*/
|
||||||
|
public Object nextValue() throws JSONException {
|
||||||
|
char c = this.nextClean();
|
||||||
|
String string;
|
||||||
|
|
||||||
|
switch (c) {
|
||||||
|
case '"':
|
||||||
|
case '\'':
|
||||||
|
return this.nextString(c);
|
||||||
|
case '{':
|
||||||
|
this.back();
|
||||||
|
try {
|
||||||
|
return new JSONObject(this);
|
||||||
|
} catch (StackOverflowError e) {
|
||||||
|
throw new JSONException("JSON Array or Object depth too large to process.", e);
|
||||||
|
}
|
||||||
|
case '[':
|
||||||
|
this.back();
|
||||||
|
try {
|
||||||
|
return new JSONArray(this);
|
||||||
|
} catch (StackOverflowError e) {
|
||||||
|
throw new JSONException("JSON Array or Object depth too large to process.", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Handle unquoted text. This could be the values true, false, or
|
||||||
|
* null, or it can be a number. An implementation (such as this one)
|
||||||
|
* is allowed to also accept non-standard forms.
|
||||||
|
*
|
||||||
|
* Accumulate characters until we reach the end of the text or a
|
||||||
|
* formatting character.
|
||||||
|
*/
|
||||||
|
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
|
||||||
|
sb.append(c);
|
||||||
|
c = this.next();
|
||||||
|
}
|
||||||
|
if (!this.eof) {
|
||||||
|
this.back();
|
||||||
|
}
|
||||||
|
|
||||||
|
string = sb.toString().trim();
|
||||||
|
if ("".equals(string)) {
|
||||||
|
throw this.syntaxError("Missing value");
|
||||||
|
}
|
||||||
|
return JSONObject.stringToValue(string);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Skip characters until the next character is the requested character.
|
||||||
|
* If the requested character is not found, no characters are skipped.
|
||||||
|
* @param to A character to skip to.
|
||||||
|
* @return The requested character, or zero if the requested character
|
||||||
|
* is not found.
|
||||||
|
* @throws JSONException Thrown if there is an error while searching
|
||||||
|
* for the to character
|
||||||
|
*/
|
||||||
|
public char skipTo(char to) throws JSONException {
|
||||||
|
char c;
|
||||||
|
try {
|
||||||
|
long startIndex = this.index;
|
||||||
|
long startCharacter = this.character;
|
||||||
|
long startLine = this.line;
|
||||||
|
this.reader.mark(1000000);
|
||||||
|
do {
|
||||||
|
c = this.next();
|
||||||
|
if (c == 0) {
|
||||||
|
// in some readers, reset() may throw an exception if
|
||||||
|
// the remaining portion of the input is greater than
|
||||||
|
// the mark size (1,000,000 above).
|
||||||
|
this.reader.reset();
|
||||||
|
this.index = startIndex;
|
||||||
|
this.character = startCharacter;
|
||||||
|
this.line = startLine;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
} while (c != to);
|
||||||
|
this.reader.mark(1);
|
||||||
|
} catch (IOException exception) {
|
||||||
|
throw new JSONException(exception);
|
||||||
|
}
|
||||||
|
this.back();
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make a JSONException to signal a syntax error.
|
||||||
|
*
|
||||||
|
* @param message The error message.
|
||||||
|
* @return A JSONException object, suitable for throwing
|
||||||
|
*/
|
||||||
|
public JSONException syntaxError(String message) {
|
||||||
|
return new JSONException(message + this.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make a JSONException to signal a syntax error.
|
||||||
|
*
|
||||||
|
* @param message The error message.
|
||||||
|
* @param causedBy The throwable that caused the error.
|
||||||
|
* @return A JSONException object, suitable for throwing
|
||||||
|
*/
|
||||||
|
public JSONException syntaxError(String message, Throwable causedBy) {
|
||||||
|
return new JSONException(message + this.toString(), causedBy);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make a printable string of this JSONTokener.
|
||||||
|
*
|
||||||
|
* @return " at {index} [character {character} line {line}]"
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return " at " + this.index + " [character " + this.character + " line " +
|
||||||
|
this.line + "]";
|
||||||
|
}
|
||||||
|
}
|
414
src/teavm/java/net/lax1dude/eaglercraft/JSONWriter.java
Normal file
414
src/teavm/java/net/lax1dude/eaglercraft/JSONWriter.java
Normal file
|
@ -0,0 +1,414 @@
|
||||||
|
package net.lax1dude.eaglercraft;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright (c) 2006 JSON.org
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
The Software shall be used for Good, not Evil.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* JSONWriter provides a quick and convenient way of producing JSON text.
|
||||||
|
* The texts produced strictly conform to JSON syntax rules. No whitespace is
|
||||||
|
* added, so the results are ready for transmission or storage. Each instance of
|
||||||
|
* JSONWriter can produce one JSON text.
|
||||||
|
* <p>
|
||||||
|
* A JSONWriter instance provides a <code>value</code> method for appending
|
||||||
|
* values to the
|
||||||
|
* text, and a <code>key</code>
|
||||||
|
* method for adding keys before values in objects. There are <code>array</code>
|
||||||
|
* and <code>endArray</code> methods that make and bound array values, and
|
||||||
|
* <code>object</code> and <code>endObject</code> methods which make and bound
|
||||||
|
* object values. All of these methods return the JSONWriter instance,
|
||||||
|
* permitting a cascade style. For example, <pre>
|
||||||
|
* new JSONWriter(myWriter)
|
||||||
|
* .object()
|
||||||
|
* .key("JSON")
|
||||||
|
* .value("Hello, World!")
|
||||||
|
* .endObject();</pre> which writes <pre>
|
||||||
|
* {"JSON":"Hello, World!"}</pre>
|
||||||
|
* <p>
|
||||||
|
* The first method called must be <code>array</code> or <code>object</code>.
|
||||||
|
* There are no methods for adding commas or colons. JSONWriter adds them for
|
||||||
|
* you. Objects and arrays can be nested up to 200 levels deep.
|
||||||
|
* <p>
|
||||||
|
* This can sometimes be easier than using a JSONObject to build a string.
|
||||||
|
* @author JSON.org
|
||||||
|
* @version 2016-08-08
|
||||||
|
*/
|
||||||
|
public class JSONWriter {
|
||||||
|
private static final int maxdepth = 200;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The comma flag determines if a comma should be output before the next
|
||||||
|
* value.
|
||||||
|
*/
|
||||||
|
private boolean comma;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The current mode. Values:
|
||||||
|
* 'a' (array),
|
||||||
|
* 'd' (done),
|
||||||
|
* 'i' (initial),
|
||||||
|
* 'k' (key),
|
||||||
|
* 'o' (object).
|
||||||
|
*/
|
||||||
|
protected char mode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The object/array stack.
|
||||||
|
*/
|
||||||
|
private final JSONObject stack[];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The stack top index. A value of 0 indicates that the stack is empty.
|
||||||
|
*/
|
||||||
|
private int top;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The writer that will receive the output.
|
||||||
|
*/
|
||||||
|
protected Appendable writer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make a fresh JSONWriter. It can be used to build one JSON text.
|
||||||
|
* @param w an appendable object
|
||||||
|
*/
|
||||||
|
public JSONWriter(Appendable w) {
|
||||||
|
this.comma = false;
|
||||||
|
this.mode = 'i';
|
||||||
|
this.stack = new JSONObject[maxdepth];
|
||||||
|
this.top = 0;
|
||||||
|
this.writer = w;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append a value.
|
||||||
|
* @param string A string value.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If the value is out of sequence.
|
||||||
|
*/
|
||||||
|
private JSONWriter append(String string) throws JSONException {
|
||||||
|
if (string == null) {
|
||||||
|
throw new JSONException("Null pointer");
|
||||||
|
}
|
||||||
|
if (this.mode == 'o' || this.mode == 'a') {
|
||||||
|
try {
|
||||||
|
if (this.comma && this.mode == 'a') {
|
||||||
|
this.writer.append(',');
|
||||||
|
}
|
||||||
|
this.writer.append(string);
|
||||||
|
} catch (IOException e) {
|
||||||
|
// Android as of API 25 does not support this exception constructor
|
||||||
|
// however we won't worry about it. If an exception is happening here
|
||||||
|
// it will just throw a "Method not found" exception instead.
|
||||||
|
throw new JSONException(e);
|
||||||
|
}
|
||||||
|
if (this.mode == 'o') {
|
||||||
|
this.mode = 'k';
|
||||||
|
}
|
||||||
|
this.comma = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
throw new JSONException("Value out of sequence.");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Begin appending a new array. All values until the balancing
|
||||||
|
* <code>endArray</code> will be appended to this array. The
|
||||||
|
* <code>endArray</code> method must be called to mark the array's end.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If the nesting is too deep, or if the object is
|
||||||
|
* started in the wrong place (for example as a key or after the end of the
|
||||||
|
* outermost array or object).
|
||||||
|
*/
|
||||||
|
public JSONWriter array() throws JSONException {
|
||||||
|
if (this.mode == 'i' || this.mode == 'o' || this.mode == 'a') {
|
||||||
|
this.push(null);
|
||||||
|
this.append("[");
|
||||||
|
this.comma = false;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
throw new JSONException("Misplaced array.");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* End something.
|
||||||
|
* @param m Mode
|
||||||
|
* @param c Closing character
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If unbalanced.
|
||||||
|
*/
|
||||||
|
private JSONWriter end(char m, char c) throws JSONException {
|
||||||
|
if (this.mode != m) {
|
||||||
|
throw new JSONException(m == 'a'
|
||||||
|
? "Misplaced endArray."
|
||||||
|
: "Misplaced endObject.");
|
||||||
|
}
|
||||||
|
this.pop(m);
|
||||||
|
try {
|
||||||
|
this.writer.append(c);
|
||||||
|
} catch (IOException e) {
|
||||||
|
// Android as of API 25 does not support this exception constructor
|
||||||
|
// however we won't worry about it. If an exception is happening here
|
||||||
|
// it will just throw a "Method not found" exception instead.
|
||||||
|
throw new JSONException(e);
|
||||||
|
}
|
||||||
|
this.comma = true;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* End an array. This method most be called to balance calls to
|
||||||
|
* <code>array</code>.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If incorrectly nested.
|
||||||
|
*/
|
||||||
|
public JSONWriter endArray() throws JSONException {
|
||||||
|
return this.end('a', ']');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* End an object. This method most be called to balance calls to
|
||||||
|
* <code>object</code>.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If incorrectly nested.
|
||||||
|
*/
|
||||||
|
public JSONWriter endObject() throws JSONException {
|
||||||
|
return this.end('k', '}');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append a key. The key will be associated with the next value. In an
|
||||||
|
* object, every value must be preceded by a key.
|
||||||
|
* @param string A key string.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If the key is out of place. For example, keys
|
||||||
|
* do not belong in arrays or if the key is null.
|
||||||
|
*/
|
||||||
|
public JSONWriter key(String string) throws JSONException {
|
||||||
|
if (string == null) {
|
||||||
|
throw new JSONException("Null key.");
|
||||||
|
}
|
||||||
|
if (this.mode == 'k') {
|
||||||
|
try {
|
||||||
|
JSONObject topObject = this.stack[this.top - 1];
|
||||||
|
// don't use the built in putOnce method to maintain Android support
|
||||||
|
if(topObject.has(string)) {
|
||||||
|
throw new JSONException("Duplicate key \"" + string + "\"");
|
||||||
|
}
|
||||||
|
topObject.put(string, true);
|
||||||
|
if (this.comma) {
|
||||||
|
this.writer.append(',');
|
||||||
|
}
|
||||||
|
this.writer.append(JSONObject.quote(string));
|
||||||
|
this.writer.append(':');
|
||||||
|
this.comma = false;
|
||||||
|
this.mode = 'o';
|
||||||
|
return this;
|
||||||
|
} catch (IOException e) {
|
||||||
|
// Android as of API 25 does not support this exception constructor
|
||||||
|
// however we won't worry about it. If an exception is happening here
|
||||||
|
// it will just throw a "Method not found" exception instead.
|
||||||
|
throw new JSONException(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new JSONException("Misplaced key.");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Begin appending a new object. All keys and values until the balancing
|
||||||
|
* <code>endObject</code> will be appended to this object. The
|
||||||
|
* <code>endObject</code> method must be called to mark the object's end.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If the nesting is too deep, or if the object is
|
||||||
|
* started in the wrong place (for example as a key or after the end of the
|
||||||
|
* outermost array or object).
|
||||||
|
*/
|
||||||
|
public JSONWriter object() throws JSONException {
|
||||||
|
if (this.mode == 'i') {
|
||||||
|
this.mode = 'o';
|
||||||
|
}
|
||||||
|
if (this.mode == 'o' || this.mode == 'a') {
|
||||||
|
this.append("{");
|
||||||
|
this.push(new JSONObject());
|
||||||
|
this.comma = false;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
throw new JSONException("Misplaced object.");
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pop an array or object scope.
|
||||||
|
* @param c The scope to close.
|
||||||
|
* @throws JSONException If nesting is wrong.
|
||||||
|
*/
|
||||||
|
private void pop(char c) throws JSONException {
|
||||||
|
if (this.top <= 0) {
|
||||||
|
throw new JSONException("Nesting error.");
|
||||||
|
}
|
||||||
|
char m = this.stack[this.top - 1] == null ? 'a' : 'k';
|
||||||
|
if (m != c) {
|
||||||
|
throw new JSONException("Nesting error.");
|
||||||
|
}
|
||||||
|
this.top -= 1;
|
||||||
|
this.mode = this.top == 0
|
||||||
|
? 'd'
|
||||||
|
: this.stack[this.top - 1] == null
|
||||||
|
? 'a'
|
||||||
|
: 'k';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Push an array or object scope.
|
||||||
|
* @param jo The scope to open.
|
||||||
|
* @throws JSONException If nesting is too deep.
|
||||||
|
*/
|
||||||
|
private void push(JSONObject jo) throws JSONException {
|
||||||
|
if (this.top >= maxdepth) {
|
||||||
|
throw new JSONException("Nesting too deep.");
|
||||||
|
}
|
||||||
|
this.stack[this.top] = jo;
|
||||||
|
this.mode = jo == null ? 'a' : 'k';
|
||||||
|
this.top += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make a JSON text of an Object value. If the object has an
|
||||||
|
* value.toJSONString() method, then that method will be used to produce the
|
||||||
|
* JSON text. The method is required to produce a strictly conforming text.
|
||||||
|
* If the object does not contain a toJSONString method (which is the most
|
||||||
|
* common case), then a text will be produced by other means. If the value
|
||||||
|
* is an array or Collection, then a JSONArray will be made from it and its
|
||||||
|
* toJSONString method will be called. If the value is a MAP, then a
|
||||||
|
* JSONObject will be made from it and its toJSONString method will be
|
||||||
|
* called. Otherwise, the value's toString method will be called, and the
|
||||||
|
* result will be quoted.
|
||||||
|
*
|
||||||
|
* <p>
|
||||||
|
* Warning: This method assumes that the data structure is acyclical.
|
||||||
|
*
|
||||||
|
* @param value
|
||||||
|
* The value to be serialized.
|
||||||
|
* @return a printable, displayable, transmittable representation of the
|
||||||
|
* object, beginning with <code>{</code> <small>(left
|
||||||
|
* brace)</small> and ending with <code>}</code> <small>(right
|
||||||
|
* brace)</small>.
|
||||||
|
* @throws JSONException
|
||||||
|
* If the value is or contains an invalid number.
|
||||||
|
*/
|
||||||
|
public static String valueToString(Object value) throws JSONException {
|
||||||
|
if (value == null || value.equals(null)) {
|
||||||
|
return "null";
|
||||||
|
}
|
||||||
|
if (value instanceof JSONString) {
|
||||||
|
String object;
|
||||||
|
try {
|
||||||
|
object = ((JSONString) value).toJSONString();
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new JSONException(e);
|
||||||
|
}
|
||||||
|
if (object != null) {
|
||||||
|
return object;
|
||||||
|
}
|
||||||
|
throw new JSONException("Bad value from toJSONString: " + object);
|
||||||
|
}
|
||||||
|
if (value instanceof Number) {
|
||||||
|
// not all Numbers may match actual JSON Numbers. i.e. Fractions or Complex
|
||||||
|
final String numberAsString = JSONObject.numberToString((Number) value);
|
||||||
|
if(JSONObject.NUMBER_PATTERN.matcher(numberAsString).matches()) {
|
||||||
|
// Close enough to a JSON number that we will return it unquoted
|
||||||
|
return numberAsString;
|
||||||
|
}
|
||||||
|
// The Number value is not a valid JSON number.
|
||||||
|
// Instead we will quote it as a string
|
||||||
|
return JSONObject.quote(numberAsString);
|
||||||
|
}
|
||||||
|
if (value instanceof Boolean || value instanceof JSONObject
|
||||||
|
|| value instanceof JSONArray) {
|
||||||
|
return value.toString();
|
||||||
|
}
|
||||||
|
if (value instanceof Map) {
|
||||||
|
Map<?, ?> map = (Map<?, ?>) value;
|
||||||
|
return new JSONObject(map).toString();
|
||||||
|
}
|
||||||
|
if (value instanceof Collection) {
|
||||||
|
Collection<?> coll = (Collection<?>) value;
|
||||||
|
return new JSONArray(coll).toString();
|
||||||
|
}
|
||||||
|
if (value.getClass().isArray()) {
|
||||||
|
return new JSONArray(value).toString();
|
||||||
|
}
|
||||||
|
if(value instanceof Enum<?>){
|
||||||
|
return JSONObject.quote(((Enum<?>)value).name());
|
||||||
|
}
|
||||||
|
return JSONObject.quote(value.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append either the value <code>true</code> or the value
|
||||||
|
* <code>false</code>.
|
||||||
|
* @param b A boolean.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException if a called function has an error
|
||||||
|
*/
|
||||||
|
public JSONWriter value(boolean b) throws JSONException {
|
||||||
|
return this.append(b ? "true" : "false");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append a double value.
|
||||||
|
* @param d A double.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If the number is not finite.
|
||||||
|
*/
|
||||||
|
public JSONWriter value(double d) throws JSONException {
|
||||||
|
return this.value(Double.valueOf(d));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append a long value.
|
||||||
|
* @param l A long.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException if a called function has an error
|
||||||
|
*/
|
||||||
|
public JSONWriter value(long l) throws JSONException {
|
||||||
|
return this.append(Long.toString(l));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append an object value.
|
||||||
|
* @param object The object to append. It can be null, or a Boolean, Number,
|
||||||
|
* String, JSONObject, or JSONArray, or an object that implements JSONString.
|
||||||
|
* @return this
|
||||||
|
* @throws JSONException If the value is out of sequence.
|
||||||
|
*/
|
||||||
|
public JSONWriter value(Object object) throws JSONException {
|
||||||
|
return this.append(valueToString(object));
|
||||||
|
}
|
||||||
|
}
|
|
@ -72,6 +72,7 @@ import net.lax1dude.eaglercraft.AssetRepository;
|
||||||
import net.lax1dude.eaglercraft.Base64;
|
import net.lax1dude.eaglercraft.Base64;
|
||||||
import net.lax1dude.eaglercraft.Client;
|
import net.lax1dude.eaglercraft.Client;
|
||||||
import net.lax1dude.eaglercraft.EaglerImage;
|
import net.lax1dude.eaglercraft.EaglerImage;
|
||||||
|
import net.lax1dude.eaglercraft.JSONObject;
|
||||||
import net.lax1dude.eaglercraft.adapter.teavm.IndexedDBFilesystem;
|
import net.lax1dude.eaglercraft.adapter.teavm.IndexedDBFilesystem;
|
||||||
import net.lax1dude.eaglercraft.adapter.teavm.IndexedDBFilesystem.OpenState;
|
import net.lax1dude.eaglercraft.adapter.teavm.IndexedDBFilesystem.OpenState;
|
||||||
//import net.lax1dude.eaglercraft.adapter.teavm.IndexedDBFilesystem;
|
//import net.lax1dude.eaglercraft.adapter.teavm.IndexedDBFilesystem;
|
||||||
|
@ -202,7 +203,7 @@ public class EaglerAdapterImpl2 {
|
||||||
@JSBody(params = { "e" }, script = "return e.which;")
|
@JSBody(params = { "e" }, script = "return e.which;")
|
||||||
private static native int getWhich(KeyboardEvent e);
|
private static native int getWhich(KeyboardEvent e);
|
||||||
|
|
||||||
public static final void initializeContext(HTMLElement rootElement, String assetPackageURI) {
|
public static final void initializeContext(HTMLElement rootElement, String assetPackageURI, JSONObject config) {
|
||||||
parent = rootElement;
|
parent = rootElement;
|
||||||
String s = parent.getAttribute("style");
|
String s = parent.getAttribute("style");
|
||||||
parent.setAttribute("style", (s == null ? "" : s)+"overflow-x:hidden;overflow-y:hidden;");
|
parent.setAttribute("style", (s == null ? "" : s)+"overflow-x:hidden;overflow-y:hidden;");
|
||||||
|
@ -312,6 +313,10 @@ public class EaglerAdapterImpl2 {
|
||||||
});
|
});
|
||||||
onBeforeCloseRegister();
|
onBeforeCloseRegister();
|
||||||
|
|
||||||
|
if(!config.isNull("dataBaseName")) {
|
||||||
|
dataBaseName = config.getString("dataBaseName");
|
||||||
|
}
|
||||||
|
|
||||||
OpenState st = IndexedDBFilesystem.initialize();
|
OpenState st = IndexedDBFilesystem.initialize();
|
||||||
if(st != OpenState.OPENED) {
|
if(st != OpenState.OPENED) {
|
||||||
if(st == OpenState.LOCKED) {
|
if(st == OpenState.LOCKED) {
|
||||||
|
@ -334,8 +339,24 @@ public class EaglerAdapterImpl2 {
|
||||||
|
|
||||||
mouseEvents.clear();
|
mouseEvents.clear();
|
||||||
keyEvents.clear();
|
keyEvents.clear();
|
||||||
|
|
||||||
|
if(!config.isNull("playerUsername")) {
|
||||||
|
forcedUser = config.getString("playerUsername");
|
||||||
|
}
|
||||||
|
if(!config.isNull("serverIP")) {
|
||||||
|
forcedServer = config.getString("serverIP");
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!config.isNull("joinServerOnLaunch")) {
|
||||||
|
joinServerOnLaunch = config.getBoolean("joinServerOnLaunch");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String forcedUser = null;
|
||||||
|
public static String forcedServer = null;
|
||||||
|
public static String dataBaseName = null;
|
||||||
|
public static boolean joinServerOnLaunch = false;
|
||||||
|
|
||||||
public static final void destroyContext() {
|
public static final void destroyContext() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ import org.teavm.jso.indexeddb.IDBVersionChangeEvent;
|
||||||
import org.teavm.jso.typedarrays.ArrayBuffer;
|
import org.teavm.jso.typedarrays.ArrayBuffer;
|
||||||
import org.teavm.jso.typedarrays.Uint8Array;
|
import org.teavm.jso.typedarrays.Uint8Array;
|
||||||
|
|
||||||
|
import net.PeytonPlayz585.opengl.GL11;
|
||||||
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2;
|
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2;
|
||||||
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.FileEntry;
|
import net.lax1dude.eaglercraft.adapter.EaglerAdapterImpl2.FileEntry;
|
||||||
|
|
||||||
|
@ -36,7 +37,13 @@ public class IndexedDBFilesystem {
|
||||||
private static IDBDatabase db = null;
|
private static IDBDatabase db = null;
|
||||||
|
|
||||||
public static final OpenState initialize() {
|
public static final OpenState initialize() {
|
||||||
DatabaseOpen dbo = AsyncHandlers.openDB("_net_lax1dude_eaglercraft_beta_IndexedDBFilesystem_1_3");
|
DatabaseOpen dbo;
|
||||||
|
if(GL11.dataBaseName != null) {
|
||||||
|
System.out.println("Setting custom database name to " + GL11.dataBaseName);
|
||||||
|
dbo = AsyncHandlers.openDB(GL11.dataBaseName);
|
||||||
|
} else {
|
||||||
|
dbo = AsyncHandlers.openDB("_net_lax1dude_eaglercraft_beta_IndexedDBFilesystem_1_3");
|
||||||
|
}
|
||||||
if(dbo == null) {
|
if(dbo == null) {
|
||||||
err = "Unknown Error";
|
err = "Unknown Error";
|
||||||
return OpenState.ERROR;
|
return OpenState.ERROR;
|
||||||
|
|
|
@ -5,10 +5,12 @@
|
||||||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
|
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
|
||||||
<script type="text/javascript" charset="utf-8" src="js/app.js"></script>
|
<script type="text/javascript" charset="utf-8" src="js/app.js"></script>
|
||||||
<script type = text/javascript>
|
<script type = text/javascript>
|
||||||
window.addEventListener("load", function() {
|
window.addEventListener("load", function() {
|
||||||
window.classicConfig = ["game","resources.mc"];
|
window.config = {
|
||||||
main();
|
gameContainer: "game", assetsLocation: "resources.mc", playerUsername: null, serverIP: null, joinServerOnLaunch: false
|
||||||
});
|
};
|
||||||
|
main();
|
||||||
|
});
|
||||||
|
|
||||||
document.esc = false;
|
document.esc = false;
|
||||||
document.addEventListener('keydown', function(e) {
|
document.addEventListener('keydown', function(e) {
|
||||||
|
|
16372
web/js/app.js
16372
web/js/app.js
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user