WASM

.gitignore

@@ -9,6 +9,8 @@ lwjgl-rundir/_eagstorage.a.dat
 lwjgl-rundir/filesystem/
 wasm_gc_teavm/bin/
 wasm_gc_teavm/build/
+lwjgl-rundir/crash-reports
+projectops/
 wasm_gc_teavm/.gradle/
 /.metadata/
 /EAGLER1.8

target_teavm_wasm_gc/.gitignore

@@ -1,11 +1,7 @@
-.gradle
-.settings
-.classpath
-.project
-build
-bin
 javascript/eagruntime.js
 javascript/classes.wasm
 javascript/classes.wasm.teadbg
 javascript/assets.epk
+javascript/lang.tmp.epk
 javascript_dist/assets.epw
+javascript_dist/EaglercraftX_1.8_*

target_teavm_wasm_gc/CompileEPK.bat

@@ -1,6 +0,0 @@
-@echo off
-title epkcompiler
-echo compiling, please wait...
-java -jar "../lwjgl-rundir/CompileEPK.jar" "../lwjgl-rundir/resources" "javascript/assets.epk" none
-echo finished compiling epk
-pause

target_teavm_wasm_gc/CompileEPK.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar "../desktopRuntime/CompileEPK.jar" "../desktopRuntime/resources" "javascript/assets.epk" none

target_teavm_wasm_gc/CompileEagRuntimeJS.bat

@@ -1,6 +0,0 @@
-@echo off
-title CompileEagRuntimeJS
-set srcFolder=../src/wasm-gc-teavm/js
-echo Compiling %srcFolder%
-java -jar buildtools/closure-compiler.jar --compilation_level ADVANCED_OPTIMIZATIONS --assume_function_wrapper --emit_use_strict --isolation_mode IIFE --js "%srcFolder%/externs.js" "%srcFolder%/eagruntime_util.js" "%srcFolder%/eagruntime_main.js" "%srcFolder%/platformApplication.js" "%srcFolder%/platformAssets.js" "%srcFolder%/platformAudio.js" "%srcFolder%/platformFilesystem.js" "%srcFolder%/platformInput.js" "%srcFolder%/platformNetworking.js" "%srcFolder%/platformOpenGL.js" "%srcFolder%/platformRuntime.js" "%srcFolder%/WASMGCBufferAllocator.js" "%srcFolder%/teavm_runtime.js" "%srcFolder%/eagruntime_entrypoint.js" --js_output_file javascript/eagruntime.js
-pause

target_teavm_wasm_gc/CompileEagRuntimeJS.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-srcFolder=../src/wasm-gc-teavm/js
-echo Compiling $srcFolder
-java -jar buildtools/closure-compiler.jar --compilation_level ADVANCED_OPTIMIZATIONS --assume_function_wrapper --emit_use_strict --isolation_mode IIFE --js $srcFolder/externs.js $srcFolder/eagruntime_util.js $srcFolder/eagruntime_main.js $srcFolder/platformApplication.js $srcFolder/platformAssets.js $srcFolder/platformAudio.js $srcFolder/platformFilesystem.js $srcFolder/platformInput.js $srcFolder/platformNetworking.js $srcFolder/platformOpenGL.js $srcFolder/platformRuntime.js $srcFolder/platformScreenRecord.js $srcFolder/platformVoiceClient.js $srcFolder/platformWebRTC.js $srcFolder/platformWebView.js $srcFolder/clientPlatformSingleplayer.js $srcFolder/serverPlatformSingleplayer.js $srcFolder/WASMGCBufferAllocator.js $srcFolder/fix-webm-duration.js $srcFolder/teavm_runtime.js $srcFolder/eagruntime_entrypoint.js --js_output_file javascript/eagruntime.js

target_teavm_wasm_gc/CompileWASM.bat

@@ -1,4 +1,5 @@
 @echo off
-title gradlew generateWasmGC
+title gradlew target_teavm_wasm_gc:assembleMainComponents 
-call gradlew generateWasmGC
+cd ../
+call gradlew target_teavm_wasm_gc:assembleMainComponents
 pause

