From c12f88314cfb66b27dff082a5c6df8686bab0960 Mon Sep 17 00:00:00 2001 From: Alexander01998 Date: Tue, 28 Feb 2023 19:36:13 +0100 Subject: [PATCH] Update Fabric API, Loader and Yarn Fixes #778 --- gradle.properties | 6 +++--- .../mixin/TerrainRenderContextMixin.java | 13 ++++++------- src/main/resources/fabric.mod.json | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gradle.properties b/gradle.properties index a0899404..b7e67076 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.jvmargs=-Xmx1G # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=1.19.3 -yarn_mappings=1.19.3+build.1 -loader_version=0.14.11 +yarn_mappings=1.19.3+build.5 +loader_version=0.14.14 #Fabric api -fabric_version=0.68.1+1.19.3 +fabric_version=0.75.1+1.19.3 # Mod Properties mod_version = v7.32-MC1.19.3 diff --git a/src/main/java/net/wurstclient/mixin/TerrainRenderContextMixin.java b/src/main/java/net/wurstclient/mixin/TerrainRenderContextMixin.java index 6e6a2cbc..fd47c32f 100644 --- a/src/main/java/net/wurstclient/mixin/TerrainRenderContextMixin.java +++ b/src/main/java/net/wurstclient/mixin/TerrainRenderContextMixin.java @@ -10,7 +10,7 @@ package net.wurstclient.mixin; 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.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.fabricmc.fabric.impl.client.indigo.renderer.render.TerrainRenderContext; import net.minecraft.block.BlockState; @@ -23,18 +23,17 @@ import net.wurstclient.events.TesselateBlockListener.TesselateBlockEvent; @Mixin(TerrainRenderContext.class) public class TerrainRenderContextMixin { - @Inject(at = {@At("HEAD")}, - method = {"tessellateBlock"}, + @Inject(at = @At("HEAD"), + method = "tessellateBlock", cancellable = true, remap = false) - private void tesselateBlock(BlockState blockState, BlockPos blockPos, - final BakedModel model, MatrixStack matrixStack, - CallbackInfoReturnable cir) + private void onTessellateBlock(BlockState blockState, BlockPos blockPos, + final BakedModel model, MatrixStack matrixStack, CallbackInfo ci) { TesselateBlockEvent event = new TesselateBlockEvent(blockState); EventManager.fire(event); if(event.isCancelled()) - cir.cancel(); + ci.cancel(); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5f81bba4..c0382dce 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ "depends": { "fabricloader": ">=0.14.10", - "fabric-api": ">=0.68.0", + "fabric-api": ">=0.75.0", "minecraft": "~1.19.3-beta.3", "java": ">=17" },