Update

build.gradle

@@ -35,6 +35,7 @@ dependencies {
     modImplementation include("eu.pb4:polymer-virtual-entity:${project.polymer_version}")
     modImplementation include("eu.pb4:polymer-blocks:${project.polymer_version}")
     modImplementation include("eu.pb4:polymer-resource-pack:${project.polymer_version}")
+    modImplementation include("eu.pb4:polymer-resource-pack-extras:${project.polymer_version}")
     modImplementation include("eu.pb4:polymer-autohost:${project.polymer_version}")
 
     modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_api_version}")

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.1
+yarn_mappings=1.21.4+build.2
 loader_version=0.16.9
 # Mod Properties
-mod_version=1.9.8
+mod_version=2.0.0
 maven_group=systems.brn
 archives_base_name=plasticgun
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.110.5+1.21.4
+fabric_version=0.111.0+1.21.4
 
-polymer_version=0.11.0+1.21.4-rc1
+polymer_version=0.11.1+1.21.4
 server_translations_api_version=2.4.0+1.21.2-rc1

src/main/java/systems/brn/plasticgun/PlasticGun.java

@@ -122,17 +122,17 @@ public class PlasticGun implements ModInitializer {
         bullets.add(new BulletItem("force_container", 99, 0, 888, false, 0, 1));
 
         // Guns
-        guns.add(new Gun("forcegun", 0, 4, 5, 10, 10, 888, 5, 0, 10, 0f, 0f, 5f, 10f, 0, 0)); // 0
-        guns.add(new Gun("p2022", 0.2, 12, 5, 10, 41, 9, 10, 0, 0, 1f, 4, 0.1f, 0.25f, -1, 1)); // 1.8
-        guns.add(new Gun("colt_1903", 0.3, 10, 5, 8, 38, 32, 10, 0, 0, 1, 3, 0.1f, 0.3f, -1, 1)); // 3
-        guns.add(new Gun("ak_47", 0.2, 4, 5, 30, 45, 762, 0, 0, 0, 1f, 2, 0.2f, 0.4f, -1, 1)); // 9
-        guns.add(new Gun("colt_45", 0.4, 9, 5, 7, 48, 45, 10, 0, 0, 1.5f, 2, 0.15f, 0.4f, -1, 1)); // 3.6
-        guns.add(new Gun("snub_nosed_revolver", 0.4, 7, 3, 5, 36, 38, 20, 0, 0, 1f, 2, 0.2f, 0.45f, -1, 1)); // 2.8
-        guns.add(new Gun("colt_peacemaker", 0.6, 8, 5, 6, 43, 45, 10, 0, 0, 0.9f, 2, 0.2f, 0.5f, -1, 1)); // 4.8
-        guns.add(new Gun("tokarev_tt_33", 0.7, 10, 5, 8, 45, 762, 10, 0, 0, 1.5f, 2.5f, 0.25f, 0.5f, -1, 1)); // 7
-        guns.add(new Gun("357_revolver", 1, 8, 5, 6, 45, 357, 20, 0, 0, 2, 4, 0.2f, 0.5f, -1, 1)); // 8
-        guns.add(new Gun("awp", 1, 4, 20, 1, 75, 762, 40, 0, 0, 4f, 16f, 0.3f, 0.6f, -2, 2)); // 4
-        guns.add(new Gun("rpg9", 2, 4, 20, 1, 10, 999, 20, 10, 0, 3f, 0.5f, 1, 2, -1, 1)); // 8
+        guns.add(new Gun("forcegun", 0, 4, 5, 10, 10, 888, 5, 0, 10, 0f, 0f, 0f, 1f, 0, 0)); // 0
+        guns.add(new Gun("p2022", 0.2, 12, 5, 10, 41, 9, 10, 0, 0, 0f, 0.7f, 0.1f, 0.25f, -0.2, 0.2)); // 1.8
+        guns.add(new Gun("colt_1903", 0.3, 10, 5, 8, 38, 32, 10, 0, 0, 0, 0.5f, 0.1f, 0.3f, -0.2, 0.2)); // 3
+        guns.add(new Gun("ak_47", 0.2, 4, 5, 30, 45, 762, 0, 0, 0, 0.1f, 0.3f, 0.2f, 0.3f, -0.2, 0.2)); // 9
+        guns.add(new Gun("colt_45", 0.4, 9, 5, 7, 48, 45, 10, 0, 0, 0, 0.5f, 0.15f, 0.4f, -0.2, 0.2)); // 3.6
+        guns.add(new Gun("snub_nosed_revolver", 0.4, 7, 3, 5, 36, 38, 20, 0, 0, 0f, 0.4f, 0.2f, 0.45f, -0.2, 0.2)); // 2.8
+        guns.add(new Gun("colt_peacemaker", 0.6, 8, 5, 6, 43, 45, 10, 0, 0, 0, 1, 0.2f, 0.5f, -0.2, 0.2)); // 4.8
+        guns.add(new Gun("tokarev_tt_33", 0.7, 10, 5, 8, 45, 762, 10, 0, 0, 0, 2f, 0.25f, 0.5f, -0.2, 0.2)); // 7
+        guns.add(new Gun("357_revolver", 1, 8, 5, 6, 45, 357, 20, 0, 0, 2, 3, 0.2f, 0.5f, -0.2, 0.2)); // 8
+        guns.add(new Gun("awp", 1, 4, 20, 1, 75, 762, 40, 0, 0, 4f, 6f, 0.3f, 0.6f, -2, 2)); // 4
+        guns.add(new Gun("rpg9", 2, 4, 20, 1, 10, 999, 20, 10, 0, 2f, 4f, 1, 2, -1, 1)); // 8
 
 
         grenades.add(new GrenadeItem("grenade_m18", 1, 0.1f, 0.2f, 50, false, false, 0, 0, 100, 15, 30)); // 0.02

src/main/java/systems/brn/plasticgun/guns/Gun.java

@@ -30,10 +30,8 @@ import systems.brn.plasticgun.lib.SimpleItem;
 import java.util.ArrayList;
 import java.util.List;
 
-import static java.lang.Math.abs;
-import static java.lang.Math.max;
-import static systems.brn.plasticgun.PlasticGun.bullets;
-import static systems.brn.plasticgun.PlasticGun.itemBulletItemMap;
+import static java.lang.Math.*;
+import static systems.brn.plasticgun.PlasticGun.*;
 import static systems.brn.plasticgun.lib.GunComponents.*;
 import static systems.brn.plasticgun.lib.Util.*;
 
@@ -81,12 +79,21 @@ public class Gun extends SimpleItem implements PolymerItem {
                         .maxDamage(clipSize + 1)
                 , id(path), Items.WOODEN_SWORD
         );
-        this.verticalRecoilMin = verticalRecoilMin;
-        this.verticalRecoilMax = verticalRecoilMax;
+        this.verticalRecoilMin = verticalRecoilMin / 10f;
+        this.verticalRecoilMax = verticalRecoilMax / 10f;
         this.velocityRecoilMin = velocityRecoilMin;
         this.velocityRecoilMax = velocityRecoilMax;
-        this.horizontalRecoilMin = horizontalRecoilMin;
-        this.horizontalRecoilMax = horizontalRecoilMax;
+        this.horizontalRecoilMin = horizontalRecoilMin / 10f;
+        this.horizontalRecoilMax = horizontalRecoilMax / 10f;
+        if (verticalRecoilMin > verticalRecoilMax) {
+            logger.error("verticalRecoilMin > verticalRecoilMax for {}", path);
+        }
+        if (horizontalRecoilMin > horizontalRecoilMax) {
+            logger.error("horizontalRecoilMin > horizontalRecoilMax for {}", path);
+        }
+        if (velocityRecoilMin > velocityRecoilMax) {
+            logger.error("velocityRecoilMin > velocityRecoilMax for {}", path);
+        }
         Registry.register(Registries.ITEM, id(path), this);
         this.damage = damage;
         this.reloadCount = reloadCount;

src/main/java/systems/brn/plasticgun/lib/SimpleItem.java

@@ -2,6 +2,7 @@ package systems.brn.plasticgun.lib;
 
 import eu.pb4.polymer.core.api.item.PolymerItem;
 import eu.pb4.polymer.core.api.item.SimplePolymerItem;
+import eu.pb4.polymer.resourcepack.extras.api.ResourcePackExtras;
 import net.minecraft.item.*;
 import net.minecraft.util.Identifier;
 import xyz.nucleoid.packettweaker.PacketContext;
@@ -13,7 +14,7 @@ public abstract class SimpleItem extends SimplePolymerItem implements PolymerIte
     public SimpleItem(Settings settings, Identifier identifier, Item replacement) {
         super(settings, replacement);
         this.identifier = identifier;
-        this.polymerModel = identifier.withPath("item/" + identifier.getPath());
+        this.polymerModel = identifier;
     }
 
     @Override

src/main/resources/assets/plasticgun/items/32_acp.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/32_acp"
+  }
+}

