From f6f2de4f229f2552716c605daec8b4649d9bc304 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Thu, 10 Jul 2025 22:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8B=97=E7=89=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atsuishio/superbwarfare/client/TooltipTool.java | 6 ++++++ .../client/screens/DogTagEditorScreen.java | 1 - .../java/com/atsuishio/superbwarfare/item/DogTag.java | 11 +++++++++++ .../resources/assets/superbwarfare/lang/en_us.json | 1 + .../resources/assets/superbwarfare/lang/zh_cn.json | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/TooltipTool.java b/src/main/java/com/atsuishio/superbwarfare/client/TooltipTool.java index cbf637225..199cfa894 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/TooltipTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/TooltipTool.java @@ -1,5 +1,6 @@ package com.atsuishio.superbwarfare.client; +import com.atsuishio.superbwarfare.init.ModKeyMappings; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; @@ -17,4 +18,9 @@ public class TooltipTool { public static void addDevelopingText(List tooltip) { tooltip.add(Component.translatable("des.superbwarfare.developing").withStyle(ChatFormatting.LIGHT_PURPLE).withStyle(ChatFormatting.BOLD)); } + + public static void addScreenProviderText(List tooltip) { + tooltip.add(Component.translatable("des.superbwarfare.item_screen_provider", + "[" + ModKeyMappings.EDIT_MODE.getKey().getDisplayName().getString() + "]").withStyle(ChatFormatting.AQUA)); + } } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java b/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java index cecc9535b..b19ba6980 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/screens/DogTagEditorScreen.java @@ -162,7 +162,6 @@ public class DogTagEditorScreen extends Screen { this.name.setResponder(this::onNameChanged); // this.name.setValue(this.stack.getHoverName().getString()); this.addWidget(this.name); -// this.setInitialFocus(this.name); this.name.setEditable(true); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java b/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java index ddf0bb4a0..290c4dfeb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/DogTag.java @@ -1,14 +1,17 @@ package com.atsuishio.superbwarfare.item; +import com.atsuishio.superbwarfare.client.TooltipTool; import com.atsuishio.superbwarfare.client.screens.DogTagEditorScreen; import com.atsuishio.superbwarfare.client.tooltip.component.DogTagImageComponent; import com.atsuishio.superbwarfare.component.ModDataComponents; import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.Component; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.neoforged.api.distmarker.Dist; import net.neoforged.api.distmarker.OnlyIn; import org.jetbrains.annotations.NotNull; @@ -17,7 +20,9 @@ import top.theillusivec4.curios.api.CuriosApi; import top.theillusivec4.curios.api.SlotContext; import top.theillusivec4.curios.api.type.capability.ICurioItem; +import javax.annotation.ParametersAreNonnullByDefault; import java.util.Arrays; +import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,6 +32,12 @@ public class DogTag extends Item implements ICurioItem, ItemScreenProvider { super(new Properties().stacksTo(1)); } + @Override + @ParametersAreNonnullByDefault + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + TooltipTool.addScreenProviderText(tooltipComponents); + } + @Override public boolean canEquip(SlotContext slotContext, ItemStack stack) { LivingEntity livingEntity = slotContext.entity(); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index cc11fc096..35e4f2f54 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -252,6 +252,7 @@ "item.superbwarfare.medium_armament_module": "Medium Armament Module", "item.superbwarfare.heavy_armament_module": "Heavy Armament Module", "item.superbwarfare.artillery_indicator": "Artillery Indicator", + "des.superbwarfare.item_screen_provider": "Press %1$s key to open GUI when holding with main hand", "attribute.superbwarfare.bullet_resistance": "Bullet Resistance", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 51f60a2c9..9cdec0cb3 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -252,6 +252,7 @@ "item.superbwarfare.medium_armament_module": "中型武装模块", "item.superbwarfare.heavy_armament_module": "重型武装模块", "item.superbwarfare.artillery_indicator": "火炮指示器", + "des.superbwarfare.item_screen_provider": "在主手时按下 %1$s 以打开GUI", "attribute.superbwarfare.bullet_resistance": "子弹防护",