diff --git a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java index 2ebc6bf90..3a3ca5848 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SksItemModel.java @@ -38,7 +38,7 @@ public class SksItemModel extends GeoModel { ItemStack stack = player.getMainHandItem(); if (stack.getOrCreateTag().getDouble("gj") == 1) { - bolt.setPosZ(3.25f); + bolt.setPosZ(3f); } double p = 0; @@ -83,7 +83,7 @@ public class SksItemModel extends GeoModel { shen.setRotZ(-0.003f * (float) fp); } - shuan.setPosZ(3 * (float) fp); + shuan.setPosZ(2.5f * (float) fp); if (stack.getOrCreateTag().getDouble("fireanim") > 0) { flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); diff --git a/src/main/java/net/mcreator/target/command/AmmoCommand.java b/src/main/java/net/mcreator/target/command/AmmoCommand.java index d0cc5bcba..2b977eac6 100644 --- a/src/main/java/net/mcreator/target/command/AmmoCommand.java +++ b/src/main/java/net/mcreator/target/command/AmmoCommand.java @@ -17,7 +17,7 @@ public class AmmoCommand { @SubscribeEvent public static void registerCommand(RegisterCommandsEvent event) { // 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 -> { var player = EntityArgument.getPlayer(context, "player"); diff --git a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java index dfb6b8c0c..38feaf56f 100644 --- a/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java +++ b/src/main/java/net/mcreator/target/event/LivingEntityEventHandler.java @@ -121,7 +121,6 @@ public class LivingEntityEventHandler { private static void killIndication(Entity sourceEntity) { if (sourceEntity == null) return; - if (sourceEntity instanceof Player player && player.getMainHandItem().is(TargetModTags.Items.GUN)) { if (!sourceEntity.level().isClientSide() && sourceEntity.getServer() != null) { // TODO 修改为正确音效播放方法 @@ -132,7 +131,6 @@ public class LivingEntityEventHandler { capability.killIndicator = 40; capability.syncPlayerVariables(sourceEntity); }); - } } private static void arrowDamageImmuneForMine(Event event, DamageSource damageSource, Entity sourceEntity) { @@ -187,7 +185,7 @@ public class LivingEntityEventHandler { || !newTag.getUUID("gun_uuid").equals(oldTag.getUUID("gun_uuid")) ) { stopGunReloadSound(serverLevel, oldGun); - + // TODO 添加一个原先物品不是枪也能触发切枪动画 if (newStack.getItem() instanceof GunItem) { newStack.getOrCreateTag().putDouble("draw", 1); } diff --git a/src/main/java/net/mcreator/target/item/gun/GunItem.java b/src/main/java/net/mcreator/target/item/gun/GunItem.java index 6037e6c7a..e4e58ab2c 100644 --- a/src/main/java/net/mcreator/target/item/gun/GunItem.java +++ b/src/main/java/net/mcreator/target/item/gun/GunItem.java @@ -52,7 +52,7 @@ public abstract class GunItem extends Item { @SubscribeEvent public static void onPickup(EntityItemPickupEvent event) { if (event.getItem().getItem().is(TargetModTags.Items.GUN)) { - event.getItem().getItem().getOrCreateTag().putDouble("drawtime", 0); + event.getItem().getItem().getOrCreateTag().putDouble("draw", 1); } } }