From dcacd279b33ef11c4c8c438bb11c50c8bc42f5e2 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sun, 22 Jun 2025 11:31:38 +1000 Subject: [PATCH] readd nvidium support --- build.gradle | 22 +++++++++++++++-- .../mixin/nvidium/MixinRenderPipeline.java | 24 +++++++++++++++++++ src/main/resources/client.voxy.mixins.json | 7 ++++-- 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 src/main/java/me/cortex/voxy/client/mixin/nvidium/MixinRenderPipeline.java diff --git a/build.gradle b/build.gradle index 1fb001d1..bc08aff9 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,24 @@ repositories { } maven { url = "https://maven.shedaniel.me/" } maven { url = "https://maven.terraformersmc.com/releases/" } + + exclusiveContent { + forRepository { + ivy { + name = "github" + url = "https://github.com/" + patternLayout { + artifact '/[organisation]/[module]/releases/download/[revision]/[module]-[revision]-[classifier].[ext]' + } + metadataSources { + artifact() + } + } + } + filter { + includeModuleByRegex("[^\\.]+", "nvidium") + } + } } @@ -92,8 +110,8 @@ dependencies { modImplementation("maven.modrinth:lithium:mc1.21.6-0.17.0-fabric") - //modRuntimeOnly "maven.modrinth:nvidium:0.2.6-beta" - //modCompileOnly "maven.modrinth:nvidium:0.2.8-beta" + modRuntimeOnlyMsk "drouarb:nvidium:0.4.1-beta4:1.21.6@jar" + modCompileOnly "drouarb:nvidium:0.4.1-beta4:1.21.6@jar" modCompileOnly("maven.modrinth:modmenu:15.0.0-beta.1") modRuntimeOnlyMsk("maven.modrinth:modmenu:15.0.0-beta.1") diff --git a/src/main/java/me/cortex/voxy/client/mixin/nvidium/MixinRenderPipeline.java b/src/main/java/me/cortex/voxy/client/mixin/nvidium/MixinRenderPipeline.java new file mode 100644 index 00000000..d414de5a --- /dev/null +++ b/src/main/java/me/cortex/voxy/client/mixin/nvidium/MixinRenderPipeline.java @@ -0,0 +1,24 @@ +package me.cortex.voxy.client.mixin.nvidium; + +import me.cortex.nvidium.RenderPipeline; +import me.cortex.voxy.client.core.IGetVoxyRenderSystem; +import net.caffeinemc.mods.sodium.client.render.chunk.ChunkRenderMatrices; +import net.caffeinemc.mods.sodium.client.render.chunk.terrain.TerrainRenderPass; +import net.caffeinemc.mods.sodium.client.render.viewport.Viewport; +import net.caffeinemc.mods.sodium.client.util.FogParameters; +import net.minecraft.client.MinecraftClient; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(RenderPipeline.class) +public class MixinRenderPipeline { + @Inject(method = "renderFrame", at = @At("RETURN")) + private void voxy$injectRender(TerrainRenderPass pass, Viewport frustum, FogParameters fogParameters, ChunkRenderMatrices crm, double px, double py, double pz, CallbackInfo ci) { + var renderer = ((IGetVoxyRenderSystem) MinecraftClient.getInstance().worldRenderer).getVoxyRenderSystem(); + if (renderer != null) { + renderer.renderOpaque(crm, px, py, pz); + } + } +} diff --git a/src/main/resources/client.voxy.mixins.json b/src/main/resources/client.voxy.mixins.json index 5a66c5a6..c34a6d0e 100644 --- a/src/main/resources/client.voxy.mixins.json +++ b/src/main/resources/client.voxy.mixins.json @@ -14,9 +14,12 @@ "minecraft.MixinWorldRenderer", "sodium.MixinDefaultChunkRenderer", "sodium.MixinRenderSectionManager", - "sodium.MixinSodiumOptionsGUI" + "sodium.MixinSodiumOptionsGUI", + "nvidium.MixinRenderPipeline" ], "injectors": { "defaultRequire": 1 - } + }, + "mixins": [ + ] }