Skip to content
This repository was archived by the owner on Sep 23, 2025. It is now read-only.

[Fix] Add additional command-line args for proper Cosmetica agent initialization #828

Closed
realdoomsboygaming wants to merge 2 commits into from
Closed

[Fix] Add additional command-line args for proper Cosmetica agent initialization #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fba645
[Fix] Add additional command-line args for proper Cosmetica agent ini…
realdoomsboygaming Mar 12, 2025
ff7b4f9
Test Compile
realdoomsboygaming Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions .github/workflows/development.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ jobs:
include:
- platform: 2
platform_name: ios
- platform: 7
platform_name: iossimulator
- platform: 8
platform_name: tvossimulator

runs-on: MacStadium

runs-on: macos-latest
steps:
- name: Install include tools
run: brew install temurin@8 ldid make

- name: Remove work folders
env:
password: ${{ secrets.ELLIE_MINI_SECRET }}
Expand All @@ -37,27 +36,32 @@ jobs:
ls -lah ./

- name: Checkout repository
uses: actions/checkout@main
uses: actions/checkout@v3

- name: Checkout repository submodules
run: git submodule update --init --recursive

- name: Set API Key Environment Variable
run: echo "CURSEFORGE_API_KEY=${{ secrets.CURSEFORGE_API_KEY }}" >> $GITHUB_ENV

- name: Get gl4es latest commit hash
id: gl4es-sha
run: echo "::set-output name=sha::$(echo $(git ls-remote https://github.com/PojavLauncherTeam/gl4es-114-extra refs/heads/master | grep -io '^\S*'))"
shell: bash
run: |
# Grab the latest commit SHA for gl4es-114-extra
GIT_SHA=$(git ls-remote https://github.com/PojavLauncherTeam/gl4es-114-extra refs/heads/master | grep -io '^\S*')
echo "sha=$GIT_SHA" >> "$GITHUB_OUTPUT"

- name: Cache gl4es
uses: actions/cache@main
if: false # use gl4es 1.1.5
uses: actions/cache@v3
if: false
id: gl4es-cache
with:
path: gl4es/libs
key: gl4es-holy-ios-shared-2-${{ steps.gl4es-sha.outputs.sha }}

- name: Get gl4es
if: false && steps.gl4es-cache.outputs.cache-hit != 'true'
uses: actions/checkout@main
uses: actions/checkout@v3
with:
repository: 'PojavLauncherTeam/gl4es-114-extra'
path: 'gl4es'
Expand All @@ -78,7 +82,7 @@ jobs:
cp -R lib/libGL.dylib ../Natives/resources/Frameworks/libgl4es_114.dylib

- name: Push gl4es
if: false && github.event != 'pull_request' && github.ref_name == 'main' && steps.gl4es-cache.outputs.cache-hit != 'true'
if: false && github.event_name != 'pull_request' && github.ref_name == 'main' && steps.gl4es-cache.outputs.cache-hit != 'true'
continue-on-error: true
run: |
git add Natives/resources/Frameworks/libgl4es_114.dylib
Expand All @@ -88,7 +92,7 @@ jobs:
- name: Get JRE8
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: build.yml
path: depends
workflow_conclusion: success
Expand All @@ -100,7 +104,7 @@ jobs:
- name: Get JRE17
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: build.yml
path: depends
workflow_conclusion: completed
Expand All @@ -112,7 +116,7 @@ jobs:
- name: Get JRE21
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
github_token: ${{ secrets.GITHUB_TOKEN }}
workflow: build.yml
path: depends
workflow_conclusion: completed
Expand All @@ -128,44 +132,41 @@ jobs:
export PATH=/opt/procursus/bin:/opt/homebrew/bin:$PATH
export RUNNER=1 SLIMMED=1
if [ "${{ matrix.platform_name }}" == "ios" ]; then
# Build ipa and tipa for iOS
gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }}
gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1
gmake -j"$(sysctl -n hw.ncpu)" dsym package PLATFORM=${{ matrix.platform }}
gmake -j"$(sysctl -n hw.ncpu)" dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1
elif [ "${{ matrix.platform_name }}" == "tvos" ]; then
# Build tipa only for tvOS
gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1
gmake -j"$(sysctl -n hw.ncpu)" dsym package PLATFORM=${{ matrix.platform }} TROLLSTORE_JIT_ENT=1
else
# Build ipa only for everything else
gmake -j$(sysctl -n hw.ncpu) dsym package PLATFORM=${{ matrix.platform }}
gmake -j"$(sysctl -n hw.ncpu)" dsym package PLATFORM=${{ matrix.platform }}
fi

- name: Upload regular ipa
uses: actions/upload-artifact@main
uses: actions/upload-artifact@v4
with:
name: net.kdt.pojavlauncher-${{ matrix.platform_name }}.ipa
path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}.ipa

- name: Upload regular tipa
uses: actions/upload-artifact@main
uses: actions/upload-artifact@v4
with:
name: net.kdt.pojavlauncher-${{ matrix.platform_name }}-trollstore.tipa
path: artifacts/net.kdt.pojavlauncher-*-${{ matrix.platform_name }}-trollstore.tipa

- name: Upload slimmed ipa
uses: actions/upload-artifact@main
uses: actions/upload-artifact@v4
with:
name: net.kdt.pojavlauncher.slimmed-${{ matrix.platform_name }}.ipa
path: artifacts/net.kdt.pojavlauncher.slimmed-*-${{ matrix.platform_name }}.ipa

