kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

ammo指令修改为target:ammo

Browse source
This commit is contained in:
Atsuihsio 2024-05-17 00:04:25 +08:00
parent 01f5d867be
commit 8899deaea0
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/mcreator/target/client/model/item/SksItemModel.java
View file

@ -38,7 +38,7 @@ public class SksItemModel extends GeoModel<SksItem> {
ItemStack stack = player.getMainHandItem(); ItemStack stack = player.getMainHandItem();
if (stack.getOrCreateTag().getDouble("gj") == 1) { if (stack.getOrCreateTag().getDouble("gj") == 1) {
bolt.setPosZ(3.25f); bolt.setPosZ(3f);
} }
double p = 0; double p = 0;
@ -83,7 +83,7 @@ public class SksItemModel extends GeoModel<SksItem> {
shen.setRotZ(-0.003f * (float) fp); shen.setRotZ(-0.003f * (float) fp);
} }
shuan.setPosZ(3 * (float) fp); shuan.setPosZ(2.5f * (float) fp);
if (stack.getOrCreateTag().getDouble("fireanim") > 0) { if (stack.getOrCreateTag().getDouble("fireanim") > 0) {
flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5)));

2
src/main/java/net/mcreator/target/command/AmmoCommand.java
View file

@ -17,7 +17,7 @@ public class AmmoCommand {
@SubscribeEvent @SubscribeEvent
public static void registerCommand(RegisterCommandsEvent event) { public static void registerCommand(RegisterCommandsEvent event) {
// mojang你看看你写的是个牛魔Builder😅 // mojang你看看你写的是个牛魔Builder😅
event.getDispatcher().register(Commands.literal("ammo").requires(s -> s.hasPermission(4)) event.getDispatcher().register(Commands.literal("target:ammo").requires(s -> s.hasPermission(4))
.then(Commands.literal("get").then(Commands.argument("player", EntityArgument.player()).then(Commands.argument("type", EnumArgument.enumArgument(GunInfo.Type.class)).executes(context -> { .then(Commands.literal("get").then(Commands.argument("player", EntityArgument.player()).then(Commands.argument("type", EnumArgument.enumArgument(GunInfo.Type.class)).executes(context -> {
var player = EntityArgument.getPlayer(context, "player"); var player = EntityArgument.getPlayer(context, "player");

4
src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java
View file

@ -121,7 +121,6 @@ public class LivingEntityEventHandler {
private static void killIndication(Entity sourceEntity) { private static void killIndication(Entity sourceEntity) {
if (sourceEntity == null) return; if (sourceEntity == null) return;
if (sourceEntity instanceof Player player && player.getMainHandItem().is(TargetModTags.Items.GUN)) {
if (!sourceEntity.level().isClientSide() && sourceEntity.getServer() != null) { if (!sourceEntity.level().isClientSide() && sourceEntity.getServer() != null) {
// TODO 修改为正确音效播放方法 // TODO 修改为正确音效播放方法
@ -133,7 +132,6 @@ public class LivingEntityEventHandler {
capability.syncPlayerVariables(sourceEntity); capability.syncPlayerVariables(sourceEntity);
}); });
} }
}
private static void arrowDamageImmuneForMine(Event event, DamageSource damageSource, Entity sourceEntity) { private static void arrowDamageImmuneForMine(Event event, DamageSource damageSource, Entity sourceEntity) {
if (damageSource == null || sourceEntity == null) return; if (damageSource == null || sourceEntity == null) return;
@ -187,7 +185,7 @@ public class LivingEntityEventHandler {
|| !newTag.getUUID("gun_uuid").equals(oldTag.getUUID("gun_uuid")) || !newTag.getUUID("gun_uuid").equals(oldTag.getUUID("gun_uuid"))
) { ) {
stopGunReloadSound(serverLevel, oldGun); stopGunReloadSound(serverLevel, oldGun);
// TODO 添加一个原先物品不是枪也能触发切枪动画
if (newStack.getItem() instanceof GunItem) { if (newStack.getItem() instanceof GunItem) {
newStack.getOrCreateTag().putDouble("draw", 1); newStack.getOrCreateTag().putDouble("draw", 1);
} }

2
src/main/java/net/mcreator/target/item/gun/GunItem.java
View file

@ -52,7 +52,7 @@ public abstract class GunItem extends Item {
@SubscribeEvent @SubscribeEvent
public static void onPickup(EntityItemPickupEvent event) { public static void onPickup(EntityItemPickupEvent event) {
if (event.getItem().getItem().is(TargetModTags.Items.GUN)) { if (event.getItem().getItem().is(TargetModTags.Items.GUN)) {
event.getItem().getItem().getOrCreateTag().putDouble("drawtime", 0); event.getItem().getItem().getOrCreateTag().putDouble("draw", 1);
} }
} }
} }