target_teavm_wasm_gc/CompileWASM.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
+cd ../
 chmod +x gradlew
-./gradlew generateWasmGC
+./gradlew target_teavm_wasm_gc:assembleMainComponents

target_teavm_wasm_gc/MakeWASMClientBundle.bat

@@ -1,6 +1,4 @@
 @echo off
-title MakeWASMClientBundle
+cd ../
-cd javascript
+call gradlew target_teavm_wasm_gc:makeMainWasmClientBundle
-java -cp "../buildtools/org.tukanni.xz.jar;../buildtools/MakeWASMClientBundle.jar;../../lwjgl-rundir/CompileEPK.jar;../../lwjgl-rundir/MakeOfflineDownload.jar" net.lax1dude.eaglercraft.v1_8.buildtools.workspace.MakeWASMClientBundle epw_src.txt epw_meta.txt "../javascript_dist"
-cd ..
 pause

target_teavm_wasm_gc/MakeWASMClientBundle.sh

@@ -1,3 +1,4 @@
 #!/bin/sh
-cd javascript
+cd ../
-java -cp "../buildtools/org.tukanni.xz.jar:../buildtools/MakeWASMClientBundle.jar:../../lwjgl-rundir/CompileEPK.jar:../../lwjgl-rundir/MakeOfflineDownload.jar" net.lax1dude.eaglercraft.v1_8.buildtools.workspace.MakeWASMClientBundle epw_src.txt epw_meta.txt "../javascript_dist"
+chmod +x gradlew
+./gradlew target_teavm_wasm_gc:makeMainWasmClientBundle

target_teavm_wasm_gc/README.md

@@ -1,25 +0,0 @@
-
-# EaglercraftX WASM-GC Runtime
-
-This folder contains the Gradle project for compiling the EaglercraftX 1.8 client to WASM. This requires a special fork of TeaVM that has been modified for Eaglercraft. The `settings.gradle` and `build.gradle` are set up to download the binaries automatically but if you would like to build the TeaVM fork yourself you can use the TeaVM fork's `publishToMavenLocal` gradle task and replace the URL maven repository declarations in the gradle build scripts with `mavenLocal()` instead.
-
-**TeaVM Fork: [https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm/tree/eagler-r1](https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm/tree/eagler-r1)**
-
-### To compile the client:
-1. Run `CompileEPK` to compile the assets.epk file
-2. Run `CompileWASM` to compile the classes.wasm file
-3. Run `CompileEagRuntimeJS` to compile the eagruntime.js file
-4. Run `MakeWASMClientBundle` to bundle the client into an EPW file
-
-The final assets.epw and offline download will be in the "javascript_dist" folder
-
-### Optional Steps:
-- Run `CompileBootstrapJS` to recompile bootstrap.js in the javascript_dist folder
-- Run `CompileLoaderWASM`to recompile loader.js and loader.wasm (requires emscripten)
-
-### Potential issues when porting:
-- Disabling VSync causes bad input lag, the solution to this problem is to remove the vsync option and force people to play with vsync enabled, like all other browser games
-- TeaVM's WASM GC backend is still under development and will sometimes generate broken code with nested try/finally statements in a try/catch block, or other strange runtime glitches
-- Fewer reflection features are supported in WASM GC than the JavaScript backend (so far)
-- Do not use `@Async` or any sort of callback (like addEventListener) in your Java, you must implement async functions in JavaScript in `../src/wasm-gc-teavm/js`, using JSPI to suspend/resume the thread for promises, or by pushing events into a queue that you can poll from your Java for event handlers.
-- Functions imported via the `@Import` will not catch exceptions, if you want proper exception handling you must call the imported function through the JSO

target_teavm_wasm_gc/build.gradle

