FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-14 19:25:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Move injection point of TooltipComponentCallback (#3085)

Browse source
This commit is contained in:
Technici4n 2023-05-30 12:59:06 +01:00 committed by modmuss50
parent daba44536b
commit 8cec7577f3
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/DrawContextMixin.java → fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/TooltipComponentMixin.java
View file

@ -16,29 +16,28 @@
package net.fabricmc.fabric.mixin.client.rendering;
import java.util.List;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.tooltip.TooltipComponent;
import net.minecraft.client.item.TooltipData;
import net.fabricmc.fabric.api.client.rendering.v1.TooltipComponentCallback;
@Mixin(DrawContext.class)
public class DrawContextMixin {
// Synthetic lambda body in renderTooltip
@Inject(at = @At("HEAD"), method = "method_51442(Ljava/util/List;Lnet/minecraft/client/item/TooltipData;)V", cancellable = true)
private static void injectRenderTooltipLambda(List<TooltipComponent> components, TooltipData data, CallbackInfo ci) {
@Mixin(TooltipComponent.class)
public interface TooltipComponentMixin {
@Inject(
method = "of(Lnet/minecraft/client/item/TooltipData;)Lnet/minecraft/client/gui/tooltip/TooltipComponent;",
at = @At("HEAD"),
cancellable = true
)
private static void convertCustomTooltipData(TooltipData data, CallbackInfoReturnable<TooltipComponent> cir) {
TooltipComponent component = TooltipComponentCallback.EVENT.invoker().getComponent(data);
if (component != null) {
components.add(1, component);
ci.cancel();
cir.setReturnValue(component);
}
}
}

2
fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json
View file

@ -9,13 +9,13 @@
"BuiltinModelItemRendererMixin",
"CapeFeatureRendererMixin",
"DimensionEffectsAccessor",
"DrawContextMixin",
"EntityModelLayersAccessor",
"EntityModelsMixin",
"EntityRenderersMixin",
"InGameHudMixin",
"ItemColorsMixin",
"LivingEntityRendererAccessor",
"TooltipComponentMixin",
"WorldRendererMixin",
"shader.GameRendererMixin",
"shader.ShaderProgramImportProcessorMixin",

5
fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/TooltipComponentTests.java
View file

@ -16,6 +16,8 @@
package net.fabricmc.fabric.test.rendering.client;
import java.util.Objects;
import net.minecraft.client.gui.tooltip.TooltipComponent;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
@ -35,5 +37,8 @@ public class TooltipComponentTests implements ClientModInitializer {
return null;
});
// Test that TooltipComponent.of works with custom TooltipData
Objects.requireNonNull(TooltipComponent.of(new TooltipComponentTestInit.Data("Hello world!")));
}
}