- name: Upload slimmed tipa
uses: actions/upload-artifact@main
uses: actions/upload-artifact@v4
with:
name: net.kdt.pojavlauncher.slimmed-${{ matrix.platform_name }}-trollstore.tipa
path: artifacts/net.kdt.pojavlauncher.slimmed-*-${{ matrix.platform_name }}-trollstore.tipa

- name: Upload PojavLauncher.dSYM
uses: actions/upload-artifact@main
if: matrix.platform_name == 'ios'
uses: actions/upload-artifact@v4
with:
name: PojavLauncher.dSYM
path: artifacts/PojavLauncher.dSYM
33 changes: 22 additions & 11 deletions Natives/JavaLauncher.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,24 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi

NSString *librariesPath = [NSString stringWithFormat:@"%@/libs", NSBundle.mainBundle.bundlePath];
margv[++margc] = [NSString stringWithFormat:@"-javaagent:%@/patchjna_agent.jar=", librariesPath].UTF8String;

// Load java
NSString *libjlipath8 = [NSString stringWithFormat:@"%@/lib/jli/libjli.dylib", javaHome]; // java 8
NSString *libjlipath11 = [NSString stringWithFormat:@"%@/lib/libjli.dylib", javaHome]; // java 11+
BOOL isJava8Path = [fm fileExistsAtPath:libjlipath8];

// Important: Add Java 9+ permissions before loading the Cosmetica agent
if(!isJava8Path) {
// Required by Cosmetica to inject DNS
margv[++margc] = "--add-opens=java.base/java.net=ALL-UNNAMED";
// Additional permissions for Cosmetica to access internal InetAddress classes
margv[++margc] = "--add-exports=java.base/sun.net.dns=ALL-UNNAMED";
margv[++margc] = "--add-exports=java.base/sun.net=ALL-UNNAMED";
margv[++margc] = "--add-opens=java.base/sun.net=ALL-UNNAMED";
margv[++margc] = "--add-opens=java.base/sun.net.dns=ALL-UNNAMED";
}

// Add Cosmetica agent after Java 9+ permissions are set
if(getPrefBool(@"general.cosmetica")) {
margv[++margc] = [NSString stringWithFormat:@"-javaagent:%@/arc_dns_injector.jar=23.95.137.176", librariesPath].UTF8String;
}
Expand All @@ -211,11 +229,7 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
// Disable Forge 1.16.x early progress window
margv[++margc] = "-Dfml.earlyprogresswindow=false";

// Load java
NSString *libjlipath8 = [NSString stringWithFormat:@"%@/lib/jli/libjli.dylib", javaHome]; // java 8
NSString *libjlipath11 = [NSString stringWithFormat:@"%@/lib/libjli.dylib", javaHome]; // java 11+
BOOL isJava8 = [fm fileExistsAtPath:libjlipath8];
setenv("INTERNAL_JLI_PATH", (isJava8 ? libjlipath8 : libjlipath11).UTF8String, 1);
setenv("INTERNAL_JLI_PATH", (isJava8Path ? libjlipath8 : libjlipath11).UTF8String, 1);
void* libjli = dlopen(getenv("INTERNAL_JLI_PATH"), RTLD_GLOBAL);

if (!libjli) {
Expand All @@ -232,14 +246,11 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
margv[++margc] = "-Dcacio.font.fontscaler=sun.font.FreetypeFontScaler";
margv[++margc] = [NSString stringWithFormat:@"-Dcacio.managed.screensize=%dx%d", width, height].UTF8String;
margv[++margc] = "-Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel";
if (isJava8) {
if (isJava8Path) {
// Setup Caciocavallo
margv[++margc] = "-Dawt.toolkit=net.java.openjdk.cacio.ctc.CTCToolkit";
margv[++margc] = "-Djava.awt.graphicsenv=net.java.openjdk.cacio.ctc.CTCGraphicsEnvironment";
} else {
// Required by Cosmetica to inject DNS
margv[++margc] = "--add-opens=java.base/java.net=ALL-UNNAMED";

// Setup Caciocavallo
margv[++margc] = "-Dawt.toolkit=com.github.caciocavallosilano.cacio.ctc.CTCToolkit";
margv[++margc] = "-Djava.awt.graphicsenv=com.github.caciocavallosilano.cacio.ctc.CTCGraphicsEnvironment";
Expand All @@ -266,8 +277,8 @@ int launchJVM(NSString *username, id launchTarget, int width, int height, int mi
}

// Add Caciocavallo bootclasspath
NSString *cacio_classpath = [NSString stringWithFormat:@"-Xbootclasspath/%s", isJava8 ? "p" : "a"];
NSString *cacio_libs_path = [NSString stringWithFormat:@"%@/libs_caciocavallo%s", NSBundle.mainBundle.bundlePath, isJava8 ? "" : "17"];
NSString *cacio_classpath = [NSString stringWithFormat:@"-Xbootclasspath/%s", isJava8Path ? "p" : "a"];
NSString *cacio_libs_path = [NSString stringWithFormat:@"%@/libs_caciocavallo%s", NSBundle.mainBundle.bundlePath, isJava8Path ? "" : "17"];
NSArray *files = [fm contentsOfDirectoryAtPath:cacio_libs_path error:nil];
for(NSString *file in files) {
if ([file hasSuffix:@".jar"]) {
Expand Down