From b8f0f700223e2cb4c2e2afdc0dac60209608c2f5 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 27 Nov 2022 01:23:39 +0800 Subject: [PATCH] Update to 1.19.3-pre2, Note that API is NOT finalized Commenting out ClientTooltipEvent.RENDER_MODIFY_COLOR for now --- .../events/client/ClientTooltipEvent.java | 2 +- .../main/resources/architectury.accessWidener | 2 +- .../mixin/fabric/client/MixinScreen.java | 29 ++++++++++--------- gradle.properties | 6 ++-- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/common/src/main/java/dev/architectury/event/events/client/ClientTooltipEvent.java b/common/src/main/java/dev/architectury/event/events/client/ClientTooltipEvent.java index 20723ee0..cb78c17b 100644 --- a/common/src/main/java/dev/architectury/event/events/client/ClientTooltipEvent.java +++ b/common/src/main/java/dev/architectury/event/events/client/ClientTooltipEvent.java @@ -52,7 +52,7 @@ public interface ClientTooltipEvent { /** * @see RenderModifyColor#renderTooltip(PoseStack, int, int, ColorContext) */ - Event RENDER_MODIFY_COLOR = EventFactory.createLoop(); + // Event RENDER_MODIFY_COLOR = EventFactory.createLoop(); static AdditionalContexts additionalContexts() { return TooltipAdditionalContextsImpl.get(); diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index 0c0faa2c..450af308 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -190,7 +190,7 @@ transitive-accessible method net/minecraft/world/level/block/EnderChestBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/FarmBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/FletchingTableBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V -transitive-accessible method net/minecraft/world/level/block/FungusBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/resources/ResourceKey;)V +transitive-accessible method net/minecraft/world/level/block/FungusBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/block/Block;)V transitive-accessible method net/minecraft/world/level/block/FurnaceBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/GrindstoneBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/HalfTransparentBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java index e6903fd5..51de6d53 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java @@ -31,6 +31,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.events.GuiEventListener; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; +import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner; import net.minecraft.world.item.ItemStack; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -96,7 +97,7 @@ public abstract class MixinScreen implements ScreenInputDelegate { } @Inject(method = "renderTooltipInternal", at = @At("HEAD"), cancellable = true) - private void renderTooltip(PoseStack poseStack, List list, int x, int y, CallbackInfo ci) { + private void renderTooltip(PoseStack poseStack, List list, int x, int y, ClientTooltipPositioner positioner, CallbackInfo ci) { if (!list.isEmpty()) { var colorContext = tooltipColorContext.get(); colorContext.reset(); @@ -105,7 +106,7 @@ public abstract class MixinScreen implements ScreenInputDelegate { if (ClientTooltipEvent.RENDER_PRE.invoker().renderTooltip(poseStack, list, x, y).isFalse()) { ci.cancel(); } else { - ClientTooltipEvent.RENDER_MODIFY_COLOR.invoker().renderTooltip(poseStack, x, y, colorContext); + // ClientTooltipEvent.RENDER_MODIFY_COLOR.invoker().renderTooltip(poseStack, x, y, colorContext); ClientTooltipEvent.RENDER_MODIFY_POSITION.invoker().renderTooltip(poseStack, positionContext); } } @@ -123,18 +124,18 @@ public abstract class MixinScreen implements ScreenInputDelegate { return tooltipPositionContext.get().getTooltipY(); } - @ModifyConstant(method = "renderTooltipInternal", constant = @Constant(intValue = 0xf0100010)) - private int modifyTooltipBackgroundColor(int original) { - return tooltipColorContext.get().getBackgroundColor(); - } + // @ModifyConstant(method = "renderTooltipInternal", constant = @Constant(intValue = 0xf0100010)) + // private int modifyTooltipBackgroundColor(int original) { + // return tooltipColorContext.get().getBackgroundColor(); + // } - @ModifyConstant(method = "renderTooltipInternal", constant = @Constant(intValue = 0x505000ff)) - private int modifyTooltipOutlineGradientTopColor(int original) { - return tooltipColorContext.get().getOutlineGradientTopColor(); - } + // @ModifyConstant(method = "renderTooltipInternal", constant = @Constant(intValue = 0x505000ff)) + // private int modifyTooltipOutlineGradientTopColor(int original) { + // return tooltipColorContext.get().getOutlineGradientTopColor(); + // } - @ModifyConstant(method = "renderTooltipInternal", constant = @Constant(intValue = 0x5028007f)) - private int modifyTooltipOutlineGradientBottomColor(int original) { - return tooltipColorContext.get().getOutlineGradientBottomColor(); - } + // @ModifyConstant(method = "renderTooltipInternal", constant = @Constant(intValue = 0x5028007f)) + // private int modifyTooltipOutlineGradientBottomColor(int original) { + // return tooltipColorContext.get().getOutlineGradientBottomColor(); + // } } diff --git a/gradle.properties b/gradle.properties index 47efe5e8..dc4fc54c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=1.19.3-pre1 -supported_version=1.19.3-pre1 +minecraft_version=1.19.3-pre2 +supported_version=1.19.3-pre2 required_version=1.19.3 artifact_type=beta @@ -15,7 +15,7 @@ base_version=7.0 maven_group=dev.architectury fabric_loader_version=0.14.10 -fabric_api_version=0.67.1+1.19.3 +fabric_api_version=0.67.2+1.19.3 mod_menu_version=3.1.0 forge_version=43.0.0