Add stuff

2024-07-27 23:41:17 +02:00
parent e692223bc4
commit 2dcf3cc1ce
37 changed files with 18 additions and 71 deletions
--- a/src/main/resources/assets/plasticgun/lang/en_us.json
+++ b/src/main/resources/assets/plasticgun/lang/en_us.json
@@ -31,7 +31,7 @@
  "item.plasticgun.grenade_m67": "M67 Fragmentation Grenade",
  "item.plasticgun.grenade_mk2": "Mk 2 Fragmentation Grenade",
  "item.plasticgun.grenade_an_m14": "AN-M14 Incendiary Grenade",
-  "item.plasticgun.grenade_m3d": "M34 White Phosphorus Incendiary Fragmentation Grenade",
+  "item.plasticgun.grenade_m34": "M34 White Phosphorus Incendiary Fragmentation Grenade",
  "item.plasticgun.grenade_m18": "M18 Smoke Grenade",
  "item.plasticgun.grenade_l109a1": "L109A1 Fragmentation Grenade",
  "item.plasticgun.grenade_m84": "M84 Stun Grenade (Flashbang)",
@@ -62,7 +62,6 @@
  "gun.description.damage": "Damage: %d hp",
  "gun.description.speed": "Speed: %d b/t",
  "gun.description.clip_size": "Magazine size: %d rounds",
-  "gun.description.has_scope": "Has scope",
  "gun.description.reload_cooldown": "Reload cooldown: %d ticks",
  "gun.description.reload_cycles": "Reload cycles: %d clicks",
  "gun.description.shoot_cooldown": "Shooting cooldown: %d",
--- a/src/main/resources/assets/plasticgun/models/item/grenade.json
+++ b/src/main/resources/assets/plasticgun/models/item/grenade.json
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "plasticgun:item/grenade"
-  }
-}
--- a/src/main/resources/assets/plasticgun/models/item/grenade_incendiary.json
+++ b/src/main/resources/assets/plasticgun/models/item/grenade_incendiary.json
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "plasticgun:item/grenade_incendiary"
-  }
-}
--- a/src/main/resources/assets/plasticgun/models/item/grenade_l109a1.json
+++ b/src/main/resources/assets/plasticgun/models/item/grenade_l109a1.json
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "plasticgun:item/grenade_l109a1"
-  }
-}
--- a/src/main/resources/assets/plasticgun/models/item/grenade_m3d.json
+++ b/src/main/resources/assets/plasticgun/models/item/grenade_m3d.json
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "plasticgun:item/grenade_m3d"
-  }
-}
--- a/src/main/resources/assets/plasticgun/models/item/grenade_mk2.json
+++ b/src/main/resources/assets/plasticgun/models/item/grenade_mk2.json
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "plasticgun:item/grenade_mk2"
-  }
-}
--- a/src/main/resources/assets/plasticgun/models/item/shuriken.json
+++ b/src/main/resources/assets/plasticgun/models/item/shuriken.json
@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/handheld",
-  "textures": {
-    "layer0": "plasticgun:item/shuriken"
-  }
-}
--- a/src/main/resources/assets/plasticgun/textures/item/32_acp.png
+++ b/src/main/resources/assets/plasticgun/textures/item/32_acp.png
--- a/src/main/resources/assets/plasticgun/textures/item/32_acp_high_velocity.png
+++ b/src/main/resources/assets/plasticgun/textures/item/32_acp_high_velocity.png
--- a/src/main/resources/assets/plasticgun/textures/item/357_magnum.png
+++ b/src/main/resources/assets/plasticgun/textures/item/357_magnum.png
--- a/src/main/resources/assets/plasticgun/textures/item/357_standard.png
+++ b/src/main/resources/assets/plasticgun/textures/item/357_standard.png
--- a/src/main/resources/assets/plasticgun/textures/item/38_special.png
+++ b/src/main/resources/assets/plasticgun/textures/item/38_special.png
--- a/src/main/resources/assets/plasticgun/textures/item/38_special_p.png
+++ b/src/main/resources/assets/plasticgun/textures/item/38_special_p.png
--- a/src/main/resources/assets/plasticgun/textures/item/45_acp.png
+++ b/src/main/resources/assets/plasticgun/textures/item/45_acp.png
--- a/src/main/resources/assets/plasticgun/textures/item/45_acp_hollow_point.png
+++ b/src/main/resources/assets/plasticgun/textures/item/45_acp_hollow_point.png
--- a/src/main/resources/assets/plasticgun/textures/item/762_tokarev.png
+++ b/src/main/resources/assets/plasticgun/textures/item/762_tokarev.png
--- a/src/main/resources/assets/plasticgun/textures/item/762_tokarev_ap.png
+++ b/src/main/resources/assets/plasticgun/textures/item/762_tokarev_ap.png
--- a/src/main/resources/assets/plasticgun/textures/item/9mm_jhp.png
+++ b/src/main/resources/assets/plasticgun/textures/item/9mm_jhp.png
--- a/src/main/resources/assets/plasticgun/textures/item/9mm_parabellum.png
+++ b/src/main/resources/assets/plasticgun/textures/item/9mm_parabellum.png
--- a/src/main/resources/assets/plasticgun/textures/item/awp.png
+++ b/src/main/resources/assets/plasticgun/textures/item/awp.png
--- a/src/main/resources/assets/plasticgun/textures/item/force_container.png
+++ b/src/main/resources/assets/plasticgun/textures/item/force_container.png
--- a/src/main/resources/assets/plasticgun/textures/item/forcegun.png
+++ b/src/main/resources/assets/plasticgun/textures/item/forcegun.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_an_m14.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_an_m14.png
--- a/src/main/resources/assets/plasticgun/textures/item/fragmentation.png
+++ b/src/main/resources/assets/plasticgun/textures/item/fragmentation.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_k417.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_k417.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_m34.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_m34.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_m7a3.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_m7a3.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_no_69.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_no_69.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_rgd_5.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_rgd_5.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_rgo.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_rgo.png
--- a/src/main/resources/assets/plasticgun/textures/item/grenade_thermite.png
+++ b/src/main/resources/assets/plasticgun/textures/item/grenade_thermite.png
--- a/src/main/resources/assets/plasticgun/textures/item/rpg9.png
+++ b/src/main/resources/assets/plasticgun/textures/item/rpg9.png
--- a/src/main/resources/assets/plasticgun/textures/item/rpg_shell.png
+++ b/src/main/resources/assets/plasticgun/textures/item/rpg_shell.png
--- a/src/main/resources/assets/plasticgun/textures/item/rpg_shell_incendiary.png
+++ b/src/main/resources/assets/plasticgun/textures/item/rpg_shell_incendiary.png