@@ -1,54 +0,0 @@
-import org.teavm.gradle.api.OptimizationLevel
-import org.teavm.gradle.api.WasmDebugInfoLocation
-import org.teavm.gradle.api.WasmDebugInfoLevel
-
-plugins {
-    id "java"
-    id "eclipse"
-    id "org.teavm" version "0.12.1-EAGLER-R3"
-}
-
-sourceSets {
-    main {
-        java {
-            srcDirs(
-                "../src/main/java",
-                "../src/game/java",
-                "../src/wasm-gc-teavm/java"
-            )
-        }
-    }
-    
-}
-
-repositories {
-    maven {
-        url = uri("https://eaglercraft-teavm-fork.github.io/maven/")
-    }
-    mavenCentral()
-}
-
-dependencies {
-    compileOnly "org.teavm:teavm-core:0.12.1-EAGLER-R3" // workaround for a few hacks
-}
-
-def folder = "javascript"
-def name = "classes.wasm"
-
-teavm.wasmGC {
-    compileJava.options.encoding = "UTF-8"
-    targetFileName = "../" + name
-    optimization = OptimizationLevel.BALANCED //AGGRESSIVE crashes
-    outOfProcess = false
-    fastGlobalAnalysis = false
-    processMemory = 512
-    mainClass = "net.lax1dude.eaglercraft.internal.wasm_gc_teavm.MainClass"
-    outputDir = file(folder)
-    properties = [ "java.util.TimeZone.autodetect": "true" ]
-    debugInformation = true
-    debugInfoLocation = WasmDebugInfoLocation.EXTERNAL;
-    debugInfoLevel = WasmDebugInfoLevel.DEOBFUSCATION;
-    minDirectBuffersSize = 32
-    maxDirectBuffersSize = 512
-    disassembly = true
-}

target_teavm_wasm_gc/build.gradle.kts

