From aaa6558a76be7b0f5e137bdac25bc2d7f02c1d2c Mon Sep 17 00:00:00 2001 From: Technici4n <13494793+Technici4n@users.noreply.github.com> Date: Mon, 5 Sep 2022 16:26:12 +0200 Subject: [PATCH] Update to 1.19.2 --- gradle.properties | 12 ++++++------ .../mekae2/integration/jade/AMJadePlugin.java | 14 ++++++-------- src/main/resources/META-INF/mods.toml | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6b66fb1..c4c5f6e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -minecraft_version=1.19 -forge_version=41.1.0 -ae2_version=12.0.1-alpha -mekanism_version=10.3.0.467 -jei_version=11.1.1.239 -jade_id=3865918 +minecraft_version=1.19.2 +forge_version=43.1.16 +ae2_version=12.2.0-beta +mekanism_version=10.3.3.470 +jei_version=11.3.0.260 +jade_id=3960379 org.gradle.daemon=false diff --git a/src/main/java/me/ramidzkh/mekae2/integration/jade/AMJadePlugin.java b/src/main/java/me/ramidzkh/mekae2/integration/jade/AMJadePlugin.java index 7bf6ce2..2413bbf 100644 --- a/src/main/java/me/ramidzkh/mekae2/integration/jade/AMJadePlugin.java +++ b/src/main/java/me/ramidzkh/mekae2/integration/jade/AMJadePlugin.java @@ -1,12 +1,10 @@ package me.ramidzkh.mekae2.integration.jade; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Block; -import mcp.mobius.waila.api.IWailaClientRegistration; -import mcp.mobius.waila.api.IWailaPlugin; -import mcp.mobius.waila.api.TooltipPosition; -import mcp.mobius.waila.api.WailaPlugin; +import snownee.jade.api.IWailaClientRegistration; +import snownee.jade.api.IWailaPlugin; +import snownee.jade.api.WailaPlugin; /** * Plugin to remove the mekanism-added chemical handler lines for interfaces and pattern providers. @@ -22,9 +20,9 @@ public class AMJadePlugin implements IWailaPlugin { @Override public void registerClient(IWailaClientRegistration registration) { - // Run in TAIL to be able to remove Mekanism's chemical tooltips - registration.registerComponentProvider((tooltip, blockAccessor, pluginConfig) -> { + registration.addTooltipCollectedCallback((tooltip, accessor) -> { // This is ugly, but nothing else worked perfectly due to Jade using old server data for new blocks. + // TODO: check if this is still needed in 1.19+ for (var loc : CHEMICALS) { if (tooltip.get(loc).size() != 9) { return; @@ -35,6 +33,6 @@ public void registerClient(IWailaClientRegistration registration) { for (var loc : CHEMICALS) { tooltip.remove(loc); } - }, TooltipPosition.TAIL, Block.class); // We must use Block.class because of the desyncs mentioned above. + }); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 88ee059..bc9b0e0 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -18,7 +18,7 @@ updateJSONURL = "https://api.modrinth.com/updates/applied-mekanistics/forge_upda [[dependencies.appmek]] modId = "forge" mandatory = true -versionRange = "[41.0.0,42.0.0)" +versionRange = "[43.0.0,44.0.0)" ordering = "NONE" side = "BOTH"