From 0cf2ec0f907fd7b6821fb77ce7bbe4bb96cbdd12 Mon Sep 17 00:00:00 2001 From: Light_Quanta Date: Sat, 18 May 2024 20:16:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83maxammo=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../target/client/model/item/BocekItemModel.java | 2 +- .../mcreator/target/client/screens/AmmoBarOverlay.java | 2 +- .../net/mcreator/target/event/PlayerEventHandler.java | 10 +++++----- .../java/net/mcreator/target/item/gun/BocekItem.java | 2 +- .../java/net/mcreator/target/item/gun/M79Item.java | 2 +- .../java/net/mcreator/target/item/gun/RpgItem.java | 2 +- src/main/java/net/mcreator/target/item/gun/Taser.java | 2 +- ...M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java | 4 ++-- .../target/procedures/PlayerReloadProcedure.java | 6 +++--- ...RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java | 2 +- .../target/procedures/TasercooldownProcedure.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java b/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java index 30b6a716c..d4f02b5ff 100644 --- a/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/BocekItemModel.java @@ -51,7 +51,7 @@ public class BocekItemModel extends GeoModel { arrow.setScaleZ(0); } - if (stack.getOrCreateTag().getInt("maxammo") == 0) { + if (stack.getOrCreateTag().getInt("max_ammo") == 0) { jian.setScaleX(0); jian.setScaleY(0); jian.setScaleZ(0); diff --git a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java index 2cc8a9cd3..398cede57 100644 --- a/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java +++ b/src/main/java/net/mcreator/target/client/screens/AmmoBarOverlay.java @@ -158,7 +158,7 @@ public class AmmoBarOverlay { if (stack.getItem() == TargetModItems.BOCEK.get() || stack.getItem() == TargetModItems.M_79.get() || stack.getItem() == TargetModItems.RPG.get() || stack.getItem() == TargetModItems.TASER.get()) { - return stack.getOrCreateTag().getInt("maxammo"); + return stack.getOrCreateTag().getInt("max_ammo"); } if (stack.getItem() == TargetModItems.MINIGUN.get()) { return (player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo; diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index c95abd78a..2c25f19d5 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -183,19 +183,19 @@ public class PlayerEventHandler { ItemStack stack = player.getMainHandItem(); if (stack.is(TargetModTags.Items.RIFLE)) { - stack.getOrCreateTag().putInt("maxammo", + stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).rifleAmmo)); } if (stack.is(TargetModTags.Items.HANDGUN) || stack.is(TargetModTags.Items.SMG)) { - stack.getOrCreateTag().putInt("maxammo", + stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).handgunAmmo)); } if (stack.is(TargetModTags.Items.SHOTGUN)) { - stack.getOrCreateTag().putInt("maxammo", + stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).shotgunAmmo)); } if (stack.is(TargetModTags.Items.SNIPER_RIFLE)) { - stack.getOrCreateTag().putInt("maxammo", + stack.getOrCreateTag().putInt("max_ammo", ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).sniperAmmo)); } } @@ -336,7 +336,7 @@ public class PlayerEventHandler { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).bowPullHold) { if (mainHandItem.getItem() == TargetModItems.BOCEK.get() - && tag.getInt("maxammo") > 0 + && tag.getInt("max_ammo") > 0 && !player.getCooldowns().isOnCooldown(mainHandItem.getItem()) && tag.getDouble("power") < 12 ) { diff --git a/src/main/java/net/mcreator/target/item/gun/BocekItem.java b/src/main/java/net/mcreator/target/item/gun/BocekItem.java index e5c4cc59a..3c2809506 100644 --- a/src/main/java/net/mcreator/target/item/gun/BocekItem.java +++ b/src/main/java/net/mcreator/target/item/gun/BocekItem.java @@ -158,7 +158,7 @@ public class BocekItem extends GunItem implements GeoItem, AnimatedItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); if (entity instanceof Player player) { - itemstack.getOrCreateTag().putInt("maxammo", getAmmoCount(player)); + itemstack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); } // TODO 合并至GunReload diff --git a/src/main/java/net/mcreator/target/item/gun/M79Item.java b/src/main/java/net/mcreator/target/item/gun/M79Item.java index 0f41f8f9f..696677026 100644 --- a/src/main/java/net/mcreator/target/item/gun/M79Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M79Item.java @@ -172,7 +172,7 @@ public class M79Item extends GunItem implements GeoItem, AnimatedItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); if (entity instanceof Player player) { - itemstack.getOrCreateTag().putInt("maxammo", getAmmoCount(player)); + itemstack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); } M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } diff --git a/src/main/java/net/mcreator/target/item/gun/RpgItem.java b/src/main/java/net/mcreator/target/item/gun/RpgItem.java index 923604239..27aa87935 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpgItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpgItem.java @@ -174,7 +174,7 @@ public class RpgItem extends GunItem implements GeoItem, AnimatedItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); if (entity instanceof Player player) { - itemstack.getOrCreateTag().putInt("maxammo", getAmmoCount(player)); + itemstack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); } RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.execute(entity, itemstack); } diff --git a/src/main/java/net/mcreator/target/item/gun/Taser.java b/src/main/java/net/mcreator/target/item/gun/Taser.java index cd98831fd..79dca7283 100644 --- a/src/main/java/net/mcreator/target/item/gun/Taser.java +++ b/src/main/java/net/mcreator/target/item/gun/Taser.java @@ -173,7 +173,7 @@ public class Taser extends GunItem implements GeoItem, AnimatedItem { public void inventoryTick(ItemStack itemstack, Level world, Entity entity, int slot, boolean selected) { super.inventoryTick(itemstack, world, entity, slot, selected); if (entity instanceof Player player) { - itemstack.getOrCreateTag().putInt("maxammo", getAmmoCount(player)); + itemstack.getOrCreateTag().putInt("max_ammo", getAmmoCount(player)); } TasercooldownProcedure.execute(entity, itemstack); } diff --git a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index a67b66d07..8e2df3f5a 100644 --- a/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -41,7 +41,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putBoolean("empty_reload", false); } if (itemstack.getOrCreateTag().getDouble("reload_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - if (itemstack.getOrCreateTag().getInt("maxammo") >= ammo1) { + if (itemstack.getOrCreateTag().getInt("max_ammo") >= ammo1) { itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + ammo1)); if (entity instanceof Player _player) { ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get()); @@ -50,7 +50,7 @@ public class M79WuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putBoolean("reloading", false); itemstack.getOrCreateTag().putBoolean("empty_reload", false); } else { - itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + itemstack.getOrCreateTag().getInt("maxammo"))); + itemstack.getOrCreateTag().putInt("ammo", (itemstack.getOrCreateTag().getInt("ammo") + itemstack.getOrCreateTag().getInt("max_ammo"))); if (entity instanceof Player _player) { ItemStack _stktoremove = new ItemStack(TargetModItems.GRENADE_40MM.get()); _player.getInventory().clearOrCountMatchingItems(p -> _stktoremove.getItem() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index dab65a59d..b884ae26a 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -22,7 +22,7 @@ public class PlayerReloadProcedure { && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && !tag.getBoolean("reloading") && tag.getInt("ammo") < 1 - && tag.getInt("maxammo") > 0) { + && tag.getInt("max_ammo") > 0) { tag.putBoolean("reloading", true); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); tag.putDouble("reload_time", 55); @@ -51,7 +51,7 @@ public class PlayerReloadProcedure { && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && !tag.getBoolean("reloading") && tag.getInt("ammo") < 1 - && tag.getInt("maxammo") > 0) { + && tag.getInt("max_ammo") > 0) { tag.putBoolean("reloading", true); tag.putDouble("empty_reload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); @@ -61,7 +61,7 @@ public class PlayerReloadProcedure { && !(player.getCooldowns().isOnCooldown(player.getMainHandItem().getItem())) && !tag.getBoolean("reloading") && tag.getInt("ammo") < 1 - && tag.getInt("maxammo") > 0) { + && tag.getInt("max_ammo") > 0) { tag.putBoolean("reloading", true); tag.putDouble("empty_reload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); diff --git a/src/main/java/net/mcreator/target/procedures/RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index ff9e82165..14a79970f 100644 --- a/src/main/java/net/mcreator/target/procedures/RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -42,7 +42,7 @@ public class RpgWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { tag.putDouble("empty", 0); } if (tag.getDouble("reload_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - if (tag.getInt("maxammo") >= 0) { + if (tag.getInt("max_ammo") >= 0) { tag.putInt("ammo", 1); if (entity instanceof Player _player) { _player.getInventory().clearOrCountMatchingItems(p -> TargetModItems.ROCKET.get() == p.getItem(), 1, _player.inventoryMenu.getCraftSlots()); diff --git a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java index 07f952db8..7af494eec 100644 --- a/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/TasercooldownProcedure.java @@ -42,7 +42,7 @@ public class TasercooldownProcedure { itemstack.getOrCreateTag().putBoolean("empty_reload", false); } if (itemstack.getOrCreateTag().getDouble("reload_time") == 1 && (entity instanceof LivingEntity _livEnt ? _livEnt.getMainHandItem() : ItemStack.EMPTY).getOrCreateTag().getDouble("id") == id) { - if (itemstack.getOrCreateTag().getInt("maxammo") >= 1) { + if (itemstack.getOrCreateTag().getInt("max_ammo") >= 1) { itemstack.getOrCreateTag().putInt("ammo", 1); if (entity instanceof Player _player) { ItemStack _stktoremove = new ItemStack(TargetModItems.TASER_ELECTRODE.get());