src/main/resources/assets/plasticgun/items/32_acp_high_velocity.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/32_acp_high_velocity"
+  }
+}

src/main/resources/assets/plasticgun/items/357_magnum.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/357_magnum"
+  }
+}

src/main/resources/assets/plasticgun/items/357_revolver.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/357_revolver"
+  }
+}

src/main/resources/assets/plasticgun/items/357_standard.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/357_standard"
+  }
+}

src/main/resources/assets/plasticgun/items/38_special.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/38_special"
+  }
+}

src/main/resources/assets/plasticgun/items/38_special_p.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/38_special_p"
+  }
+}

src/main/resources/assets/plasticgun/items/45_acp.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/45_acp"
+  }
+}

src/main/resources/assets/plasticgun/items/45_acp_hollow_point.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/45_acp_hollow_point"
+  }
+}

src/main/resources/assets/plasticgun/items/762_tokarev.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/762_tokarev"
+  }
+}

src/main/resources/assets/plasticgun/items/762_tokarev_ap.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/762_tokarev_ap"
+  }
+}

src/main/resources/assets/plasticgun/items/9mm_jhp.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/9mm_jhp"
+  }
+}

src/main/resources/assets/plasticgun/items/9mm_parabellum.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/9mm_parabellum"
+  }
+}

