diff --git a/dependencies.gradle b/dependencies.gradle index 6bba63fb1..2400cc903 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -76,7 +76,7 @@ dependencies { // Iris Shaders compileOnly('org.jetbrains:annotations:26.0.2') - api("com.github.GTNewHorizons:GTNHLib:0.11.4:dev") + api("com.github.GTNewHorizons:GTNHLib:0.11.19:dev") shadowImplementation(project(":glsm")) { transitive = false } shadowImplementation(project(":lwjgl3-backend")) { transitive = false } @@ -173,6 +173,9 @@ dependencies { testImplementation('org.junit.platform:junit-platform-launcher') testImplementation('com.tngtech.archunit:archunit-junit5:1.4.1') + + testRuntimeOnly("it.unimi.dsi:fastutil:8.5.18") + testRuntimeOnly("org.joml:joml:1.10.8") } } diff --git a/glsm/build.gradle.kts b/glsm/build.gradle.kts index 3610c5ee5..92d7288d1 100644 --- a/glsm/build.gradle.kts +++ b/glsm/build.gradle.kts @@ -96,6 +96,8 @@ dependencies { // Deps (normally from MC) - compile only, but needed at test runtime compileOnly("com.google.guava:guava:${property("guavaVersion")}") testRuntimeOnly("com.google.guava:guava:${property("guavaVersion")}") + testRuntimeOnly("it.unimi.dsi:fastutil:${property("fastutilVersion")}") + testRuntimeOnly("org.joml:joml:${property("jomlVersion")}") { isTransitive = false } // Test testImplementation(sourceSets["stubs"].output) diff --git a/glsm/gradle.properties b/glsm/gradle.properties index 4591962cc..1977e15aa 100644 --- a/glsm/gradle.properties +++ b/glsm/gradle.properties @@ -4,7 +4,9 @@ celeritasVersion = 2.5.3-GTNH lombokVersion = 1.18.42 log4jVersion = 2.0-beta9 guavaVersion = 18.0 -gtnhlibVersion = 0.10.0 +gtnhlibVersion = 0.11.19 +fastutilVersion = 8.5.18 +jomlVersion = 1.10.8 glslTransformLibVersion = 0.2.0-26.g5ee7d96-GTNH antlr4RuntimeVersion = 4.13.2 jcppVersion = 1.4.14 diff --git a/lwjgl3-backend/build.gradle.kts b/lwjgl3-backend/build.gradle.kts index 80df37516..14b824f68 100644 --- a/lwjgl3-backend/build.gradle.kts +++ b/lwjgl3-backend/build.gradle.kts @@ -34,6 +34,10 @@ repositories { name = "GTNH Maven" url = uri("https://nexus.gtnewhorizons.com/repository/public/") } + maven { + name = "Minecraft Libraries" + url = uri("https://libraries.minecraft.net") + } maven { name = "Forge" url = uri("https://maven.minecraftforge.net/") diff --git a/src/main/java/net/coderbot/iris/shaderpack/PackRenderTargetDirectives.java b/src/main/java/net/coderbot/iris/shaderpack/PackRenderTargetDirectives.java index 3276e564e..039f6f9e9 100644 --- a/src/main/java/net/coderbot/iris/shaderpack/PackRenderTargetDirectives.java +++ b/src/main/java/net/coderbot/iris/shaderpack/PackRenderTargetDirectives.java @@ -55,7 +55,7 @@ public class PackRenderTargetDirectives { renderTargetSettings.forEach((index, settings) -> { if (settings.shouldClear()) { - buffersToBeCleared.add(index.intValue()); + buffersToBeCleared.add(index); } });