Merge branch 'LAX1DUDE-main'

This commit is contained in:
ayunami2000 2022-01-19 08:16:16 -05:00
commit 9283bfe009
4 changed files with 5 additions and 7 deletions

View File

@ -37,11 +37,11 @@ dependencies {
teavm { teavm {
compileScopes = null; compileScopes = null;
minifying = true; minifying = false;
maxTopLevelNames = 10000; maxTopLevelNames = 10000;
properties = null; properties = null;
debugInformationGenerated = false; debugInformationGenerated = false;
sourceMapsGenerated = true; sourceMapsGenerated = false;
sourceFilesCopied = false; sourceFilesCopied = false;
incremental = false; incremental = false;
transformers = null; transformers = null;

View File

@ -1,3 +1,4 @@
<!DOCTYPE html>
<html> <html>
<head> <head>
<title>eagler</title> <title>eagler</title>

View File

@ -4,7 +4,7 @@ public class ConfigConstants {
public static boolean profanity = false; public static boolean profanity = false;
public static final String version = "22m03a"; public static final String version = "22w03b";
public static final String mainMenuString = "eaglercraft " + version; public static final String mainMenuString = "eaglercraft " + version;
public static final String forkMe = "https://github.com/ayunami2000/ayuncraft"; public static final String forkMe = "https://github.com/ayunami2000/ayuncraft";

View File

@ -280,15 +280,13 @@ public class EaglerAdapterImpl2 {
execute("window.eagsFileChooser = {\r\n" + execute("window.eagsFileChooser = {\r\n" +
"inputElement: null,\r\n" + "inputElement: null,\r\n" +
"openFileChooser: function(ext, mime){\r\n" + "openFileChooser: function(ext, mime){\r\n" +
"var el = window.eagsFileChooser.inputElement;\r\n" +
"if(el == null){\r\n" +
"el = window.eagsFileChooser.inputElement = document.createElement(\"input\");\r\n" + "el = window.eagsFileChooser.inputElement = document.createElement(\"input\");\r\n" +
"el.type = \"file\";\r\n" + "el.type = \"file\";\r\n" +
"el.multiple = false;\r\n" + "el.multiple = false;\r\n" +
"el.addEventListener(\"change\", function(evt){\r\n" + "el.addEventListener(\"change\", function(evt){\r\n" +
"var f = window.eagsFileChooser.inputElement.files;\r\n" + "var f = window.eagsFileChooser.inputElement.files;\r\n" +
"if(f.length == 0){\r\n" + "if(f.length == 0){\r\n" +
"window.eagsFileChooser.getFileChooserResult = new ArrayBuffer(0);\r\n" + "window.eagsFileChooser.getFileChooserResult = null;\r\n" +
"}else{\r\n" + "}else{\r\n" +
"(async function(){\r\n" + "(async function(){\r\n" +
"window.eagsFileChooser.getFileChooserResult = await f[0].arrayBuffer();\r\n" + "window.eagsFileChooser.getFileChooserResult = await f[0].arrayBuffer();\r\n" +
@ -296,7 +294,6 @@ public class EaglerAdapterImpl2 {
"})();\r\n" + "})();\r\n" +
"}\r\n" + "}\r\n" +
"});\r\n" + "});\r\n" +
"}\r\n" +
"window.eagsFileChooser.getFileChooserResult = null;\r\n" + "window.eagsFileChooser.getFileChooserResult = null;\r\n" +
"window.eagsFileChooser.getFileChooserResultName = null;\r\n" + "window.eagsFileChooser.getFileChooserResultName = null;\r\n" +
"el.accept = mime;\r\n" + "el.accept = mime;\r\n" +