diff --git a/build.gradle b/build.gradle index 4328a16c5..b992cbb64 100644 --- a/build.gradle +++ b/build.gradle @@ -179,6 +179,8 @@ subprojects { p -> if (isMinecraftSubProject) { annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}") } + + annotationProcessor("systems.manifold:manifold-strings:${rootProject.manifold_version}") // Log4j // TODO: Change to shadowMe later to work in the standalone jar @@ -617,11 +619,11 @@ allprojects { p -> tasks.withType(JavaCompile) { if (isMinecraftSubProject) { options.release = rootProject.java_version as Integer - options.compilerArgs += ["-Xplugin:Manifold"] } else { options.release = 8; // Core & Api should use Java 8 no matter what //options.release = rootProject.java_version as Integer // But if you want to test some stuff, then this can be enabled } + options.compilerArgs += ["-Xplugin:Manifold"] options.encoding = "UTF-8" } diff --git a/coreSubProjects b/coreSubProjects index b18460b82..6c278ea3b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit b18460b825c3b840ac3e15fab858495dd8d794a5 +Subproject commit 6c278ea3b13667a65ce22cdb53c58cf770b4ff42 diff --git a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java index fd53cc0d9..a7b7df22a 100644 --- a/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java +++ b/fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java @@ -84,7 +84,7 @@ public class SodiumAccessor implements ISodiumAccessor sodiumPerformanceOptions = optionsClass.getDeclaredField("performance").get(basicOptions); setFogOcclusionMethod = MethodHandles.lookup() .findSetter(Class.forName( - "me.jellysquid.mods.sodium.client.gui.SodiumGameOptions$PerformanceSettings"), + "me.jellysquid.mods.sodium.client.gui.SodiumGameOptions\$PerformanceSettings"), "useFogOcclusion", boolean.class); // alternate option if referencing Sodium 0.5 directly @@ -101,7 +101,7 @@ public class SodiumAccessor implements ISodiumAccessor sodiumPerformanceOptions = optionsClass.getDeclaredField("performance").get(basicOptions); setFogOcclusionMethod = MethodHandles.lookup() .findSetter(Class.forName( - "net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions$PerformanceSettings"), + "net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions\$PerformanceSettings"), "useFogOcclusion", boolean.class); } }