From b730ae4b0bdb2d5ee76d10a4547d4b0d0da701d1 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sun, 12 May 2024 15:01:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8D=A2=E5=BC=B9=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 2 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- .../target/procedures/Reload1Procedure.java | 40 ------------------ .../target/procedures/Reload2Procedure.java | 41 ------------------- .../procedures/RifleReloadProcedure.java | 36 ++++++++++++++++ ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- .../procedures/ShotgunReloadProcedure.java | 8 +++- ...aiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 +- 13 files changed, 59 insertions(+), 100 deletions(-) delete mode 100644 src/main/java/net/mcreator/target/procedures/Reload1Procedure.java delete mode 100644 src/main/java/net/mcreator/target/procedures/Reload2Procedure.java create mode 100644 src/main/java/net/mcreator/target/procedures/RifleReloadProcedure.java diff --git a/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 2188c8406..0799a9aa3 100644 --- a/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -39,7 +39,7 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { @@ -62,7 +62,7 @@ public class AK47WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 25d5adca8..b9e699154 100644 --- a/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -37,7 +37,7 @@ public class Aa12WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { if (entity instanceof LivingEntity) { - ShotgunReloadProcedure.execute((LivingEntity) entity, false); + ShotgunReloadProcedure.execute((LivingEntity) entity); } } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { diff --git a/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index d6b6a794e..607772fc5 100644 --- a/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -39,7 +39,7 @@ public class DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 51) { @@ -63,7 +63,7 @@ public class DevotionWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 5d7b1334e..65db63888 100644 --- a/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -39,7 +39,7 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { @@ -62,7 +62,7 @@ public class Hk416WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index da8fd8dff..401c4c8c1 100644 --- a/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -39,7 +39,7 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { @@ -62,7 +62,7 @@ public class M4WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 5dc36ab55..668bf3ef0 100644 --- a/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -42,7 +42,7 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 111) { @@ -65,7 +65,7 @@ public class M60WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } WeapondrawhaveyProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 773f6e143..ec97784e8 100644 --- a/src/main/java/net/mcreator/target/procedures/Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -42,7 +42,7 @@ public class Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("gj", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 45) { @@ -65,7 +65,7 @@ public class Mk14WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/Reload1Procedure.java b/src/main/java/net/mcreator/target/procedures/Reload1Procedure.java deleted file mode 100644 index 9563e23a9..000000000 --- a/src/main/java/net/mcreator/target/procedures/Reload1Procedure.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.network.TargetModVariables; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; - -public class Reload1Procedure { - public static void execute(Entity entity) { - if (entity == null) - return; - double ammo1 = 0; - ItemStack stack = ItemStack.EMPTY; - stack = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - ammo1 = stack.getOrCreateTag().getDouble("mag") - stack.getOrCreateTag().getDouble("ammo"); - if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo >= ammo1) { - { - double _setval = (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo - ammo1; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.rifleAmmo = _setval; - capability.syncPlayerVariables(entity); - }); - } - stack.getOrCreateTag().putDouble("ammo", (stack.getOrCreateTag().getDouble("ammo") + ammo1)); - stack.getOrCreateTag().putDouble("reloading", 0); - stack.getOrCreateTag().putDouble("emptyreload", 0); - } else { - stack.getOrCreateTag().putDouble("ammo", (stack.getOrCreateTag().getDouble("ammo") + (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo)); - { - double _setval = 0; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.rifleAmmo = _setval; - capability.syncPlayerVariables(entity); - }); - } - stack.getOrCreateTag().putDouble("reloading", 0); - stack.getOrCreateTag().putDouble("emptyreload", 0); - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/Reload2Procedure.java b/src/main/java/net/mcreator/target/procedures/Reload2Procedure.java deleted file mode 100644 index 1ab0383ee..000000000 --- a/src/main/java/net/mcreator/target/procedures/Reload2Procedure.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.mcreator.target.procedures; - -import net.mcreator.target.network.TargetModVariables; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.LivingEntity; -import net.minecraft.world.item.ItemStack; - -public class Reload2Procedure { - public static void execute(Entity entity) { - if (entity == null) - return; - ItemStack stack = ItemStack.EMPTY; - double ammo2 = 0; - double ammo1 = 0; - stack = (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY); - ammo2 = (stack.getOrCreateTag().getDouble("mag") + 1) - stack.getOrCreateTag().getDouble("ammo"); - if ((entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo >= ammo2) { - { - double _setval = (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo - ammo2; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.rifleAmmo = _setval; - capability.syncPlayerVariables(entity); - }); - } - stack.getOrCreateTag().putDouble("ammo", (stack.getOrCreateTag().getDouble("ammo") + ammo2)); - stack.getOrCreateTag().putDouble("reloading", 0); - stack.getOrCreateTag().putDouble("emptyreload", 0); - } else { - stack.getOrCreateTag().putDouble("ammo", (stack.getOrCreateTag().getDouble("ammo") + (entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo)); - { - double _setval = 0; - entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { - capability.rifleAmmo = _setval; - capability.syncPlayerVariables(entity); - }); - } - stack.getOrCreateTag().putDouble("reloading", 0); - stack.getOrCreateTag().putDouble("emptyreload", 0); - } - } -} diff --git a/src/main/java/net/mcreator/target/procedures/RifleReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/RifleReloadProcedure.java new file mode 100644 index 000000000..0896e045f --- /dev/null +++ b/src/main/java/net/mcreator/target/procedures/RifleReloadProcedure.java @@ -0,0 +1,36 @@ +package net.mcreator.target.procedures; + +import net.mcreator.target.network.TargetModVariables; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.item.ItemStack; + +public class RifleReloadProcedure { + public static void execute(Entity entity) { + execute(entity, false); + } + + public static void execute(Entity entity, boolean extraOne) { + if (entity == null) return; + + ItemStack stack = (entity instanceof LivingEntity living ? living.getMainHandItem() : ItemStack.EMPTY); + + CompoundTag tag = stack.getOrCreateTag(); + + double mag = tag.getDouble("mag"); + double ammo = tag.getDouble("ammo"); + double rifleAmmo = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.rifleAmmo).orElse(0d); + + double ammo1 = mag - ammo + (extraOne ? 1 : 0); + + tag.putDouble("ammo", ammo + Math.min(ammo1, rifleAmmo)); + entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> { + capability.rifleAmmo = Math.max(0, rifleAmmo - ammo1); + capability.syncPlayerVariables(entity); + }); + + tag.putDouble("reloading", 0); + tag.putDouble("emptyreload", 0); + } +} diff --git a/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 2ec7aa24d..308cc4475 100644 --- a/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -35,7 +35,7 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { @@ -56,7 +56,7 @@ public class RpkWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack); diff --git a/src/main/java/net/mcreator/target/procedures/ShotgunReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/ShotgunReloadProcedure.java index d831400e9..c4e2c602f 100644 --- a/src/main/java/net/mcreator/target/procedures/ShotgunReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/ShotgunReloadProcedure.java @@ -5,12 +5,16 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.LivingEntity; public class ShotgunReloadProcedure { - public static void execute(LivingEntity entity, boolean plusOne) { + public static void execute(LivingEntity entity) { + execute(entity, false); + } + + public static void execute(LivingEntity entity, boolean extraOne) { CompoundTag tag = entity.getMainHandItem().getOrCreateTag(); double mag = tag.getDouble("mag"); double ammo = tag.getDouble("ammo"); - double empty = mag - ammo + (plusOne ? 1 : 0); + double empty = mag - ammo + (extraOne ? 1 : 0); double shotgunAmmo = entity.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).map(c -> c.shotgunAmmo).orElse(0d); tag.putDouble("ammo", ammo + Math.min(empty, shotgunAmmo)); diff --git a/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index 0b34e4edc..570d17277 100644 --- a/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -43,7 +43,7 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("gj", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload1Procedure.execute(entity); + RifleReloadProcedure.execute(entity); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { @@ -67,7 +67,7 @@ public class SksWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloadtime") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - Reload2Procedure.execute(entity); + RifleReloadProcedure.execute(entity, true); } } WeaponDrawProcedure.execute(entity, itemstack);