From 09d63c19a126c593c0f202c7edc3e2e9d76b282e Mon Sep 17 00:00:00 2001 From: GearShocky Date: Thu, 17 Mar 2022 22:28:41 +0600 Subject: [PATCH] >Portable gravitational stabilizer now has a model. >Plasma rifle and Energy sword now has a 2d texture as item model, but draws a 3d model in hand. >Tweaked Plasma rifle position in first person. --- .../model/GravitationStabilizerModel.java | 25 +- .../mc/otm/item/weapon/PlasmaRifleItem.kt | 10 + .../models/item/energy_sword.json | 213 ++------------ .../models/item/energy_sword_3d.json | 205 +++++++++++++ .../models/item/plasma_rifle.json | 264 ++--------------- .../models/item/plasma_rifle_3d.json | 272 ++++++++++++++++++ .../textures/item/plasma_rifle.png | Bin 344 -> 345 bytes .../textures/item/plasmaicon.png | Bin 0 -> 285 bytes .../textures/item/swordicon.png | Bin 0 -> 278 bytes .../armor/gravitation_stabilizer_layer_1.png | Bin 0 -> 542 bytes 10 files changed, 541 insertions(+), 448 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle_3d.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/plasmaicon.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/swordicon.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/models/armor/gravitation_stabilizer_layer_1.png diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java index 0de89a54b..8df645490 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/GravitationStabilizerModel.java @@ -26,10 +26,27 @@ public class GravitationStabilizerModel { MeshDefinition meshdefinition = new MeshDefinition(); PartDefinition partdefinition = meshdefinition.getRoot(); - partdefinition.addOrReplaceChild("right_leg", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); - partdefinition.addOrReplaceChild("left_leg", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); - partdefinition.addOrReplaceChild("head", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); - partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); + PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create(), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition hat = partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F)); + + PartDefinition body = partdefinition.addOrReplaceChild("body", CubeListBuilder.create().texOffs(0, 0).addBox(-2.0F, 1.0F, -3.0F, 4.0F, 4.0F, 1.0F, new CubeDeformation(0.0F)) + .texOffs(0, 5).addBox(-4.0F, 3.0F, 5.0F, 8.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 5).addBox(-4.0F, 0.0F, 5.0F, 8.0F, 2.0F, 2.0F, new CubeDeformation(0.0F)) + .texOffs(0, 9).addBox(2.0F, -1.0F, 5.0F, 1.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(0, 9).addBox(-3.0F, -1.0F, 5.0F, 1.0F, 12.0F, 3.0F, new CubeDeformation(0.0F)) + .texOffs(40, 16).addBox(-4.0F, 0.0F, -2.0F, 8.0F, 12.0F, 4.0F, new CubeDeformation(0.41F)) + .texOffs(44, 33).addBox(-4.0F, 0.0F, 2.8F, 8.0F, 6.0F, 2.0F, new CubeDeformation(0.4F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + + PartDefinition backpackslope_r1 = body.addOrReplaceChild("backpackslope_r1", CubeListBuilder.create().texOffs(44, 41).addBox(-4.0F, 0.4F, -2.4F, 8.0F, 3.0F, 2.0F, new CubeDeformation(0.39F)), PartPose.offsetAndRotation(0.0F, 6.4F, 5.2F, -1.0908F, 0.0F, 0.0F)); + + PartDefinition right_arm = partdefinition.addOrReplaceChild("right_arm", CubeListBuilder.create(), PartPose.offset(-5.0F, 2.0F, 0.0F)); + + PartDefinition left_arm = partdefinition.addOrReplaceChild("left_arm", CubeListBuilder.create(), PartPose.offset(5.0F, 2.0F, 0.0F)); + + PartDefinition right_leg = partdefinition.addOrReplaceChild("right_leg", CubeListBuilder.create(), PartPose.offset(-1.9F, 12.0F, 0.0F)); + + PartDefinition left_leg = partdefinition.addOrReplaceChild("left_leg", CubeListBuilder.create(), PartPose.offset(1.9F, 12.0F, 0.0F)); model = null; return def = LayerDefinition.create(meshdefinition, 64, 64); diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt index e89e1aee5..72547b50b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/weapon/PlasmaRifleItem.kt @@ -3,11 +3,21 @@ package ru.dbotthepony.mc.otm.item.weapon import net.minecraft.world.entity.player.Player import net.minecraft.world.entity.projectile.Arrow import net.minecraft.world.item.ItemStack +import ru.dbotthepony.kvector.vector.Angle3f +import ru.dbotthepony.kvector.vector.ndouble.Vector3d import ru.dbotthepony.mc.otm.core.ImpreciseFraction class PlasmaRifleItem : PlasmaWeaponItem(WeaponDataTable::class, ImpreciseFraction(200_000)) { override val roundsPerMinute: Int = 400 override val scopingTime: Int = 7 + override val positionIdle: Vector3d + get() = Vector3d(0.2,-0.4,-0.6) + override val positionIronSights: Vector3d + get() = Vector3d(0.0,-0.24,-1.0) + override val rotIdle: Angle3f + get() = Angle3f(0f,-0.02f,0f) + override val rotIronSights: Angle3f + get() = Angle3f(-0.02f,0f,0f) override fun primaryFire(itemStack: ItemStack, player: Player, dt: WeaponDataTable): Boolean { println("FIER! ${Thread.currentThread()}") diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json index 884aa4211..ab0140a49 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword.json @@ -1,205 +1,24 @@ { - "textures": { - "0": "overdrive_that_matters:item/energy_sword" - }, - "elements": [ - { - "name": "handle", - "from": [7.4, 0, 10], - "to": [8.4, 6, 11], - "faces": { - "north": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "east": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "south": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "west": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"} - } - }, - { - "name": "blade", - "from": [7.6, 11, 10], - "to": [8.1, 17, 10.9], - "faces": { - "north": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "east": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "south": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "west": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"} - } - }, - { - "name": "handle", - "from": [7.6, 0, 8], - "to": [8.2, 1, 10], - "faces": { - "north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"}, - "east": {"uv": [4, 5, 3, 5.5], "texture": "#0"}, - "south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, - "west": {"uv": [3, 5, 4, 5.5], "texture": "#0"}, - "up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}, - "down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"} - } - }, - { - "name": "handle", - "from": [7.6, 5, 8], - "to": [8.2, 6, 10], - "faces": { - "north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"}, - "east": {"uv": [4, 2.5, 3, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, - "west": {"uv": [3, 2.5, 4, 3], "texture": "#0"}, - "up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"}, - "down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"} - } - }, - { - "name": "handle", - "from": [7.6, 1, 8], - "to": [8.2, 5, 9], - "faces": { - "north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"}, - "east": {"uv": [3, 3, 3.5, 5], "texture": "#0"}, - "south": {"uv": [3, 3, 3.3, 5], "texture": "#0"}, - "west": {"uv": [3, 3, 3.5, 5], "texture": "#0"}, - "up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"} - } - }, - { - "name": "button", - "from": [7.6, 5, 11], - "to": [8.2, 6, 11.4], - "faces": { - "north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, - "east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"}, - "south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"}, - "west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"}, - "up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"}, - "down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"} - } - }, - { - "name": "blade", - "from": [7.5, 7, 8], - "to": [8.3, 12, 11], - "faces": { - "north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"}, - "east": {"uv": [2, 8.5, 0.5, 11], "texture": "#0"}, - "south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"}, - "west": {"uv": [0.5, 8.5, 2, 11], "texture": "#0"}, - "up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"} - } - }, - { - "name": "blade", - "from": [7.5, 14, 8], - "to": [8.3, 29, 11], - "faces": { - "north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"}, - "east": {"uv": [2, 0, 0.5, 7.5], "texture": "#0"}, - "south": {"uv": [2, 0, 2.4, 7.5], "texture": "#0"}, - "west": {"uv": [0.5, 0, 2, 7.5], "texture": "#0"}, - "up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"}, - "down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"} - } - }, - { - "name": "blade", - "from": [7.5, 12, 8], - "to": [8.3, 13, 10.5], - "faces": { - "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, - "east": {"uv": [1.75, 8, 0.5, 8.5], "texture": "#0"}, - "south": {"uv": [2, 8, 2.4, 8.5], "texture": "#0"}, - "west": {"uv": [0.5, 8, 1.75, 8.5], "texture": "#0"}, - "up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"} - } - }, - { - "name": "blade", - "from": [7.5, 13, 8], - "to": [8.3, 13.5, 10.5], - "faces": { - "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, - "east": {"uv": [1.75, 7.75, 0.5, 8], "texture": "#0"}, - "south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"}, - "west": {"uv": [0.5, 7.75, 1.75, 8], "texture": "#0"}, - "up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"} - } - }, - { - "name": "blade", - "from": [7.5, 13.5, 8], - "to": [8.3, 14, 11], - "faces": { - "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, - "east": {"uv": [2, 7.5, 0.5, 7.75], "texture": "#0"}, - "south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"}, - "west": {"uv": [0.5, 7.5, 2, 7.75], "texture": "#0"}, - "up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}, - "down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"} - } - }, - { - "name": "handle", - "from": [7, 6, 7], - "to": [9, 7, 12], - "faces": { - "north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"}, - "east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"}, - "south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"}, - "west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"}, - "up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"}, - "down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"} - } - }, - { - "name": "battery", - "from": [7.2, 7, 10], - "to": [8.8, 10, 12], - "faces": { - "north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"}, - "east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"}, - "south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"}, - "west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"}, - "up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"} - } + "loader": "forge:separate-perspective", + "gui_light": "front", + "base": { + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "overdrive_that_matters:item/swordicon" } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 3, -1] + }, + "perspectives": { + "third_person_right_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" }, - "thirdperson_lefthand": { - "translation": [0, 3, -1] + "third_person_left_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" }, - "firstperson_righthand": { - "rotation": [20, 0, 0], - "translation": [0, 1.75, -4.25] + "first_person_right_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" }, - "firstperson_lefthand": { - "rotation": [20, 0, 0], - "translation": [0, 1.75, -4.25] - }, - "ground": { - "rotation": [13, 0, 0], - "translation": [0, 5, -2.25] - }, - "gui": { - "rotation": [90, 42, -90], - "translation": [-4.75, -2.25, 0], - "scale": [0.8, 0.8, 0.8] - }, - "fixed": { - "rotation": [90, -45, 90], - "translation": [5.5, -3.5, -1] + "first_person_left_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" } } } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json new file mode 100644 index 000000000..884aa4211 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json @@ -0,0 +1,205 @@ +{ + "textures": { + "0": "overdrive_that_matters:item/energy_sword" + }, + "elements": [ + { + "name": "handle", + "from": [7.4, 0, 10], + "to": [8.4, 6, 11], + "faces": { + "north": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "east": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "south": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "west": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"} + } + }, + { + "name": "blade", + "from": [7.6, 11, 10], + "to": [8.1, 17, 10.9], + "faces": { + "north": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "east": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "south": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "west": {"uv": [0, 11, 0.5, 14], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 14, 0.5, 14.5], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [7.6, 0, 8], + "to": [8.2, 1, 10], + "faces": { + "north": {"uv": [2.5, 5, 2.8, 5.5], "texture": "#0"}, + "east": {"uv": [4, 5, 3, 5.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, + "west": {"uv": [3, 5, 4, 5.5], "texture": "#0"}, + "up": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"}, + "down": {"uv": [2.5, 4.5, 2.8, 5.5], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [7.6, 5, 8], + "to": [8.2, 6, 10], + "faces": { + "north": {"uv": [2.5, 2.5, 2.8, 3], "texture": "#0"}, + "east": {"uv": [4, 2.5, 3, 3], "texture": "#0"}, + "south": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, + "west": {"uv": [3, 2.5, 4, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 0.3, 1], "texture": "#missing"}, + "down": {"uv": [2.5, 2.5, 2.8, 3.5], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [7.6, 1, 8], + "to": [8.2, 5, 9], + "faces": { + "north": {"uv": [2.5, 3, 2.8, 5], "texture": "#0"}, + "east": {"uv": [3, 3, 3.5, 5], "texture": "#0"}, + "south": {"uv": [3, 3, 3.3, 5], "texture": "#0"}, + "west": {"uv": [3, 3, 3.5, 5], "texture": "#0"}, + "up": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"} + } + }, + { + "name": "button", + "from": [7.6, 5, 11], + "to": [8.2, 6, 11.4], + "faces": { + "north": {"uv": [0, 0, 0.3, 0.5], "texture": "#missing"}, + "east": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"}, + "south": {"uv": [0.5, 11, 0.8, 11.5], "texture": "#0"}, + "west": {"uv": [0.5, 11, 0.7, 11.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0.3, 0.2], "texture": "#missing"}, + "down": {"uv": [0.5, 11, 0.8, 11.2], "texture": "#0"} + } + }, + { + "name": "blade", + "from": [7.5, 7, 8], + "to": [8.3, 12, 11], + "faces": { + "north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"}, + "east": {"uv": [2, 8.5, 0.5, 11], "texture": "#0"}, + "south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"}, + "west": {"uv": [0.5, 8.5, 2, 11], "texture": "#0"}, + "up": {"uv": [0.5, 8.5, 2, 8.9], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 0.4, 1.5], "texture": "#missing"} + } + }, + { + "name": "blade", + "from": [7.5, 14, 8], + "to": [8.3, 29, 11], + "faces": { + "north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"}, + "east": {"uv": [2, 0, 0.5, 7.5], "texture": "#0"}, + "south": {"uv": [2, 0, 2.4, 7.5], "texture": "#0"}, + "west": {"uv": [0.5, 0, 2, 7.5], "texture": "#0"}, + "up": {"uv": [0.5, 0, 2, 0.4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [2, 8.5, 2.4, 10], "texture": "#0"} + } + }, + { + "name": "blade", + "from": [7.5, 12, 8], + "to": [8.3, 13, 10.5], + "faces": { + "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, + "east": {"uv": [1.75, 8, 0.5, 8.5], "texture": "#0"}, + "south": {"uv": [2, 8, 2.4, 8.5], "texture": "#0"}, + "west": {"uv": [0.5, 8, 1.75, 8.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"} + } + }, + { + "name": "blade", + "from": [7.5, 13, 8], + "to": [8.3, 13.5, 10.5], + "faces": { + "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, + "east": {"uv": [1.75, 7.75, 0.5, 8], "texture": "#0"}, + "south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"}, + "west": {"uv": [0.5, 7.75, 1.75, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.4, 1.25], "texture": "#missing"} + } + }, + { + "name": "blade", + "from": [7.5, 13.5, 8], + "to": [8.3, 14, 11], + "faces": { + "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, + "east": {"uv": [2, 7.5, 0.5, 7.75], "texture": "#0"}, + "south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"}, + "west": {"uv": [0.5, 7.5, 2, 7.75], "texture": "#0"}, + "up": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"}, + "down": {"uv": [2, 4, 2.4, 5.5], "texture": "#0"} + } + }, + { + "name": "handle", + "from": [7, 6, 7], + "to": [9, 7, 12], + "faces": { + "north": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"}, + "east": {"uv": [3.5, 8, 4, 5.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [2.5, 8, 3.5, 8.5], "texture": "#0"}, + "west": {"uv": [3.5, 5.5, 4, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [2.5, 8, 3.5, 5.5], "texture": "#0"}, + "down": {"uv": [2.5, 5.5, 3.5, 8], "texture": "#0"} + } + }, + { + "name": "battery", + "from": [7.2, 7, 10], + "to": [8.8, 10, 12], + "faces": { + "north": {"uv": [4.5, 0, 5.3, 1.5], "texture": "#0"}, + "east": {"uv": [3.5, 0, 2.5, 1.5], "texture": "#0"}, + "south": {"uv": [3.5, 0, 4.3, 1.5], "texture": "#0"}, + "west": {"uv": [2.5, 0, 3.5, 1.5], "texture": "#0"}, + "up": {"uv": [2.5, 1.5, 3.5, 2.3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 0.8, 1], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, -1] + }, + "thirdperson_lefthand": { + "translation": [0, 3, -1] + }, + "firstperson_righthand": { + "rotation": [20, 0, 0], + "translation": [0, 1.75, -4.25] + }, + "firstperson_lefthand": { + "rotation": [20, 0, 0], + "translation": [0, 1.75, -4.25] + }, + "ground": { + "rotation": [13, 0, 0], + "translation": [0, 5, -2.25] + }, + "gui": { + "rotation": [90, 42, -90], + "translation": [-4.75, -2.25, 0], + "scale": [0.8, 0.8, 0.8] + }, + "fixed": { + "rotation": [90, -45, 90], + "translation": [5.5, -3.5, -1] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json b/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json index 8a363c450..75af85d14 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle.json @@ -1,257 +1,27 @@ { - "textures": { - "0": "overdrive_that_matters:item/plasma_rifle" - }, - "elements": [ - { - "from": [7, 2, 13], - "to": [9, 7, 15], - "rotation": {"angle": -22.5, "axis": "x", "origin": [8.5, 4.5, 13]}, - "faces": { - "north": {"uv": [10.5, 5.5, 11.5, 8], "texture": "#0"}, - "east": {"uv": [12.5, 5.5, 11.5, 8], "texture": "#0"}, - "south": {"uv": [9.5, 5.5, 10.5, 8], "texture": "#0"}, - "west": {"uv": [11.5, 5.5, 12.5, 8], "texture": "#0"}, - "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, - "down": {"uv": [10.5, 8, 11.5, 9], "texture": "#0"} - } - }, - { - "from": [6.5, 5, -5], - "to": [9.5, 11, -1], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [5.5, 2, 7, 5], "texture": "#0"}, - "east": {"uv": [9, 2, 7, 5], "texture": "#0"}, - "south": {"uv": [9, 2, 10.5, 5], "texture": "#0"}, - "west": {"uv": [7, 2, 9, 5], "texture": "#0"}, - "up": {"uv": [5.5, 2, 7, 0], "texture": "#0"}, - "down": {"uv": [5.5, 0, 7, 2], "texture": "#0"} - } - }, - { - "from": [6.7, 5.2, -0.8], - "to": [9.3, 10.8, 6.8], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [4, 1.5, 5.5, 4.5], "texture": "#0"}, - "east": {"uv": [4, 1.5, 0, 4.5], "texture": "#0"}, - "south": {"uv": [4, 1.5, 5.5, 4.5], "texture": "#0"}, - "west": {"uv": [0, 1.5, 4, 4.5], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 1.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [4, 0, 0, 1.5], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6.5, 5, 7], - "to": [9.5, 11, 12], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [0, 5.5, 1.5, 8.5], "texture": "#0"}, - "east": {"uv": [4, 5.5, 1.5, 8.5], "texture": "#0"}, - "south": {"uv": [11, 2.5, 12.5, 5.5], "texture": "#0"}, - "west": {"uv": [1.5, 5.5, 4, 8.5], "texture": "#0"}, - "up": {"uv": [0, 8.5, 1.5, 11], "texture": "#0"}, - "down": {"uv": [1.5, 11, 3, 8.5], "texture": "#0"} - } - }, - { - "from": [6, 7, 7.1], - "to": [7, 10, 10.1], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, - "east": {"uv": [12.5, 0, 11, 1.5], "texture": "#0"}, - "south": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, - "west": {"uv": [11, 0, 12.5, 1.5], "texture": "#0"}, - "up": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [9, 7, 7.1], - "to": [10, 10, 10.1], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, - "east": {"uv": [12.5, 0, 11, 1.5], "texture": "#0"}, - "south": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, - "west": {"uv": [11, 0, 12.5, 1.5], "texture": "#0"}, - "up": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [7, 3, 7.6], - "to": [9, 5, 11.6], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [10, 9, 11, 10], "rotation": 90, "texture": "#0"}, - "east": {"uv": [8, 10, 10, 11], "texture": "#0"}, - "south": {"uv": [10, 9, 11, 10], "rotation": 90, "texture": "#0"}, - "west": {"uv": [8, 10, 10, 11], "texture": "#0"}, - "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, - "down": {"uv": [8, 11, 10, 12], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6.5, 6, 12], - "to": [9.5, 10, 20], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [0, 0, 1.5, 2], "texture": "#missing"}, - "east": {"uv": [8, 7, 4, 9], "texture": "#0"}, - "south": {"uv": [8, 7, 9.5, 9], "texture": "#0"}, - "west": {"uv": [4, 7, 8, 9], "texture": "#0"}, - "up": {"uv": [4, 5.5, 8, 7], "rotation": 90, "texture": "#0"}, - "down": {"uv": [4, 9, 8, 10.5], "rotation": 270, "texture": "#0"} - } - }, - { - "from": [7.5, 6, -1], - "to": [8.5, 10, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, - "east": {"uv": [0, 1.5, 4, 3.5], "texture": "#0"}, - "south": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, - "west": {"uv": [0, 1.5, 4, 3.5], "texture": "#0"}, - "up": {"uv": [0, 2.5, 4, 3], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 2.5, 4, 3], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [7, 9.7, 12], - "to": [9, 10.7, 17], - "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, - "faces": { - "north": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, - "east": {"uv": [13, 1, 15.5, 1.5], "texture": "#0"}, - "south": {"uv": [15.5, 0, 16, 1], "rotation": 90, "texture": "#0"}, - "west": {"uv": [13, 1, 15.5, 1.5], "texture": "#0"}, - "up": {"uv": [13, 0, 15.5, 1], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"} - } - }, - { - "from": [6, 5.5, -4], - "to": [7, 6.5, 11], - "faces": { - "north": {"uv": [2.5, 5, 3, 5.5], "texture": "#0"}, - "east": {"uv": [10.5, 5, 3, 5.5], "texture": "#0"}, - "south": {"uv": [10.5, 5, 11, 5.5], "texture": "#0"}, - "west": {"uv": [3, 5, 10.5, 5.5], "texture": "#0"}, - "up": {"uv": [3, 5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.5, 5, 3, 5.5], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [6, 6.5, -4], - "to": [7, 10.5, -3], - "faces": { - "north": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, - "east": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, - "south": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, - "west": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} - } - }, - { - "from": [6, 10.5, -4], - "to": [10, 11.5, -3], - "faces": { - "north": {"uv": [8.5, 1.5, 10.5, 2], "texture": "#0"}, - "east": {"uv": [10.5, 1.5, 11, 2], "texture": "#0"}, - "south": {"uv": [8.5, 1.5, 10.5, 2], "texture": "#0"}, - "west": {"uv": [8, 1.5, 8.5, 2], "texture": "#0"}, - "up": {"uv": [8.5, 1.5, 10.5, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 2, 0.5], "texture": "#missing"} - } - }, - { - "from": [7.5, 11, 7], - "to": [8.5, 11.5, 8], - "faces": { - "north": {"uv": [9, 2, 9.5, 1.75], "texture": "#0"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, - "south": {"uv": [9, 1.5, 9.5, 1.75], "texture": "#0"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, - "up": {"uv": [9, 1.5, 9.5, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} - } - }, - { - "from": [6.5, 11, 7], - "to": [7.5, 12, 8], - "faces": { - "north": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, - "east": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, - "south": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, - "west": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, - "up": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} - } - }, - { - "from": [8.5, 11, 7], - "to": [9.5, 12, 8], - "faces": { - "north": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, - "east": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, - "south": {"uv": [10.5, 2, 10, 1.5], "texture": "#0"}, - "west": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, - "up": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} - } - }, - { - "from": [9, 6.5, -4], - "to": [10, 10.5, -3], - "faces": { - "north": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, - "east": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, - "south": {"uv": [11, 2.5, 10.5, 4.5], "texture": "#0"}, - "west": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} - } - }, - { - "from": [9, 5.5, -4], - "to": [10, 6.5, 11], - "faces": { - "north": {"uv": [2.5, 5, 3, 5.5], "texture": "#0"}, - "east": {"uv": [10.5, 5, 3, 5.5], "texture": "#0"}, - "south": {"uv": [10.5, 5, 11, 5.5], "texture": "#0"}, - "west": {"uv": [3, 5, 10.5, 5.5], "texture": "#0"}, - "up": {"uv": [3, 5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [10.5, 5, 3, 5.5], "rotation": 90, "texture": "#0"} - } + "loader": "forge:separate-perspective", + "gui_light": "front", + "base": { + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "overdrive_that_matters:item/plasmaicon" } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 2.25, -4.25] + }, + "perspectives": { + "third_person_right_hand": { + "parent": "overdrive_that_matters:item/plasma_rifle_3d" }, - "thirdperson_lefthand": { - "translation": [0, 2.25, -4.25] + "third_person_left_hand": { + "parent": "overdrive_that_matters:item/plasma_rifle_3d" }, - "firstperson_rightthand": { - "translation": [-4, 2, 0] + "first_person_right_hand": { + "parent": "overdrive_that_matters:item/plasma_rifle_3d" }, - "firstperson_lefthand": { - "translation": [-4, 0, 0] - }, - "ground": { - "translation": [0, 2, 0] - }, - "gui": { - "rotation": [56, -42, 22] + "first_person_left_hand": { + "parent": "overdrive_that_matters:item/plasma_rifle_3d" }, "fixed": { - "rotation": [90, 45, -90], - "translation": [0.5, -0.25, -0.75] + "parent": "overdrive_that_matters:item/plasma_rifle_3d" } } } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle_3d.json b/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle_3d.json new file mode 100644 index 000000000..f7005e7be --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/plasma_rifle_3d.json @@ -0,0 +1,272 @@ +{ + "textures": { + "0": "overdrive_that_matters:item/plasma_rifle" + }, + "elements": [ + { + "name": "grip", + "from": [7, 2, 13], + "to": [9, 7, 15], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8.5, 4.5, 13]}, + "faces": { + "north": {"uv": [10.5, 5.5, 11.5, 8], "texture": "#0"}, + "east": {"uv": [12.5, 5.5, 11.5, 8], "texture": "#0"}, + "south": {"uv": [9.5, 5.5, 10.5, 8], "texture": "#0"}, + "west": {"uv": [11.5, 5.5, 12.5, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "down": {"uv": [10.5, 8, 11.5, 9], "texture": "#0"} + } + }, + { + "name": "barrel", + "from": [6.5, 5, -4], + "to": [9.5, 11, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [5.5, 2, 7, 5], "texture": "#0"}, + "east": {"uv": [9, 2, 7, 5], "texture": "#0"}, + "south": {"uv": [9, 2, 10.5, 5], "texture": "#0"}, + "west": {"uv": [7, 2, 9, 5], "texture": "#0"}, + "up": {"uv": [5.5, 2, 7, 0], "texture": "#0"}, + "down": {"uv": [5.5, 0, 7, 2], "texture": "#0"} + } + }, + { + "name": "heatsink", + "from": [6.7, 5.2, 0.2], + "to": [9.3, 10.8, 6.8], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [4, 1.5, 5.5, 4.5], "texture": "#0"}, + "east": {"uv": [4, 1.5, 0.5, 4.5], "texture": "#0"}, + "south": {"uv": [4, 1.5, 5.5, 4.5], "texture": "#0"}, + "west": {"uv": [0.5, 1.5, 4, 4.5], "texture": "#0"}, + "up": {"uv": [0.5, 0, 4, 1.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 0, 0.5, 1.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "barrel", + "from": [6.5, 5, 7], + "to": [9.5, 11, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [0, 5.5, 1.5, 8.5], "texture": "#0"}, + "east": {"uv": [4, 5.5, 1.5, 8.5], "texture": "#0"}, + "south": {"uv": [11, 2.5, 12.5, 5.5], "texture": "#0"}, + "west": {"uv": [1.5, 5.5, 4, 8.5], "texture": "#0"}, + "up": {"uv": [0, 8.5, 1.5, 11], "texture": "#0"}, + "down": {"uv": [1.5, 11, 3, 8.5], "texture": "#0"} + } + }, + { + "name": "details", + "from": [6, 7, 7.1], + "to": [7, 10, 10.1], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, + "east": {"uv": [12.5, 0, 11, 1.5], "texture": "#0"}, + "south": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, + "west": {"uv": [11, 0, 12.5, 1.5], "texture": "#0"}, + "up": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "details", + "from": [9, 7, 7.1], + "to": [10, 10, 10.1], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, + "east": {"uv": [12.5, 0, 11, 1.5], "texture": "#0"}, + "south": {"uv": [12.5, 0, 13, 1.5], "texture": "#0"}, + "west": {"uv": [11, 0, 12.5, 1.5], "texture": "#0"}, + "up": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11, 1.5, 12.5, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "battery", + "from": [7, 3, 7.6], + "to": [9, 5, 11.6], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [10, 9, 11, 10], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 10, 10, 11], "texture": "#0"}, + "south": {"uv": [10, 9, 11, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 10, 10, 11], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "down": {"uv": [8, 11, 10, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "stock", + "from": [6.5, 6, 12], + "to": [9.5, 10, 20], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [0, 0, 1.5, 2], "texture": "#missing"}, + "east": {"uv": [8, 7, 4, 9], "texture": "#0"}, + "south": {"uv": [8, 7, 9.5, 9], "texture": "#0"}, + "west": {"uv": [4, 7, 8, 9], "texture": "#0"}, + "up": {"uv": [4, 5.5, 8, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 9, 8, 10.5], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "barrel", + "from": [7.5, 6, -1], + "to": [8.5, 10, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "east": {"uv": [0, 1.5, 4, 3.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "west": {"uv": [0, 1.5, 4, 3.5], "texture": "#0"}, + "up": {"uv": [0, 2.5, 4, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 2.5, 4, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "details", + "from": [7, 9.7, 12], + "to": [9, 10.7, 17], + "rotation": {"angle": 0, "axis": "y", "origin": [0.5, 0, 0]}, + "faces": { + "north": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "east": {"uv": [13, 1, 15.5, 1.5], "texture": "#0"}, + "south": {"uv": [15.5, 0, 16, 1], "rotation": 90, "texture": "#0"}, + "west": {"uv": [13, 1, 15.5, 1.5], "texture": "#0"}, + "up": {"uv": [13, 0, 15.5, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [6, 5.5, -3], + "to": [7, 6.5, 11], + "faces": { + "north": {"uv": [2.5, 5, 3, 5.5], "texture": "#0"}, + "east": {"uv": [10.5, 5, 3.5, 5.5], "texture": "#0"}, + "south": {"uv": [10.5, 5, 11, 5.5], "texture": "#0"}, + "west": {"uv": [3.5, 5, 10.5, 5.5], "texture": "#0"}, + "up": {"uv": [3.5, 5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 5, 3.5, 5.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [6, 6.5, -3], + "to": [7, 10.5, -2], + "faces": { + "north": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "south": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, + "west": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [6, 10.5, -3], + "to": [10, 11.5, -2], + "faces": { + "north": {"uv": [8.5, 1.5, 10.5, 2], "texture": "#0"}, + "east": {"uv": [10.5, 1.5, 11, 2], "texture": "#0"}, + "south": {"uv": [8.5, 1.5, 10.5, 2], "texture": "#0"}, + "west": {"uv": [8, 1.5, 8.5, 2], "texture": "#0"}, + "up": {"uv": [8.5, 1.5, 10.5, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 2, 0.5], "texture": "#missing"} + } + }, + { + "name": "sight", + "from": [7.5, 11, 7], + "to": [8.5, 11.5, 8], + "faces": { + "north": {"uv": [9, 2, 9.5, 1.75], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "south": {"uv": [9, 1.5, 9.5, 1.75], "texture": "#0"}, + "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "up": {"uv": [9, 1.5, 9.5, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "sight", + "from": [6.5, 11, 7], + "to": [7.5, 12, 8], + "faces": { + "north": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, + "east": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, + "south": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, + "west": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, + "up": {"uv": [8.5, 1.5, 9, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "sight", + "from": [8.5, 11, 7], + "to": [9.5, 12, 8], + "faces": { + "north": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, + "east": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, + "south": {"uv": [10.5, 2, 10, 1.5], "texture": "#0"}, + "west": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, + "up": {"uv": [10, 1.5, 10.5, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [9, 6.5, -3], + "to": [10, 10.5, -2], + "faces": { + "north": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, + "east": {"uv": [10.5, 2.5, 11, 4.5], "texture": "#0"}, + "south": {"uv": [11, 2.5, 10.5, 4.5], "texture": "#0"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [9, 5.5, -3], + "to": [10, 6.5, 11], + "faces": { + "north": {"uv": [2.5, 5, 3, 5.5], "texture": "#0"}, + "east": {"uv": [10.5, 5, 3.5, 5.5], "texture": "#0"}, + "south": {"uv": [10.5, 5, 11, 5.5], "texture": "#0"}, + "west": {"uv": [3.5, 5, 10.5, 5.5], "texture": "#0"}, + "up": {"uv": [3.5, 5, 10.5, 5.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [10.5, 5, 3.5, 5.5], "rotation": 90, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 2.25, -4.25] + }, + "thirdperson_lefthand": { + "translation": [0, 2.25, -4.25] + }, + "ground": { + "translation": [0, 2, 0] + }, + "gui": { + "rotation": [56, -42, 22] + }, + "head": { + "translation": [0, 9.25, -3.5] + }, + "fixed": { + "rotation": [90, 45, -90], + "translation": [0.5, -0.25, -0.75] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/plasma_rifle.png b/src/main/resources/assets/overdrive_that_matters/textures/item/plasma_rifle.png index 3d174cbdf72c7e738afaaeb9622cc2e5fc74c89e..627ebaaca3b7bf86cc14d7cf2d95fcccb378ca0f 100644 GIT binary patch delta 238 zcmVuF%E)25CzZ$xxg3;>Bxu& zFiS$KxEHX11DLSACOEY=QrmG`XLfNVG?xDI<MI78{uF%E)25Czah_X1;V?8t}* zFiV1VihBVIIDiS;Yl2g2Befm3b!Nd8X)OKa%b%Z&ia5A5$WgYa+z{*-q;c|~v_)4q zn~Q1=!@*E3Ev|8tP8hCq2@Mrb1Ne;&ntK3$Qnyb5zm)jV?q&pWRTO3EoU33aKx8r^ zN->UL@(tSduxUn(Z7X1Rpb?m;)Qi}jX n2o1!rApz(C`}~G?{sM?ExIbM&spj&700000NkvXXu0mjfP%39I diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/plasmaicon.png b/src/main/resources/assets/overdrive_that_matters/textures/item/plasmaicon.png new file mode 100644 index 0000000000000000000000000000000000000000..df792c4569c2e8e6b5e7106d0e18bcdead806e7e GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|&0G|-o`uchs5C3V?rZvu5k=xWSCMKq>tt}@fXJKJ6&(w77Tpysq6bbXy zK#Hd%$S?Rm0x$^OKX(o&&RO6QSNS%G}50G|+78xQ|8XU;UvT9Mn-udS{9|NnnEIXP2PQ!z0y3k!>^tgL{5fOcJ7 zpmK4upHqMoUrCT(Fi;r+Ft{GLa{?&CS>O>_3{-Fkgc(IOyc&Rl(Vi}jAsWGnhAnQi@-n!pviYU7{ZKx-I0UHx3vIVCg! E08I8^%>V!Z literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/gravitation_stabilizer_layer_1.png b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/gravitation_stabilizer_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..035e207d033cd239b4b39d4398a4f13758f620a8 GIT binary patch literal 542 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0Z1^9%xPMbEZzP|qd4Tk>@Jhip8#l*zq$B+p3x6^ow zn+$l`x`U!-{{3HH{GIn@=ZI@7@-sHQn#8=4Kg6G9o5aFLr%MA0_VRGe zV084_JfG8EzfSQ_laKOarj=`%ihM0BGejq3H$6XI8fV|gy4T!6;{5?%8@9Xshxj=v z*d%Mria%+3%#WYFb?%{w3eD%&|D4JfkS~5h+59$(Bdg=J4l_oL>t~r(IdKNAna$4e z`@I2Y(jGxWFVze&muJVcjYMv+95uSEQ*q2*kVRH?mv>j1l;FWr<|V2JkC!(o7z=bK zJ31Ub=yV5;Ev!htoEeW^pa zgX_^m_8Q&y{RfVx2Lx_>S{d)ERyehUJ8<69w~c1~pB6M|nK9N|Uc4T>pW)9&z88}| z&S&JSFu&jG*my0Bai`j=Tc255rulxF#Oua*wbS8#h4*%a?FqK6viS$2Cj@!T?^v=a VS$2umbzmGYc)I$ztaD0e0swaP+nfLZ literal 0 HcmV?d00001