From 4ef539653ca47feb4f8daa493a7a06c6cf764748 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 31 Aug 2022 04:49:12 +0600 Subject: [PATCH] Glass panes now finally have a frame texture on their edges; Energy sword 3D model update; Tritanium armor model update; --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 2 +- .../otm/client/model/TritaniumArmorModel.java | 11 +- .../models/item/energy_sword.json | 333 +++++++++++++++++- .../models/item/energy_sword_3d.json | 205 ----------- .../models/item/energy_sword_old.json | 24 ++ .../decorative/industrial_glass_frame.png | Bin 0 -> 155 bytes .../textures/item/energy_sword.png | Bin 234 -> 360 bytes .../textures/item/energy_sword_charge.png | Bin 0 -> 2207 bytes .../item/energy_sword_charge.png.mcmeta | 1 + .../textures/models/armor/tritanium_armor.png | Bin 2792 -> 2614 bytes 10 files changed, 350 insertions(+), 226 deletions(-) delete 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/energy_sword_old.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/industrial_glass_frame.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 450db6154..7d3d82547 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -198,7 +198,7 @@ object DataGen { for ((i, glass) in MRegistry.INDUSTRIAL_GLASS_PANE.blocks.withIndex()) { val name = MRegistry.INDUSTRIAL_GLASS.blocks[i].registryName!!.path val textureSide = ResourceLocation(MOD_ID, "block/decorative/$name") - val textureRailing = textureSide + val textureRailing = ResourceLocation(MOD_ID, "block/decorative/industrial_glass_frame") pane(glass, textureSide, textureRailing) } diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java index cbcdbd1f4..49da53a19 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/model/TritaniumArmorModel.java @@ -48,11 +48,14 @@ public class TritaniumArmorModel { PartDefinition partdefinition = meshdefinition.getRoot(); PartDefinition head = partdefinition.addOrReplaceChild("head", CubeListBuilder.create().texOffs(0, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.51F)) - .texOffs(32, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F)) - .texOffs(44, 47).addBox(-4.0F, -8.6F, -5.6F, 8.0F, 2.0F, 2.0F, new CubeDeformation(0.5F)) - .texOffs(46, 52).addBox(-3.0F, -7.6F, 4.4F, 6.0F, 2.0F, 1.0F, new CubeDeformation(0.5F)), PartPose.offset(0.0F, 0.0F, 0.0F)); + .texOffs(0, 53).addBox(-4.0F, -0.3F, -5.0F, 8.0F, 0.0F, 1.0F, new CubeDeformation(0.52F)) + .texOffs(32, 0).addBox(-4.0F, -8.3F, -4.0F, 8.0F, 8.0F, 8.0F, new CubeDeformation(0.7F)) + .texOffs(46, 52).addBox(-3.0F, -7.6F, 4.4F, 6.0F, 2.0F, 1.0F, new CubeDeformation(0.5F)) + .texOffs(0, 58).addBox(-4.0F, -5.4F, -4.9F, 8.0F, 5.0F, 1.0F, new CubeDeformation(0.5F)) + .texOffs(0, 42).addBox(-5.5F, -3.7F, -4.0F, 2.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)) + .texOffs(0, 42).addBox(3.5F, -3.7F, -4.0F, 2.0F, 4.0F, 7.0F, new CubeDeformation(0.0F)), PartPose.offset(0.0F, 0.0F, 0.0F)); - PartDefinition Helmet_r1 = head.addOrReplaceChild("Helmet_r1", CubeListBuilder.create().texOffs(44, 47).addBox(-4.0F, 0.5F, 0.5F, 8.0F, 1.0F, 2.0F, new CubeDeformation(0.49F)), PartPose.offsetAndRotation(0.0F, -6.1F, -6.1F, 1.1781F, 0.0F, 0.0F)); + PartDefinition cube_r1 = head.addOrReplaceChild("cube_r1", CubeListBuilder.create().texOffs(0, 55).addBox(-4.0F, -1.2F, -0.04F, 8.0F, 2.0F, 1.0F, new CubeDeformation(0.5F)), PartPose.offsetAndRotation(0.0F, -7.0F, -4.5F, -0.3054F, 0.0F, 0.0F)); PartDefinition hat = partdefinition.addOrReplaceChild("hat", CubeListBuilder.create(), PartPose.offset(0.0F, 24.0F, 0.0F)); 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 ab0140a49..be31b8d37 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,24 +1,325 @@ { - "loader": "forge:separate-perspective", - "gui_light": "front", - "base": { - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "overdrive_that_matters:item/swordicon" - } + "textures": { + "0": "overdrive_that_matters:item/energy_sword", + "1": "overdrive_that_matters:item/energy_sword_charge" }, - "perspectives": { - "third_person_right_hand": { - "parent": "overdrive_that_matters:item/energy_sword_3d" + "elements": [ + { + "name": "handle", + "from": [7.5, 0, 10], + "to": [8.5, 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"} + } }, - "third_person_left_hand": { - "parent": "overdrive_that_matters:item/energy_sword_3d" + { + "name": "blade", + "from": [7.7, 11, 10.3], + "to": [8.2, 17, 11.2], + "faces": { + "north": {"uv": [5.5, 0, 6, 3], "texture": "#0"}, + "east": {"uv": [5.5, 0, 6, 3], "texture": "#0"}, + "south": {"uv": [5.5, 0, 6, 3], "texture": "#0"}, + "west": {"uv": [5.5, 0, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "down": {"uv": [6, 2.5, 6.5, 3], "texture": "#0"} + } }, - "first_person_right_hand": { - "parent": "overdrive_that_matters:item/energy_sword_3d" + { + "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"} + } }, - "first_person_left_hand": { - "parent": "overdrive_that_matters:item/energy_sword_3d" + { + "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.7, 5, 11], + "to": [8.3, 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.6, 7, 7.3], + "to": [8.4, 12, 11.3], + "faces": { + "north": {"uv": [0, 8.5, 0.4, 11], "texture": "#0"}, + "east": {"uv": [15.5, 8.5, 13.5, 11], "texture": "#0"}, + "south": {"uv": [2, 8.5, 2.4, 11], "texture": "#0"}, + "west": {"uv": [13.5, 8.5, 15.5, 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.6, 14, 7.3], + "to": [8.4, 29, 11.3], + "faces": { + "north": {"uv": [0, 0, 0.4, 7.5], "texture": "#0"}, + "east": {"uv": [15.5, 0, 13.5, 7.5], "texture": "#0"}, + "south": {"uv": [15.6, 0, 16, 7.5], "texture": "#0"}, + "west": {"uv": [13.5, 0, 15.5, 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.6, 12, 7.3], + "to": [8.4, 13, 10.8], + "faces": { + "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, + "east": {"uv": [15.25, 8, 13.5, 8.5], "texture": "#0"}, + "south": {"uv": [15.5, 8, 15.9, 8.5], "texture": "#0"}, + "west": {"uv": [13.5, 8, 15.25, 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.6, 13, 7.3], + "to": [8.4, 13.5, 10.8], + "faces": { + "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, + "east": {"uv": [15.25, 7.75, 13.5, 8], "texture": "#0"}, + "south": {"uv": [15.5, 7.5, 15.9, 7.75], "texture": "#0"}, + "west": {"uv": [13.5, 7.75, 15.25, 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.6, 13.5, 7.3], + "to": [8.4, 14, 11.3], + "faces": { + "north": {"uv": [0, 0, 0.4, 0.25], "texture": "#0"}, + "east": {"uv": [15.5, 7.5, 13.5, 7.75], "texture": "#0"}, + "south": {"uv": [2, 7.5, 2.4, 7.75], "texture": "#0"}, + "west": {"uv": [13.5, 7.5, 15.5, 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.3, 7, 9.8], + "to": [8.7, 10, 11.8], + "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"} + } + }, + { + "name": "frame", + "from": [9, 7.1, 6.3], + "to": [9, 8.1, 12.3], + "faces": { + "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "west": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [7, 7.1, 6.3], + "to": [7, 8.1, 12.3], + "faces": { + "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "east": {"uv": [2.5, 8.5, 5.5, 9], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "west": {"uv": [5.5, 8.5, 2.5, 9], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [7, 7.1, 12.3], + "to": [9, 8.1, 12.3], + "faces": { + "north": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "south": {"uv": [5.5, 9.5, 6.5, 10], "texture": "#0"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 0], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [7, 5.1, 6.3], + "to": [7, 7.1, 7.3], + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [9, 5.1, 6.3], + "to": [9, 7.1, 7.3], + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "east": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "west": {"uv": [5, 8.5, 5.5, 9.5], "texture": "#0"}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [7, 5.1, 6.3], + "to": [9, 8.1, 6.3], + "faces": { + "north": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, + "south": {"uv": [7, 8.5, 8.5, 10], "texture": "#0"}, + "west": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, + "up": {"uv": [2.5, 11, 3.5, 11.5], "texture": "#0"}, + "down": {"uv": [2, 11, 3, 11.5], "texture": "#0"} + } + }, + { + "name": "charge", + "from": [7.1, 7, 6.9], + "to": [8.8, 29.3, 12], + "faces": { + "north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"}, + "east": {"uv": [0, 1, 2.5, 12], "texture": "#1"}, + "south": {"uv": [6, 1, 7, 12], "texture": "#1"}, + "west": {"uv": [3.5, 1, 6, 12], "texture": "#1"}, + "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"} + } + }, + { + "name": "capacitor", + "from": [7.5, 7.4, 10.5], + "to": [8.5, 8.4, 13.5], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]}, + "faces": { + "north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"}, + "south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"}, + "west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"} + } + }, + { + "name": "capacitor", + "from": [7.5, 8.9, 11], + "to": [8.5, 9.9, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8.5, 12.5]}, + "faces": { + "north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "east": {"uv": [7.5, 0.5, 8, 2], "rotation": 270, "texture": "#0"}, + "south": {"uv": [7.5, 0, 8, 0.5], "texture": "#0"}, + "west": {"uv": [7.5, 0.5, 8, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 0.5, 8, 2], "rotation": 180, "texture": "#0"}, + "down": {"uv": [7.5, 0.5, 8, 2], "texture": "#0"} + } + } + ], + "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/energy_sword_3d.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json deleted file mode 100644 index 884aa4211..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_3d.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "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/energy_sword_old.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json new file mode 100644 index 000000000..ab0140a49 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_old.json @@ -0,0 +1,24 @@ +{ + "loader": "forge:separate-perspective", + "gui_light": "front", + "base": { + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "overdrive_that_matters:item/swordicon" + } + }, + "perspectives": { + "third_person_right_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" + }, + "third_person_left_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" + }, + "first_person_right_hand": { + "parent": "overdrive_that_matters:item/energy_sword_3d" + }, + "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/textures/block/decorative/industrial_glass_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/industrial_glass_frame.png new file mode 100644 index 0000000000000000000000000000000000000000..fd84aced07d8498f8650c8d34073bd5bcb7a2a7c GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK?6@0#}EtuSRG%+B>R}$nG43t6u2G;|3P5@;%3p^r=feH?RFr%o3 zR|8ORt*47)h=u>&$rt&W6?j}1MzK!$|NrjRh;66q+0GqFRcG;ie{w2&$+^n+nX}Xu zRi>%c1qt;Z+BApbb(P79Ra=_;wm6184Zgs}zkw} zQ;(+VY$nw}$8V0#Jx_%<^|M$s^9tHD-(y=e$N1^>)&s^KOCIi4@Klzu6)R^s{OI+e zZST)a6V+K~5v2K$W&6$39PIW^)8$QSMBi9GS$E(MgQT#~aj{>^egd7&;OXk;vd$@? F2>=}8ha><1 delta 169 zcmV;a09OC#0_p*f7zqRe0001iRA~~i5iGHhju>rNNklYH5EL>tQgML;tOBM%XaXiKF8Bom7|;b+s33rD zsE`r?0kLFbRDrZ4G!==MW~iWY}82IT@3EiR}68t4KgE@%QOE+nhK5O5(;z{Lds XSw4F``P6P+00000NkvXXu0mjf5ScmM diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png new file mode 100644 index 0000000000000000000000000000000000000000..833c0f3e13729a02f1f3268ce55af6305f4ef793 GIT binary patch literal 2207 zcmZ8jdpy%^8~<%%n2qp~b1SprajZE^!ZghBvCtwiZ(9zpLyVH+kd+d9M9yb9)+*{H zq>*AJhCC&Nr{$2+h$N@?=Y2n)=a2V~`*YpbKlgQiukZE!-gla-iyaD~i~s-tWltiW z03#XzAb>a=+zpjSUH}7xal+0T;Pk7`gNcYg!I=O64>Bb;{Y1fB;ylTd0RU3Zb{C{4 ztd<4<;y8OE!9DuS*CI%k0E@KopEb_1L7bKO1EWV4UvYg!AF3aO8#B7CdV}g&Z zSbF^@zDU6ADMHO^&KcaKu3S)GQBxNMA#zYDXy@nVR;lGHQf`ZIY%=;-k4Q4V(JSn} zQ^|4LKu!@QmqDJ-aS~*}2K+RjO2Ia%8Zdz8v1$dLX*GhnS4Td^ha7)dn(V#xG;x#U zymrHeXIK+Ki&pkj5_?X@@_EFkb%%5uF1tKeR^h{uh}@~z6HO1(LY>^>EX<-4eiv^S zJalN&?!~<4Ld>Y7oND*{uo2^Gj}(1+O5QKVFyZ zJjXDjx{LZ0y9h91ySuP;t);nGYw%uEnw_Rb$0E6Gi@I>7KaWg1K1Pkh^-P5M7Ad(2 zNWv2>#d?zi;WvjE7wA&w!cXL(%ftF7_=*^Lp6;D8ncEc0XqK}pr4nZAVTyx%!Jp&@ z@-n9#*F^Jz(W0q^{0?BN&qADrb?hbnk`*u{aLq)5x2cTEAMA2ts=FN=$Z|V;-6DYK zUcA@*tcU(w3Vh{JlfFSy%Z97#AmNwYB*1D<~FVCbShY+)vS09 zjh{=g73f-OT5Oh(RtOr)S=6EeyA=YgbxkZ3)|~VT<=tT^OjSv$$t;~rsQTz{R*|Xk zYjx98`7XDnMPvD1=si!v@scNF5236Jf@j#;F~UqFH!nlGyZKY6>QP~p(6F86%S=l8 z6b~7-kk2RiCdYBom!f_8ZAN>EIQMDB_(XPQZR1Beymk}m{`l|+RXY8Hws`+~ zf~$Rl#OM$7_qIktL|z$(7YJ{6;9ZXAUU z9Ik=c(o@3P2DPs;K*FQ;9nXne8Nc}Qh@TM^uJTP1w}GfZ%gsBo2XYMK13yRT)!Sez z$`PfNdKxKrYkO)Nmk-0KazoA8PYZ10|EX!Wa z0ApTI8LpJO6LdkP1?3$&_4S9C%g#43t0%t&@{X!cKwe)e)J7|5DkbbyJVnrm;eymp z=M6(DgF2fh0_4+oJ28@3j@Vp@hrHOX88aE(OWlQzmK$_U9UxOc=yRQA4h!V;K}cl` z)nkCmJPYEtPe2$5TjL=&q;xiDdT!3QH69gSQ^2ugjpRo1kP5dhYGg%kKx2Z{KL-&m_wWLrffSrv9SEx3*U|=^Id|*nQ$( zB#X|mK;oIkHy-D*UMxiD*<&4GsJM()^$>2$&_eA?iV`SIMPZ)|XkVLlhbJR^nc$GK zQJO*6Q)eZVbad7dmq_M`zTA|CH#5tz)>gB--LNg-!^PDMss=TwB~AL=D(V$T)QQz2 zJ|6q`?}1ilNG`h#SD+LrF}m134>qqDZ$@>h6rhWrbzd`VmR24-gcsf_O<#k2R8GO% zvUeycJo>lT#}g9)P}$#iwwY0d#SlxonI9PKFQ$j>W;e=YrpH3F=X!}HR>TJLkxD&Nf^d65ypPqwu*Hs7FMyNR)GT(XsumL6NFT04;%HY%rC7w%>ps zrxf1hz120TJ8q4wn92{*RvS?bHIdh?O_en|c*igax#=pt-k14{RuR&7jcyt9n@lRe8O z7hJy-h2Oi1K1gzXdwKT03^JttQ!ii@QEze4WW;(TKbI*p0s|@Aq<2d&R>L0Zb8#SM zt2A|(#J~Ei;F69O((M!fGc$#JqRM&jVQf_AeK_aKoUcdJi>=p3zd#TFcgI0cz+Od|iI?Kw6ZU^Ye0@#K!eSft5%6hhT}MxV Pp9;X<#)ZhSrY8Rfs|4)x literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta new file mode 100644 index 000000000..b14454b15 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/item/energy_sword_charge.png.mcmeta @@ -0,0 +1 @@ +{ "animation": { "frametime": 1 } } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png b/src/main/resources/assets/overdrive_that_matters/textures/models/armor/tritanium_armor.png index 259c90a3cbc566220805aed2f15e8137fe47ac16..e5269475e8707dc1012c9eb7638b3b03f9380766 100644 GIT binary patch delta 2477 zcmV;e2~zgx6}A+RL4PSwOjJc(Z+cH&XkKu8*x1gl$V#6-QC^U+1X)pekv*|EG#T7EiIawnw6E66%`fQ+JD*_8XAFtffpASlarHL zY100009a7bBm000iZ000iZ0XPLyBme*iCrLy> zR9HuqR||XEx*3+dSi;~KuzY-x9ZqXA+~ATCC~h1lChcj?r8()^Zrxe8vm5{aN9>g# z0g~)I&)y^o64L8W-`!-j0ink44oqfJ-m=;qYHyaeI8=k9KWcQlJ*R)~uI>qhM-ILr zhROUOj6z8_%Ui^1Nc2aAqrqU%>mK#C1g7}*nP)zyQq3gOi@R{sG#hRS2ETVky>7lG zAcVX)5JK={H47h0prs${j|#nkJLnCH9Ria)`$h%;APJp9rg0jJ%KkN zCw~ycpplySQ@yy0_|$(IrtW5f=@>uBEV(C;el!oIl&(LQ!Q9{Oyn|lZvBC!T1nKbA zA}aITJ!GBNJUQDeZ=tWChdmIFc+U+luwJFIsQOi&7luL3iDA^{!2zkw&AyEv>=0;) z;uV=(v^tmGJk4ZT=4D8VOr5^@O(J#y6Cal|4 zk@A`@uTHql_2%CIVTC1gUP!-$_+?W>b6U!*nA-KlMdy;SRh*n9dn%2`$<6}dt;@?d z^lc-HSvf1pDq5(O7NfM|`>(&F`r2Cu1k_}!W5TBFJI0FHqNtP#BIz$VT-;&v83dH$yp4N~ z?KhX)8OJfD)P7ep-pQEp0|0PRR%*wc0ss&P^1$u9JRwL{!P6WBHGx`Se&Mw#o$ zE_5(%BT`{40k`)=Edw=1k0sE$*fYtRU^!(=J=>ttAsv5}da?_Bc0V2nRJOFQu9x`7 zVf^~-alfC-IU+iOT@hVXS@z4kuXk_!U&B(v>55D#tL^LWYpxW*829m2YRO2>hv`t! zqV?zM05i1gp3r^(0{p8fOsevUh0I}DY1_(hk0?sBES2Cz-ZX?K3?lSV zq%Z>sNL_z{*C*FCwLzp@YA)xenRN;=a7_LveM^QvtqF)g?lz4zfev~xA@5(qac{0| zNKZMxy!7*?$cv&Z)n7A{Q6IvbmeJ(gz{8&lP2xcm12q7tLtTNf=EjB`HUj7(nl*3pS*~JJ z39*Q(F!ZA`f_#i!D&bqT&FRlJrSBN4IjN!i+Yf*I$S4TlQAH7jd1Pg&HJ=4O>{k}4 zRTVjV$M5PL&NH0XL0glLx1T=Vu2#37Za;kd`02wf@(NDn<=di|H8VtLRnBGERO_>k zK~{hHzQYYOD}@2t!=Yta8GOOAq)dmf=+hvslZ?mr2_tbP=VIcCHW4XQ3@ygS7u4o8r!}7X{O_D z4dKM@Vd4l53&QHC;mWDRpW%<6hNc%0SE{?Y!9vWdZuD8D5|1gl!4(PdWpep zMo}x+zFwXZY=qfv-EGD{aVjuM2_$1vDzIkiy{ zr*{OxOZKl|Wx6;FUkz1-xC?)%fqV4V!6-QzjYosgC>d;(=*AC}xCKnGu>qQVXEYjp zje9+}*BuPTFF_z+QSPB>850}H0GWQX_Z~_M>rdTLZ#=-G4|}~4hNB}i+(ZR~DdNBV z{Y;fQ?|fbPb|J%PBf-}$q#tyT;@;8AZqgfk?YX}am<3hsFiu=mTPT0bv);T#nw{Qh zU~n&~&mBVw=P*VK_`i&yF^=(`)s6p^ygYM% z)pjQ<>ok)-I%U1#{|A48uPnl-Y|6(?-4hVReo*8{_G;my%Pq>sP2CefCemTG1+EbF z(UCNdd%CB97nz3=`2R)|aExBA*{s|n%i1cYRVblbNHY_!mWII}6gm$vIhzg1v`h{ANjKT%_NW4Z+?PxA~0KI8NR2jgVM(~&*umY7! rvUH{h0w0MXOXEXL;KYfJkJakGqO+yE3Ybuv00000NkvXXu0mjfK{lak delta 2610 zcmV-23eEMl6zCO@L4V^=OjJc;bbnN1ZD4YJ;o;%j+}vGndQ4koOIl<&L`xPQex>EG#UKkB@|egqD_;l9G}Y6%}4^dsSz0-rn9}bADKAbr~5MARr(}S7Cd5 zdytTjnVFf|+S=RO+g50EPF-hpb#;@IlboEKcXxLb6co_V(9O-w7#J8IA0L2#fH5&K zEiEm6etv?2f`3MaGM@d*>JxNehW^p`7PeV^u zV|9RLc!Nq=W7pT$dU|?AQCLDwRXaycK}}RQLrPFzY1!G?hK7bJDk?-!S3pct5fKql zU}{EHUl$h_C@3h1h=>vr5;Z|cE-o%JKSp+Tb~ZvuB7Y(xBqSt-g@smSZ_Lch$jHc5 zWNt4nFC`@<%gf70R$w$VG}F`55D*a3($X_CGY=0BHa0doIyyT$J2y8sIXO8#K0e>y z-%Vm?$GCQ~&?} z|NsC0|C5OURFjYaM1KIWpn`?~000SaNLh0L01m+b01m+cxRGn^000N!NklLkR*4rrN3GGO}$+o9unEE}zKIGd4& z0*%}x7V0z!RxI1ksXLw+ONpJp`C%Uc$Gao>)!n=I-hUmrK>|0yfATv42qKvL zG&Lo`qq-bCcw*gmv%WtJu(av=W-7+pgK3k|}cUk8+D{;Z* z!I-<5sc3V#nSV0@RkxOQi*^y_N0&wY|+P zvNAIF8<-95v+6h;r`{EGOWEAIvpzMs{pH4Xt)|=7&VP-9r+oEE5h%%XiT!3-mBHHI z4>o2M*7i7CbdlWsec9+zNk-)qBEiOs}j)V>lrP?Na>91dR_U?5o zG{2uVqX#ZnTMNW2o&4C}4w)S@1(&V%b6uA!hpn(~#6R1u<_|DIV0&Y48wK${y<uw zaRdegt=*1X&yzfIG~wW;vEQO|sN2O$ZfeRw|_=yLiBS?t* zz<;E@{m?LSI9#UB*nFpuw~?^1?ta2 zvwwoIazj8$H4+bw^ybNDH{m09HI!@ie`Q?Lf89TU# zoocgLE@P*QAOVTH9zjup5ejI!0e~CqcZb~x&F;SAIB9B!W;2bkft_@ors?xunZRXM zO6|;9e#n$UMk;j@mgzn~f98w4L4Ow|dEgvpY5fhdQd4X`6!-&0_>)z%&}1ab(w9MU z`yA&42y_DxR4;B@TMNt2>@3a{8i&Sq%_h#*aPv4H(Ee+-4|9Dj{!F_;h^ z44j&AK*VjwK>MS*KpyU&^!vn`$qsF6Q! z#xXTSS6lQZUD}qS981Tx6$KI}a5ecC-C8X?<^@5e?;3}_I3pDlTd?&kOW^;3yc}Nz zWIDOSyy=)xEs7cz5243df`4r7@>Y@G6$IiC9xznE!9{KP?fsV zrB2?(g;g3jdXerYTpX0IEL-QEQ!Ska&!^ZlX!NTzTy?H7JX!%uh_5_q;c9cg>)@ju zPxM46LBbUkZuM80SL7d6#ZnBMcB%%ZQ*b2_c_hnxv?L*RW{O8ZgMX~q&08uU;tg8_ zghMWYzXZ_DK86ttdUS&{T6vn5E&_qNafoxRTx+61)0az-`EEQHSif`Ld#ymP)+px!fj_$-JGx-NA8h=R3%95 zJb16bFs$pQ(RAv$UVr~2?n5xT<$($DRRd991_%TqO(^eyx^Ov_>L1LP`!t?R=8Yiu z?TJSk;J+w3^0qr$>kqer_m9BD%c*jo=61R-g!BEluOY$PG;N|akd<6|1VO=X!&SJ5 zI3d06&(DVkuTxZ}JnYpnl{rnjuPtU~uF*of)G8RQ9^02rwX-3<)-FWE+Oz1zBYH|n!ixVlop3)y^j>|?_brlneSHo(~73C z@1Ktpn4YG~Sby=`ZLKsr9Ky#=;T#_?FrQo#K3?FRZRYk07*qoM6N<$f{L=nqW}N^