From 4baf38cb9af0deccb9ea984d7aa6aed19e4d68bc Mon Sep 17 00:00:00 2001 From: Mysticpasta1 Date: Sat, 31 Aug 2024 01:32:05 -0500 Subject: [PATCH] fix compat for oculus 1.7.0 --- Forge/build.gradle.kts | 2 +- .../compat/oculus/ForgeOculusHandle.java | 2 +- .../mixins/oculus/HeldItemSupplierMixin.java | 2 +- .../core/mixins/oculus/ProgramSetMixin.java | 22 ++++--------------- .../mixins/oculus/ShaderPropertiesMixin.java | 8 +++---- .../ShaderStorageBufferHolderMixin.java | 4 ++-- .../mixins/oculus/StandardMacrosMixin.java | 6 ++--- .../ChunkBuilderMeshingTaskMixin.java | 1 + .../rubidium/ShaderStorageBufferAccessor.java | 7 +++--- 9 files changed, 21 insertions(+), 33 deletions(-) diff --git a/Forge/build.gradle.kts b/Forge/build.gradle.kts index fca93ff..2b663fd 100644 --- a/Forge/build.gradle.kts +++ b/Forge/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { modCompileOnly("icyllis.modernui:ModernUI-Forge:${minecraft_version}-${modernui_version}") modImplementation("maven.modrinth:embeddium:0.3.4+mc1.20.1") - modImplementation("maven.modrinth:oculus:1.20.1-1.6.15a") + modImplementation("maven.modrinth:oculus:1.20.1-1.7.0") } diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/compat/oculus/ForgeOculusHandle.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/compat/oculus/ForgeOculusHandle.java index be34d51..5c28bc1 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/compat/oculus/ForgeOculusHandle.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/compat/oculus/ForgeOculusHandle.java @@ -6,8 +6,8 @@ import com.lowdragmc.shimmer.comp.iris.IrisHandle; import com.lowdragmc.shimmer.core.mixins.MixinPluginShared; import com.lowdragmc.shimmer.forge.core.mixins.rubidium.ShaderStorageBufferAccessor; -import net.coderbot.iris.gl.buffer.ShaderStorageBuffer; import net.irisshaders.iris.api.v0.IrisApi; +import net.irisshaders.iris.gl.buffer.ShaderStorageBuffer; import net.minecraft.client.Minecraft; import org.apache.commons.lang3.tuple.Pair; import org.jetbrains.annotations.Nullable; diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/HeldItemSupplierMixin.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/HeldItemSupplierMixin.java index 448fbc0..ae4289c 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/HeldItemSupplierMixin.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/HeldItemSupplierMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(targets = "net.coderbot.iris.uniforms.IdMapUniforms.HeldItemSupplier", remap = false) +@Mixin(targets = "net.irisshaders.iris.uniforms.IdMapUniforms.HeldItemSupplier", remap = false) public abstract class HeldItemSupplierMixin { @Shadow diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ProgramSetMixin.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ProgramSetMixin.java index 3cf5a01..2eaf5a2 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ProgramSetMixin.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ProgramSetMixin.java @@ -2,9 +2,9 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.lowdragmc.shimmer.comp.iris.ShaderpackInjection; -import net.coderbot.iris.shaderpack.ProgramSet; -import net.coderbot.iris.shaderpack.ShaderProperties; -import net.coderbot.iris.shaderpack.include.AbsolutePackPath; +import net.irisshaders.iris.shaderpack.include.AbsolutePackPath; +import net.irisshaders.iris.shaderpack.programs.ProgramSet; +import net.irisshaders.iris.shaderpack.properties.ShaderProperties; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -13,7 +13,7 @@ @Mixin(ProgramSet.class) public abstract class ProgramSetMixin { @ModifyExpressionValue( - method = "readProgramSource(Lnet/coderbot/iris/shaderpack/include/AbsolutePackPath;Ljava/util/function/Function;Ljava/lang/String;Lnet/coderbot/iris/shaderpack/ProgramSet;Lnet/coderbot/iris/shaderpack/ShaderProperties;Lnet/coderbot/iris/gl/blending/BlendModeOverride;)Lnet/coderbot/iris/shaderpack/ProgramSource;", + method = "readProgramSource(Lnet/irisshaders/iris/shaderpack/include/AbsolutePackPath;Ljava/util/function/Function;Ljava/lang/String;Lnet/irisshaders/iris/shaderpack/programs/ProgramSet;Lnet/irisshaders/iris/shaderpack/properties/ShaderProperties;Lnet/irisshaders/iris/gl/blending/BlendModeOverride;Z)Lnet/irisshaders/iris/shaderpack/programs/ProgramSource;", at = @At(value = "INVOKE", target = "Ljava/util/function/Function;apply(Ljava/lang/Object;)Ljava/lang/Object;", ordinal = 0) @@ -24,18 +24,4 @@ private static Object injectShaderpackVsh(Object value, AbsolutePackPath directo } return value; } - - @ModifyExpressionValue( - method = "readProgramSource(Lnet/coderbot/iris/shaderpack/include/AbsolutePackPath;Ljava/util/function/Function;Ljava/lang/String;Lnet/coderbot/iris/shaderpack/ProgramSet;Lnet/coderbot/iris/shaderpack/ShaderProperties;Lnet/coderbot/iris/gl/blending/BlendModeOverride;)Lnet/coderbot/iris/shaderpack/ProgramSource;", - at = @At(value = "INVOKE", - target = "Ljava/util/function/Function;apply(Ljava/lang/Object;)Ljava/lang/Object;", - ordinal = 2) - , remap = false) - private static Object injectShaderpackFsh(Object value, AbsolutePackPath directory, Function sourceProvider, String program, ProgramSet programSet, ShaderProperties properties){ - if (program.equals("gbuffers_terrain") && value instanceof String fsh) { - return ShaderpackInjection.TERRAIN.injectTerrainFsh(fsh); - } - return value; - } - } diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderPropertiesMixin.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderPropertiesMixin.java index 83809c3..7fb1c62 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderPropertiesMixin.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderPropertiesMixin.java @@ -1,9 +1,9 @@ package com.lowdragmc.shimmer.forge.core.mixins.oculus; import com.lowdragmc.shimmer.comp.iris.IrisHandle; -import net.coderbot.iris.shaderpack.ShaderProperties; -import net.coderbot.iris.shaderpack.StringPair; -import net.coderbot.iris.shaderpack.option.ShaderPackOptions; +import net.irisshaders.iris.helpers.StringPair; +import net.irisshaders.iris.shaderpack.option.ShaderPackOptions; +import net.irisshaders.iris.shaderpack.properties.ShaderProperties; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -12,7 +12,7 @@ @Mixin(value = ShaderProperties.class, remap = false) public abstract class ShaderPropertiesMixin { - @Inject(method = "(Ljava/lang/String;Lnet/coderbot/iris/shaderpack/option/ShaderPackOptions;Ljava/lang/Iterable;)V",at = @At("TAIL")) + @Inject(method = "(Ljava/lang/String;Lnet/irisshaders/iris/shaderpack/option/ShaderPackOptions;Ljava/lang/Iterable;)V",at = @At("TAIL")) private void shaderProperties(String contents, ShaderPackOptions shaderPackOptions, Iterable environmentDefines, CallbackInfo ci){ IrisHandle.analyzeShaderProperties(contents); } diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderStorageBufferHolderMixin.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderStorageBufferHolderMixin.java index 16ba2ff..3f3773a 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderStorageBufferHolderMixin.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/ShaderStorageBufferHolderMixin.java @@ -1,8 +1,8 @@ package com.lowdragmc.shimmer.forge.core.mixins.oculus; import com.lowdragmc.shimmer.comp.iris.IrisHandle; -import net.coderbot.iris.gl.buffer.ShaderStorageBuffer; -import net.coderbot.iris.gl.buffer.ShaderStorageBufferHolder; +import net.irisshaders.iris.gl.buffer.ShaderStorageBuffer; +import net.irisshaders.iris.gl.buffer.ShaderStorageBufferHolder; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/StandardMacrosMixin.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/StandardMacrosMixin.java index 2d8e7a9..3d8cead 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/StandardMacrosMixin.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/oculus/StandardMacrosMixin.java @@ -1,8 +1,8 @@ package com.lowdragmc.shimmer.forge.core.mixins.oculus; import com.lowdragmc.shimmer.ShimmerConstants; -import net.coderbot.iris.gl.shader.StandardMacros; -import net.coderbot.iris.shaderpack.StringPair; +import net.irisshaders.iris.gl.shader.StandardMacros; +import net.irisshaders.iris.helpers.StringPair; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -22,7 +22,7 @@ private static void define(List list, String s) { @Inject(method = "createStandardEnvironmentDefines", at = @At(value = "INVOKE", ordinal = 1, - target = "Lnet/coderbot/iris/gl/shader/StandardMacros;define(Ljava/util/List;Ljava/lang/String;)V"), + target = "Lnet/irisshaders/iris/gl/shader/StandardMacros;define(Ljava/util/List;Ljava/lang/String;Ljava/lang/String;)V"), locals = LocalCapture.CAPTURE_FAILHARD ) private static void injectMacro(CallbackInfoReturnable> cir, ArrayList list) { diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ChunkBuilderMeshingTaskMixin.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ChunkBuilderMeshingTaskMixin.java index 097fc30..eff446a 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ChunkBuilderMeshingTaskMixin.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ChunkBuilderMeshingTaskMixin.java @@ -28,6 +28,7 @@ * @implNote ChunkRenderRebuildTaskMixin */ @Mixin(ChunkBuilderMeshingTask.class) + public abstract class ChunkBuilderMeshingTaskMixin { @Shadow(remap = false) @Final diff --git a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ShaderStorageBufferAccessor.java b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ShaderStorageBufferAccessor.java index 2f65235..5af34a9 100644 --- a/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ShaderStorageBufferAccessor.java +++ b/Forge/src/main/java/com/lowdragmc/shimmer/forge/core/mixins/rubidium/ShaderStorageBufferAccessor.java @@ -1,7 +1,7 @@ package com.lowdragmc.shimmer.forge.core.mixins.rubidium; -import net.coderbot.iris.gl.buffer.ShaderStorageBuffer; -import net.coderbot.iris.gl.buffer.ShaderStorageInfo; +import net.irisshaders.iris.gl.buffer.ShaderStorageBuffer; +import net.irisshaders.iris.gl.buffer.ShaderStorageInfo; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Invoker; @@ -9,5 +9,6 @@ @Mixin(value = ShaderStorageBuffer.class, remap = false) public interface ShaderStorageBufferAccessor { @Invoker void callDestroy(); - @Accessor ShaderStorageInfo getInfo(); + @Accessor + ShaderStorageInfo getInfo(); }