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 2b705f6eb..268be7832 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/dps_generator_deployer.png and b/src/main/resources/assets/superbwarfare/textures/item/dps_generator_deployer.png differ