From b8fda63ef3dbf0a461468f816ebb2b08f0231458 Mon Sep 17 00:00:00 2001 From: mcrcortex <18544518+MCRcortex@users.noreply.github.com> Date: Sat, 11 Jan 2025 20:04:37 +1000 Subject: [PATCH] Update to 1.21.4 --- build.gradle | 40 +++++++++++-------- gradle.properties | 8 ++-- .../mixin/minecraft/MixinWorldRenderer.java | 2 +- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index e7ceb556..0e9932af 100644 --- a/build.gradle +++ b/build.gradle @@ -65,41 +65,42 @@ dependencies { mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation(fabricApi.module("fabric-api-base", project.fabric_version)) modImplementation(fabricApi.module("fabric-rendering-fluids-v1", project.fabric_version)) modImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_version)) modImplementation(fabricApi.module("fabric-command-api-v2", project.fabric_version)) - //modImplementation("net.fabricmc.fabric-api:fabric-rendering-data-attachment-v1:0.3.38+73761d2e9a") modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" //TODO: this is to eventually not need sodium installed as atm its just used for parsing shaders - modRuntimeOnly "maven.modrinth:sodium:mc1.21.3-0.6.0-fabric" - modCompileOnly "maven.modrinth:sodium:mc1.21.3-0.6.0-fabric" + modRuntimeOnly "maven.modrinth:sodium:mc1.21.4-0.6.6-fabric" + modCompileOnly "maven.modrinth:sodium:mc1.21.4-0.6.6-fabric" //modRuntimeOnly "maven.modrinth:nvidium:0.2.6-beta" modCompileOnly "maven.modrinth:nvidium:0.2.8-beta" - modImplementation("maven.modrinth:cloth-config:16.0.141+fabric") + modImplementation("maven.modrinth:cloth-config:17.0.144+fabric") - modImplementation("maven.modrinth:modmenu:12.0.0-beta.1") + modImplementation("maven.modrinth:modmenu:13.0.0") - modCompileOnly("maven.modrinth:iris:1.8.0+1.21.3-fabric") + modCompileOnly("maven.modrinth:iris:1.8.5+1.21.4-fabric") //modCompileOnly("maven.modrinth:starlight:1.1.3+1.20.4") //modCompileOnly("maven.modrinth:immersiveportals:v5.1.7-mc1.20.4") - modCompileOnly("maven.modrinth:vivecraft:1.21.1-1.1.14-b2-fabric") modCompileOnly("maven.modrinth:chunky:1.4.27-fabric") modRuntimeOnly("maven.modrinth:chunky:1.4.27-fabric") - modRuntimeOnly("maven.modrinth:spark:1.10.115-fabric") - modRuntimeOnly("maven.modrinth:fabric-permissions-api:0.3.1") + modRuntimeOnly("maven.modrinth:spark:1.10.121-fabric") + modRuntimeOnly("maven.modrinth:fabric-permissions-api:0.3.3") //modRuntimeOnly("maven.modrinth:nsight-loader:1.2.0") - modImplementation('io.github.douira:glsl-transformer:2.0.1') + //modImplementation('io.github.douira:glsl-transformer:2.0.1') + + modCompileOnly("maven.modrinth:vivecraft:1.21.1-1.1.14-b2-fabric") } @@ -133,17 +134,16 @@ jar { } } + + tasks.register('excludeUnused', Zip) { //outputs.upToDateWhen { false } archiveExtension.set("jar") entryCompression(ZipEntryCompression.STORED) destinationDirectory.set temporaryDir - /* archiveFileName.set processIncludeJars.outputDirectory.asFileTree.filter { it.name.startsWith('rocksdb') }.first().name - */ - archiveFileName.set "rocksdb.jar" processIncludeJars.outputDirectory.asFileTree.each { if (it.name.startsWith('rocksdb')) { from zipTree(it) @@ -162,13 +162,19 @@ tasks.register('excludeUnused', Zip) { dependsOn processIncludeJars } -remapJar { - nestedJars = nestedJars.filter { - !it.name.startsWith('rocksdb') +if (processIncludeJars.outputDirectory.asFileTree.filter { + it.name.startsWith('rocksdb') +}.first() != null) { + println "Compressing rocksdb" + remapJar { + nestedJars = nestedJars.filter { + !it.name.startsWith('rocksdb') + } + nestedJars.from excludeUnused } - nestedJars.from excludeUnused } + project.ext.lwjglVersion = "3.3.3" project.ext.lwjglNatives = "natives-windows" diff --git a/gradle.properties b/gradle.properties index a4457f26..04c8d81a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.21.3 -yarn_mappings=1.21.3+build.2 -loader_version=0.16.9 +minecraft_version=1.21.4 +yarn_mappings=1.21.4+build.8 +loader_version=0.16.10 # Fabric API -fabric_version=0.108.0+1.21.3 +fabric_version=0.114.2+1.21.4 # Mod Properties mod_version = 0.2.0-alpha diff --git a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java index 0fdc63db..72074874 100644 --- a/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java +++ b/src/main/java/me/cortex/voxy/client/mixin/minecraft/MixinWorldRenderer.java @@ -26,7 +26,7 @@ public abstract class MixinWorldRenderer implements IGetVoxelCore { @Unique private VoxelCore core; @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;setupTerrain(Lnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/Frustum;ZZ)V", shift = At.Shift.AFTER)) - private void injectSetup(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci) { + private void injectSetup(ObjectAllocator allocator, RenderTickCounter tickCounter, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, Matrix4f positionMatrix, Matrix4f projectionMatrix, CallbackInfo ci) { if (this.core != null) { this.core.renderSetup(this.frustum, camera); } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index cd292496..0d0b941c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -35,7 +35,7 @@ "common.voxy.mixins.json" ], "depends": { - "minecraft": "1.21.3", + "minecraft": "1.21.4", "fabricloader": ">=0.14.22", "fabric-api": ">=0.91.1", "cloth-config": ">=13",