From 7602d903d06ae2fb4c9e8c161ed7308c30b7e432 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 7 May 2024 14:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=8F=E8=BF=B0procedure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/common/ammo/CreativeAmmoBox.java | 3 +- .../item/common/ammo/HandgunAmmoBox.java | 3 +- .../target/item/common/ammo/RifleAmmoBox.java | 3 +- .../item/common/ammo/ShotgunAmmoBox.java | 3 +- .../item/common/ammo/SniperAmmoBox.java | 3 +- .../target/procedures/GunsTipsProcedure.java | 49 ------------------- .../mcreator/target/tools/TooltipTool.java | 8 +-- .../resources/assets/target/lang/en_us.json | 9 +++- .../resources/assets/target/lang/zh_cn.json | 13 +++-- 9 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java diff --git a/src/main/java/net/mcreator/target/item/common/ammo/CreativeAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/CreativeAmmoBox.java index c28ec0652..39d03561d 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/CreativeAmmoBox.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/CreativeAmmoBox.java @@ -1,6 +1,7 @@ package net.mcreator.target.item.common.ammo; import net.mcreator.target.procedures.CreativeAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -35,7 +36,7 @@ public class CreativeAmmoBox extends Item { @Override public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + list.add(Component.translatable("des.target.creative_ammo_box").withStyle(ChatFormatting.GRAY)); } @Override diff --git a/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java index a4a81e64d..3a65dcc80 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/HandgunAmmoBox.java @@ -1,6 +1,7 @@ package net.mcreator.target.item.common.ammo; import net.mcreator.target.procedures.HandgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -27,7 +28,7 @@ public class HandgunAmmoBox extends Item { @Override public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + list.add(Component.translatable("des.target.handgun_ammo_box").withStyle(ChatFormatting.GRAY)); } @Override diff --git a/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java index 3472b83c7..6b35457e5 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/RifleAmmoBox.java @@ -1,6 +1,7 @@ package net.mcreator.target.item.common.ammo; import net.mcreator.target.procedures.RifleAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -27,7 +28,7 @@ public class RifleAmmoBox extends Item { @Override public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + list.add(Component.translatable("des.target.rifle_ammo_box").withStyle(ChatFormatting.GRAY)); } @Override diff --git a/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java index 8381b8b43..05057647c 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/ShotgunAmmoBox.java @@ -1,6 +1,7 @@ package net.mcreator.target.item.common.ammo; import net.mcreator.target.procedures.ShotgunAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -27,7 +28,7 @@ public class ShotgunAmmoBox extends Item { @Override public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + list.add(Component.translatable("des.target.shotgun_ammo_box").withStyle(ChatFormatting.GRAY)); } @Override diff --git a/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java b/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java index b59642d3e..4adcf8af4 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/SniperAmmoBox.java @@ -1,6 +1,7 @@ package net.mcreator.target.item.common.ammo; import net.mcreator.target.procedures.SniperAmmoBoxWanJiaWanChengShiYongWuPinShiProcedure; +import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResultHolder; @@ -27,7 +28,7 @@ public class SniperAmmoBox extends Item { @Override public void appendHoverText(ItemStack itemstack, Level world, List list, TooltipFlag flag) { - super.appendHoverText(itemstack, world, list, flag); + list.add(Component.translatable("des.target.sniper_ammo_box").withStyle(ChatFormatting.GRAY)); } @Override diff --git a/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java b/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java deleted file mode 100644 index 427531675..000000000 --- a/src/main/java/net/mcreator/target/procedures/GunsTipsProcedure.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.init.TargetModItems; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.tags.ItemTags; -import net.minecraft.world.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import net.minecraftforge.eventbus.api.Event; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; - -import javax.annotation.Nullable; -import java.util.List; - -@Mod.EventBusSubscriber -public class GunsTipsProcedure { - @OnlyIn(Dist.CLIENT) - @SubscribeEvent - public static void onItemTooltip(ItemTooltipEvent event) { - execute(event, event.getItemStack(), event.getToolTip()); - } - - public static void execute(ItemStack itemstack, List tooltip) { - execute(null, itemstack, tooltip); - } - - private static void execute(@Nullable Event event, ItemStack itemstack, List tooltip) { - if (tooltip == null) - return; - if (itemstack.getItem() == TargetModItems.CREATIVE_AMMO_BOX.get()) { - tooltip.add(Component.literal("Creative Ammo * 2147483647")); - } - if (itemstack.getItem() == TargetModItems.RIFLE_AMMO_BOX.get()) { - tooltip.add(Component.literal("Rifle Ammo * 30")); - } - if (itemstack.getItem() == TargetModItems.HANDGUN_AMMO_BOX.get()) { - tooltip.add(Component.literal("Handgun Ammo * 30")); - } - if (itemstack.getItem() == TargetModItems.SHOTGUN_AMMO_BOX.get()) { - tooltip.add(Component.literal("Shotgun Ammo * 12")); - } - if (itemstack.getItem() == TargetModItems.SNIPER_AMMO_BOX.get()) { - tooltip.add(Component.literal("Sniper Ammo * 12")); - } - } -} diff --git a/src/main/java/net/mcreator/target/tools/TooltipTool.java b/src/main/java/net/mcreator/target/tools/TooltipTool.java index 6784e9450..e1aa99ede 100644 --- a/src/main/java/net/mcreator/target/tools/TooltipTool.java +++ b/src/main/java/net/mcreator/target/tools/TooltipTool.java @@ -23,7 +23,7 @@ public class TooltipTool { ItemNBTTool.getDouble(stack, "adddamage", 0)) * ItemNBTTool.getDouble(stack, "damageadd", 1); - tooltip.add(Component.translatable("des.target.tips.damage").withStyle(ChatFormatting.WHITE) + tooltip.add(Component.translatable("des.target.tips.damage").withStyle(ChatFormatting.GRAY) .append(Component.literal("").withStyle(ChatFormatting.RESET)) .append(Component.literal(new DecimalFormat("##.#").format(damage)).withStyle(ChatFormatting.GREEN))); @@ -32,7 +32,7 @@ public class TooltipTool { ChatFormatting formatting; if (level < 4) { - formatting = ChatFormatting.GRAY; + formatting = ChatFormatting.WHITE; } else if (level < 6) { formatting = ChatFormatting.AQUA; } else if (level < 8) { @@ -43,8 +43,8 @@ public class TooltipTool { formatting = ChatFormatting.RED; } - tooltip.add(Component.translatable("des.target.tips.level").withStyle(ChatFormatting.WHITE) + tooltip.add(Component.translatable("des.target.tips.level").withStyle(ChatFormatting.GRAY) .append(Component.literal("").withStyle(ChatFormatting.RESET)) - .append(Component.literal(level + " " + new DecimalFormat("##.##").format(rate) + "%")).withStyle(formatting).withStyle(ChatFormatting.BOLD)); + .append(Component.literal(level + " " + new DecimalFormat("##.##").format(rate) + "%").withStyle(formatting).withStyle(ChatFormatting.BOLD))); } } diff --git a/src/main/resources/assets/target/lang/en_us.json b/src/main/resources/assets/target/lang/en_us.json index 3fef3465e..fa879dc10 100644 --- a/src/main/resources/assets/target/lang/en_us.json +++ b/src/main/resources/assets/target/lang/en_us.json @@ -86,17 +86,22 @@ "item.target.rocket": "RPG Rocket", "item.target.sniper_ammo": "Sniper Ammo *2", "item.target.sniper_ammo_box": "Sniper Ammo Box", + "des.target.sniper_ammo_box": "Sniper Ammo *12", "item.target.rifle_ammo": "Rifle Ammo *5", "item.target.rifle_ammo_box": "Rifle Ammo Box", + "des.target.rifle_ammo_box": "Rifle Ammo *30", "item.target.shotgun_ammo": "Shotgun Ammo *2", "item.target.shotgun_ammo_box": "Shotgun Ammo Box", - "item.target.handgun_ammo": "Handgun Ammo * 5", + "des.target.shotgun_ammo_box": "Shotgun Ammo *12", + "item.target.handgun_ammo": "Handgun Ammo *5", "item.target.handgun_ammo_box": "Handgun Ammo Box", + "des.target.handgun_ammo_box": "Handgun Ammo *30", "item.target.creative_ammo_box": "Creative Ammo Box", + "des.target.creative_ammo_box": "Creative Ammo *2147483647", "item.target.target_deployer": "Target", "item.target.senpai_spawn_egg": "Senpai Spawn Egg", - "item.target.light_saber": "Lightsaber", + "item.target.light_saber": "Light Saber", "item.target.hammer": "Hammer", "item.target.mortar_bipod": "Mortar Bipod", "item.target.mortar_base_plate": "Mortar Base Plate", diff --git a/src/main/resources/assets/target/lang/zh_cn.json b/src/main/resources/assets/target/lang/zh_cn.json index 5ceb220a9..e823fc3e3 100644 --- a/src/main/resources/assets/target/lang/zh_cn.json +++ b/src/main/resources/assets/target/lang/zh_cn.json @@ -84,15 +84,20 @@ "item.target.mortar_shells": "迫击炮弹", "item.target.grenade_40mm": "40mm枪榴弹", "item.target.rocket": "RPG火箭", - "item.target.sniper_ammo": "狙击枪弹药*2", + "item.target.sniper_ammo": "狙击枪弹药 *2", "item.target.sniper_ammo_box": "狙击枪弹药盒", - "item.target.rifle_ammo": "步枪弹药* 5", + "des.target.sniper_ammo_box": "狙击枪弹药 *12", + "item.target.rifle_ammo": "步枪弹药 *5", "item.target.rifle_ammo_box": "步枪弹药盒", - "item.target.shotgun_ammo": "霰弹枪弹药*2", + "des.target.rifle_ammo_box": "步枪弹药 *30", + "item.target.shotgun_ammo": "霰弹枪弹药 *2", "item.target.shotgun_ammo_box": "霰弹枪弹药盒", - "item.target.handgun_ammo": "手枪弹药* 5", + "des.target.shotgun_ammo_box": "霰弹枪弹药 *12", + "item.target.handgun_ammo": "手枪弹药 *5", "item.target.handgun_ammo_box": "手枪弹药盒", + "des.target.handgun_ammo_box": "手枪弹药 *30", "item.target.creative_ammo_box": "创造弹药盒", + "des.target.creative_ammo_box": "创造弹药 *2147483647", "item.target.target_deployer": "标靶", "item.target.senpai_spawn_egg": "野兽先辈刷怪蛋",