From 6fc5738e384401711b7ba0097d02f511cb5b0730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Ryb=C3=A1rsky?= Date: Mon, 23 Dec 2024 08:49:36 +0100 Subject: [PATCH] Update --- build.gradle | 1 + gradle.properties | 8 +++---- .../systems/brn/plasticgun/PlasticGun.java | 22 +++++++++--------- .../java/systems/brn/plasticgun/guns/Gun.java | 23 ++++++++++++------- .../brn/plasticgun/lib/SimpleItem.java | 3 ++- .../assets/plasticgun/items/32_acp.json | 6 +++++ .../items/32_acp_high_velocity.json | 6 +++++ .../assets/plasticgun/items/357_magnum.json | 6 +++++ .../assets/plasticgun/items/357_revolver.json | 6 +++++ .../assets/plasticgun/items/357_standard.json | 6 +++++ .../assets/plasticgun/items/38_special.json | 6 +++++ .../assets/plasticgun/items/38_special_p.json | 6 +++++ .../assets/plasticgun/items/45_acp.json | 6 +++++ .../plasticgun/items/45_acp_hollow_point.json | 6 +++++ .../assets/plasticgun/items/762_tokarev.json | 6 +++++ .../plasticgun/items/762_tokarev_ap.json | 6 +++++ .../assets/plasticgun/items/9mm_jhp.json | 6 +++++ .../plasticgun/items/9mm_parabellum.json | 6 +++++ .../plasticgun/items/advanced_circuit.json | 6 +++++ .../assets/plasticgun/items/ak_47.json | 6 +++++ .../assets/plasticgun/items/alloy_wheel.json | 6 +++++ .../assets/plasticgun/items/awp.json | 6 +++++ .../plasticgun/items/ceramic_mixture.json | 6 +++++ .../plasticgun/items/ceramic_plate.json | 6 +++++ .../assets/plasticgun/items/colt_1903.json | 6 +++++ .../assets/plasticgun/items/colt_45.json | 6 +++++ .../plasticgun/items/colt_peacemaker.json | 6 +++++ .../plasticgun/items/composite_frame.json | 6 +++++ .../plasticgun/items/composite_resin.json | 6 +++++ .../plasticgun/items/copper_wiring.json | 6 +++++ .../plasticgun/items/diamond_shuriken.json | 6 +++++ .../plasticgun/items/enhanced_gunpowder.json | 6 +++++ .../plasticgun/items/explosive_powder.json | 6 +++++ .../assets/plasticgun/items/flak_vest.json | 6 +++++ .../plasticgun/items/force_container.json | 6 +++++ .../assets/plasticgun/items/forcegun.json | 6 +++++ .../plasticgun/items/golden_shuriken.json | 6 +++++ .../plasticgun/items/graphene_sheet.json | 6 +++++ .../plasticgun/items/grenade_an_m14.json | 6 +++++ .../assets/plasticgun/items/grenade_f1.json | 6 +++++ .../assets/plasticgun/items/grenade_k417.json | 6 +++++ .../assets/plasticgun/items/grenade_m18.json | 6 +++++ .../assets/plasticgun/items/grenade_m34.json | 6 +++++ .../assets/plasticgun/items/grenade_m67.json | 6 +++++ .../assets/plasticgun/items/grenade_m7a3.json | 6 +++++ .../assets/plasticgun/items/grenade_m84.json | 6 +++++ .../plasticgun/items/grenade_mk3a2.json | 6 +++++ .../plasticgun/items/grenade_no_69.json | 6 +++++ .../plasticgun/items/grenade_rgd_5.json | 6 +++++ .../assets/plasticgun/items/grenade_rgo.json | 6 +++++ .../plasticgun/items/grenade_thermite.json | 6 +++++ .../plasticgun/items/hardened_steel.json | 6 +++++ .../assets/plasticgun/items/hyperalloy.json | 6 +++++ .../plasticgun/items/iron_shuriken.json | 6 +++++ .../assets/plasticgun/items/kevlar_sheet.json | 6 +++++ .../assets/plasticgun/items/kevlar_vest.json | 6 +++++ .../plasticgun/items/magnetic_coil.json | 6 +++++ .../assets/plasticgun/items/microchip.json | 6 +++++ .../assets/plasticgun/items/nano_tubes.json | 6 +++++ .../plasticgun/items/netherite_shuriken.json | 6 +++++ .../assets/plasticgun/items/p2022.json | 6 +++++ .../assets/plasticgun/items/plasma_core.json | 6 +++++ .../assets/plasticgun/items/power_cell.json | 6 +++++ .../plasticgun/items/precision_gear.json | 6 +++++ .../plasticgun/items/reinforced_fiber.json | 6 +++++ .../assets/plasticgun/items/rpg9.json | 6 +++++ .../assets/plasticgun/items/rpg_shell.json | 6 +++++ .../items/rpg_shell_incendiary.json | 6 +++++ .../plasticgun/items/silicon_mixture.json | 6 +++++ .../plasticgun/items/silicon_wafer.json | 6 +++++ .../plasticgun/items/snub_nosed_revolver.json | 6 +++++ .../plasticgun/items/stone_shuriken.json | 6 +++++ .../plasticgun/items/titanium_alloy.json | 6 +++++ .../plasticgun/items/tokarev_tt_33.json | 6 +++++ .../plasticgun/items/trigger_mechanism.json | 6 +++++ .../plasticgun/items/wooden_shuriken.json | 6 +++++ .../assets/plasticgun/models/item/32_acp.json | 2 +- .../models/item/32_acp_high_velocity.json | 2 +- .../plasticgun/models/item/357_magnum.json | 2 +- .../plasticgun/models/item/357_revolver.json | 2 +- .../plasticgun/models/item/357_standard.json | 2 +- .../plasticgun/models/item/38_special.json | 2 +- .../plasticgun/models/item/38_special_p.json | 2 +- .../assets/plasticgun/models/item/45_acp.json | 2 +- .../models/item/45_acp_hollow_point.json | 2 +- .../plasticgun/models/item/762_tokarev.json | 2 +- .../models/item/762_tokarev_ap.json | 2 +- .../plasticgun/models/item/9mm_jhp.json | 4 ++-- .../models/item/9mm_parabellum.json | 2 +- .../models/item/advanced_circuit.json | 2 +- .../plasticgun/models/item/alloy_wheel.json | 2 +- .../assets/plasticgun/models/item/awp.json | 2 +- .../models/item/ceramic_mixture.json | 2 +- .../plasticgun/models/item/ceramic_plate.json | 2 +- .../plasticgun/models/item/colt_1903.json | 2 +- .../plasticgun/models/item/colt_45.json | 2 +- .../models/item/colt_peacemaker.json | 2 +- .../models/item/composite_frame.json | 2 +- .../models/item/composite_resin.json | 2 +- .../plasticgun/models/item/copper_wiring.json | 2 +- .../models/item/diamond_shuriken.json | 2 +- .../models/item/enhanced_gunpowder.json | 2 +- .../models/item/explosive_powder.json | 2 +- .../plasticgun/models/item/flak_vest.json | 2 +- .../models/item/force_container.json | 2 +- .../plasticgun/models/item/forcegun.json | 2 +- .../models/item/golden_shuriken.json | 2 +- .../models/item/graphene_sheet.json | 2 +- .../models/item/grenade_an_m14.json | 2 +- .../plasticgun/models/item/grenade_f1.json | 2 +- .../plasticgun/models/item/grenade_k417.json | 2 +- .../plasticgun/models/item/grenade_m18.json | 2 +- .../plasticgun/models/item/grenade_m34.json | 2 +- .../plasticgun/models/item/grenade_m67.json | 2 +- .../plasticgun/models/item/grenade_m7a3.json | 2 +- .../plasticgun/models/item/grenade_m84.json | 2 +- .../plasticgun/models/item/grenade_mk3a2.json | 2 +- .../plasticgun/models/item/grenade_no_69.json | 2 +- .../plasticgun/models/item/grenade_rgd_5.json | 2 +- .../plasticgun/models/item/grenade_rgo.json | 2 +- .../models/item/grenade_thermite.json | 2 +- .../models/item/hardened_steel.json | 2 +- .../plasticgun/models/item/hyperalloy.json | 2 +- .../plasticgun/models/item/iron_shuriken.json | 2 +- .../plasticgun/models/item/kevlar_sheet.json | 2 +- .../plasticgun/models/item/kevlar_vest.json | 2 +- .../plasticgun/models/item/magnetic_coil.json | 2 +- .../plasticgun/models/item/microchip.json | 2 +- .../plasticgun/models/item/nano_tubes.json | 2 +- .../models/item/netherite_shuriken.json | 2 +- .../assets/plasticgun/models/item/p2022.json | 2 +- .../plasticgun/models/item/plasma_core.json | 2 +- .../plasticgun/models/item/power_cell.json | 2 +- .../models/item/precision_gear.json | 2 +- .../models/item/reinforced_fiber.json | 2 +- .../assets/plasticgun/models/item/rpg9.json | 2 +- .../plasticgun/models/item/rpg_shell.json | 2 +- .../models/item/rpg_shell_incendiary.json | 2 +- .../models/item/silicon_mixture.json | 2 +- .../plasticgun/models/item/silicon_wafer.json | 2 +- .../models/item/snub_nosed_revolver.json | 2 +- .../models/item/stone_shuriken.json | 2 +- .../models/item/titanium_alloy.json | 2 +- .../plasticgun/models/item/tokarev_tt_33.json | 2 +- .../models/item/trigger_mechanism.json | 2 +- .../models/item/wooden_shuriken.json | 2 +- .../plasticgun/recipe/wooden_shuriken.json | 14 +++++------ 147 files changed, 536 insertions(+), 103 deletions(-) create mode 100644 src/main/resources/assets/plasticgun/items/32_acp.json create mode 100644 src/main/resources/assets/plasticgun/items/32_acp_high_velocity.json create mode 100644 src/main/resources/assets/plasticgun/items/357_magnum.json create mode 100644 src/main/resources/assets/plasticgun/items/357_revolver.json create mode 100644 src/main/resources/assets/plasticgun/items/357_standard.json create mode 100644 src/main/resources/assets/plasticgun/items/38_special.json create mode 100644 src/main/resources/assets/plasticgun/items/38_special_p.json create mode 100644 src/main/resources/assets/plasticgun/items/45_acp.json create mode 100644 src/main/resources/assets/plasticgun/items/45_acp_hollow_point.json create mode 100644 src/main/resources/assets/plasticgun/items/762_tokarev.json create mode 100644 src/main/resources/assets/plasticgun/items/762_tokarev_ap.json create mode 100644 src/main/resources/assets/plasticgun/items/9mm_jhp.json create mode 100644 src/main/resources/assets/plasticgun/items/9mm_parabellum.json create mode 100644 src/main/resources/assets/plasticgun/items/advanced_circuit.json create mode 100644 src/main/resources/assets/plasticgun/items/ak_47.json create mode 100644 src/main/resources/assets/plasticgun/items/alloy_wheel.json create mode 100644 src/main/resources/assets/plasticgun/items/awp.json create mode 100644 src/main/resources/assets/plasticgun/items/ceramic_mixture.json create mode 100644 src/main/resources/assets/plasticgun/items/ceramic_plate.json create mode 100644 src/main/resources/assets/plasticgun/items/colt_1903.json create mode 100644 src/main/resources/assets/plasticgun/items/colt_45.json create mode 100644 src/main/resources/assets/plasticgun/items/colt_peacemaker.json create mode 100644 src/main/resources/assets/plasticgun/items/composite_frame.json create mode 100644 src/main/resources/assets/plasticgun/items/composite_resin.json create mode 100644 src/main/resources/assets/plasticgun/items/copper_wiring.json create mode 100644 src/main/resources/assets/plasticgun/items/diamond_shuriken.json create mode 100644 src/main/resources/assets/plasticgun/items/enhanced_gunpowder.json create mode 100644 src/main/resources/assets/plasticgun/items/explosive_powder.json create mode 100644 src/main/resources/assets/plasticgun/items/flak_vest.json create mode 100644 src/main/resources/assets/plasticgun/items/force_container.json create mode 100644 src/main/resources/assets/plasticgun/items/forcegun.json create mode 100644 src/main/resources/assets/plasticgun/items/golden_shuriken.json create mode 100644 src/main/resources/assets/plasticgun/items/graphene_sheet.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_an_m14.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_f1.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_k417.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_m18.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_m34.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_m67.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_m7a3.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_m84.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_mk3a2.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_no_69.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_rgd_5.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_rgo.json create mode 100644 src/main/resources/assets/plasticgun/items/grenade_thermite.json create mode 100644 src/main/resources/assets/plasticgun/items/hardened_steel.json create mode 100644 src/main/resources/assets/plasticgun/items/hyperalloy.json create mode 100644 src/main/resources/assets/plasticgun/items/iron_shuriken.json create mode 100644 src/main/resources/assets/plasticgun/items/kevlar_sheet.json create mode 100644 src/main/resources/assets/plasticgun/items/kevlar_vest.json create mode 100644 src/main/resources/assets/plasticgun/items/magnetic_coil.json create mode 100644 src/main/resources/assets/plasticgun/items/microchip.json create mode 100644 src/main/resources/assets/plasticgun/items/nano_tubes.json create mode 100644 src/main/resources/assets/plasticgun/items/netherite_shuriken.json create mode 100644 src/main/resources/assets/plasticgun/items/p2022.json create mode 100644 src/main/resources/assets/plasticgun/items/plasma_core.json create mode 100644 src/main/resources/assets/plasticgun/items/power_cell.json create mode 100644 src/main/resources/assets/plasticgun/items/precision_gear.json create mode 100644 src/main/resources/assets/plasticgun/items/reinforced_fiber.json create mode 100644 src/main/resources/assets/plasticgun/items/rpg9.json create mode 100644 src/main/resources/assets/plasticgun/items/rpg_shell.json create mode 100644 src/main/resources/assets/plasticgun/items/rpg_shell_incendiary.json create mode 100644 src/main/resources/assets/plasticgun/items/silicon_mixture.json create mode 100644 src/main/resources/assets/plasticgun/items/silicon_wafer.json create mode 100644 src/main/resources/assets/plasticgun/items/snub_nosed_revolver.json create mode 100644 src/main/resources/assets/plasticgun/items/stone_shuriken.json create mode 100644 src/main/resources/assets/plasticgun/items/titanium_alloy.json create mode 100644 src/main/resources/assets/plasticgun/items/tokarev_tt_33.json create mode 100644 src/main/resources/assets/plasticgun/items/trigger_mechanism.json create mode 100644 src/main/resources/assets/plasticgun/items/wooden_shuriken.json diff --git a/build.gradle b/build.gradle index 00d18c0..04b5018 100644 --- a/build.gradle +++ b/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}") diff --git a/gradle.properties b/gradle.properties index 61709e0..32933b0 100644 --- a/gradle.properties +++ b/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 \ No newline at end of file diff --git a/src/main/java/systems/brn/plasticgun/PlasticGun.java b/src/main/java/systems/brn/plasticgun/PlasticGun.java index 2b8b076..4be238e 100644 --- a/src/main/java/systems/brn/plasticgun/PlasticGun.java +++ b/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 diff --git a/src/main/java/systems/brn/plasticgun/guns/Gun.java b/src/main/java/systems/brn/plasticgun/guns/Gun.java index e8005a4..8fe1b56 100644 --- a/src/main/java/systems/brn/plasticgun/guns/Gun.java +++ b/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; diff --git a/src/main/java/systems/brn/plasticgun/lib/SimpleItem.java b/src/main/java/systems/brn/plasticgun/lib/SimpleItem.java index db44ff7..25a8b17 100644 --- a/src/main/java/systems/brn/plasticgun/lib/SimpleItem.java +++ b/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 diff --git a/src/main/resources/assets/plasticgun/items/32_acp.json b/src/main/resources/assets/plasticgun/items/32_acp.json new file mode 100644 index 0000000..983c919 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/32_acp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/32_acp" + } +} diff --git a/src/main/resources/assets/plasticgun/items/32_acp_high_velocity.json b/src/main/resources/assets/plasticgun/items/32_acp_high_velocity.json new file mode 100644 index 0000000..52b5e31 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/plasticgun/items/357_magnum.json b/src/main/resources/assets/plasticgun/items/357_magnum.json new file mode 100644 index 0000000..013efdf --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/357_magnum.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/357_magnum" + } +} diff --git a/src/main/resources/assets/plasticgun/items/357_revolver.json b/src/main/resources/assets/plasticgun/items/357_revolver.json new file mode 100644 index 0000000..a31b496 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/357_revolver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/357_revolver" + } +} diff --git a/src/main/resources/assets/plasticgun/items/357_standard.json b/src/main/resources/assets/plasticgun/items/357_standard.json new file mode 100644 index 0000000..c58f897 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/357_standard.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/357_standard" + } +} diff --git a/src/main/resources/assets/plasticgun/items/38_special.json b/src/main/resources/assets/plasticgun/items/38_special.json new file mode 100644 index 0000000..4eb62e0 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/38_special.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/38_special" + } +} diff --git a/src/main/resources/assets/plasticgun/items/38_special_p.json b/src/main/resources/assets/plasticgun/items/38_special_p.json new file mode 100644 index 0000000..07c20ea --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/38_special_p.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/38_special_p" + } +} diff --git a/src/main/resources/assets/plasticgun/items/45_acp.json b/src/main/resources/assets/plasticgun/items/45_acp.json new file mode 100644 index 0000000..22547f3 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/45_acp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/45_acp" + } +} diff --git a/src/main/resources/assets/plasticgun/items/45_acp_hollow_point.json b/src/main/resources/assets/plasticgun/items/45_acp_hollow_point.json new file mode 100644 index 0000000..98cfb0b --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/plasticgun/items/762_tokarev.json b/src/main/resources/assets/plasticgun/items/762_tokarev.json new file mode 100644 index 0000000..0e81648 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/762_tokarev.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/762_tokarev" + } +} diff --git a/src/main/resources/assets/plasticgun/items/762_tokarev_ap.json b/src/main/resources/assets/plasticgun/items/762_tokarev_ap.json new file mode 100644 index 0000000..16e3720 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/762_tokarev_ap.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/762_tokarev_ap" + } +} diff --git a/src/main/resources/assets/plasticgun/items/9mm_jhp.json b/src/main/resources/assets/plasticgun/items/9mm_jhp.json new file mode 100644 index 0000000..28ca675 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/9mm_jhp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/9mm_jhp" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/items/9mm_parabellum.json b/src/main/resources/assets/plasticgun/items/9mm_parabellum.json new file mode 100644 index 0000000..603ccf8 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/9mm_parabellum.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/9mm_parabellum" + } +} diff --git a/src/main/resources/assets/plasticgun/items/advanced_circuit.json b/src/main/resources/assets/plasticgun/items/advanced_circuit.json new file mode 100644 index 0000000..eb475f5 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/advanced_circuit.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/advanced_circuit" + } +} diff --git a/src/main/resources/assets/plasticgun/items/ak_47.json b/src/main/resources/assets/plasticgun/items/ak_47.json new file mode 100644 index 0000000..b9f8ef4 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/ak_47.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/ak_47" + } +} diff --git a/src/main/resources/assets/plasticgun/items/alloy_wheel.json b/src/main/resources/assets/plasticgun/items/alloy_wheel.json new file mode 100644 index 0000000..2e39111 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/alloy_wheel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/alloy_wheel" + } +} diff --git a/src/main/resources/assets/plasticgun/items/awp.json b/src/main/resources/assets/plasticgun/items/awp.json new file mode 100644 index 0000000..f7a7834 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/awp.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/awp" + } +} diff --git a/src/main/resources/assets/plasticgun/items/ceramic_mixture.json b/src/main/resources/assets/plasticgun/items/ceramic_mixture.json new file mode 100644 index 0000000..18a984a --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/ceramic_mixture.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/ceramic_mixture" + } +} diff --git a/src/main/resources/assets/plasticgun/items/ceramic_plate.json b/src/main/resources/assets/plasticgun/items/ceramic_plate.json new file mode 100644 index 0000000..213b360 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/ceramic_plate.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/ceramic_plate" + } +} diff --git a/src/main/resources/assets/plasticgun/items/colt_1903.json b/src/main/resources/assets/plasticgun/items/colt_1903.json new file mode 100644 index 0000000..e2c6348 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/colt_1903.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/colt_1903" + } +} diff --git a/src/main/resources/assets/plasticgun/items/colt_45.json b/src/main/resources/assets/plasticgun/items/colt_45.json new file mode 100644 index 0000000..8310b17 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/colt_45.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/colt_45" + } +} diff --git a/src/main/resources/assets/plasticgun/items/colt_peacemaker.json b/src/main/resources/assets/plasticgun/items/colt_peacemaker.json new file mode 100644 index 0000000..a0c5e8f --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/colt_peacemaker.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/colt_peacemaker" + } +} diff --git a/src/main/resources/assets/plasticgun/items/composite_frame.json b/src/main/resources/assets/plasticgun/items/composite_frame.json new file mode 100644 index 0000000..d6082d4 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/composite_frame.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/composite_frame" + } +} diff --git a/src/main/resources/assets/plasticgun/items/composite_resin.json b/src/main/resources/assets/plasticgun/items/composite_resin.json new file mode 100644 index 0000000..0e1d8d3 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/composite_resin.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/composite_resin" + } +} diff --git a/src/main/resources/assets/plasticgun/items/copper_wiring.json b/src/main/resources/assets/plasticgun/items/copper_wiring.json new file mode 100644 index 0000000..d061e0d --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/copper_wiring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/copper_wiring" + } +} diff --git a/src/main/resources/assets/plasticgun/items/diamond_shuriken.json b/src/main/resources/assets/plasticgun/items/diamond_shuriken.json new file mode 100644 index 0000000..4d42cec --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/diamond_shuriken.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/diamond_shuriken" + } +} diff --git a/src/main/resources/assets/plasticgun/items/enhanced_gunpowder.json b/src/main/resources/assets/plasticgun/items/enhanced_gunpowder.json new file mode 100644 index 0000000..cac7135 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/enhanced_gunpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/enhanced_gunpowder" + } +} diff --git a/src/main/resources/assets/plasticgun/items/explosive_powder.json b/src/main/resources/assets/plasticgun/items/explosive_powder.json new file mode 100644 index 0000000..3a49655 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/explosive_powder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/explosive_powder" + } +} diff --git a/src/main/resources/assets/plasticgun/items/flak_vest.json b/src/main/resources/assets/plasticgun/items/flak_vest.json new file mode 100644 index 0000000..f72aafb --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/flak_vest.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/flak_vest" + } +} diff --git a/src/main/resources/assets/plasticgun/items/force_container.json b/src/main/resources/assets/plasticgun/items/force_container.json new file mode 100644 index 0000000..1dc7372 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/force_container.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/force_container" + } +} diff --git a/src/main/resources/assets/plasticgun/items/forcegun.json b/src/main/resources/assets/plasticgun/items/forcegun.json new file mode 100644 index 0000000..53256d9 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/forcegun.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/forcegun" + } +} diff --git a/src/main/resources/assets/plasticgun/items/golden_shuriken.json b/src/main/resources/assets/plasticgun/items/golden_shuriken.json new file mode 100644 index 0000000..ac360a4 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/golden_shuriken.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/golden_shuriken" + } +} diff --git a/src/main/resources/assets/plasticgun/items/graphene_sheet.json b/src/main/resources/assets/plasticgun/items/graphene_sheet.json new file mode 100644 index 0000000..b850729 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/graphene_sheet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/graphene_sheet" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_an_m14.json b/src/main/resources/assets/plasticgun/items/grenade_an_m14.json new file mode 100644 index 0000000..33beab1 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_an_m14.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_an_m14" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_f1.json b/src/main/resources/assets/plasticgun/items/grenade_f1.json new file mode 100644 index 0000000..955e4a1 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_f1.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_f1" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_k417.json b/src/main/resources/assets/plasticgun/items/grenade_k417.json new file mode 100644 index 0000000..e26e3cb --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_k417.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_k417" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_m18.json b/src/main/resources/assets/plasticgun/items/grenade_m18.json new file mode 100644 index 0000000..ec85fcb --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_m18.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_m18" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_m34.json b/src/main/resources/assets/plasticgun/items/grenade_m34.json new file mode 100644 index 0000000..68ce31b --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_m34.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_m34" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_m67.json b/src/main/resources/assets/plasticgun/items/grenade_m67.json new file mode 100644 index 0000000..9737f8f --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_m67.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_m67" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_m7a3.json b/src/main/resources/assets/plasticgun/items/grenade_m7a3.json new file mode 100644 index 0000000..df6432a --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_m7a3.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_m7a3" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_m84.json b/src/main/resources/assets/plasticgun/items/grenade_m84.json new file mode 100644 index 0000000..9fee519 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_m84.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_m84" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_mk3a2.json b/src/main/resources/assets/plasticgun/items/grenade_mk3a2.json new file mode 100644 index 0000000..1aeb8a0 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_mk3a2.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_mk3a2" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_no_69.json b/src/main/resources/assets/plasticgun/items/grenade_no_69.json new file mode 100644 index 0000000..de2bc00 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_no_69.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_no_69" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_rgd_5.json b/src/main/resources/assets/plasticgun/items/grenade_rgd_5.json new file mode 100644 index 0000000..4b0889a --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_rgd_5.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_rgd_5" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_rgo.json b/src/main/resources/assets/plasticgun/items/grenade_rgo.json new file mode 100644 index 0000000..157a583 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_rgo.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_rgo" + } +} diff --git a/src/main/resources/assets/plasticgun/items/grenade_thermite.json b/src/main/resources/assets/plasticgun/items/grenade_thermite.json new file mode 100644 index 0000000..dbceee9 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/grenade_thermite.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/grenade_thermite" + } +} diff --git a/src/main/resources/assets/plasticgun/items/hardened_steel.json b/src/main/resources/assets/plasticgun/items/hardened_steel.json new file mode 100644 index 0000000..6e96a20 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/hardened_steel.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/hardened_steel" + } +} diff --git a/src/main/resources/assets/plasticgun/items/hyperalloy.json b/src/main/resources/assets/plasticgun/items/hyperalloy.json new file mode 100644 index 0000000..018b70b --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/hyperalloy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/hyperalloy" + } +} diff --git a/src/main/resources/assets/plasticgun/items/iron_shuriken.json b/src/main/resources/assets/plasticgun/items/iron_shuriken.json new file mode 100644 index 0000000..c7fea5e --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/iron_shuriken.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/iron_shuriken" + } +} diff --git a/src/main/resources/assets/plasticgun/items/kevlar_sheet.json b/src/main/resources/assets/plasticgun/items/kevlar_sheet.json new file mode 100644 index 0000000..845c248 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/kevlar_sheet.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/kevlar_sheet" + } +} diff --git a/src/main/resources/assets/plasticgun/items/kevlar_vest.json b/src/main/resources/assets/plasticgun/items/kevlar_vest.json new file mode 100644 index 0000000..08c61bd --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/kevlar_vest.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/kevlar_vest" + } +} diff --git a/src/main/resources/assets/plasticgun/items/magnetic_coil.json b/src/main/resources/assets/plasticgun/items/magnetic_coil.json new file mode 100644 index 0000000..e5cee28 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/magnetic_coil.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/magnetic_coil" + } +} diff --git a/src/main/resources/assets/plasticgun/items/microchip.json b/src/main/resources/assets/plasticgun/items/microchip.json new file mode 100644 index 0000000..165ffba --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/microchip.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/microchip" + } +} diff --git a/src/main/resources/assets/plasticgun/items/nano_tubes.json b/src/main/resources/assets/plasticgun/items/nano_tubes.json new file mode 100644 index 0000000..00af007 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/nano_tubes.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/nano_tubes" + } +} diff --git a/src/main/resources/assets/plasticgun/items/netherite_shuriken.json b/src/main/resources/assets/plasticgun/items/netherite_shuriken.json new file mode 100644 index 0000000..d07bcfa --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/netherite_shuriken.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/netherite_shuriken" + } +} diff --git a/src/main/resources/assets/plasticgun/items/p2022.json b/src/main/resources/assets/plasticgun/items/p2022.json new file mode 100644 index 0000000..eb18d92 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/p2022.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/p2022" + } +} diff --git a/src/main/resources/assets/plasticgun/items/plasma_core.json b/src/main/resources/assets/plasticgun/items/plasma_core.json new file mode 100644 index 0000000..13635f7 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/plasma_core.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/plasma_core" + } +} diff --git a/src/main/resources/assets/plasticgun/items/power_cell.json b/src/main/resources/assets/plasticgun/items/power_cell.json new file mode 100644 index 0000000..11a91d4 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/power_cell.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/power_cell" + } +} diff --git a/src/main/resources/assets/plasticgun/items/precision_gear.json b/src/main/resources/assets/plasticgun/items/precision_gear.json new file mode 100644 index 0000000..5aca2fc --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/precision_gear.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/precision_gear" + } +} diff --git a/src/main/resources/assets/plasticgun/items/reinforced_fiber.json b/src/main/resources/assets/plasticgun/items/reinforced_fiber.json new file mode 100644 index 0000000..8542469 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/reinforced_fiber.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/reinforced_fiber" + } +} diff --git a/src/main/resources/assets/plasticgun/items/rpg9.json b/src/main/resources/assets/plasticgun/items/rpg9.json new file mode 100644 index 0000000..0fa9ebb --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/rpg9.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/rpg9" + } +} diff --git a/src/main/resources/assets/plasticgun/items/rpg_shell.json b/src/main/resources/assets/plasticgun/items/rpg_shell.json new file mode 100644 index 0000000..3ae074f --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/rpg_shell.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/rpg_shell" + } +} diff --git a/src/main/resources/assets/plasticgun/items/rpg_shell_incendiary.json b/src/main/resources/assets/plasticgun/items/rpg_shell_incendiary.json new file mode 100644 index 0000000..5026e31 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/rpg_shell_incendiary.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/rpg_shell_incendiary" + } +} diff --git a/src/main/resources/assets/plasticgun/items/silicon_mixture.json b/src/main/resources/assets/plasticgun/items/silicon_mixture.json new file mode 100644 index 0000000..cc653cb --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/silicon_mixture.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/silicon_mixture" + } +} diff --git a/src/main/resources/assets/plasticgun/items/silicon_wafer.json b/src/main/resources/assets/plasticgun/items/silicon_wafer.json new file mode 100644 index 0000000..bc42191 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/silicon_wafer.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/silicon_wafer" + } +} diff --git a/src/main/resources/assets/plasticgun/items/snub_nosed_revolver.json b/src/main/resources/assets/plasticgun/items/snub_nosed_revolver.json new file mode 100644 index 0000000..4d3268e --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/snub_nosed_revolver.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/snub_nosed_revolver" + } +} diff --git a/src/main/resources/assets/plasticgun/items/stone_shuriken.json b/src/main/resources/assets/plasticgun/items/stone_shuriken.json new file mode 100644 index 0000000..ebc4ed3 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/stone_shuriken.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/stone_shuriken" + } +} diff --git a/src/main/resources/assets/plasticgun/items/titanium_alloy.json b/src/main/resources/assets/plasticgun/items/titanium_alloy.json new file mode 100644 index 0000000..755ca49 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/titanium_alloy.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/titanium_alloy" + } +} diff --git a/src/main/resources/assets/plasticgun/items/tokarev_tt_33.json b/src/main/resources/assets/plasticgun/items/tokarev_tt_33.json new file mode 100644 index 0000000..63add11 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/tokarev_tt_33.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/tokarev_tt_33" + } +} diff --git a/src/main/resources/assets/plasticgun/items/trigger_mechanism.json b/src/main/resources/assets/plasticgun/items/trigger_mechanism.json new file mode 100644 index 0000000..e7f1f36 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/trigger_mechanism.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/trigger_mechanism" + } +} diff --git a/src/main/resources/assets/plasticgun/items/wooden_shuriken.json b/src/main/resources/assets/plasticgun/items/wooden_shuriken.json new file mode 100644 index 0000000..54b4c50 --- /dev/null +++ b/src/main/resources/assets/plasticgun/items/wooden_shuriken.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "plasticgun:item/wooden_shuriken" + } +} diff --git a/src/main/resources/assets/plasticgun/models/item/32_acp.json b/src/main/resources/assets/plasticgun/models/item/32_acp.json index 3a7a8f5..34143eb 100644 --- a/src/main/resources/assets/plasticgun/models/item/32_acp.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/32_acp_high_velocity.json b/src/main/resources/assets/plasticgun/models/item/32_acp_high_velocity.json index 612966d..4543ab4 100644 --- a/src/main/resources/assets/plasticgun/models/item/32_acp_high_velocity.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/357_magnum.json b/src/main/resources/assets/plasticgun/models/item/357_magnum.json index 0cfaf72..c005595 100644 --- a/src/main/resources/assets/plasticgun/models/item/357_magnum.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/357_revolver.json b/src/main/resources/assets/plasticgun/models/item/357_revolver.json index b3ae03c..9c2f397 100644 --- a/src/main/resources/assets/plasticgun/models/item/357_revolver.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/357_standard.json b/src/main/resources/assets/plasticgun/models/item/357_standard.json index ff2b3e5..71325a4 100644 --- a/src/main/resources/assets/plasticgun/models/item/357_standard.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/38_special.json b/src/main/resources/assets/plasticgun/models/item/38_special.json index e562532..81c2007 100644 --- a/src/main/resources/assets/plasticgun/models/item/38_special.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/38_special_p.json b/src/main/resources/assets/plasticgun/models/item/38_special_p.json index 84d1962..db30e69 100644 --- a/src/main/resources/assets/plasticgun/models/item/38_special_p.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/45_acp.json b/src/main/resources/assets/plasticgun/models/item/45_acp.json index a8a474b..fed414c 100644 --- a/src/main/resources/assets/plasticgun/models/item/45_acp.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/45_acp_hollow_point.json b/src/main/resources/assets/plasticgun/models/item/45_acp_hollow_point.json index c7b647d..1298120 100644 --- a/src/main/resources/assets/plasticgun/models/item/45_acp_hollow_point.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/762_tokarev.json b/src/main/resources/assets/plasticgun/models/item/762_tokarev.json index 0f6ecf7..1e08528 100644 --- a/src/main/resources/assets/plasticgun/models/item/762_tokarev.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/762_tokarev_ap.json b/src/main/resources/assets/plasticgun/models/item/762_tokarev_ap.json index 3a3e332..58c8bb7 100644 --- a/src/main/resources/assets/plasticgun/models/item/762_tokarev_ap.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/9mm_jhp.json b/src/main/resources/assets/plasticgun/models/item/9mm_jhp.json index 6e0bdb6..a30ea2a 100644 --- a/src/main/resources/assets/plasticgun/models/item/9mm_jhp.json +++ b/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" } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/plasticgun/models/item/9mm_parabellum.json b/src/main/resources/assets/plasticgun/models/item/9mm_parabellum.json index 651dab4..6279d5a 100644 --- a/src/main/resources/assets/plasticgun/models/item/9mm_parabellum.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/advanced_circuit.json b/src/main/resources/assets/plasticgun/models/item/advanced_circuit.json index 879f85f..e75c67a 100644 --- a/src/main/resources/assets/plasticgun/models/item/advanced_circuit.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/alloy_wheel.json b/src/main/resources/assets/plasticgun/models/item/alloy_wheel.json index 974c88a..cbb9ac2 100644 --- a/src/main/resources/assets/plasticgun/models/item/alloy_wheel.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/awp.json b/src/main/resources/assets/plasticgun/models/item/awp.json index 8a825b5..7c10d19 100644 --- a/src/main/resources/assets/plasticgun/models/item/awp.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/ceramic_mixture.json b/src/main/resources/assets/plasticgun/models/item/ceramic_mixture.json index b10d063..525190e 100644 --- a/src/main/resources/assets/plasticgun/models/item/ceramic_mixture.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/ceramic_plate.json b/src/main/resources/assets/plasticgun/models/item/ceramic_plate.json index b223f74..043d58d 100644 --- a/src/main/resources/assets/plasticgun/models/item/ceramic_plate.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/colt_1903.json b/src/main/resources/assets/plasticgun/models/item/colt_1903.json index 6bc4dcc..4a8a1d3 100644 --- a/src/main/resources/assets/plasticgun/models/item/colt_1903.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/colt_45.json b/src/main/resources/assets/plasticgun/models/item/colt_45.json index 136125c..4a4f888 100644 --- a/src/main/resources/assets/plasticgun/models/item/colt_45.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json b/src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json index 35d5b97..42c7808 100644 --- a/src/main/resources/assets/plasticgun/models/item/colt_peacemaker.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/composite_frame.json b/src/main/resources/assets/plasticgun/models/item/composite_frame.json index 38d6baf..79d1fc0 100644 --- a/src/main/resources/assets/plasticgun/models/item/composite_frame.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/composite_resin.json b/src/main/resources/assets/plasticgun/models/item/composite_resin.json index 94c0cad..ef7cbc2 100644 --- a/src/main/resources/assets/plasticgun/models/item/composite_resin.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/copper_wiring.json b/src/main/resources/assets/plasticgun/models/item/copper_wiring.json index 9697627..a7102bd 100644 --- a/src/main/resources/assets/plasticgun/models/item/copper_wiring.json +++ b/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" } diff --git a/src/main/resources/assets/plasticgun/models/item/diamond_shuriken.json b/src/main/resources/assets/plasticgun/models/item/diamond_shuriken.json index 2c7909c..70e702d 100644 --- a/src/main/resources/assets/plasticgun/models/item/diamond_shuriken.json +++ b/src/main/resources/assets/plasticgun/models/item/diamond_shuriken.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/diamond_shuriken" } diff --git a/src/main/resources/assets/plasticgun/models/item/enhanced_gunpowder.json b/src/main/resources/assets/plasticgun/models/item/enhanced_gunpowder.json index 87ff060..eac29a7 100644 --- a/src/main/resources/assets/plasticgun/models/item/enhanced_gunpowder.json +++ b/src/main/resources/assets/plasticgun/models/item/enhanced_gunpowder.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/enhanced_gunpowder" } diff --git a/src/main/resources/assets/plasticgun/models/item/explosive_powder.json b/src/main/resources/assets/plasticgun/models/item/explosive_powder.json index 4f97929..7526697 100644 --- a/src/main/resources/assets/plasticgun/models/item/explosive_powder.json +++ b/src/main/resources/assets/plasticgun/models/item/explosive_powder.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/explosive_powder" } diff --git a/src/main/resources/assets/plasticgun/models/item/flak_vest.json b/src/main/resources/assets/plasticgun/models/item/flak_vest.json index 7ea06d5..636abb0 100644 --- a/src/main/resources/assets/plasticgun/models/item/flak_vest.json +++ b/src/main/resources/assets/plasticgun/models/item/flak_vest.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/flak_vest" } diff --git a/src/main/resources/assets/plasticgun/models/item/force_container.json b/src/main/resources/assets/plasticgun/models/item/force_container.json index e6ac040..8cbb1d1 100644 --- a/src/main/resources/assets/plasticgun/models/item/force_container.json +++ b/src/main/resources/assets/plasticgun/models/item/force_container.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/force_container" } diff --git a/src/main/resources/assets/plasticgun/models/item/forcegun.json b/src/main/resources/assets/plasticgun/models/item/forcegun.json index 8881141..87159b3 100644 --- a/src/main/resources/assets/plasticgun/models/item/forcegun.json +++ b/src/main/resources/assets/plasticgun/models/item/forcegun.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/forcegun" } diff --git a/src/main/resources/assets/plasticgun/models/item/golden_shuriken.json b/src/main/resources/assets/plasticgun/models/item/golden_shuriken.json index 2800ac7..e33fea9 100644 --- a/src/main/resources/assets/plasticgun/models/item/golden_shuriken.json +++ b/src/main/resources/assets/plasticgun/models/item/golden_shuriken.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/golden_shuriken" } diff --git a/src/main/resources/assets/plasticgun/models/item/graphene_sheet.json b/src/main/resources/assets/plasticgun/models/item/graphene_sheet.json index c2d9715..f396823 100644 --- a/src/main/resources/assets/plasticgun/models/item/graphene_sheet.json +++ b/src/main/resources/assets/plasticgun/models/item/graphene_sheet.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/graphene_sheet" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_an_m14.json b/src/main/resources/assets/plasticgun/models/item/grenade_an_m14.json index b1c9457..e536ac0 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_an_m14.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_an_m14.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_an_m14" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_f1.json b/src/main/resources/assets/plasticgun/models/item/grenade_f1.json index 828ddef..f4c9bd0 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_f1.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_f1.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_f1" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_k417.json b/src/main/resources/assets/plasticgun/models/item/grenade_k417.json index 7a50fb2..476bdd7 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_k417.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_k417.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_k417" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_m18.json b/src/main/resources/assets/plasticgun/models/item/grenade_m18.json index 82cea67..dfeb00c 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_m18.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_m18.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_m18" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_m34.json b/src/main/resources/assets/plasticgun/models/item/grenade_m34.json index 33e1c94..dac28bb 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_m34.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_m34.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_m34" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_m67.json b/src/main/resources/assets/plasticgun/models/item/grenade_m67.json index 2c374f8..abc4f4c 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_m67.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_m67.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_m67" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_m7a3.json b/src/main/resources/assets/plasticgun/models/item/grenade_m7a3.json index b318f6a..b3d266a 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_m7a3.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_m7a3.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_m7a3" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_m84.json b/src/main/resources/assets/plasticgun/models/item/grenade_m84.json index 87baee5..839b661 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_m84.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_m84.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_m84" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_mk3a2.json b/src/main/resources/assets/plasticgun/models/item/grenade_mk3a2.json index 3f9999b..62cbd19 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_mk3a2.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_mk3a2.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_mk3a2" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_no_69.json b/src/main/resources/assets/plasticgun/models/item/grenade_no_69.json index fff0460..8052884 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_no_69.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_no_69.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_no_69" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_rgd_5.json b/src/main/resources/assets/plasticgun/models/item/grenade_rgd_5.json index f4610dd..5916635 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_rgd_5.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_rgd_5.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_rgd_5" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_rgo.json b/src/main/resources/assets/plasticgun/models/item/grenade_rgo.json index 3d1af96..5a6b8e7 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_rgo.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_rgo.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_rgo" } diff --git a/src/main/resources/assets/plasticgun/models/item/grenade_thermite.json b/src/main/resources/assets/plasticgun/models/item/grenade_thermite.json index d2568cd..b512c85 100644 --- a/src/main/resources/assets/plasticgun/models/item/grenade_thermite.json +++ b/src/main/resources/assets/plasticgun/models/item/grenade_thermite.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/grenade_thermite" } diff --git a/src/main/resources/assets/plasticgun/models/item/hardened_steel.json b/src/main/resources/assets/plasticgun/models/item/hardened_steel.json index 689ea39..7e4fa6b 100644 --- a/src/main/resources/assets/plasticgun/models/item/hardened_steel.json +++ b/src/main/resources/assets/plasticgun/models/item/hardened_steel.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/hardened_steel" } diff --git a/src/main/resources/assets/plasticgun/models/item/hyperalloy.json b/src/main/resources/assets/plasticgun/models/item/hyperalloy.json index 9a8c21e..4c0b920 100644 --- a/src/main/resources/assets/plasticgun/models/item/hyperalloy.json +++ b/src/main/resources/assets/plasticgun/models/item/hyperalloy.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/hyperalloy" } diff --git a/src/main/resources/assets/plasticgun/models/item/iron_shuriken.json b/src/main/resources/assets/plasticgun/models/item/iron_shuriken.json index 680087c..976bb3e 100644 --- a/src/main/resources/assets/plasticgun/models/item/iron_shuriken.json +++ b/src/main/resources/assets/plasticgun/models/item/iron_shuriken.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/iron_shuriken" } diff --git a/src/main/resources/assets/plasticgun/models/item/kevlar_sheet.json b/src/main/resources/assets/plasticgun/models/item/kevlar_sheet.json index 6b1c1d7..5c017f0 100644 --- a/src/main/resources/assets/plasticgun/models/item/kevlar_sheet.json +++ b/src/main/resources/assets/plasticgun/models/item/kevlar_sheet.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/kevlar_sheet" } diff --git a/src/main/resources/assets/plasticgun/models/item/kevlar_vest.json b/src/main/resources/assets/plasticgun/models/item/kevlar_vest.json index e47a5b6..b79a5fb 100644 --- a/src/main/resources/assets/plasticgun/models/item/kevlar_vest.json +++ b/src/main/resources/assets/plasticgun/models/item/kevlar_vest.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/kevlar_vest" } diff --git a/src/main/resources/assets/plasticgun/models/item/magnetic_coil.json b/src/main/resources/assets/plasticgun/models/item/magnetic_coil.json index f650fb3..7ecbe06 100644 --- a/src/main/resources/assets/plasticgun/models/item/magnetic_coil.json +++ b/src/main/resources/assets/plasticgun/models/item/magnetic_coil.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/magnetic_coil" } diff --git a/src/main/resources/assets/plasticgun/models/item/microchip.json b/src/main/resources/assets/plasticgun/models/item/microchip.json index b25198e..7b2bf48 100644 --- a/src/main/resources/assets/plasticgun/models/item/microchip.json +++ b/src/main/resources/assets/plasticgun/models/item/microchip.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/microchip" } diff --git a/src/main/resources/assets/plasticgun/models/item/nano_tubes.json b/src/main/resources/assets/plasticgun/models/item/nano_tubes.json index dc910cc..8a08160 100644 --- a/src/main/resources/assets/plasticgun/models/item/nano_tubes.json +++ b/src/main/resources/assets/plasticgun/models/item/nano_tubes.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/nano_tubes" } diff --git a/src/main/resources/assets/plasticgun/models/item/netherite_shuriken.json b/src/main/resources/assets/plasticgun/models/item/netherite_shuriken.json index 89fbbb3..533404f 100644 --- a/src/main/resources/assets/plasticgun/models/item/netherite_shuriken.json +++ b/src/main/resources/assets/plasticgun/models/item/netherite_shuriken.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/netherite_shuriken" } diff --git a/src/main/resources/assets/plasticgun/models/item/p2022.json b/src/main/resources/assets/plasticgun/models/item/p2022.json index b248261..e901bcd 100644 --- a/src/main/resources/assets/plasticgun/models/item/p2022.json +++ b/src/main/resources/assets/plasticgun/models/item/p2022.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/p2022" } diff --git a/src/main/resources/assets/plasticgun/models/item/plasma_core.json b/src/main/resources/assets/plasticgun/models/item/plasma_core.json index 9b609da..c8400f5 100644 --- a/src/main/resources/assets/plasticgun/models/item/plasma_core.json +++ b/src/main/resources/assets/plasticgun/models/item/plasma_core.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/plasma_core" } diff --git a/src/main/resources/assets/plasticgun/models/item/power_cell.json b/src/main/resources/assets/plasticgun/models/item/power_cell.json index c8ea7ad..dff5cc7 100644 --- a/src/main/resources/assets/plasticgun/models/item/power_cell.json +++ b/src/main/resources/assets/plasticgun/models/item/power_cell.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/power_cell" } diff --git a/src/main/resources/assets/plasticgun/models/item/precision_gear.json b/src/main/resources/assets/plasticgun/models/item/precision_gear.json index 62b0423..8235c08 100644 --- a/src/main/resources/assets/plasticgun/models/item/precision_gear.json +++ b/src/main/resources/assets/plasticgun/models/item/precision_gear.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/precision_gear" } diff --git a/src/main/resources/assets/plasticgun/models/item/reinforced_fiber.json b/src/main/resources/assets/plasticgun/models/item/reinforced_fiber.json index 3d93f4e..95b9793 100644 --- a/src/main/resources/assets/plasticgun/models/item/reinforced_fiber.json +++ b/src/main/resources/assets/plasticgun/models/item/reinforced_fiber.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/reinforced_fiber" } diff --git a/src/main/resources/assets/plasticgun/models/item/rpg9.json b/src/main/resources/assets/plasticgun/models/item/rpg9.json index 0efd759..dff3dcf 100644 --- a/src/main/resources/assets/plasticgun/models/item/rpg9.json +++ b/src/main/resources/assets/plasticgun/models/item/rpg9.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/rpg9" } diff --git a/src/main/resources/assets/plasticgun/models/item/rpg_shell.json b/src/main/resources/assets/plasticgun/models/item/rpg_shell.json index 52f27b3..d3ac00f 100644 --- a/src/main/resources/assets/plasticgun/models/item/rpg_shell.json +++ b/src/main/resources/assets/plasticgun/models/item/rpg_shell.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/rpg_shell" } diff --git a/src/main/resources/assets/plasticgun/models/item/rpg_shell_incendiary.json b/src/main/resources/assets/plasticgun/models/item/rpg_shell_incendiary.json index 34d359d..016590a 100644 --- a/src/main/resources/assets/plasticgun/models/item/rpg_shell_incendiary.json +++ b/src/main/resources/assets/plasticgun/models/item/rpg_shell_incendiary.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/rpg_shell_incendiary" } diff --git a/src/main/resources/assets/plasticgun/models/item/silicon_mixture.json b/src/main/resources/assets/plasticgun/models/item/silicon_mixture.json index 0ee0f92..e8917c4 100644 --- a/src/main/resources/assets/plasticgun/models/item/silicon_mixture.json +++ b/src/main/resources/assets/plasticgun/models/item/silicon_mixture.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/silicon_mixture" } diff --git a/src/main/resources/assets/plasticgun/models/item/silicon_wafer.json b/src/main/resources/assets/plasticgun/models/item/silicon_wafer.json index 80ce699..a4cc90d 100644 --- a/src/main/resources/assets/plasticgun/models/item/silicon_wafer.json +++ b/src/main/resources/assets/plasticgun/models/item/silicon_wafer.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/silicon_wafer" } diff --git a/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json b/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json index 889d649..3d19f3c 100644 --- a/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json +++ b/src/main/resources/assets/plasticgun/models/item/snub_nosed_revolver.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/snub_nosed_revolver" } diff --git a/src/main/resources/assets/plasticgun/models/item/stone_shuriken.json b/src/main/resources/assets/plasticgun/models/item/stone_shuriken.json index c1a48b9..5dcef62 100644 --- a/src/main/resources/assets/plasticgun/models/item/stone_shuriken.json +++ b/src/main/resources/assets/plasticgun/models/item/stone_shuriken.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/stone_shuriken" } diff --git a/src/main/resources/assets/plasticgun/models/item/titanium_alloy.json b/src/main/resources/assets/plasticgun/models/item/titanium_alloy.json index 32ddd77..dd4bbb1 100644 --- a/src/main/resources/assets/plasticgun/models/item/titanium_alloy.json +++ b/src/main/resources/assets/plasticgun/models/item/titanium_alloy.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/titanium_alloy" } diff --git a/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json b/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json index 7bf1916..126956c 100644 --- a/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json +++ b/src/main/resources/assets/plasticgun/models/item/tokarev_tt_33.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/tokarev_tt_33" } diff --git a/src/main/resources/assets/plasticgun/models/item/trigger_mechanism.json b/src/main/resources/assets/plasticgun/models/item/trigger_mechanism.json index 14c1dc9..29f84e4 100644 --- a/src/main/resources/assets/plasticgun/models/item/trigger_mechanism.json +++ b/src/main/resources/assets/plasticgun/models/item/trigger_mechanism.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/trigger_mechanism" } diff --git a/src/main/resources/assets/plasticgun/models/item/wooden_shuriken.json b/src/main/resources/assets/plasticgun/models/item/wooden_shuriken.json index 083eb6b..569a413 100644 --- a/src/main/resources/assets/plasticgun/models/item/wooden_shuriken.json +++ b/src/main/resources/assets/plasticgun/models/item/wooden_shuriken.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/handheld", + "parent": "minecraft:item/generated", "textures": { "layer0": "plasticgun:item/wooden_shuriken" } diff --git a/src/main/resources/data/plasticgun/recipe/wooden_shuriken.json b/src/main/resources/data/plasticgun/recipe/wooden_shuriken.json index 87addca..e85d962 100644 --- a/src/main/resources/data/plasticgun/recipe/wooden_shuriken.json +++ b/src/main/resources/data/plasticgun/recipe/wooden_shuriken.json @@ -1,15 +1,13 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - " W ", - "W W", - " W " - ], "key": { - "W": { - "tag": "minecraft:planks" - } + "#": "#minecraft:planks" }, + "pattern": [ + " # ", + "# #", + " # " + ], "result": { "id": "plasticgun:wooden_shuriken" }