From 709f36a81207f08408361df6f9e4e7e5dd539146 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 10 May 2025 22:10:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2DPS=E5=8F=91=E7=94=B5?= =?UTF-8?q?=E6=9C=BA=E7=9A=84=E8=B4=B4=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/entity/DPSGeneratorModel.java | 3 ++- .../item/DPSGeneratorDeployer.java | 12 ++++++++++++ .../assets/superbwarfare/lang/en_us.json | 1 + .../assets/superbwarfare/lang/zh_cn.json | 1 + .../textures/item/dps_generator_deployer.png | Bin 428 -> 207 bytes 5 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java index 84b1f7f6a..ce72c62a9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/entity/DPSGeneratorModel.java @@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.client.model.entity; import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.entity.DPSGeneratorEntity; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import software.bernie.geckolib.model.GeoModel; public class DPSGeneratorModel extends GeoModel { @@ -19,6 +20,6 @@ public class DPSGeneratorModel extends GeoModel { @Override public ResourceLocation getTextureResource(DPSGeneratorEntity entity) { - return Mod.loc("textures/entity/dps_generator_tier_" + entity.getGeneratorLevel() + ".png"); + return Mod.loc("textures/entity/dps_generator_tier_" + Mth.clamp(entity.getGeneratorLevel(), 0, 7) + ".png"); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/DPSGeneratorDeployer.java b/src/main/java/com/atsuishio/superbwarfare/item/DPSGeneratorDeployer.java index d522c4dae..632f3ad69 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/DPSGeneratorDeployer.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/DPSGeneratorDeployer.java @@ -2,8 +2,10 @@ package com.atsuishio.superbwarfare.item; import com.atsuishio.superbwarfare.entity.DPSGeneratorEntity; import com.atsuishio.superbwarfare.init.ModEntities; +import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; @@ -13,6 +15,7 @@ import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.ClipContext; import net.minecraft.world.level.Level; @@ -23,13 +26,22 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import org.jetbrains.annotations.NotNull; +import javax.annotation.ParametersAreNonnullByDefault; +import java.util.List; import java.util.Objects; public class DPSGeneratorDeployer extends Item { + public DPSGeneratorDeployer() { super(new Properties()); } + @Override + @ParametersAreNonnullByDefault + public void appendHoverText(ItemStack stack, TooltipContext context, List tooltipComponents, TooltipFlag tooltipFlag) { + tooltipComponents.add(Component.translatable("des.superbwarfare.dps_generator_deployer").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC)); + } + @Override public @NotNull InteractionResult useOn(UseOnContext pContext) { Level level = pContext.getLevel(); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 64266d4d6..df0a2fd9b 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -177,6 +177,7 @@ "item.superbwarfare.ancient_cpu": "Ancient CPU", "item.superbwarfare.target_deployer": "Target", "item.superbwarfare.dps_generator_deployer": "DPS Generator", + "des.superbwarfare.dps_generator_deployer": "\"So what is your DPS?\"", "item.superbwarfare.senpai_spawn_egg": "Senpai Spawn Egg", "item.superbwarfare.knife": "Knife", "item.superbwarfare.hammer": "Hammer", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 5a36ec3b7..1e0fd4038 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -177,6 +177,7 @@ "item.superbwarfare.ancient_cpu": "古代处理器", "item.superbwarfare.target_deployer": "标靶", "item.superbwarfare.dps_generator_deployer": "DPS发电机", + "des.superbwarfare.dps_generator_deployer": "“那我问你，你DPS多少？”", "item.superbwarfare.senpai_spawn_egg": "野兽先辈刷怪蛋", "item.superbwarfare.knife": "军刀", "item.superbwarfare.hammer": "大锤", diff --git a/src/main/resources/assets/superbwarfare/textures/item/dps_generator_deployer.png b/src/main/resources/assets/superbwarfare/textures/item/dps_generator_deployer.png index 2b705f6eb89b4da5afa6a00ad5fdd84886bbe969..268be7832d526a7b8c5a499cbeacc31de94309b5 100644 GIT binary patch delta 190 zcmV;v073t(1J41F8Gi-<001BJ|6u?C00DDSM?wIu&K&6g004|3z1|1x@M3mL^m4%(u@pXt{~a~nC5}= s04lV(6r!>+%-}h5=74iD0KjLR5yANF{Qv*}07*qoM6N<$f^73l-v9sr literal 428 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G~10G|-o4hDv+3=IGO|Bn>n28s#x9_9g3tR+Ey!9clBSEK+1B}!Z)N`mv#O3D+9QW*jgGxJLH{9Hp6O!W-)%)76Bw*;!$mKx!i z=IN=$zyUIrL5h);ff2~^0%B<>8{~2gMrN=$6Oe7l$OQID6p)?S&H@(C0$Nv;eZ8x(p2rK(eat z^LiJXY&{BO>U+94hG+yQCnP2&HZTjYw@5BzP&~lGc7jQvGK6t~4I^WT?u#}j##q)F c6B)R<8Kgy-R5jh~r-F>}boFyt=akR{08KJbyZ`_I