backup

Author: SolsticeSpectrum

.gitignore

@@ -24,6 +24,10 @@ server/bin/
 client/bin/
 *.zip
 
+# Native build
+agent-extracted-predefined-classes/
+*.lock
+
 # Run directories
 run/
 run_server/

README.md

@@ -137,6 +137,8 @@ prism-instance/
 
 ## Native Builds
 
+Requires `./gradlew setup` first.
+
 ### Build
 
 ```bash

build.gradle

@@ -235,15 +235,14 @@ task runClient(type: JavaExec) {
 
     environment '__GL_THREADED_OPTIMIZATIONS', '0'
 
-    args = ['--version', version, '--accessToken', '0', '--assetsDir', 'assets',
-            '--assetIndex', assetsVer, '--gameDir', 'run']
+    args = Utils.clientArgs(version, assetsVer, project.properties)
 }
 
 task runNativeServer(type: Exec) {
     group = 'run'
     doFirst { mkdir 'run_server' }
 
-    commandLine = Native.runCommand(rootDir, 'server', '--nogui')
+    commandLine = Native.runCommand(rootDir, 'server', '')
     workingDir = file('run_server')
 }
 
@@ -253,8 +252,7 @@ task runNativeClient(type: Exec) {
     doFirst { mkdir 'run' }
 
     commandLine = Native.runCommand(rootDir, 'client',
-        '--version', version, '--accessToken', '0', '--assetsDir', 'assets',
-        '--assetIndex', assetsVer, '--gameDir', 'run')
+        Utils.clientArgs(version, assetsVer, project.properties).toArray(new String[0]))
     workingDir = file('run')
     environment '__GL_THREADED_OPTIMIZATIONS', '0'
 }
@@ -283,16 +281,17 @@ task nativeClientAgent(type: JavaExec) {
     jvmArgs = [Native.agentArg(rootDir, 'client')]
     environment '__GL_THREADED_OPTIMIZATIONS', '0'
 
-    args = ['--version', version, '--accessToken', '0', '--assetsDir', 'assets',
-            '--assetIndex', assetsVer, '--gameDir', 'run']
+    args = Utils.clientArgs(version, assetsVer, project.properties)
 }
 
 project(':server').tasks.compileJava.mustRunAfter snapServer
+project(':server').tasks.processResources.mustRunAfter snapServer
 project(':client').tasks.compileJava.mustRunAfter snapClient
+project(':client').tasks.processResources.mustRunAfter snapClient
 
 task nativeServer(type: Exec) {
     group = 'native'
-    dependsOn snapServer, ':server:jar', ':native:jar'
+    dependsOn ':server:jar', ':native:jar'
     doFirst {
         Native.requireGraalVM(); mkdir 'native/build'
         def cp = Native.classpath(
@@ -306,7 +305,7 @@ task nativeServer(type: Exec) {
 
 task nativeClient(type: Exec) {
     group = 'native'
-    dependsOn snapServer, snapClient, ':client:jar', ':native:jar'
+    dependsOn ':client:jar', ':native:jar'
     doFirst {
         Native.requireGraalVM(); mkdir 'native/build'
         def cp = Native.classpath(

buildSrc/src/main/java/Utils.java

@@ -57,4 +57,13 @@ public static String runOut(File dir, String... cmd) throws Exception {
 
         return out;
     }
+
+    public static List<String> clientArgs(String ver, String assetsVer, Map<String, Object> p) {
+        List<String> args = new ArrayList<>(Arrays.asList(
+            "--version", ver, "--accessToken", "0",
+            "--assetsDir", "assets", "--assetIndex", assetsVer, "--gameDir", "."));
+        String user = (String) p.getOrDefault("mc.username", "");
+        if (!user.isEmpty()) { args.add("--username"); args.add(user); }
+        return args;
+    }
 }

gradle.properties

@@ -2,3 +2,5 @@ org.gradle.jvmargs=-Xmx12G
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
+
+mc.username=ConanTheKing

native/configs/client/predefined-classes-config.json

@@ -0,0 +1,8 @@
+[
+  {
+    "type":"agent-extracted",
+    "classes":[
+    ]
+  }
+]
+

native/configs/client/reflect-config.json

@@ -1,4 +1,8 @@
 [
+{
+  "name":"net.minecraft.client.main.Main",
+  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
+},
 {
   "name":"[B"
 },
@@ -62,6 +66,11 @@
   "allDeclaredFields":true,
   "methods":[{"name":"<init>","parameterTypes":["java.util.List","java.util.List"] }, {"name":"playerCertificateKeys","parameterTypes":[] }, {"name":"profilePropertyKeys","parameterTypes":[] }]
 },
+{
+  "name":"com.mojang.authlib.yggdrasil.request.JoinMinecraftServerRequest",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.util.UUID","java.lang.String"] }, {"name":"accessToken","parameterTypes":[] }, {"name":"selectedProfile","parameterTypes":[] }, {"name":"serverId","parameterTypes":[] }]
+},
 {
   "name":"com.mojang.authlib.yggdrasil.response.ErrorResponse",
   "allDeclaredFields":true,
@@ -89,6 +98,10 @@
   "name":"com.sun.crypto.provider.AESCipher$General",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"com.sun.crypto.provider.AESKeyGenerator",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"com.sun.crypto.provider.ARCFOURCipher",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -117,6 +130,10 @@
   "name":"com.sun.crypto.provider.HmacCore$HmacSHA384",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"com.sun.crypto.provider.RSACipher",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"com.sun.crypto.provider.TlsMasterSecretGenerator",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -620,6 +637,14 @@
 {
   "name":"net.minecraft.server.network.ServerConnectionListener$2"
 },
+{
+  "name":"net.minecraft.world.entity.boss.enderdragon.phases.DragonHoldingPatternPhase",
+  "methods":[{"name":"<init>","parameterTypes":["net.minecraft.world.entity.boss.enderdragon.EnderDragon"] }]
+},
+{
+  "name":"net.minecraft.world.entity.boss.enderdragon.phases.DragonHoverPhase",
+  "methods":[{"name":"<init>","parameterTypes":["net.minecraft.world.entity.boss.enderdragon.EnderDragon"] }]
+},
 {
   "name":"org.apache.logging.log4j.core.appender.AbstractAppender$Builder",
   "allDeclaredFields":true

native/configs/server/jni-config.json

@@ -128,10 +128,6 @@
   "name":"java.awt.GraphicsEnvironment",
   "methods":[{"name":"getLocalGraphicsEnvironment","parameterTypes":[] }, {"name":"isHeadless","parameterTypes":[] }]
 },
-{
-  "name":"sun.java2d.SunGraphicsEnvironment",
-  "methods":[{"name":"isDisplayLocal","parameterTypes":[] }]
-},
 {
   "name":"java.awt.Rectangle",
   "methods":[{"name":"<init>","parameterTypes":["int","int","int","int"] }]
@@ -307,6 +303,10 @@
   "name":"java.nio.channels.ClosedChannelException",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"net.minecraft.server.Main",
+  "methods":[{"name":"main","parameterTypes":["java.lang.String[]"] }]
+},
 {
   "name":"sun.awt.SunHints",
   "fields":[{"name":"INTVAL_STROKE_PURE"}]
@@ -418,6 +418,10 @@
   "name":"sun.java2d.SunGraphics2D",
   "fields":[{"name":"clipRegion"}, {"name":"composite"}, {"name":"eargb"}, {"name":"lcdTextContrast"}, {"name":"pixel"}, {"name":"strokeHint"}]
 },
+{
+  "name":"sun.java2d.SunGraphicsEnvironment",
+  "methods":[{"name":"isDisplayLocal","parameterTypes":[] }]
+},
 {
   "name":"sun.java2d.SurfaceData",
   "fields":[{"name":"pData"}, {"name":"valid"}]

native/configs/server/predefined-classes-config.json

@@ -0,0 +1,8 @@
+[
+  {
+    "type":"agent-extracted",
+    "classes":[
+    ]
+  }
+]
+