BRNSystems/PlasticGun
BRNSystems/PlasticGun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Bruno Rybársky 2024-07-24 17:14:57 +02:00
parent 5ea34e9f16
commit 5ccab8eb6a
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/systems/brn/plasticgun/guns/Gun.java
View File

@ -85,7 +85,7 @@ public class Gun extends SimpleItem implements PolymerItem {
chamber.setCount(bulletsInChamber + addedBullets); chamber.setCount(bulletsInChamber + addedBullets);
bulletStack.decrement(addedBullets); bulletStack.decrement(addedBullets);
if (chamber.isEmpty()) { if (chamber.isEmpty()) {
stack.set(GUN_AMMO_COMPONENT, ItemStack.EMPTY); stack.remove(GUN_AMMO_COMPONENT);
} else { } else {
stack.set(GUN_AMMO_COMPONENT, chamber); stack.set(GUN_AMMO_COMPONENT, chamber);
world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.5f, 1.0f); world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.5f, 1.0f);
@ -99,7 +99,7 @@ public class Gun extends SimpleItem implements PolymerItem {
chamber = bulletStack.copy(); chamber = bulletStack.copy();
chamber.setCount(targetCount); chamber.setCount(targetCount);
if (chamber.isEmpty()) { if (chamber.isEmpty()) {
stack.set(GUN_AMMO_COMPONENT, ItemStack.EMPTY); stack.remove(GUN_AMMO_COMPONENT);
} else { } else {
stack.set(GUN_AMMO_COMPONENT, chamber); stack.set(GUN_AMMO_COMPONENT, chamber);
world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 1f, 2.5f); world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 1f, 2.5f);
@ -135,7 +135,7 @@ public class Gun extends SimpleItem implements PolymerItem {
world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE.value(), SoundCategory.PLAYERS, 0.1f, 1.2f); world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_GENERIC_EXPLODE.value(), SoundCategory.PLAYERS, 0.1f, 1.2f);
chamber.decrement(1); chamber.decrement(1);
if (chamber.isEmpty()) { if (chamber.isEmpty()) {
stack.set(GUN_AMMO_COMPONENT, ItemStack.EMPTY); stack.remove(GUN_AMMO_COMPONENT);
} else { } else {
stack.set(GUN_AMMO_COMPONENT, chamber); stack.set(GUN_AMMO_COMPONENT, chamber);
} }

38
src/main/resources/assets/plasticgun/lang/en_us.json
View File

@ -1,22 +1,22 @@
{ {
"item.bullet.357_magnum": "357 Magnum", "item.plasticgun.357_magnum": "357 Magnum",
"item.bullet.32_acp_high_velocity": "32 ACP High Velocity", "item.plasticgun.32_acp_high_velocity": "32 ACP High Velocity",
"item.bullet.45_acp_hollow_point": "45 ACP Hollow Point", "item.plasticgun.45_acp_hollow_point": "45 ACP Hollow Point",
"item.bullet.9mm_jhp": "9mm JHP", "item.plasticgun.9mm_jhp": "9mm JHP",
"item.bullet.38_special_p": "38 Special +P", "item.plasticgun.38_special_p": "38 Special +P",
"item.bullet.762_tokarev_ap": "7.62 Tokarev AP", "item.plasticgun.762_tokarev_ap": "7.62 Tokarev AP",
"item.bullet.357_standard": "357 Standard", "item.plasticgun.357_standard": "357 Standard",
"item.bullet.32_acp": "32 ACP", "item.plasticgun.32_acp": "32 ACP",
"item.bullet.45_acp": "45 ACP", "item.plasticgun.45_acp": "45 ACP",
"item.bullet.9mm_parabellum": "9mm Parabellum", "item.plasticgun.9mm_parabellum": "9mm Parabellum",
"item.bullet.38_special": "38 Special", "item.plasticgun.38_special": "38 Special",
"item.bullet.762_tokarev": "7.62 Tokarev", "item.plasticgun.762_tokarev": "7.62 Tokarev",
"item.gun.357_revolver": "357 Revolver", "item.plasticgun.357_revolver": "357 Revolver",
"item.gun.colt_1903": "Colt 1903", "item.plasticgun.colt_1903": "Colt 1903",
"item.gun.colt_45": "Colt 45", "item.plasticgun.colt_45": "Colt 45",
"item.gun.colt_peacemaker": "Colt Peacemaker", "item.plasticgun.colt_peacemaker": "Colt Peacemaker",
"item.gun.p2022": "P2022", "item.plasticgun.p2022": "P2022",
"item.gun.snub_nosed_revolver": "Snub Nosed Revolver", "item.plasticgun.snub_nosed_revolver": "Snub Nosed Revolver",
"item.gun.tokarev_tt_33": "Tokarev TT-33" "item.plasticgun.tokarev_tt_33": "Tokarev TT-33"
} }