diff --git a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java index f7a57d4f9..31034c6b6 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/model/item/M60ItemModel.java @@ -58,32 +58,33 @@ public class M60ItemModel extends GeoModel { } int ammo = GunsTool.getGunIntTag(stack, "Ammo", 0); + boolean flag = GunsTool.getGunBooleanTag(stack, "HideBulletChain"); - if (ammo < 5 && stack.getOrCreateTag().getBoolean("HideBulletChain")) { + if (ammo < 5 && flag) { b5.setScaleX(0); b5.setScaleY(0); b5.setScaleZ(0); } - if (ammo < 4 && stack.getOrCreateTag().getBoolean("HideBulletChain")) { + if (ammo < 4 && flag) { b4.setScaleX(0); b4.setScaleY(0); b4.setScaleZ(0); } - if (ammo < 3 && stack.getOrCreateTag().getBoolean("HideBulletChain")) { + if (ammo < 3 && flag) { b3.setScaleX(0); b3.setScaleY(0); b3.setScaleZ(0); } - if (ammo < 2 && stack.getOrCreateTag().getBoolean("HideBulletChain")) { + if (ammo < 2 && flag) { b2.setScaleX(0); b2.setScaleY(0); b2.setScaleZ(0); } - if (ammo < 1 && stack.getOrCreateTag().getBoolean("HideBulletChain")) { + if (ammo < 1 && flag) { b1.setScaleX(0); b1.setScaleY(0); b1.setScaleZ(0); diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index db08f872a..df694687c 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -364,7 +364,7 @@ public class GunEventHandler { if (stack.getItem() == ModItems.M_60.get()) { if (data.getInt("ReloadTime") == 55) { - tag.putBoolean("HideBulletChain", false); + data.putBoolean("HideBulletChain", false); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java index 984c1e945..23b041abd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/machinegun/M60Item.java @@ -134,15 +134,15 @@ public class M60Item extends GunItem implements GeoItem, AnimatedItem { } @Override - public void inventoryTick(ItemStack itemstack, Level level, Entity entity, int slot, boolean selected) { - if (itemstack.getOrCreateTag().getBoolean("draw")) { - itemstack.getOrCreateTag().putBoolean("draw", false); + public void inventoryTick(ItemStack stack, Level level, Entity entity, int slot, boolean selected) { + if (stack.getOrCreateTag().getBoolean("draw")) { + stack.getOrCreateTag().putBoolean("draw", false); - if (GunsTool.getGunIntTag(itemstack, "Ammo", 0) <= 5) { - itemstack.getOrCreateTag().putBoolean("HideBulletChain", true); + if (GunsTool.getGunIntTag(stack, "Ammo", 0) <= 5) { + GunsTool.setGunBooleanTag(stack, "HideBulletChain", true); } } - super.inventoryTick(itemstack, level, entity, slot, selected); + super.inventoryTick(stack, level, entity, slot, selected); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java index ca7b4115b..2caa1e676 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/ShootMessage.java @@ -75,7 +75,7 @@ public class ShootMessage { stack.getOrCreateTag().putDouble("empty", 1); if (stack.getItem() == ModItems.M_60.get() && GunsTool.getGunIntTag(stack, "Ammo", 0) <= 5) { - stack.getOrCreateTag().putBoolean("HideBulletChain", true); + GunsTool.setGunBooleanTag(stack, "HideBulletChain", true); } if (stack.getItem() == ModItems.ABEKIRI.get()) {