Skip to content

Commit

Permalink
Merge pull request #45 from Cart-shit/EmbeddiumCraft
Browse files Browse the repository at this point in the history
Embeddium X JVM Update
  • Loading branch information
thejudge156 authored Jun 2, 2024
2 parents c18d49d + c4eb3b2 commit e982b28
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 84 deletions.
82 changes: 41 additions & 41 deletions devmods.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"defaultMods": [
{
"slug": "Sodium",
"version": "0.5.8",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.4-0.5.8/sodium-fabric-0.5.8+mc1.20.4.jar"
"version": "0.3.14",
"download_link": "https://cdn.modrinth.com/data/sk9rgfiA/versions/RHVugIok/embeddium-fabric-0.3.14%2Bmc1.20.4.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -49,6 +49,31 @@
"slug": "Modern-Fix",
"version": "5.10.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/vxDb5tOq/modernfix-fabric-5.10.0%2Bmc1.20.3.jar"
},
{
"slug": "Noisium",
"version": "2.0.3",
"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/Eie3f6ki/noisium-fabric-2.0.3%2Bmc1.20.2-1.20.4.jar"
},
{
"slug": "Lithium",
"version": "0.12.1",
"download_link": "https://cdn.modrinth.com/data/gvQqBUqZ/versions/nMhjKWVE/lithium-fabric-mc1.20.4-0.12.1.jar"
},
{
"slug": "EntityCulling",
"version": "1.6.5",
"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/hyejM5za/entityculling-fabric-1.6.5-mc1.20.4.jar"
},
{
"slug": "Ferrite-Core",
"version": "6.0.3",
"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/pguEMpy9/ferritecore-6.0.3-fabric.jar"
},
{
"slug": "Krypton",
"version": "0.2.6",
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/bRcuOnao/krypton-0.2.6.jar"
}
]
},
Expand Down Expand Up @@ -107,11 +132,6 @@
"version": "1.5.0",
"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/wgjsjWPu/servercore-fabric-1.5.0%2B1.20.2.jar"
},
{
"slug": "Mod-Menu",
"version": "8.0.0",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/TwfjidT5/modmenu-8.0.0.jar"
},
{
"slug": "ImmediatelyFast",
"version": "1.2.6",
Expand All @@ -126,6 +146,11 @@
"slug": "Modern-Fix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
},
{
"slug": "Noisium",
"version": "2.0.2",
"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/ZgEmwDsG/noisium-fabric-2.0.2%2Bmc1.20.2-1.20.4.jar"
}
]
},
Expand All @@ -151,8 +176,8 @@
},
{
"slug": "Ferrite-Core",
"version": "6.0.0",
"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/FCnCG6PS/ferritecore-6.0.0-fabric.jar"
"version": "6.0.1",
"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar"
},
{
"slug": "Entity-Culling",
Expand All @@ -161,8 +186,8 @@
},
{
"slug": "Sodium",
"version": "0.5.8",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.1-0.5.8/sodium-fabric-0.5.8+mc1.20.1.jar"
"version": "0.3.19",
"download_link": "https://cdn.modrinth.com/data/sk9rgfiA/versions/Xg1M092Q/embeddium-fabric-0.3.19%2Bmc1.20.1.jar"
},
{
"slug": "Cloth-Config",
Expand All @@ -189,11 +214,6 @@
"version": "1.5.0",
"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/dXmFuxyH/servercore-fabric-1.5.0%2B1.20.1.jar"
},
{
"slug": "Mod-Menu",
"version": "7.0.1",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/RTFDnTKf/modmenu-7.0.1.jar"
},
{
"slug": "ImmediatelyFast",
"version": "1.1.15",
Expand All @@ -208,6 +228,11 @@
"slug": "Modern-Fix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
},
{
"slug": "Noisium",
"version": "2.0.3",
"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/uTdy9g9c/noisium-fabric-2.0.3%2Bmc1.20-1.20.1.jar"
}
]
},
Expand Down Expand Up @@ -291,21 +316,11 @@
"version": "1.3.5-1.19.4",
"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/aq6o4qRe/servercore-1.3.5-1.19.4.jar"
},
{
"slug": "Mod-Menu",
"version": "6.2.1",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/yjjsLqbS/modmenu-6.2.1.jar"
},
{
"slug": "ImmediatelyFast",
"version": "1.1.12",
"download_link": "https://cdn.modrinth.com/data/5ZwdcRci/versions/8IFFeKYy/ImmediatelyFast-1.1.12%2B1.19.4.jar"
},
{
"slug": "Noxesium",
"version": "0.1.8",
"download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/5QKzTtlI/noxesium-0.1.8.jar"
},
{
"slug": "Modern-Fix",
"version": "5.7.2",
Expand Down Expand Up @@ -378,11 +393,6 @@
"version": "0.2.1",
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.2.1/krypton-0.2.1.jar"
},
{
"slug": "Mod_Menu",
"version": "4.2.0-beta.2",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/gSoPJyVn/modmenu-4.2.0-beta.2.jar"
},
{
"slug": "Better-Biome-Blend",
"version": "1.3.6",
Expand All @@ -393,11 +403,6 @@
"version": "1.1.12",
"download_link": "https://cdn.modrinth.com/data/5ZwdcRci/versions/4yVqQKQO/ImmediatelyFast-1.1.12%2B1.19.jar"
},
{
"slug": "Noxesium",
"version": "0.1.4",
"download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/WhRq6Q4n/noxesium-0.1.4.jar"
},
{
"slug": "Modern-Fix",
"version": "5.9.0",
Expand Down Expand Up @@ -490,11 +495,6 @@
"version": "0.1.9",
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.1.9/krypton-0.1.9.jar"
},
{
"slug": "Mod-Menu",
"version": "3.2.5",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/nVxObSbX/modmenu-3.2.5.jar"
},
{
"slug": "Modern-Fix",
"version": "5.9.0",
Expand Down
84 changes: 42 additions & 42 deletions mods.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"defaultMods": [
{
"slug": "Sodium",
"version": "0.5.8",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.4-0.5.8/sodium-fabric-0.5.8+mc1.20.4.jar"
"version": "0.3.14",
"download_link": "https://cdn.modrinth.com/data/sk9rgfiA/versions/RHVugIok/embeddium-fabric-0.3.14%2Bmc1.20.4.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -49,6 +49,31 @@
"slug": "Modern-Fix",
"version": "5.10.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/vxDb5tOq/modernfix-fabric-5.10.0%2Bmc1.20.3.jar"
},
{
"slug": "Noisium",
"version": "2.0.3",
"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/Eie3f6ki/noisium-fabric-2.0.3%2Bmc1.20.2-1.20.4.jar"
},
{
"slug": "Lithium",
"version": "0.12.1",
"download_link": "https://cdn.modrinth.com/data/gvQqBUqZ/versions/nMhjKWVE/lithium-fabric-mc1.20.4-0.12.1.jar"
},
{
"slug": "EntityCulling",
"version": "1.6.5",
"download_link": "https://cdn.modrinth.com/data/NNAgCjsB/versions/hyejM5za/entityculling-fabric-1.6.5-mc1.20.4.jar"
},
{
"slug": "Ferrite-Core",
"version": "6.0.3",
"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/pguEMpy9/ferritecore-6.0.3-fabric.jar"
},
{
"slug": "Krypton",
"version": "0.2.6",
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/bRcuOnao/krypton-0.2.6.jar"
}
]
},
Expand Down Expand Up @@ -107,11 +132,6 @@
"version": "1.5.0",
"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/wgjsjWPu/servercore-fabric-1.5.0%2B1.20.2.jar"
},
{
"slug": "Mod-Menu",
"version": "8.0.0",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/TwfjidT5/modmenu-8.0.0.jar"
},
{
"slug": "ImmediatelyFast",
"version": "1.2.6",
Expand All @@ -126,6 +146,11 @@
"slug": "Modern-Fix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
},
{
"slug": "Noisium",
"version": "2.0.2",
"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/ZgEmwDsG/noisium-fabric-2.0.2%2Bmc1.20.2-1.20.4.jar"
}
]
},
Expand All @@ -151,8 +176,8 @@
},
{
"slug": "Ferrite-Core",
"version": "6.0.0",
"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/FCnCG6PS/ferritecore-6.0.0-fabric.jar"
"version": "6.0.1",
"download_link": "https://cdn.modrinth.com/data/uXXizFIs/versions/unerR5MN/ferritecore-6.0.1-fabric.jar"
},
{
"slug": "Entity-Culling",
Expand All @@ -161,8 +186,8 @@
},
{
"slug": "Sodium",
"version": "0.5.8",
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.20.1-0.5.8/sodium-fabric-0.5.8+mc1.20.1.jar"
"version": "0.3.19",
"download_link": "https://cdn.modrinth.com/data/sk9rgfiA/versions/Xg1M092Q/embeddium-fabric-0.3.19%2Bmc1.20.1.jar"
},
{
"slug": "Cloth-Config",
Expand All @@ -189,11 +214,6 @@
"version": "1.5.0",
"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/dXmFuxyH/servercore-fabric-1.5.0%2B1.20.1.jar"
},
{
"slug": "Mod-Menu",
"version": "7.0.1",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/RTFDnTKf/modmenu-7.0.1.jar"
},
{
"slug": "ImmediatelyFast",
"version": "1.1.15",
Expand All @@ -208,6 +228,11 @@
"slug": "Modern-Fix",
"version": "5.9.0",
"download_link": "https://cdn.modrinth.com/data/nmDcB62a/versions/FDGaMHFj/modernfix-fabric-5.9.0%2Bmc1.20.1.jar"
},
{
"slug": "Noisium",
"version": "2.0.3",
"download_link": "https://cdn.modrinth.com/data/KuNKN7d2/versions/uTdy9g9c/noisium-fabric-2.0.3%2Bmc1.20-1.20.1.jar"
}
]
},
Expand Down Expand Up @@ -254,7 +279,7 @@
{
"slug": "Sodium",
"version": "0.4.10",
"download_link": "https://cdn.modrinth.com/data/AANobbMI/versions/b4hTi3mo/sodium-fabric-mc1.19.4-0.4.10%2Bbuild.24.jar"
"download_link": "https://github.com/QuestCraftPlusPlus/sodium-fabric/releases/download/mc1.19.4-0.4.11/sodium-fabric-mc1.19.4-0.4.11+build.1.jar"
},
{
"slug": "Cloth-Config",
Expand Down Expand Up @@ -291,21 +316,11 @@
"version": "1.3.5-1.19.4",
"download_link": "https://cdn.modrinth.com/data/4WWQxlQP/versions/aq6o4qRe/servercore-1.3.5-1.19.4.jar"
},
{
"slug": "Mod-Menu",
"version": "6.2.1",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/yjjsLqbS/modmenu-6.2.1.jar"
},
{
"slug": "ImmediatelyFast",
"version": "1.1.12",
"download_link": "https://cdn.modrinth.com/data/5ZwdcRci/versions/8IFFeKYy/ImmediatelyFast-1.1.12%2B1.19.4.jar"
},
{
"slug": "Noxesium",
"version": "0.1.8",
"download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/5QKzTtlI/noxesium-0.1.8.jar"
},
{
"slug": "Modern-Fix",
"version": "5.7.2",
Expand Down Expand Up @@ -378,11 +393,6 @@
"version": "0.2.1",
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.2.1/krypton-0.2.1.jar"
},
{
"slug": "Mod_Menu",
"version": "4.2.0-beta.2",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/gSoPJyVn/modmenu-4.2.0-beta.2.jar"
},
{
"slug": "Better-Biome-Blend",
"version": "1.3.6",
Expand All @@ -393,11 +403,6 @@
"version": "1.1.12",
"download_link": "https://cdn.modrinth.com/data/5ZwdcRci/versions/4yVqQKQO/ImmediatelyFast-1.1.12%2B1.19.jar"
},
{
"slug": "Noxesium",
"version": "0.1.4",
"download_link": "https://cdn.modrinth.com/data/Kw7Sm3Xf/versions/WhRq6Q4n/noxesium-0.1.4.jar"
},
{
"slug": "Modern-Fix",
"version": "5.9.0",
Expand Down Expand Up @@ -490,11 +495,6 @@
"version": "0.1.9",
"download_link": "https://cdn.modrinth.com/data/fQEb0iXm/versions/0.1.9/krypton-0.1.9.jar"
},
{
"slug": "Mod-Menu",
"version": "3.2.5",
"download_link": "https://cdn.modrinth.com/data/mOgUt4GM/versions/nVxObSbX/modmenu-3.2.5.jar"
},
{
"slug": "Modern-Fix",
"version": "5.9.0",
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/pojlib/util/JREUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,10 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr

userArgs.add("-XX:+UseZGC");
userArgs.add("-XX:+ZGenerational");

userArgs.add("-XX:+UnlockExperimentalVMOptions");
userArgs.add("-XX:+UnlockDiagnosticVMOptions");
userArgs.add("-XX:+DisableExplicitGC");
userArgs.add("-XX:+UseCriticalJavaThreadPriority");
userArgs.add("-Dorg.lwjgl.opengl.libname=" + graphicsLib);
userArgs.add("-Dorg.lwjgl.opengles.libname=" + "/system/lib64/libGLESv3.so");
userArgs.add("-Dorg.lwjgl.egl.libname=" + "/system/lib64/libEGL_dri.so");
Expand Down

0 comments on commit e982b28

Please sign in to comment.