diff --git a/bridge/src/test/python/run/bridge/rsx-bridge.jar b/bridge/src/test/python/run/bridge/rsx-bridge.jar new file mode 100644 index 0000000..0b14c0e Binary files /dev/null and b/bridge/src/test/python/run/bridge/rsx-bridge.jar differ diff --git a/bridge/src/test/python/run/game.jar b/bridge/src/test/python/run/game.jar new file mode 100644 index 0000000..135d9d8 Binary files /dev/null and b/bridge/src/test/python/run/game.jar differ diff --git a/bridge/src/test/python/run/mods/example-mod.jar b/bridge/src/test/python/run/mods/example-mod.jar new file mode 100644 index 0000000..198f9d5 Binary files /dev/null and b/bridge/src/test/python/run/mods/example-mod.jar differ diff --git a/bridge/src/test/python/run/rsx/bridge.log b/bridge/src/test/python/run/rsx/bridge.log new file mode 100644 index 0000000..1edc1d3 --- /dev/null +++ b/bridge/src/test/python/run/rsx/bridge.log @@ -0,0 +1,19 @@ +23:54:04.418 [INFO] --- rsx bridge log opened: G:\rsx-modloader\bridge\src\test\python\run\rsx\bridge.log +23:54:04.420 [INFO] rsx bridge starting (home=G:\rsx-modloader\bridge\src\test\python\run\bridge) +23:54:04.436 [INFO] profile 8446af0b5e805725 from latest.rsxp (named 1/1) +23:54:04.436 [INFO] loader anchor: net.rustexremake.loader.RemoteClassLoader (unmapped) +23:54:04.466 [INFO] build verified: game.jar sha256 ok +23:54:04.466 [INFO] A2 applied: -Djoml.fastmath=true (class wsygzaib) +23:54:04.474 [INFO] game class loader: sun.misc.Launcher$AppClassLoader@349885916 +23:54:04.985 [INFO] client is up, loader: sun.misc.Launcher$AppClassLoader@349885916 +23:54:05.007 [INFO] A6 applied: telemetry timers replaced in 1 object(s), 1 found +23:54:05.009 [INFO] found 1 mod jar(s) in G:\rsx-modloader\bridge\src\test\python\run\mods +23:54:05.063 [INFO] ExampleMod: loaded on build 8446af0b5e805725 +23:54:05.063 [INFO] ExampleMod: Minecraft is net.minecraft.client.Minecraft -> wwk +23:54:05.065 [INFO] mod loaded: example-mod.jar (example.ExampleMod) +23:54:05.065 [INFO] ready: 1 mod(s) loaded +23:54:06.995 [INFO] ExampleMod tick 1 client=true player=PLAYER world=WORLD +23:54:07.197 [INFO] ExampleMod tick 2 client=true player=PLAYER world=WORLD +23:54:07.399 [INFO] ExampleMod tick 3 client=true player=PLAYER world=WORLD +23:54:07.615 [INFO] ExampleMod tick 4 client=true player=PLAYER world=WORLD +23:54:07.816 [INFO] ExampleMod tick 5 client=true player=PLAYER world=WORLD diff --git a/bridge/src/test/python/run_test.py b/bridge/src/test/python/run_test.py index 532a6cc..b65ea88 100644 --- a/bridge/src/test/python/run_test.py +++ b/bridge/src/test/python/run_test.py @@ -24,9 +24,12 @@ import sys import zipfile HERE = os.path.dirname(os.path.abspath(__file__)) -BRIDGE_JAR = os.path.join(os.path.dirname(HERE), "build", "libs", "rsx-bridge.jar") -SRC = os.path.join(HERE, "fakeclient") -MOD_SRC = os.path.join(HERE, "mod") +# src/test/python -> src/test -> src -> bridge -> repo root +REPO = os.path.dirname(os.path.dirname(os.path.dirname( + os.path.dirname(HERE)))) +BRIDGE_JAR = os.path.join(REPO, "dist", "rsx-bridge.jar") +SRC = os.path.join(os.path.dirname(HERE), "fakeclient") +MOD_SRC = os.path.join(os.path.dirname(HERE), "mod") RUN = os.path.join(HERE, "run") @@ -37,7 +40,7 @@ def sh(*args, **kw): # The client ships its own Java 8. Run the stand on that same JRE: patch A6 # reaches into java.util.Timer's internals, which the module system blocks on # modern JDKs but allows on 8 - the runtime the agent actually meets in game. -CLIENT_JRE = r"G:\rustexremake\rustexremake\gamefiles\java\bin\java.exe" +CLIENT_JRE = os.environ.get("RSX_CLIENT_JRE", "") def java():