Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Build on 1.21.5 with some less compat layers enabled

Browse Source
This commit is contained in:
Linnea Gräf
2025-04-09 13:26:26 +02:00
parent bb02aa6ddd
commit 0abfc0068c
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle.kts
View File

@@ -227,7 +227,7 @@ val yaclSourceSet = createIsolatedSourceSet("yacl")
val explosiveEnhancementSourceSet = val explosiveEnhancementSourceSet =
createIsolatedSourceSet("explosiveEnhancement", isEnabled = false) // TODO: wait for their port createIsolatedSourceSet("explosiveEnhancement", isEnabled = false) // TODO: wait for their port
val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender", isEnabled = false) val wildfireGenderSourceSet = createIsolatedSourceSet("wildfireGender", isEnabled = false)
val jadeSourceSet = createIsolatedSourceSet("jade") val jadeSourceSet = createIsolatedSourceSet("jade", isEnabled = false)
val modmenuSourceSet = createIsolatedSourceSet("modmenu") val modmenuSourceSet = createIsolatedSourceSet("modmenu")
val reiSourceSet = createIsolatedSourceSet("rei", isEnabled = false) val reiSourceSet = createIsolatedSourceSet("rei", isEnabled = false)
val moulconfigSourceSet = createIsolatedSourceSet("moulconfig") val moulconfigSourceSet = createIsolatedSourceSet("moulconfig")
@@ -269,7 +269,6 @@ dependencies {
modCompileOnly(libs.fabric.api) modCompileOnly(libs.fabric.api)
modRuntimeOnly(libs.fabric.api.deprecated) modRuntimeOnly(libs.fabric.api.deprecated)
modApi(libs.architectury)
modCompileOnly(libs.jarvis.api) modCompileOnly(libs.jarvis.api)
include(libs.jarvis.fabric) include(libs.jarvis.fabric)

4
gradle/libs.versions.toml
View File

@@ -34,7 +34,7 @@ sodium = "mc1.21.5-0.6.11-fabric"
freecammod = "1.3.2+mc1.21.4" freecammod = "1.3.2+mc1.21.4"
# Update from https://modrinth.com/mod/no-chat-reports/versions?l=fabric # Update from https://modrinth.com/mod/no-chat-reports/versions?l=fabric
ncr = "Fabric-1.21.4-v2.11.0" ncr = "Fabric-1.21.5-v2.12.0"
# Update from https://modrinth.com/mod/female-gender/versions?l=fabric # Update from https://modrinth.com/mod/female-gender/versions?l=fabric
femalegender = "4.3.3+1.21.4" femalegender = "4.3.3+1.21.4"
@@ -139,7 +139,7 @@ asm = { module = "org.ow2.asm:asm", version.ref = "asm" }
[bundles] [bundles]
runtime_required = [ runtime_required = [
"rei_fabric", # "rei_fabric",
# "notenoughanimations", # "notenoughanimations",
"hypixelmodapi_fabric", "hypixelmodapi_fabric",
] ]

6
src/main/java/moe/nea/firmament/mixins/WorldRenderLastEventPatch.java
View File

@@ -2,11 +2,9 @@
package moe.nea.firmament.mixins; package moe.nea.firmament.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import moe.nea.firmament.events.WorldRenderLastEvent; import moe.nea.firmament.events.WorldRenderLastEvent;
import net.minecraft.client.render.*; import net.minecraft.client.render.*;
import net.minecraft.client.util.Handle; import net.minecraft.client.util.Handle;
import net.minecraft.client.util.ObjectAllocator;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.profiler.Profiler; import net.minecraft.util.profiler.Profiler;
import org.joml.Matrix4f; import org.joml.Matrix4f;
@@ -31,12 +29,12 @@ public abstract class WorldRenderLastEventPatch {
protected abstract void checkEmpty(MatrixStack matrices); protected abstract void checkEmpty(MatrixStack matrices);
@Inject(method = "method_62214", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V", shift = At.Shift.AFTER)) @Inject(method = "method_62214", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V", shift = At.Shift.AFTER))
public void onWorldRenderLast(Fog fog, RenderTickCounter tickCounter, Camera camera, Profiler profiler, Matrix4f matrix4f, Matrix4f matrix4f2, Handle handle, Handle handle2, Handle handle3, Handle handle4, boolean bl, Frustum frustum, Handle handle5, CallbackInfo ci) { public void onWorldRenderLast(Fog fog, RenderTickCounter renderTickCounter, Camera camera, Profiler profiler, Matrix4f matrix4f, Matrix4f matrix4f2, Handle handle, Handle handle2, boolean bl, Frustum frustum, Handle handle3, Handle handle4, CallbackInfo ci) {
var imm = this.bufferBuilders.getEntityVertexConsumers(); var imm = this.bufferBuilders.getEntityVertexConsumers();
var stack = new MatrixStack(); var stack = new MatrixStack();
// TODO: pre-cancel this event if F1 is active // TODO: pre-cancel this event if F1 is active
var event = new WorldRenderLastEvent( var event = new WorldRenderLastEvent(
stack, tickCounter, stack, renderTickCounter,
camera, camera,
imm imm
); );