imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-28 03:56:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to 1.19.3-pre2, Note that API is NOT finalized

Browse Source 
Commenting out ClientTooltipEvent.RENDER_MODIFY_COLOR for now
This commit is contained in:
shedaniel
2022-11-27 01:23:39 +08:00
parent a5405323a8
commit b8f0f70022
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/dev/architectury/event/events/client/ClientTooltipEvent.java
View File

@@ -52,7 +52,7 @@ public interface ClientTooltipEvent {
/**
* @see RenderModifyColor#renderTooltip(PoseStack, int, int, ColorContext)
*/
Event<RenderModifyColor> RENDER_MODIFY_COLOR = EventFactory.createLoop();
// Event<RenderModifyColor> RENDER_MODIFY_COLOR = EventFactory.createLoop();
static AdditionalContexts additionalContexts() {
return TooltipAdditionalContextsImpl.get();

2
common/src/main/resources/architectury.accessWidener
View File

@@ -190,7 +190,7 @@ transitive-accessible method net/minecraft/world/level/block/EnderChestBlock <in
transitive-accessible method net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
transitive-accessible method net/minecraft/world/level/block/FarmBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
transitive-accessible method net/minecraft/world/level/block/FletchingTableBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
transitive-accessible method net/minecraft/world/level/block/FungusBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Lnet/minecraft/resources/ResourceKey;)V
transitive-accessible method net/minecraft/world/level/block/FungusBlock <init> (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 <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
transitive-accessible method net/minecraft/world/level/block/GrindstoneBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V
transitive-accessible method net/minecraft/world/level/block/HalfTransparentBlock <init> (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V

29
fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinScreen.java
View File

@@ -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<? extends ClientTooltipComponent> list, int x, int y, CallbackInfo ci) {
private void renderTooltip(PoseStack poseStack, List<? extends ClientTooltipComponent> 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();
// }
}

6
gradle.properties
View File

@@ -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