From 88cbb7ec45ba5ab0ae89119bf4c9daf90fb59f29 Mon Sep 17 00:00:00 2001 From: deirn Date: Fri, 26 May 2023 13:36:13 +0700 Subject: [PATCH] fix crash with wthit 5.16 --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- .../java/lol/bai/megane/runtime/mixin/MixinRegistrar.java | 4 ++-- module-base/runtime/src/main/resources/fabric.mod.json | 2 +- src/main/resources/fabric.mod.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 836aa5b..01e8ef1 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -11,7 +11,7 @@ object deps { val yarn = "net.fabricmc:yarn:1.19.2+build.8:v2" val fabricLoader = "net.fabricmc:fabric-loader:0.14.15" - val wthit = "mcp.mobius.waila:wthit:fabric-5.13.5" + val wthit = "mcp.mobius.waila:wthit:fabric-5.16.1" val ae2 = "appeng:appliedenergistics2-fabric:12.9.2" val alloyForge = "maven.modrinth:jhl28YkY:2.0.19+1.19" diff --git a/module-base/runtime/src/main/java/lol/bai/megane/runtime/mixin/MixinRegistrar.java b/module-base/runtime/src/main/java/lol/bai/megane/runtime/mixin/MixinRegistrar.java index de7ee9c..8ecc2db 100644 --- a/module-base/runtime/src/main/java/lol/bai/megane/runtime/mixin/MixinRegistrar.java +++ b/module-base/runtime/src/main/java/lol/bai/megane/runtime/mixin/MixinRegistrar.java @@ -1,7 +1,7 @@ package lol.bai.megane.runtime.mixin; import mcp.mobius.waila.api.IBlockComponentProvider; -import mcp.mobius.waila.api.IServerDataProvider; +import mcp.mobius.waila.api.IDataProvider; import mcp.mobius.waila.api.TooltipPosition; import mcp.mobius.waila.plugin.vanilla.provider.FurnaceProvider; import mcp.mobius.waila.registry.Registrar; @@ -21,7 +21,7 @@ private void addComponent(IBlockComponentProvider provider, TooltipPosition } @Inject(method = "addBlockData", at = @At("HEAD"), cancellable = true) - private void addBlockData(IServerDataProvider provider, Class clazz, CallbackInfo ci) { + private void addBlockData(IDataProvider provider, Class clazz, int priority, CallbackInfo ci) { if (provider instanceof FurnaceProvider) { ci.cancel(); } diff --git a/module-base/runtime/src/main/resources/fabric.mod.json b/module-base/runtime/src/main/resources/fabric.mod.json index c43bff3..2f1a60d 100644 --- a/module-base/runtime/src/main/resources/fabric.mod.json +++ b/module-base/runtime/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ ], "depends" : { "minecraft" : ">=1.19", - "wthit" : ">=5.4.3", + "wthit" : ">=5.16.1", "megane-api" : "*" }, "custom" : { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index aaf7942..b235852 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -22,6 +22,6 @@ "environment" : "*", "depends" : { "minecraft" : ">=1.19", - "wthit" : ">=5.4.3" + "wthit" : ">=5.16.1" } }