diff --git a/build.gradle b/build.gradle index 1cf1c168..054fda12 100644 --- a/build.gradle +++ b/build.gradle @@ -78,7 +78,7 @@ dependencies { // QSL is not a complete API; You will need Quilted Fabric API to fill in the gaps. // Quilted Fabric API will automatically pull in the correct QSL version. - modImplementation libs.quilt.quiltedFabricApi + modImplementation libs.bundles.quilt.quiltedFabricApi // modImplementation libs.bundles.quilted.fabric.api // If you wish to use Fabric API's deprecated modules, you can replace the above line with this one // mod menu @@ -98,14 +98,15 @@ dependencies { // lodestone lib modImplementation(libs.lodestoneLib) { - exclude group: 'io.github.ladysnake' + transitive = false } include(libs.lodestoneLib) // iris and sodium modLocalImplementation(libs.sodium) modLocalImplementation(libs.iris) - runtimeOnly compileOnly("org.anarres:jcpp:1.4.14") // for iris + runtimeOnly(libs.jcpp) + implementation(libs.glslTransformer) } chenille { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9b685cc..bad95cfc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,9 +3,9 @@ chenille = "0.11.3" # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html minecraft = "1.20.1" quilt-mappings = "1.20.1+build.23" -quilt-loader = "0.23.0-beta.1" +quilt-loader = "0.23.0" -quilt-quiltedFabricApi = "7.1.1+0.86.1-1.20.1" +quilt-quiltedFabricApi = "7.4.0+0.90.0-1.20.1" # Third party dependencies # The latest versions should be available at https://ladysnake.org/tools/dependencies @@ -15,6 +15,8 @@ midnightLib = "1.4.1-quilt" modmenu = "7.2.2" satin = "1.14.0" sodium = "mc1.20.1-0.5.3" +jcpp = "1.4.14" +glslTransformer = "2.0.0-pre13" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -26,6 +28,8 @@ quilt-quiltedFabricApi-deprecated = { module = "org.quiltmc.quilted-fabric-api:q # Third party dependencies iris = { module = "maven.modrinth:iris", version.ref = "iris" } +jcpp = { module = "org.anarres:jcpp", version.ref = "jcpp" } +glslTransformer = { module = "io.github.douira:glsl-transformer", version.ref = "glslTransformer" } lodestoneLib = { module = "team.lodestar.lodestone:LodestoneLib-Quilt", version.ref = "lodestoneLib" } midnightLib = { module = "maven.modrinth:midnightlib", version.ref = "midnightLib" } modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu"} @@ -34,7 +38,7 @@ sodium = { module = "maven.modrinth:sodium", version.ref = "sodium"} # If you have multiple similar dependencies, you can declare a dependency bundle and reference it on the build script with "libs.bundles.example". [bundles] -quilt-quiltedFabricApi = ["quilt-quiltedFabricApi", "quilt-quiltedFabricApi-deprecated"] +quilt-quiltedFabricApi = [ "quilt-quiltedFabricApi", "quilt-quiltedFabricApi-deprecated" ] [plugins] chenille = { id = "io.github.ladysnake.chenille", version.ref = "chenille" } diff --git a/src/main/java/org/ladysnake/effective/particle/types/AllayTwinkleParticleType.java b/src/main/java/org/ladysnake/effective/particle/types/AllayTwinkleParticleType.java index dda1b0a8..4c5e10cd 100644 --- a/src/main/java/org/ladysnake/effective/particle/types/AllayTwinkleParticleType.java +++ b/src/main/java/org/ladysnake/effective/particle/types/AllayTwinkleParticleType.java @@ -7,11 +7,10 @@ import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.ParticleType; +import org.jetbrains.annotations.Nullable; import org.ladysnake.effective.particle.AllayTwinkleParticle; import team.lodestar.lodestone.systems.rendering.particle.world.WorldParticleEffect; -import javax.annotation.Nullable; - public class AllayTwinkleParticleType extends ParticleType { public AllayTwinkleParticleType() { super(false, WorldParticleEffect.DESERIALIZER);