添加武器文案,修改发射延迟
This commit is contained in:
parent
bca8ba3fce
commit
989b7a09a6
6 changed files with 49 additions and 2 deletions
|
@ -1,19 +1,24 @@
|
||||||
package com.atsuishio.superbwarfare.item.gun.handgun;
|
package com.atsuishio.superbwarfare.item.gun.handgun;
|
||||||
|
|
||||||
import com.atsuishio.superbwarfare.Mod;
|
import com.atsuishio.superbwarfare.Mod;
|
||||||
|
import com.atsuishio.superbwarfare.client.TooltipTool;
|
||||||
import com.atsuishio.superbwarfare.client.renderer.gun.AureliaSceptreRenderer;
|
import com.atsuishio.superbwarfare.client.renderer.gun.AureliaSceptreRenderer;
|
||||||
import com.atsuishio.superbwarfare.data.gun.GunData;
|
import com.atsuishio.superbwarfare.data.gun.GunData;
|
||||||
import com.atsuishio.superbwarfare.event.ClientEventHandler;
|
import com.atsuishio.superbwarfare.event.ClientEventHandler;
|
||||||
import com.atsuishio.superbwarfare.init.ModEnumExtensions;
|
import com.atsuishio.superbwarfare.init.ModEnumExtensions;
|
||||||
import com.atsuishio.superbwarfare.item.gun.GunItem;
|
import com.atsuishio.superbwarfare.item.gun.GunItem;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.model.HumanoidModel;
|
import net.minecraft.client.model.HumanoidModel;
|
||||||
import net.minecraft.client.player.LocalPlayer;
|
import net.minecraft.client.player.LocalPlayer;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.Style;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.world.InteractionHand;
|
import net.minecraft.world.InteractionHand;
|
||||||
import net.minecraft.world.entity.LivingEntity;
|
import net.minecraft.world.entity.LivingEntity;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
import net.neoforged.api.distmarker.Dist;
|
import net.neoforged.api.distmarker.Dist;
|
||||||
import net.neoforged.api.distmarker.OnlyIn;
|
import net.neoforged.api.distmarker.OnlyIn;
|
||||||
import software.bernie.geckolib.animatable.GeoItem;
|
import software.bernie.geckolib.animatable.GeoItem;
|
||||||
|
@ -22,6 +27,8 @@ import software.bernie.geckolib.animation.*;
|
||||||
import software.bernie.geckolib.renderer.GeoItemRenderer;
|
import software.bernie.geckolib.renderer.GeoItemRenderer;
|
||||||
import software.bernie.geckolib.util.GeckoLibUtil;
|
import software.bernie.geckolib.util.GeckoLibUtil;
|
||||||
|
|
||||||
|
import javax.annotation.ParametersAreNonnullByDefault;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
@ -69,6 +76,19 @@ public class AureliaSceptre extends GunItem implements GeoItem {
|
||||||
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aurelia_sceptre.idle"));
|
return event.setAndContinue(RawAnimation.begin().thenLoop("animation.aurelia_sceptre.idle"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@ParametersAreNonnullByDefault
|
||||||
|
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
tooltipComponents.add(Component.empty());
|
||||||
|
tooltipComponents.add(Component.translatable("des.superbwarfare.aurelia_sceptre_1").withStyle(ChatFormatting.GRAY));
|
||||||
|
tooltipComponents.add(Component.translatable("des.superbwarfare.aurelia_sceptre_2").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC));
|
||||||
|
|
||||||
|
TooltipTool.addHideText(tooltipComponents, Component.literal(""));
|
||||||
|
TooltipTool.addHideText(tooltipComponents, Component.translatable("des.superbwarfare.trachelium_3").withStyle(ChatFormatting.WHITE));
|
||||||
|
TooltipTool.addHideText(tooltipComponents, Component.translatable("des.superbwarfare.aurelia_sceptre_3").withStyle(Style.EMPTY.withColor(0xABCDEF)));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
|
public void registerControllers(AnimatableManager.ControllerRegistrar data) {
|
||||||
var idleController = new AnimationController<>(this, "idleController", 6, this::idlePredicate);
|
var idleController = new AnimationController<>(this, "idleController", 6, this::idlePredicate);
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.atsuishio.superbwarfare.item.gun.launcher;
|
package com.atsuishio.superbwarfare.item.gun.launcher;
|
||||||
|
|
||||||
import com.atsuishio.superbwarfare.Mod;
|
import com.atsuishio.superbwarfare.Mod;
|
||||||
|
import com.atsuishio.superbwarfare.client.TooltipTool;
|
||||||
import com.atsuishio.superbwarfare.client.renderer.gun.SecondaryCataclysmRenderer;
|
import com.atsuishio.superbwarfare.client.renderer.gun.SecondaryCataclysmRenderer;
|
||||||
import com.atsuishio.superbwarfare.client.tooltip.component.SecondaryCataclysmImageComponent;
|
import com.atsuishio.superbwarfare.client.tooltip.component.SecondaryCataclysmImageComponent;
|
||||||
import com.atsuishio.superbwarfare.data.gun.GunData;
|
import com.atsuishio.superbwarfare.data.gun.GunData;
|
||||||
|
@ -14,9 +15,12 @@ import com.atsuishio.superbwarfare.item.gun.GunItem;
|
||||||
import com.atsuishio.superbwarfare.perk.AmmoPerk;
|
import com.atsuishio.superbwarfare.perk.AmmoPerk;
|
||||||
import com.atsuishio.superbwarfare.perk.Perk;
|
import com.atsuishio.superbwarfare.perk.Perk;
|
||||||
import com.atsuishio.superbwarfare.tools.ParticleTool;
|
import com.atsuishio.superbwarfare.tools.ParticleTool;
|
||||||
|
import net.minecraft.ChatFormatting;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.client.player.LocalPlayer;
|
import net.minecraft.client.player.LocalPlayer;
|
||||||
import net.minecraft.core.particles.ParticleTypes;
|
import net.minecraft.core.particles.ParticleTypes;
|
||||||
|
import net.minecraft.network.chat.Component;
|
||||||
|
import net.minecraft.network.chat.Style;
|
||||||
import net.minecraft.resources.ResourceLocation;
|
import net.minecraft.resources.ResourceLocation;
|
||||||
import net.minecraft.server.level.ServerLevel;
|
import net.minecraft.server.level.ServerLevel;
|
||||||
import net.minecraft.world.entity.Entity;
|
import net.minecraft.world.entity.Entity;
|
||||||
|
@ -24,6 +28,7 @@ import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.inventory.tooltip.TooltipComponent;
|
import net.minecraft.world.inventory.tooltip.TooltipComponent;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
|
import net.minecraft.world.item.TooltipFlag;
|
||||||
import net.minecraft.world.level.Level;
|
import net.minecraft.world.level.Level;
|
||||||
import net.neoforged.neoforge.capabilities.Capabilities;
|
import net.neoforged.neoforge.capabilities.Capabilities;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
@ -34,6 +39,7 @@ import software.bernie.geckolib.renderer.GeoItemRenderer;
|
||||||
import software.bernie.geckolib.util.GeckoLibUtil;
|
import software.bernie.geckolib.util.GeckoLibUtil;
|
||||||
|
|
||||||
import javax.annotation.ParametersAreNonnullByDefault;
|
import javax.annotation.ParametersAreNonnullByDefault;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
|
@ -56,6 +62,17 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, EnergyStorag
|
||||||
return Math.round((float) (cap != null ? cap.getEnergyStored() : 0) * 13.0F / 24000F);
|
return Math.round((float) (cap != null ? cap.getEnergyStored() : 0) * 13.0F / 24000F);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@ParametersAreNonnullByDefault
|
||||||
|
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
|
||||||
|
tooltipComponents.add(Component.empty());
|
||||||
|
tooltipComponents.add(Component.translatable("des.superbwarfare.secondary_cataclysm_1").withStyle(ChatFormatting.GRAY).withStyle(ChatFormatting.ITALIC));
|
||||||
|
|
||||||
|
TooltipTool.addHideText(tooltipComponents, Component.empty());
|
||||||
|
TooltipTool.addHideText(tooltipComponents, Component.translatable("des.superbwarfare.trachelium_3").withStyle(ChatFormatting.WHITE));
|
||||||
|
TooltipTool.addHideText(tooltipComponents, Component.translatable("des.superbwarfare.secondary_cataclysm_2").withStyle(Style.EMPTY.withColor(0x68B9F6)));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getBarColor(@NotNull ItemStack pStack) {
|
public int getBarColor(@NotNull ItemStack pStack) {
|
||||||
return 0x95E9FF;
|
return 0x95E9FF;
|
||||||
|
|
|
@ -44,11 +44,16 @@
|
||||||
"item.superbwarfare.m_1911": "M1911A1",
|
"item.superbwarfare.m_1911": "M1911A1",
|
||||||
"item.superbwarfare.mp_443": "MP-443",
|
"item.superbwarfare.mp_443": "MP-443",
|
||||||
"item.superbwarfare.aurelia_sceptre": "Aurelia Sceptre",
|
"item.superbwarfare.aurelia_sceptre": "Aurelia Sceptre",
|
||||||
|
"des.superbwarfare.aurelia_sceptre_1": "The ethereal fae, pearl-covered sceptre spans the universe",
|
||||||
|
"des.superbwarfare.aurelia_sceptre_2": "\"It is the cerulean ocean's lament, the lunar weeping on shores, the laughter crystallized amidst the crimson barrage\"",
|
||||||
|
"des.superbwarfare.aurelia_sceptre_3": "Sana",
|
||||||
"item.superbwarfare.qbz_95": "QBZ-95-1",
|
"item.superbwarfare.qbz_95": "QBZ-95-1",
|
||||||
"item.superbwarfare.k_98": "KAR-98K",
|
"item.superbwarfare.k_98": "KAR-98K",
|
||||||
"item.superbwarfare.mosin_nagant": "Mosin Nagant",
|
"item.superbwarfare.mosin_nagant": "Mosin Nagant",
|
||||||
"item.superbwarfare.javelin": "FGM-148 Javelin",
|
"item.superbwarfare.javelin": "FGM-148 Javelin",
|
||||||
"item.superbwarfare.secondary_cataclysm": "Secondary Cataclysm",
|
"item.superbwarfare.secondary_cataclysm": "Secondary Cataclysm",
|
||||||
|
"des.superbwarfare.secondary_cataclysm_1": "\"Like the remnants after a shower of stars fall\"",
|
||||||
|
"des.superbwarfare.secondary_cataclysm_2": "Hiru",
|
||||||
"item.superbwarfare.insidious": "Insidious",
|
"item.superbwarfare.insidious": "Insidious",
|
||||||
|
|
||||||
"des.superbwarfare.guns.damage": "Damage: ",
|
"des.superbwarfare.guns.damage": "Damage: ",
|
||||||
|
|
|
@ -44,11 +44,16 @@
|
||||||
"item.superbwarfare.m_1911": "M1911手枪",
|
"item.superbwarfare.m_1911": "M1911手枪",
|
||||||
"item.superbwarfare.mp_443": "MP-443手枪",
|
"item.superbwarfare.mp_443": "MP-443手枪",
|
||||||
"item.superbwarfare.aurelia_sceptre": "海月权杖",
|
"item.superbwarfare.aurelia_sceptre": "海月权杖",
|
||||||
|
"des.superbwarfare.aurelia_sceptre_1": "缥缈的精灵,诸世界中的明珠之杖",
|
||||||
|
"des.superbwarfare.aurelia_sceptre_2": "“它是蔚蓝大海的叹息,是天边明月的泪水,是她于枪火纷飞之中的微笑”",
|
||||||
|
"des.superbwarfare.aurelia_sceptre_3": "纱奈Sana",
|
||||||
"item.superbwarfare.qbz_95": "95-1式自动步枪",
|
"item.superbwarfare.qbz_95": "95-1式自动步枪",
|
||||||
"item.superbwarfare.k_98": "KAR-98K",
|
"item.superbwarfare.k_98": "KAR-98K",
|
||||||
"item.superbwarfare.mosin_nagant": "莫辛纳甘",
|
"item.superbwarfare.mosin_nagant": "莫辛纳甘",
|
||||||
"item.superbwarfare.javelin": "FGM-148标枪导弹",
|
"item.superbwarfare.javelin": "FGM-148标枪导弹",
|
||||||
"item.superbwarfare.secondary_cataclysm": "二次灾变",
|
"item.superbwarfare.secondary_cataclysm": "二次灾变",
|
||||||
|
"des.superbwarfare.secondary_cataclysm_1": "“宛若群星陨落后的余烬”",
|
||||||
|
"des.superbwarfare.secondary_cataclysm_2": "灯瑠Hiru",
|
||||||
"item.superbwarfare.insidious": "阴险",
|
"item.superbwarfare.insidious": "阴险",
|
||||||
|
|
||||||
"des.superbwarfare.guns.upgrade_point": "升级点数: ",
|
"des.superbwarfare.guns.upgrade_point": "升级点数: ",
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
"BypassesArmor": 0.26,
|
"BypassesArmor": 0.26,
|
||||||
"SoundRadius": 2,
|
"SoundRadius": 2,
|
||||||
"RPM": 1100,
|
"RPM": 1100,
|
||||||
"ShootDelay": 10,
|
"ShootDelay": 5,
|
||||||
"HeatPerShoot": 1,
|
"HeatPerShoot": 1,
|
||||||
"AvailableFireModes": [
|
"AvailableFireModes": [
|
||||||
"Auto"
|
"Auto"
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
"DefaultFireMode": "Auto",
|
"DefaultFireMode": "Auto",
|
||||||
"AvailableFireModes": ["Auto"],
|
"AvailableFireModes": ["Auto"],
|
||||||
"AmmoType": "@RifleAmmo",
|
"AmmoType": "@RifleAmmo",
|
||||||
"ShootDelay": 20,
|
"ShootDelay": 10,
|
||||||
"HeatPerShoot": 0.5,
|
"HeatPerShoot": 0.5,
|
||||||
"AvailablePerks": [
|
"AvailablePerks": [
|
||||||
"@Ammo",
|
"@Ammo",
|
||||||
|
|
Loading…
Add table
Reference in a new issue