@@ -16,13 +16,19 @@ java {
 }
 
 sourceSets {
-	named("main") {
+	main {
-		java.srcDirs(
+		java.setSrcDirs(
-			"../src/wasm-gc-teavm/java"
+			listOf(
+				"../src/wasm-gc-teavm/java",
+				"../src/main/java"
 			)
-		resources.srcDirs(
+		)
+
+		resources.setSrcDirs(
+			listOf(
 				"../src/teavm/resources"
 			)
+		)
 	}
 }
 
@@ -37,11 +43,12 @@ dependencies {
 	teavm(teavm.libs.jso)
 	teavm(teavm.libs.jsoApis)
 	compileOnly("org.teavm:teavm-core:0.12.1-EAGLER-R3") // workaround for a few hacks
-	implementation(rootProject)
 	implementation(libs.jorbis)
 	implementation(libs.bundles.common)
 }
 
+tasks.register("prepareKotlinBuildScriptModel") {
+}
 val wasmFolder = "javascript"
 val wasmOutputFileName = "classes.wasm"
 
@@ -51,7 +58,7 @@ teavm.wasmGC {
 	outOfProcess = false
 	fastGlobalAnalysis = false
 	processMemory = 512
-	mainClass = "net.lax1dude.eaglercraft.v1_8.internal.wasm_gc_teavm.MainClass"
+	mainClass = "net.lax1dude.eaglercraft.internal.wasm_gc_teavm.MainClass"
 	outputDir = file(wasmFolder)
 	properties = mapOf("java.util.TimeZone.autodetect" to "true")
 	debugInformation = true
@@ -103,7 +110,7 @@ eaglercraftBuild {
 			epwSearchDirectory = file(wasmFolder)
 			clientBundleOutputDir = file("javascript_dist")
 		}.apply {
-			epkSources = file("../desktopRuntime/resources")
+			epkSources = file("../lwjgl-rundir/resources")
 			epkOutput = file("javascript/assets.epk")
 
 			languageMetadataInput = file("../target_teavm_javascript/javascript/lang")

target_teavm_wasm_gc/gradle.properties

@@ -1,2 +0,0 @@
-org.gradle.jvmargs=-Xmx4G -Xms4G
-org.gradle.java.home=/usr/lib/jvm/java-17-temurin-jdk/

target_teavm_wasm_gc/gradlew

@@ -1,249 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
-done
-
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
-    echo "$*"
-} >&2
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
-    else
-        JAVACMD=$JAVA_HOME/bin/java
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
-fi
-
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
-fi
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
-exec "$JAVACMD" "$@"

target_teavm_wasm_gc/gradlew.bat

@@ -1,92 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

target_teavm_wasm_gc/javascript/OfflineDownloadTemplate.txt

@@ -1,14 +1,39 @@
 <!DOCTYPE html>
+
+
+
+<!--
+
+This file is from ${date}, there is no official eagler download link anymore, check the websites and discords of your favorite eagler servers for new versions
+
+Be aware that some server owners are lazy and do not update their client regularly
+
+This is the WASM-GC version of EaglercraftX and may not be compatible with outdated browsers
+
+-->
+
+
+
+
+
+
+
+
+
+
+
+
+
 <html style="width:100%;height:100%;background-color:black;">
 <head>
 <meta charset="UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
-<meta name="description" content="Eaglercraft 1.4.7 WASM-GC Offline" />
+<meta name="description" content="EaglercraftX 1.8 WASM-GC Offline" />
-<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.4, 1.4.7" />
+<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
-<title>Beta 1.1_02 WASM</title>
+<title>EaglercraftX 1.8 WASM-GC</title>
 <meta property="og:locale" content="en-US" />
 <meta property="og:type" content="website" />
-<meta property="og:title" content="Eaglercraft 1.4.7 WASM-GC" />
+<meta property="og:title" content="EaglercraftX 1.8 WASM-GC Offline" />
 <meta property="og:description" content="this file is not a website, whoever uploaded it to this URL is a dumbass" />
 <script type="text/javascript">
 "use strict";
@@ -18,7 +43,12 @@ var relayId = Math.floor(Math.random() * 3);
 
 window.eaglercraftXOpts = {
 	container: "game_frame",
-	worldsDB: "worlds"
+	worldsDB: "worlds",
+	relays: [
+		{ addr: "wss://relay.deev.is/", comment: "lax1dude relay #1", primary: relayId == 0 },
+		{ addr: "wss://relay.lax1dude.net/", comment: "lax1dude relay #2", primary: relayId == 1 },
+		{ addr: "wss://relay.shhnowisnottheti.me/", comment: "ayunami relay #1", primary: relayId == 2 }
+	]
 };
 
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

target_teavm_wasm_gc/javascript/epw_meta.txt

@@ -1,8 +1,8 @@
-client-version-integer=53
+client-version-integer=52
 client-package-name=net.lax1dude.eaglercraft.v1_8.client
 client-origin-name=EaglercraftX
-client-origin-version=u53
+client-origin-version=u52
 client-origin-vendor=lax1dude
 client-fork-name=EaglercraftX
-client-fork-version=u53
+client-fork-version=u52
-client-fork-vendor=EymenWSMC
+client-fork-vendor=lax1dude

target_teavm_wasm_gc/javascript/epw_src.txt

@@ -6,6 +6,8 @@ classes-deobf-teadbg-file=classes.wasm.teadbg
 classes-deobf-wasm-file=classes.wasm-deobfuscator.wasm
 assets-epk-0-file=assets.epk
 assets-epk-0-path=/
+assets-epk-1-file=lang.tmp.epk
+assets-epk-1-path=/assets/minecraft/lang/
 splash-logo-image-file=splash.png
 splash-logo-image-mime=image/png
 press-any-key-image-file=pressAnyKey.png
@@ -17,4 +19,4 @@ favicon-image-mime=image/png
 jspi-unavailable-file=enableJSPIScreen.html
 offline-download-template=OfflineDownloadTemplate.txt
 offline-download-script=../javascript_dist/bootstrap.js
-offline-download-name=Eaglercraft_1.4.7_OPTIFINE_HD_D5_WASM.html
+offline-download-name=EaglercraftX_1.8_WASM-GC_Offline_Download.html

target_teavm_wasm_gc/javascript/index.html

@@ -3,12 +3,12 @@
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
-		<meta name="description" content="Eaglercraft Beta 1.1_02 WASM-GC test directory HTML page" />
+		<meta name="description" content="EaglercraftX 1.8 WASM-GC test directory HTML page" />
-		<meta name="keywords" content="eaglercraft, eaglercraftx, eagler, minecraft, beta, 1.1, 1.1_02" />
+		<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
-		<title>Beta 1.1_02 WASM-GC</title>
+		<title>EaglercraftX 1.8 WASM-GC</title>
 		<meta property="og:locale" content="en-US" />
 		<meta property="og:type" content="website" />
-		<meta property="og:title" content="Eaglercraft Beta 1.1_02 WASM-GC" />
+		<meta property="og:title" content="EaglercraftX 1.8 WASM-GC" />
 		<meta property="og:description" content="test directory HTML page" />
 		<link type="image/png" rel="shortcut icon" href="favicon.png" />
 		<script type="text/javascript">
@@ -42,7 +42,15 @@
 					const eaglercraftXOpts = {
 						demoMode: false,
 						localesURI: "lang/",
-						worldsDB: "worlds"
+						worldsDB: "worlds",
+						servers: [
+							{ addr: "ws://localhost:8081/", name: "Local test server" }
+						],
+						relays: [
+							{ addr: "wss://relay.deev.is/", comment: "lax1dude relay #1", primary: relayId === 0 },
+							{ addr: "wss://relay.lax1dude.net/", comment: "lax1dude relay #2", primary: relayId === 1 },
+							{ addr: "wss://relay.shhnowisnottheti.me/", comment: "ayunami relay #1", primary: relayId === 2 }
+						]
 					};
 					
 					window.__eaglercraftXLoaderContext = {

target_teavm_wasm_gc/javascript_dist/index.html

@@ -3,13 +3,13 @@
 	<head>
 		<meta charset="UTF-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />
-		<meta name="description" content="Play minecraft beta 1.1_02 in your browser" />
+		<meta name="description" content="Play minecraft 1.8 in your browser" />
-		<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, beta 1.1, 1.1_02" />
+		<meta name="keywords" content="eaglercraft, eaglercraftx, minecraft, 1.8, 1.8.8" />
-		<title>Beta 1.1_02 WASM-GC</title>
+		<title>EaglercraftX 1.8 WASM-GC</title>
 		<meta property="og:locale" content="en-US" />
 		<meta property="og:type" content="website" />
-		<meta property="og:title" content="Eaglercraft Beta 1.1_2 WASM-GC" />
+		<meta property="og:title" content="EaglercraftX 1.8 WASM-GC" />
-		<meta property="og:description" content="Play minecraft beta 1.1_02 in your browser" />
+		<meta property="og:description" content="Play minecraft 1.8 in your browser" />
 		<meta property="og:image" content="favicon.png" />
 		<link type="image/png" rel="shortcut icon" href="favicon.png" />
 		<script type="text/javascript" src="bootstrap.js"></script>
@@ -27,7 +27,15 @@
 						demoMode: false,
 						container: "game_frame",
 						assetsURI: "assets.epw",
-						worldsDB: "worlds"
+						worldsDB: "worlds",
+						servers: [
+							/* example: { addr: "ws://localhost:8081/", name: "Local test server" } */
+						],
+						relays: [
+							{ addr: "wss://relay.deev.is/", comment: "lax1dude relay #1", primary: relayId == 0 },
+							{ addr: "wss://relay.lax1dude.net/", comment: "lax1dude relay #2", primary: relayId == 1 },
+							{ addr: "wss://relay.shhnowisnottheti.me/", comment: "ayunami relay #1", primary: relayId == 2 }
+						]
 					};
 					
 					// %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

target_teavm_wasm_gc/settings.gradle

@@ -1,19 +0,0 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user manual at https://docs.gradle.org/6.0/userguide/multi_project_builds.html
- */
-
-pluginManagement {
-    repositories {
-        maven {
-            url = uri("https://eaglercraft-teavm-fork.github.io/maven/")
-        }
-        mavenCentral()
-    }
-}
-
-rootProject.name = 'eagler-workspace-wasm-gc-teavm'