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 10:28:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update #22 - Singleplayer and shared worlds, shader fixes

Browse Source
This commit is contained in:
lax1dude
2023-12-12 01:22:54 -08:00
parent e3d6256493
commit 3f00d402fa
2350 changed files with 45241 additions and 7798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildtools/teavm-bridge/build.gradle
View File

@ -2,9 +2,6 @@
apply plugin: 'java'
apply plugin: 'eclipse'
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceSets {
main {
java {
@ -18,7 +15,6 @@ repositories {
}
dependencies {
/** we use 0.6.1 due to performance issues on 7.0.0 */
implementation 'org.teavm:teavm-cli:0.6.1'
implementation 'org.teavm:teavm-tooling:0.6.1'
implementation 'org.teavm:teavm-cli:0.9.2'
implementation 'org.teavm:teavm-tooling:0.9.2'
}

97
buildtools/teavm-bridge/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/teavm/TeaVMBridgeImpl.java
View File

@ -13,7 +13,6 @@ import org.teavm.tooling.TeaVMTargetType;
import org.teavm.tooling.builder.BuildException;
import org.teavm.tooling.builder.BuildResult;
import org.teavm.tooling.builder.BuildStrategy;
import org.teavm.tooling.builder.ClassLoaderFactory;
import org.teavm.tooling.builder.InProcessBuildStrategy;
import org.teavm.vm.TeaVMOptimizationLevel;
import org.teavm.vm.TeaVMPhase;
@ -64,70 +63,48 @@ public class TeaVMBridgeImpl {
System.out.println();
final List<URLClassLoader> openedClassLoaders = new ArrayList();
BuildStrategy buildStrategy = new InProcessBuildStrategy(new ClassLoaderFactory() {
@Override
public ClassLoader create(URL[] var1, ClassLoader var2) {
URLClassLoader classLoader = new URLClassLoader(var1, var2);
synchronized(openedClassLoaders) {
openedClassLoaders.add(classLoader);
}
return classLoader;
}
});
BuildStrategy buildStrategy = new InProcessBuildStrategy();
long start = System.currentTimeMillis();
BuildResult result = null;
buildStrategy.setClassPathEntries((List<String>)options.get("classPathEntries"));
buildStrategy.setDebugInformationGenerated(false);
buildStrategy.setEntryPointName((String)options.get("entryPointName"));
buildStrategy.setMainClass((String)options.get("mainClass"));
buildStrategy.setMaxTopLevelNames(16000); // TODO: what does this do? sounds important
buildStrategy.setObfuscated(((Boolean)options.get("minifying")).booleanValue());
buildStrategy.setOptimizationLevel(TeaVMOptimizationLevel.valueOf((String)options.get("optimizationLevel")));
buildStrategy.setSourceFilesCopied(false);
buildStrategy.setSourceMapsFileGenerated(((Boolean)options.get("generateSourceMaps")).booleanValue());
buildStrategy.setTargetDirectory((String)options.get("targetDirectory"));
buildStrategy.setTargetFileName((String)options.get("targetFileName"));
buildStrategy.setTargetType(TeaVMTargetType.JAVASCRIPT);
buildStrategy.setProgressListener(new TeaVMProgressListener() {
@Override
public TeaVMProgressFeedback progressReached(int var1) {
return TeaVMProgressFeedback.CONTINUE;
}
@Override
public TeaVMProgressFeedback phaseStarted(TeaVMPhase var1, int var2) {
if(var1 == TeaVMPhase.DEPENDENCY_ANALYSIS) {
System.out.println("[TeaVMBridge] Analyzing dependencies...");
}else if(var1 == TeaVMPhase.COMPILING) {
System.out.println("[TeaVMBridge] Running compiler...");
}
return TeaVMProgressFeedback.CONTINUE;
}
});
try {
buildStrategy.setClassPathEntries((List<String>)options.get("classPathEntries"));
buildStrategy.setDebugInformationGenerated(false);
buildStrategy.setEntryPointName((String)options.get("entryPointName"));
buildStrategy.setMainClass((String)options.get("mainClass"));
buildStrategy.setMaxTopLevelNames(10000); // TODO: what does this do? sounds important
buildStrategy.setMinifying(((Boolean)options.get("minifying")).booleanValue());
buildStrategy.setOptimizationLevel(TeaVMOptimizationLevel.valueOf((String)options.get("optimizationLevel")));
buildStrategy.setSourceFilesCopied(false);
buildStrategy.setSourceMapsFileGenerated(((Boolean)options.get("generateSourceMaps")).booleanValue());
buildStrategy.setTargetDirectory((String)options.get("targetDirectory"));
buildStrategy.setTargetFileName((String)options.get("targetFileName"));
buildStrategy.setTargetType(TeaVMTargetType.JAVASCRIPT);
buildStrategy.setProgressListener(new TeaVMProgressListener() {
@Override
public TeaVMProgressFeedback progressReached(int var1) {
return TeaVMProgressFeedback.CONTINUE;
}
@Override
public TeaVMProgressFeedback phaseStarted(TeaVMPhase var1, int var2) {
if(var1 == TeaVMPhase.DEPENDENCY_ANALYSIS) {
System.out.println("[TeaVMBridge] Analyzing dependencies...");
}else if(var1 == TeaVMPhase.COMPILING) {
System.out.println("[TeaVMBridge] Running compiler...");
}
return TeaVMProgressFeedback.CONTINUE;
}
});
try {
result = buildStrategy.build();
}catch(BuildException ex) {
throw new RuntimeException("[TeaVMBridge] BuildException thrown while building!", ex.getCause());
}catch(Throwable t) {
throw new RuntimeException("[TeaVMBridge] Unhandled exception thrown while building!", t);
}
}finally {
for(int i = 0, l = openedClassLoaders.size(); i < l; ++i) {
URLClassLoader cl = openedClassLoaders.get(i);
try {
cl.close();
}catch(Throwable t) {
System.out.println("[TeaVMBridge] ERROR: could not free classloader " + cl + ": " + t.toString());
}
}
result = buildStrategy.build();
}catch(BuildException ex) {
throw new RuntimeException("[TeaVMBridge] BuildException thrown while building!", ex.getCause());
}catch(Throwable t) {
throw new RuntimeException("[TeaVMBridge] Unhandled exception thrown while building!", t);
}
System.out.println();