Skip to content

Commit 0e79380

Browse files
authored
More class loading order fun with java 8... (#1804)
1 parent b639d5c commit 0e79380

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ dependencies {
7676

7777
// Iris Shaders
7878
compileOnly('org.jetbrains:annotations:26.0.2')
79-
api("com.github.GTNewHorizons:GTNHLib:0.10.0:dev")
79+
api("com.github.GTNewHorizons:GTNHLib:0.11.4:dev")
8080

8181
shadowImplementation(project(":glsm")) { transitive = false }
8282
shadowImplementation(project(":lwjgl3-backend")) { transitive = false }

src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,15 @@ public AngelicaClientTweaker() {
5353
Launch.classLoader.addTransformerExclusion("com.gtnewhorizons.angelica.loading");
5454
Launch.classLoader.addTransformerExclusion("com.gtnewhorizons.angelica.glsm.GLStateManager");
5555

56-
if (Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE) {
56+
final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
57+
if (rfbLoaded) {
5758
addLwjgl3ifyExclusions();
59+
} else {
60+
// Fucking java 8 and non RFB
61+
try {
62+
Class.forName("com.gtnewhorizon.gtnhlib.core.GTNHLibCore", true, Launch.classLoader);
63+
} catch (ClassNotFoundException ignored) {
64+
}
5865
}
5966

6067
try {
@@ -84,7 +91,6 @@ public AngelicaClientTweaker() {
8491
// packages to avoid interfering with mixin delegation on game classes. AngelicaLateTweaker removes this registration once
8592
// mixins are setup.
8693
if (FMLLaunchHandler.side().isClient()) {
87-
final boolean rfbLoaded = Launch.blackboard.getOrDefault("angelica.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
8894
if (!rfbLoaded) {
8995
final String transformer = "com.gtnewhorizons.angelica.loading.fml.transformers.EarlyRedirectorTransformer";
9096
FMLRelaunchLog.finer("Registering transformer %s", transformer);

0 commit comments

Comments
 (0)