src/main/resources/assets/plasticgun/items/advanced_circuit.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/advanced_circuit"
+  }
+}

src/main/resources/assets/plasticgun/items/ak_47.json

@@ -0,0 +1,6 @@
+{
+	"model": {
+		"type": "minecraft:model",
+		"model": "plasticgun:item/ak_47"
+	}
+}

src/main/resources/assets/plasticgun/items/alloy_wheel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/alloy_wheel"
+  }
+}

src/main/resources/assets/plasticgun/items/awp.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/awp"
+  }
+}

src/main/resources/assets/plasticgun/items/ceramic_mixture.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/ceramic_mixture"
+  }
+}

src/main/resources/assets/plasticgun/items/ceramic_plate.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/ceramic_plate"
+  }
+}

src/main/resources/assets/plasticgun/items/colt_1903.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/colt_1903"
+  }
+}

src/main/resources/assets/plasticgun/items/colt_45.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/colt_45"
+  }
+}

src/main/resources/assets/plasticgun/items/colt_peacemaker.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/colt_peacemaker"
+  }
+}

src/main/resources/assets/plasticgun/items/composite_frame.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/composite_frame"
+  }
+}

src/main/resources/assets/plasticgun/items/composite_resin.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/composite_resin"
+  }
+}

src/main/resources/assets/plasticgun/items/copper_wiring.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/copper_wiring"
+  }
+}

src/main/resources/assets/plasticgun/items/diamond_shuriken.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/diamond_shuriken"
+  }
+}

src/main/resources/assets/plasticgun/items/enhanced_gunpowder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/enhanced_gunpowder"
+  }
+}

src/main/resources/assets/plasticgun/items/explosive_powder.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/explosive_powder"
+  }
+}

src/main/resources/assets/plasticgun/items/flak_vest.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/flak_vest"
+  }
+}

src/main/resources/assets/plasticgun/items/force_container.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/force_container"
+  }
+}

src/main/resources/assets/plasticgun/items/forcegun.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/forcegun"
+  }
+}

src/main/resources/assets/plasticgun/items/golden_shuriken.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/golden_shuriken"
+  }
+}

src/main/resources/assets/plasticgun/items/graphene_sheet.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/graphene_sheet"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_an_m14.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_an_m14"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_f1.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_f1"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_k417.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_k417"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_m18.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_m18"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_m34.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_m34"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_m67.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_m67"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_m7a3.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_m7a3"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_m84.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_m84"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_mk3a2.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_mk3a2"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_no_69.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_no_69"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_rgd_5.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_rgd_5"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_rgo.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_rgo"
+  }
+}

src/main/resources/assets/plasticgun/items/grenade_thermite.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/grenade_thermite"
+  }
+}

src/main/resources/assets/plasticgun/items/hardened_steel.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/hardened_steel"
+  }
+}

src/main/resources/assets/plasticgun/items/hyperalloy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/hyperalloy"
+  }
+}

src/main/resources/assets/plasticgun/items/iron_shuriken.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/iron_shuriken"
+  }
+}

src/main/resources/assets/plasticgun/items/kevlar_sheet.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/kevlar_sheet"
+  }
+}

src/main/resources/assets/plasticgun/items/kevlar_vest.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/kevlar_vest"
+  }
+}

src/main/resources/assets/plasticgun/items/magnetic_coil.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/magnetic_coil"
+  }
+}

src/main/resources/assets/plasticgun/items/microchip.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/microchip"
+  }
+}

