From a885ea4d87e93fc9d321b42149de17332730d370 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 29 Jan 2024 04:15:13 +0600 Subject: [PATCH] Models and more texture updates --- .../mc/otm/datagen/blocks/BlockStates.kt | 3 ++ .../mc/otm/datagen/items/ItemModels.kt | 3 ++ ...source.json => infinite_water_source.json} | 0 .../{painting_table.json => painter.json} | 0 .../models/item/matter_cable.json | 50 ------------------ .../resource/deepslate_tritanium_ore.png | Bin 283 -> 312 bytes .../textures/block/resource/tritanium_ore.png | Bin 285 -> 303 bytes 7 files changed, 6 insertions(+), 50 deletions(-) rename src/main/resources/assets/overdrive_that_matters/models/block/{water_source.json => infinite_water_source.json} (100%) rename src/main/resources/assets/overdrive_that_matters/models/block/{painting_table.json => painter.json} (100%) delete mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json 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 68846f7b9..8cf6bd9b6 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 @@ -114,6 +114,9 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.ENERGY_SERVO.values) provider.block(MBlocks.COBBLESTONE_GENERATOR.values) + provider.block(MBlocks.PAINTER) + provider.block(MBlocks.INFINITE_WATER_SOURCE) + provider.exec { for (block in MBlocks.ESSENCE_STORAGE.values) { provider.getVariantBuilder(block).forAllStates { 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 daadb672c..349820416 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 @@ -186,6 +186,9 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.coloredWithBaseBlock(MItems.MATTER_RECYCLER, "matter_recycler", "_idle") provider.coloredWithBaseBlock(MItems.COBBLESTONE_GENERATOR, "cobblestone_generator") + provider.block(MItems.PAINTER, "painter") + provider.block(MItems.INFINITE_WATER_SOURCE, "infinite_water_source") + provider.exec { provider.withExistingParent("essence_storage", modLocation("block/essence_storage_empty")) .override() diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/water_source.json b/src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/water_source.json rename to src/main/resources/assets/overdrive_that_matters/models/block/infinite_water_source.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json b/src/main/resources/assets/overdrive_that_matters/models/block/painter.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/painting_table.json rename to src/main/resources/assets/overdrive_that_matters/models/block/painter.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json deleted file mode 100644 index 530e26553..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_cable.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "block/block", - "texture_size": [16, 16], - "textures": { - "0": "overdrive_that_matters:block/matter_cable", - "particle": "#0" - }, - "elements": [ - { - "from": [6, 6, 6], - "to": [10, 10, 10], - "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "south": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "up": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "down": {"uv": [0, 0, 4, 4], "texture": "#0"} - } - }, - { - "from": [0, 6, 6], - "to": [6, 10, 10], - "faces": { - "north": {"uv": [4, 0, 10, 4], "texture": "#0"}, - "south": {"uv": [10, 0, 4, 4], "texture": "#0"}, - "west": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "up": {"uv": [10, 0, 4, 4], "texture": "#0"}, - "down": {"uv": [10, 0, 4, 4], "texture": "#0"} - } - }, - { - "from": [10, 6, 6], - "to": [16, 10, 10], - "faces": { - "north": {"uv": [10, 0, 16, 4], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "south": {"uv": [16, 0, 10, 4], "texture": "#0"}, - "up": {"uv": [16, 0, 10, 4], "texture": "#0"}, - "down": {"uv": [16, 0, 10, 4], "texture": "#0"} - } - } - ], - "gui_light": "front", - "display": { - "gui": { - "rotation": [0, 0, 0], - "translation": [0, 0, 0], - "scale": [1, 1, 1] - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_tritanium_ore.png index 1cff8f4670747feb3f2dcc59752182040481b240..786132f8bd80ddc8e4cf2b0c6daa61388c936f73 100644 GIT binary patch delta 255 zcmV0$PflHDox99|ny5`?VQr3i zZGw-T%(8!_iTfo%4FCWD32;bRa{vGizW@LZzX3P}QzQTY0GCNbK~xyiV_;NLG8Pn4 zR$@?gF%DByGFD~~WE4toaW*k#FcO`tVaOmT#NZsZ+E_GAPzZKJEoDIlW6ec^YKvWr85o3&O_Yoj1%M186$L>hK>&`KACBG7;hg{g002ovPDHLk FV1f~(VC?_^ delta 226 zcmV<803H9h0-FMmL4O`lOjJdAd3j`HWKmI3Jv~D&FE?$1k6mwiJV;MYU1v2lH3vgX zr~m)}32;bRa{vGizW@LZzX3P}QzQTY0ES6KK~xyi4a+eOf3pSX4;ApY*;9-!2pu}!mh@y cj|cMf2Ug-6IQTjhGynhq07*qoM6N<$g3Df60{{R3 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/tritanium_ore.png index 53a1f0e06ec0c70ecaca97e0905cfb8cfce08ec1..b8ad6556b1732e6369f12f84cfc51303748b7d6d 100644 GIT binary patch delta 246 zcmVMSL{lR{)ru|?NN#nj ze;FQ2Pcdk9b;&9u;(E*R{^_A*=cDdISaF}aMhOfy$s(tKfknGGx?xr=i^FNsg7qU@ wzegT&eo6DmGGN|I(c4c_rPE)6q{V^o3%?;5HdZ`J!vFvP07*qoM6N<$f>6C?(f|Me delta 208 zcmV;>05AWq0-XYoK_?ziOjJdWkB@(Ue{^(oXlQ6$TwHB}k6mwiJV;MYU1v2lHR~Of zs*!ORe~3v$K~xyi70xjZf-o2c(2s;L^ZkUqEncA5#967q187fRDkGvv!{`K~-dJ7V z^Z