From 2a8d08c357b0f3a5ac32a71338eb5581032bff99 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Fri, 27 Jan 2023 05:15:15 +0600 Subject: [PATCH] holo-sign model is in but for some reason lights rendering is odd --- .../mc/otm/datagen/blocks/BlockStates.kt | 1 + .../mc/otm/datagen/items/ItemModels.kt | 2 + .../models/block/holo_sign.json | 191 ++++++++++++++++++ .../textures/block/holo_sign.png | Bin 0 -> 418 bytes 4 files changed, 194 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 2d821f4cd..6869638f6 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -32,6 +32,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.CHEMICAL_GENERATOR) provider.block(MBlocks.MATTER_SCANNER) provider.block(MBlocks.ITEM_MONITOR) + provider.block(MBlocks.HOLO_SIGN) provider.exec { with(provider.getMultipartBuilder(MBlocks.PHANTOM_ATTRACTOR)) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 3b8e3a921..241e68d50 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -29,6 +29,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.TRITANIUM_INGOT_BLOCK) provider.block(MItems.ITEM_MONITOR) provider.block(MItems.PHANTOM_ATTRACTOR) + provider.block(MItems.HOLO_SIGN) + MRegistry.VENT.allItems.values.forEach(provider::block) MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json new file mode 100644 index 000000000..050affd54 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/holo_sign.json @@ -0,0 +1,191 @@ +{ + "parent": "block/cube_all", + "render_type": "translucent", + "textures": { + "0": "overdrive_that_matters:block/holo_sign", + "particle": "overdrive_that_matters:block/holo_sign" + }, + "elements": [ + { + "name": "body", + "from": [0, 0, 14], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "east": {"uv": [0, 11.5, 8, 12.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 11.5, 8, 12.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 11.5, 8, 12.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 11.5, 8, 12.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [1, 1, 13], + "to": [15, 15, 14], + "faces": { + "north": {"uv": [0, 0, 7, 7], "texture": "#missing"}, + "east": {"uv": [0, 11, 7, 11.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 7, 7], "texture": "#missing"}, + "west": {"uv": [0, 11, 7, 11.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 11, 7, 11.5], "texture": "#0"}, + "down": {"uv": [0, 11, 7, 11.5], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 10], + "to": [16, 16, 13], + "faces": { + "north": {"uv": [8, 0, 16, 8], "texture": "#0"}, + "east": {"uv": [0, 9.5, 8, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 8], "texture": "#0"}, + "west": {"uv": [0, 9.5, 8, 11], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9.5], "texture": "#0"}, + "down": {"uv": [0, 8, 8, 9.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [14, 5, 9], + "to": [16, 11, 10], + "faces": { + "north": {"uv": [0.5, 12.5, 1.5, 15.5], "texture": "#0"}, + "east": {"uv": [0, 12.5, 0.5, 15.5], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 3], "texture": "#missing"}, + "west": {"uv": [1.5, 12.5, 2, 15.5], "texture": "#0"}, + "up": {"uv": [1.5, 16, 0.5, 15.5], "texture": "#0"}, + "down": {"uv": [1.5, 15.5, 0.5, 16], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 5, 9], + "to": [2, 11, 10], + "faces": { + "north": {"uv": [1.5, 12.5, 0.5, 15.5], "texture": "#0"}, + "east": {"uv": [1.5, 12.5, 2, 15.5], "texture": "#0"}, + "south": {"uv": [0, 0, 1, 3], "texture": "#missing"}, + "west": {"uv": [0, 12.5, 0.5, 15.5], "texture": "#0"}, + "up": {"uv": [0.5, 15.5, 1.5, 16], "texture": "#0"}, + "down": {"uv": [0.5, 15.5, 1.5, 16], "texture": "#0"} + } + }, + { + "name": "light", + "from": [1, 14, 10], + "to": [2, 15, 10], + "faces": { + "north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + } + }, + { + "name": "light", + "from": [1, 1, 10], + "to": [2, 2, 10], + "faces": { + "north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + } + }, + { + "name": "light", + "from": [14, 1, 10], + "to": [15, 2, 10], + "faces": { + "north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + } + }, + { + "name": "light", + "from": [14, 14, 10], + "to": [15, 15, 10], + "faces": { + "north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "emissivity": 15}, + "east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "emissivity": 15}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + } + }, + { + "name": "light", + "from": [14, 6, 9], + "to": [14, 10, 10], + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#missing"}, + "east": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "south": {"uv": [0, 0, 0, 2], "texture": "#missing"}, + "west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "emissivity": 15}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + }, + { + "name": "light", + "from": [2, 6, 9], + "to": [2, 10, 10], + "faces": { + "north": {"uv": [0, 0, 0, 2], "texture": "#missing"}, + "east": {"uv": [2, 13, 2.5, 15], "texture": "#0", "emissivity": 15}, + "south": {"uv": [0, 0, 0, 2], "texture": "#missing"}, + "west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "emissivity": 15}, + "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "rotation": [90, 0, 0], + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [2, -1.25, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "translation": [0, 0, -10], + "scale": [0.94, 0.94, 0.94] + }, + "fixed": { + "translation": [0, 0, -2.75], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png b/src/main/resources/assets/overdrive_that_matters/textures/block/holo_sign.png new file mode 100644 index 0000000000000000000000000000000000000000..1100a2d1bbb7608b6c5d8195f46b14d808dfcdd9 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCijS1AIbU6A}_aLPFHk)U>s=O-)V3#Kh|B>)YGg|3C2je*>t9AzSVDHz37b z666>B9}XD2{24z1g*gj6B8wRq_zr_GV60Za4DfZlg2E_qLM;GNzw!A8^BrO(Cafwz#vnH|cp)s@>Gmabr1ti7T@ zrQ}VEclQ;hg_9g~&*V>ElKuN^!MwW91{$+@UL{_6-gA1>hP*dc`CHe{7P}_@TCC1G zDok zQp0AC*xS~