diff --git a/build.gradle b/build.gradle index 51fd93c..2205cd9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version "1.6-SNAPSHOT" - id 'io.github.ladysnake.chenille' version '0.13.0' + id 'fabric-loom' version "1.7-SNAPSHOT" + id 'io.github.ladysnake.chenille' version '0.14.0' } archivesBaseName = project.archives_base_name diff --git a/gradle.properties b/gradle.properties index f72f789..3eede0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21 -yarn_mappings=1.21+build.1 -loader_version=0.15.11 +minecraft_version=24w38a +yarn_mappings=24w38a+build.5 +loader_version=0.16.5 #Fabric api -fabric_version=0.99.5+1.21 +fabric_version=0.104.2+1.21.2 # Mod Properties mod_version = 2.0.0 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17655d0..0d18421 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java b/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java index 5c85544..0b70490 100644 --- a/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java +++ b/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java @@ -21,8 +21,9 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.Framebuffer; -import net.minecraft.client.gl.JsonEffectShaderProgram; import net.minecraft.client.gl.PostEffectProcessor; +import net.minecraft.client.gl.ShaderProgram; +import net.minecraft.client.render.DefaultFramebufferSet; import net.minecraft.client.texture.AbstractTexture; import net.minecraft.resource.ResourceFactory; import net.minecraft.util.Identifier; @@ -90,7 +91,7 @@ public void initialize() throws IOException { @Override protected PostEffectProcessor parseShader(ResourceFactory resourceFactory, MinecraftClient mc, Identifier location) throws IOException { - return new PostEffectProcessor(mc.getTextureManager(), mc.getResourceManager(), mc.getFramebuffer(), location); + return mc.getShaderLoader().loadPostEffect(location, DefaultFramebufferSet.MAIN_ONLY); } @Override @@ -246,7 +247,7 @@ public void setupDynamicUniforms(Runnable dynamicSetBlock) { public void setupDynamicUniforms(int index, Runnable dynamicSetBlock) { AccessiblePassesShaderEffect sg = (AccessiblePassesShaderEffect) this.getShaderEffect(); if (sg != null) { - JsonEffectShaderProgram sm = sg.getPasses().get(index).getProgram(); + ShaderProgram sm = sg.getPasses().get(index).getProgram(); ShaderPrograms.useShader(sm.getGlRef()); dynamicSetBlock.run(); ShaderPrograms.useShader(0);