Update to 1.21.4

This commit is contained in:
mcrcortex
2025-01-11 20:04:37 +10:00
parent 316f42cf03
commit b8fda63ef3
4 changed files with 29 additions and 23 deletions

View File

@@ -65,41 +65,42 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation(fabricApi.module("fabric-api-base", project.fabric_version)) modImplementation(fabricApi.module("fabric-api-base", project.fabric_version))
modImplementation(fabricApi.module("fabric-rendering-fluids-v1", 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-resource-loader-v0", project.fabric_version))
modImplementation(fabricApi.module("fabric-command-api-v2", 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}" 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 //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" modRuntimeOnly "maven.modrinth:sodium:mc1.21.4-0.6.6-fabric"
modCompileOnly "maven.modrinth:sodium:mc1.21.3-0.6.0-fabric" modCompileOnly "maven.modrinth:sodium:mc1.21.4-0.6.6-fabric"
//modRuntimeOnly "maven.modrinth:nvidium:0.2.6-beta" //modRuntimeOnly "maven.modrinth:nvidium:0.2.6-beta"
modCompileOnly "maven.modrinth:nvidium:0.2.8-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:starlight:1.1.3+1.20.4")
//modCompileOnly("maven.modrinth:immersiveportals:v5.1.7-mc1.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") modCompileOnly("maven.modrinth:chunky:1.4.27-fabric")
modRuntimeOnly("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:spark:1.10.121-fabric")
modRuntimeOnly("maven.modrinth:fabric-permissions-api:0.3.1") modRuntimeOnly("maven.modrinth:fabric-permissions-api:0.3.3")
//modRuntimeOnly("maven.modrinth:nsight-loader:1.2.0") //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) { tasks.register('excludeUnused', Zip) {
//outputs.upToDateWhen { false } //outputs.upToDateWhen { false }
archiveExtension.set("jar") archiveExtension.set("jar")
entryCompression(ZipEntryCompression.STORED) entryCompression(ZipEntryCompression.STORED)
destinationDirectory.set temporaryDir destinationDirectory.set temporaryDir
/*
archiveFileName.set processIncludeJars.outputDirectory.asFileTree.filter { archiveFileName.set processIncludeJars.outputDirectory.asFileTree.filter {
it.name.startsWith('rocksdb') it.name.startsWith('rocksdb')
}.first().name }.first().name
*/
archiveFileName.set "rocksdb.jar"
processIncludeJars.outputDirectory.asFileTree.each { processIncludeJars.outputDirectory.asFileTree.each {
if (it.name.startsWith('rocksdb')) { if (it.name.startsWith('rocksdb')) {
from zipTree(it) from zipTree(it)
@@ -162,13 +162,19 @@ tasks.register('excludeUnused', Zip) {
dependsOn processIncludeJars dependsOn processIncludeJars
} }
remapJar { if (processIncludeJars.outputDirectory.asFileTree.filter {
nestedJars = nestedJars.filter { it.name.startsWith('rocksdb')
!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.lwjglVersion = "3.3.3"
project.ext.lwjglNatives = "natives-windows" project.ext.lwjglNatives = "natives-windows"

View File

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.21.3 minecraft_version=1.21.4
yarn_mappings=1.21.3+build.2 yarn_mappings=1.21.4+build.8
loader_version=0.16.9 loader_version=0.16.10
# Fabric API # Fabric API
fabric_version=0.108.0+1.21.3 fabric_version=0.114.2+1.21.4
# Mod Properties # Mod Properties
mod_version = 0.2.0-alpha mod_version = 0.2.0-alpha

View File

@@ -26,7 +26,7 @@ public abstract class MixinWorldRenderer implements IGetVoxelCore {
@Unique private VoxelCore core; @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)) @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) { if (this.core != null) {
this.core.renderSetup(this.frustum, camera); this.core.renderSetup(this.frustum, camera);
} }

View File

@@ -35,7 +35,7 @@
"common.voxy.mixins.json" "common.voxy.mixins.json"
], ],
"depends": { "depends": {
"minecraft": "1.21.3", "minecraft": "1.21.4",
"fabricloader": ">=0.14.22", "fabricloader": ">=0.14.22",
"fabric-api": ">=0.91.1", "fabric-api": ">=0.91.1",
"cloth-config": ">=13", "cloth-config": ">=13",