src/main/resources/assets/plasticgun/items/nano_tubes.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/nano_tubes"
+  }
+}

src/main/resources/assets/plasticgun/items/netherite_shuriken.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/netherite_shuriken"
+  }
+}

src/main/resources/assets/plasticgun/items/p2022.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/p2022"
+  }
+}

src/main/resources/assets/plasticgun/items/plasma_core.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/plasma_core"
+  }
+}

src/main/resources/assets/plasticgun/items/power_cell.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/power_cell"
+  }
+}

src/main/resources/assets/plasticgun/items/precision_gear.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/precision_gear"
+  }
+}

src/main/resources/assets/plasticgun/items/reinforced_fiber.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/reinforced_fiber"
+  }
+}

src/main/resources/assets/plasticgun/items/rpg9.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/rpg9"
+  }
+}

src/main/resources/assets/plasticgun/items/rpg_shell.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/rpg_shell"
+  }
+}

src/main/resources/assets/plasticgun/items/rpg_shell_incendiary.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/rpg_shell_incendiary"
+  }
+}

src/main/resources/assets/plasticgun/items/silicon_mixture.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/silicon_mixture"
+  }
+}

src/main/resources/assets/plasticgun/items/silicon_wafer.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/silicon_wafer"
+  }
+}

src/main/resources/assets/plasticgun/items/snub_nosed_revolver.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/snub_nosed_revolver"
+  }
+}

src/main/resources/assets/plasticgun/items/stone_shuriken.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/stone_shuriken"
+  }
+}

src/main/resources/assets/plasticgun/items/titanium_alloy.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/titanium_alloy"
+  }
+}

src/main/resources/assets/plasticgun/items/tokarev_tt_33.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/tokarev_tt_33"
+  }
+}

src/main/resources/assets/plasticgun/items/trigger_mechanism.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/trigger_mechanism"
+  }
+}

src/main/resources/assets/plasticgun/items/wooden_shuriken.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "plasticgun:item/wooden_shuriken"
+  }
+}

src/main/resources/assets/plasticgun/models/item/32_acp.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/32_acp"
   }

src/main/resources/assets/plasticgun/models/item/32_acp_high_velocity.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/32_acp_high_velocity"
   }

src/main/resources/assets/plasticgun/models/item/357_magnum.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/357_magnum"
   }

src/main/resources/assets/plasticgun/models/item/357_revolver.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/357_revolver"
   }

src/main/resources/assets/plasticgun/models/item/357_standard.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/357_standard"
   }

src/main/resources/assets/plasticgun/models/item/38_special.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/38_special"
   }

src/main/resources/assets/plasticgun/models/item/38_special_p.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/38_special_p"
   }

src/main/resources/assets/plasticgun/models/item/45_acp.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/45_acp"
   }

src/main/resources/assets/plasticgun/models/item/45_acp_hollow_point.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/45_acp_hollow_point"
   }

src/main/resources/assets/plasticgun/models/item/762_tokarev.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/762_tokarev"
   }

src/main/resources/assets/plasticgun/models/item/762_tokarev_ap.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/762_tokarev_ap"
   }

src/main/resources/assets/plasticgun/models/item/9mm_jhp.json

@@ -1,6 +1,6 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/9mm_jhp"
   }
-}
+}

src/main/resources/assets/plasticgun/models/item/9mm_parabellum.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/9mm_parabellum"
   }

src/main/resources/assets/plasticgun/models/item/advanced_circuit.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/advanced_circuit"
   }

src/main/resources/assets/plasticgun/models/item/alloy_wheel.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/alloy_wheel"
   }

src/main/resources/assets/plasticgun/models/item/awp.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/awp"
   }

src/main/resources/assets/plasticgun/models/item/ceramic_mixture.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/ceramic_mixture"
   }

src/main/resources/assets/plasticgun/models/item/ceramic_plate.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/ceramic_plate"
   }

src/main/resources/assets/plasticgun/models/item/colt_1903.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/colt_1903"
   }

src/main/resources/assets/plasticgun/models/item/colt_45.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/colt_45"
   }

src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/colt_peacemaker"
   }

src/main/resources/assets/plasticgun/models/item/composite_frame.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/composite_frame"
   }

src/main/resources/assets/plasticgun/models/item/composite_resin.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/composite_resin"
   }

src/main/resources/assets/plasticgun/models/item/copper_wiring.json

@@ -1,5 +1,5 @@
 {
-  "parent": "minecraft:item/handheld",
+  "parent": "minecraft:item/generated",
   "textures": {
     "layer0": "plasticgun:item/copper_wiring"
   }