diff --git a/build.gradle b/build.gradle index 5cebdc7..4d10058 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ sourceSets { java { srcDirs( "src/main/java", - "src/teavm/java", + "src/lwjgl/java", "sp-server/src/ipc/java" ) } @@ -26,10 +26,10 @@ tasks.withType(JavaCompile) { options.compilerArgs << "-Xmaxerrs" << "1000" } -//sourceSets.main.resources.srcDirs += 'src/lwjgl/java/javazoom/jl/decoder' +sourceSets.main.resources.srcDirs += 'src/lwjgl/java/javazoom/jl/decoder' dependencies { - //implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar') + implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar') teavm(teavm.libs.jso) teavm(teavm.libs.jsoApis) diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index d49f19c..8788d82 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java b/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java index 7aafece..f534b47 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/MinecraftMain.java @@ -23,6 +23,8 @@ public class MinecraftMain { if(par0ArrayOfStr.length > 0) { EaglerAdapter.setServerToJoinOnLaunch(par0ArrayOfStr[0]); } + + System.out.println(EaglerAdapter.getGPUInfo()); Minecraft mc = new Minecraft(); mc.run(); diff --git a/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java b/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java index e28f3cd..125a6f9 100644 --- a/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java +++ b/src/lwjgl/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java @@ -109,6 +109,14 @@ public class EaglerAdapterImpl2 { } } + public static String getGPUInfo(){ + String glvendor = GL11.glGetString(GL11.GL_VENDOR); + String glrenderer = GL11.glGetString(GL11.GL_RENDERER); + String glversion = GL11.glGetString(GL11.GL_VERSION); + + return glrenderer + "\n" + glversion + "\n"; + } + public static final boolean isSSLPage() { return true; } diff --git a/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java b/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java index 864ff8e..9a4bf24 100644 --- a/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java +++ b/src/teavm/java/net/lax1dude/eaglercraft/adapter/EaglerAdapterImpl2.java @@ -169,6 +169,10 @@ public class EaglerAdapterImpl2 { } } + public static String getGPUInfo(){ + return null; + } + @Async public static native String downloadAssetPack(String assetPackageURI);