Uplandustries/Eaglercraft-1.8
1
0
Fork 0
mirror of https://github.com/Eaglercraft-Archive/Eaglercraftx-1.8.8-src.git synced 2025-06-27 18:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update #44 - WebAssembly GC support, fix more WebRTC bugs

Browse Source
This commit is contained in:
lax1dude
2024-12-03 23:38:28 -08:00
parent 919014b4df
commit 70b52bbf7a
216 changed files with 34358 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
buildtools/BuildTools.jar
View File

Binary file not shown.

40
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/diff/PullRequestTask.java
View File

@ -72,6 +72,11 @@ public class PullRequestTask {
File originalSourceTeaVMC = new File(EaglerBuildTools.repositoryRoot, "sources/teavmc-classpath/resources");
File originalSourceBootMenu = new File(EaglerBuildTools.repositoryRoot, "sources/teavm-boot-menu/java");
File originalSourceLWJGL = new File(EaglerBuildTools.repositoryRoot, "sources/lwjgl/java");
File originalSourceWASMGCTeaVMJava = new File(EaglerBuildTools.repositoryRoot, "sources/wasm-gc-teavm/java");
File originalSourceWASMGCTeaVMJS = new File(EaglerBuildTools.repositoryRoot, "sources/wasm-gc-teavm/js");
File originalSourceWASMGCTeaVMBootstrapJS = new File(EaglerBuildTools.repositoryRoot, "sources/wasm-gc-teavm-bootstrap/js");
File originalSourceWASMGCTeaVMLoaderC = new File(EaglerBuildTools.repositoryRoot, "sources/wasm-gc-teavm-loader/c");
File originalSourceWASMGCTeaVMLoaderJS = new File(EaglerBuildTools.repositoryRoot, "sources/wasm-gc-teavm-loader/js");
File originalUnpatchedSourceResourcesJar = new File(EaglerBuildToolsConfig.getTemporaryDirectory(), "MinecraftSrc/minecraft_res.jar");
File originalSourceResourcesJar = new File(EaglerBuildToolsConfig.getTemporaryDirectory(), "MinecraftSrc/minecraft_res_patch.jar");
File originalSourceResources = new File(EaglerBuildTools.repositoryRoot, "sources/resources");
@ -83,6 +88,11 @@ public class PullRequestTask {
File diffFromBootMenu = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/teavm-boot-menu/java");
File diffFromTeaVMC = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/teavmc-classpath/resources");
File diffFromLWJGL = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/lwjgl/java");
File diffFromWASMGCTeaVMJava = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/wasm-gc-teavm/java");
File diffFromWASMGCTeaVMJS = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/wasm-gc-teavm/js");
File diffFromWASMGCTeaVMBootstrapJS = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/wasm-gc-teavm-bootstrap/js");
File diffFromWASMGCTeaVMLoaderC = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/wasm-gc-teavm-loader/c");
File diffFromWASMGCTeaVMLoaderJS = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "src/wasm-gc-teavm-loader/js");
File diffFromResources = new File(EaglerBuildToolsConfig.getWorkspaceDirectory(), "desktopRuntime/resources");
File pullRequestTo = new File(EaglerBuildTools.repositoryRoot, "pullrequest");
@ -163,6 +173,36 @@ public class PullRequestTask {
}
System.out.println("Found " + i + " changed files in /src/lwjgl/java/");
i = copyAllModified(diffFromWASMGCTeaVMJava, originalSourceWASMGCTeaVMJava);
if(i > 0) {
flag = true;
}
System.out.println("Found " + i + " changed files in /src/wasm-gc-teavm/java/");
i = copyAllModified(diffFromWASMGCTeaVMJS, originalSourceWASMGCTeaVMJS);
if(i > 0) {
flag = true;
}
System.out.println("Found " + i + " changed files in /src/wasm-gc-teavm/js/");
i = copyAllModified(diffFromWASMGCTeaVMBootstrapJS, originalSourceWASMGCTeaVMBootstrapJS);
if(i > 0) {
flag = true;
}
System.out.println("Found " + i + " changed files in /src/wasm-gc-teavm-bootstrap/js/");
i = copyAllModified(diffFromWASMGCTeaVMLoaderC, originalSourceWASMGCTeaVMLoaderC);
if(i > 0) {
flag = true;
}
System.out.println("Found " + i + " changed files in /src/wasm-gc-teavm-loader/c/");
i = copyAllModified(diffFromWASMGCTeaVMLoaderJS, originalSourceWASMGCTeaVMLoaderJS);
if(i > 0) {
flag = true;
}
System.out.println("Found " + i + " changed files in /src/wasm-gc-teavm-loader/js/");
i = createDiffFiles(null, minecraftJavadocTmp, originalUnpatchedSourceMainJar,
originalSourceMainJar, diffFromGame, pullRequestToMain, true);
if(i > 0) {

110
buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/SetupWorkspace.java
View File

@ -129,6 +129,11 @@ public class SetupWorkspace {
File repoSourcesProtoRelay = new File(repoSources, "protocol-relay/java");
File repoSourcesBootMenu = new File(repoSources, "teavm-boot-menu/java");
File repoSourcesTeavmCRes = new File(repoSources, "teavmc-classpath/resources");
File repoSourcesWASMGCTeaVMJava = new File(repoSources, "wasm-gc-teavm/java");
File repoSourcesWASMGCTeaVMJS = new File(repoSources, "wasm-gc-teavm/js");
File repoSourcesWASMGCTeaVMBootstrapJS = new File(repoSources, "wasm-gc-teavm-bootstrap/js");
File repoSourcesWASMGCTeaVMLoaderC = new File(repoSources, "wasm-gc-teavm-loader/c");
File repoSourcesWASMGCTeaVMLoaderJS = new File(repoSources, "wasm-gc-teavm-loader/js");
File repoSourcesResources = new File(repoSources, "resources");
File srcMainJava = new File(workspaceDirectory, "src/main/java");
File srcGameJava = new File(workspaceDirectory, "src/game/java");
@ -138,6 +143,11 @@ public class SetupWorkspace {
File srcProtoRelay = new File(workspaceDirectory, "src/protocol-relay/java");
File srcBootMenu = new File(workspaceDirectory, "src/teavm-boot-menu/java");
File srcTeavmCRes = new File(workspaceDirectory, "src/teavmc-classpath/resources");
File srcWASMGCTeaVMJava = new File(workspaceDirectory, "src/wasm-gc-teavm/java");
File srcWASMGCTeaVMJS = new File(workspaceDirectory, "src/wasm-gc-teavm/js");
File srcWASMGCTeaVMBootstrapJS = new File(workspaceDirectory, "src/wasm-gc-teavm-bootstrap/js");
File srcWASMGCTeaVMLoaderC = new File(workspaceDirectory, "src/wasm-gc-teavm-loader/c");
File srcWASMGCTeaVMLoaderJS = new File(workspaceDirectory, "src/wasm-gc-teavm-loader/js");
File resourcesExtractTo = new File(workspaceDirectory, "desktopRuntime/resources");
File mcLanguagesZip = new File(mcTmpDirectory, "minecraft_languages.zip");
File mcLanguagesExtractTo = new File(workspaceDirectory, "javascript/lang");
@ -165,6 +175,11 @@ public class SetupWorkspace {
System.err.println("ERROR: Could not rename \".gitignore.default\" to \".gitignore\" in the workspace directory!");
}
existingGi = new File(workspaceDirectory, "wasm_gc_teavm/.gitignore");
if((existingGi.exists() && !existingGi.delete()) || !(new File(workspaceDirectory, "wasm_gc_teavm/.gitignore.default").renameTo(existingGi))) {
System.err.println("ERROR: Could not rename \"wasm_gc_teavm/.gitignore.default\" to \"wasm_gc_teavm/.gitignore\" in the workspace directory!");
}
if(repoSourcesTeaVM.isDirectory()) {
System.out.println("Copying files from \"/sources/teavm/java/\" to workspace...");
@ -183,6 +198,10 @@ public class SetupWorkspace {
System.out.println("Copying files from \"/sources/main/java/\" to workspace...");
try {
if(!srcMainJava.isDirectory() && !srcMainJava.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesMain, srcMainJava);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/main/java/\" to \"" + srcMainJava.getAbsolutePath() + "\"!");
@ -193,6 +212,10 @@ public class SetupWorkspace {
System.out.println("Copying files from \"/sources/protocol-game/java/\" to workspace...");
try {
if(!srcProtoGame.isDirectory() && !srcProtoGame.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesProtoGame, srcProtoGame);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/protocol-game/java/\" to \"" + srcProtoGame.getAbsolutePath() + "\"!");
@ -204,6 +227,10 @@ public class SetupWorkspace {
System.out.println("Copying files from \"/sources/protocol-relay/java/\" to workspace...");
try {
if(!srcProtoRelay.isDirectory() && !srcProtoRelay.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesProtoRelay, srcProtoRelay);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/protocol-relay/java/\" to \"" + srcProtoRelay.getAbsolutePath() + "\"!");
@ -215,6 +242,10 @@ public class SetupWorkspace {
System.out.println("Copying files from \"/sources/teavmc-classpath/resources/\" to workspace...");
try {
if(!srcTeavmCRes.isDirectory() && !srcTeavmCRes.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesTeavmCRes, srcTeavmCRes);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/teavmc-classpath/resources/\" to \"" + srcTeavmCRes.getAbsolutePath() + "\"!");
@ -226,6 +257,10 @@ public class SetupWorkspace {
System.out.println("Copying files from \"/sources/teavm-boot-menu/java/\" to workspace...");
try {
if(!srcBootMenu.isDirectory() && !srcBootMenu.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesBootMenu, srcBootMenu);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/teavm-boot-menu/java/\" to \"" + srcBootMenu.getAbsolutePath() + "\"!");
@ -247,6 +282,81 @@ public class SetupWorkspace {
throw ex;
}
}
if(repoSourcesWASMGCTeaVMJava.isDirectory()) {
System.out.println("Copying files from \"/sources/wasm-gc-teavm/java/\" to workspace...");
try {
if(!srcWASMGCTeaVMJava.isDirectory() && !srcWASMGCTeaVMJava.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesWASMGCTeaVMJava, srcWASMGCTeaVMJava);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/wasm-gc-teavm/java/\" to \"" + srcWASMGCTeaVMJava.getAbsolutePath() + "\"!");
throw ex;
}
}
if(repoSourcesWASMGCTeaVMJS.isDirectory()) {
System.out.println("Copying files from \"/sources/wasm-gc-teavm/js/\" to workspace...");
try {
if(!srcWASMGCTeaVMJS.isDirectory() && !srcWASMGCTeaVMJS.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesWASMGCTeaVMJS, srcWASMGCTeaVMJS);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/wasm-gc-teavm/js/\" to \"" + srcWASMGCTeaVMJS.getAbsolutePath() + "\"!");
throw ex;
}
}
if(repoSourcesWASMGCTeaVMBootstrapJS.isDirectory()) {
System.out.println("Copying files from \"/sources/wasm-gc-teavm-bootstrap/js/\" to workspace...");
try {
if(!srcWASMGCTeaVMBootstrapJS.isDirectory() && !srcWASMGCTeaVMBootstrapJS.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesWASMGCTeaVMBootstrapJS, srcWASMGCTeaVMBootstrapJS);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/wasm-gc-teavm-bootstrap/js/\" to \"" + srcWASMGCTeaVMBootstrapJS.getAbsolutePath() + "\"!");
throw ex;
}
}
if(repoSourcesWASMGCTeaVMLoaderC.isDirectory()) {
System.out.println("Copying files from \"/sources/wasm-gc-teavm-loader/c/\" to workspace...");
try {
if(!srcWASMGCTeaVMLoaderC.isDirectory() && !srcWASMGCTeaVMLoaderC.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesWASMGCTeaVMLoaderC, srcWASMGCTeaVMLoaderC);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/wasm-gc-teavm-loader/c/\" to \"" + srcWASMGCTeaVMLoaderC.getAbsolutePath() + "\"!");
throw ex;
}
}
if(repoSourcesWASMGCTeaVMLoaderJS.isDirectory()) {
System.out.println("Copying files from \"/sources/wasm-gc-teavm-loader/js/\" to workspace...");
try {
if(!srcWASMGCTeaVMLoaderJS.isDirectory() && !srcWASMGCTeaVMLoaderJS.mkdirs()) {
System.err.println("ERROR: Could not create destination directory!");
return false;
}
FileUtils.copyDirectory(repoSourcesWASMGCTeaVMLoaderJS, srcWASMGCTeaVMLoaderJS);
}catch(IOException ex) {
System.err.println("ERROR: could not copy \"/sources/wasm-gc-teavm-loader/js/\" to \"" + srcWASMGCTeaVMLoaderJS.getAbsolutePath() + "\"!");
throw ex;
}
}
System.out.println("Copying files from \"/sources/resources/\" to workspace...");