imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-04-02 21:47:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'architectury/1.19.4' into 1.20

Browse Source 
# Conflicts:
#	fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java
#	forge/src/main/java/dev/architectury/event/forge/EventHandlerImplClient.java
#	forge/src/main/resources/META-INF/mods.toml
#	gradle.properties
This commit is contained in:
shedaniel
2023-07-09 17:37:48 +08:00
parent b523f05f53 e542e2d367
commit 7f7807469b
8 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGuiGraphics.java
View File

@@ -40,8 +40,6 @@ import java.util.List;
public abstract class MixinGuiGraphics {
@Unique
private static ThreadLocal<TooltipEventPositionContextImpl> tooltipPositionContext = ThreadLocal.withInitial(TooltipEventPositionContextImpl::new);
@Unique
private static ThreadLocal<TooltipEventColorContextImpl> tooltipColorContext = ThreadLocal.withInitial(TooltipEventColorContextImpl::new);
@Inject(method = "renderTooltip(Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;II)V", at = @At("HEAD"))
private void preRenderTooltipItem(Font font, ItemStack stack, int x, int y, CallbackInfo ci) {
@@ -56,14 +54,14 @@ public abstract class MixinGuiGraphics {
@Inject(method = "renderTooltipInternal", at = @At("HEAD"), cancellable = true)
private void renderTooltip(Font font, List<? extends ClientTooltipComponent> list, int x, int y, ClientTooltipPositioner positioner, CallbackInfo ci) {
if (!list.isEmpty()) {
var colorContext = tooltipColorContext.get();
var colorContext = TooltipEventColorContextImpl.CONTEXT.get();
colorContext.reset();
var positionContext = tooltipPositionContext.get();
positionContext.reset(x, y);
if (ClientTooltipEvent.RENDER_PRE.invoker().renderTooltip((GuiGraphics) (Object) this, list, x, y).isFalse()) {
ci.cancel();
} else {
// ClientTooltipEvent.RENDER_MODIFY_COLOR.invoker().renderTooltip((GuiGraphics) (Object) this, x, y, colorContext);
ClientTooltipEvent.RENDER_MODIFY_COLOR.invoker().renderTooltip((GuiGraphics) (Object) this, x, y, colorContext);
ClientTooltipEvent.RENDER_MODIFY_POSITION.invoker().renderTooltip((GuiGraphics) (Object) this, positionContext);
}
}
@@ -80,19 +78,4 @@ public abstract class MixinGuiGraphics {
private int modifyTooltipY(int original) {
return tooltipPositionContext.get().getTooltipY();
}
// @ModifyConstant(method = "renderTooltipInternal(Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V", constant = @Constant(intValue = 0xf0100010))
// private int modifyTooltipBackgroundColor(int original) {
// return tooltipColorContext.get().getBackgroundColor();
// }
//
// @ModifyConstant(method = "renderTooltipInternal(Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V", constant = @Constant(intValue = 0x505000ff))
// private int modifyTooltipOutlineGradientTopColor(int original) {
// return tooltipColorContext.get().getOutlineGradientTopColor();
// }
//
// @ModifyConstant(method = "renderTooltipInternal(Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V", constant = @Constant(intValue = 0x5028007f))
// private int modifyTooltipOutlineGradientBottomColor(int original) {
// return tooltipColorContext.get().getOutlineGradientBottomColor();
// }
}

44
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinTooltipRenderUtil.java Normal file
View File

@@ -0,0 +1,44 @@
/*
* This file is part of architectury.
* Copyright (C) 2020, 2021, 2022 architectury
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
package dev.architectury.mixin.fabric.client;
import dev.architectury.impl.TooltipEventColorContextImpl;
import net.minecraft.client.gui.screens.inventory.tooltip.TooltipRenderUtil;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
@Mixin(TooltipRenderUtil.class)
public abstract class MixinTooltipRenderUtil {
@ModifyConstant(method = "renderTooltipBackground", constant = @Constant(intValue = 0xf0100010))
private static int modifyTooltipBackgroundColor(int original) {
return TooltipEventColorContextImpl.CONTEXT.get().getBackgroundColor();
}
@ModifyConstant(method = "renderTooltipBackground", constant = @Constant(intValue = 0x505000ff))
private static int modifyTooltipOutlineGradientTopColor(int original) {
return TooltipEventColorContextImpl.CONTEXT.get().getOutlineGradientTopColor();
}
@ModifyConstant(method = "renderTooltipBackground", constant = @Constant(intValue = 0x5028007f))
private static int modifyTooltipOutlineGradientBottomColor(int original) {
return TooltipEventColorContextImpl.CONTEXT.get().getOutlineGradientBottomColor();
}
}

1
fabric/src/main/resources/architectury.mixins.json
View File

@@ -20,6 +20,7 @@
"client.MixinMouseHandler",
"client.MixinMultiPlayerGameMode",
"client.MixinScreen",
"client.MixinTooltipRenderUtil"
],
"mixins": [
"BiomeAccessor",