From 70fdf98d0f6872a22cf8c0010f2a236c4959c2c0 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sat, 8 Feb 2025 04:20:54 +0500 Subject: [PATCH] flywheel battery blocks textures --- .../mc/otm/datagen/blocks/BlockModels.kt | 8 ++ .../mc/otm/datagen/blocks/BlockStates.kt | 7 ++ .../mc/otm/datagen/items/ItemModels.kt | 8 ++ .../datagen/models/MatteryModelProvider.kt | 8 ++ .../models/block/matter_recycler_rework.json | 84 ++++++++++++++++++ .../textures/block/energy_input_interface.png | Bin 0 -> 471 bytes .../block/energy_output_interface.png | Bin 0 -> 471 bytes .../textures/block/flywheel_bearing.png | Bin 0 -> 454 bytes .../textures/block/flywheel_bearing_top.png | Bin 0 -> 471 bytes .../textures/block/flywheel_controller.png | Bin 0 -> 484 bytes .../textures/block/flywheel_housing.png | Bin 0 -> 469 bytes .../textures/block/flywheel_shaft.png | Bin 0 -> 431 bytes .../textures/block/flywheel_shaft_top.png | Bin 0 -> 467 bytes .../textures/block/generator_block.png | Bin 0 -> 468 bytes 14 files changed, 115 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing_top.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_controller.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_housing.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt index d26e76d66..0d56dce4b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt @@ -14,6 +14,14 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { resourceCubeAll(MBlocks.DEEPSLATE_DILITHIUM_ORE) resourceCubeAll(MBlocks.DILITHIUM_CRYSTAL_BLOCK) + cubeAll(MBlocks.FLYWHEEL_HOUSING) + column(MBlocks.FLYWHEEL_BEARING, "block/flywheel_bearing","block/flywheel_bearing_top") + column(MBlocks.FLYWHEEL_SHAFT, "block/flywheel_shaft","block/flywheel_shaft_top") + + cubeAll(MBlocks.GENERATOR_BLOCK) + cubeAll(MBlocks.ENERGY_INPUT_INTERFACE) + cubeAll(MBlocks.ENERGY_OUTPUT_INTERFACE) + cable("crude_energy_cable", "block/power_cable_0", powered = true) cable("regular_energy_cable", "block/power_cable_1", powered = true) cable("advanced_energy_cable", "block/power_cable_2", powered = true) 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 ea7f3a860..d8dc2f935 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 @@ -310,4 +310,11 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { return@forAllStates generated.toTypedArray() } } + provider.block(MBlocks.FLYWHEEL_HOUSING) + provider.block(MBlocks.FLYWHEEL_BEARING) + provider.block(MBlocks.FLYWHEEL_SHAFT) + + provider.block(MBlocks.GENERATOR_BLOCK) + provider.block(MBlocks.ENERGY_INPUT_INTERFACE) + provider.block(MBlocks.ENERGY_OUTPUT_INTERFACE) } 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 f386dcd52..1116fd053 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 @@ -228,6 +228,14 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.STORAGE_IMPORTER) provider.block(MItems.STORAGE_EXPORTER) + provider.block(MItems.FLYWHEEL_HOUSING) + provider.block(MItems.FLYWHEEL_BEARING) + provider.block(MItems.FLYWHEEL_SHAFT) + + provider.block(MItems.GENERATOR_BLOCK) + provider.block(MItems.ENERGY_INPUT_INTERFACE) + provider.block(MItems.ENERGY_OUTPUT_INTERFACE) + for (item in MItems.TRITANIUM_ANVIL) { provider.block(item) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index c587551d2..6494663c6 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -26,6 +26,14 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve return "Block Models: $modid" } + fun cubeAll(vararg blocks: Block) { + for (block in blocks) { + exec { + cubeAll(block.registryName!!.path, modLocation("block/${block.registryName!!.path}")) + } + } + } + fun decorativeGlassAll(blocks: Collection) { for (block in blocks) { exec { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json new file mode 100644 index 000000000..966ebfe8c --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_rework.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "elements": [ + { + "from": [0, 0, 1], + "to": [16, 9, 15], + "color": 5, + "faces": { + "north": {"uv": [0, 0, 8, 4.5], "texture": "#missing"}, + "east": {"uv": [0, 0, 7, 4.5], "texture": "#missing"}, + "south": {"uv": [0, 0, 8, 4.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 7, 4.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 8, 7], "texture": "#missing"}, + "down": {"uv": [0, 0, 8, 7], "texture": "#missing"} + } + }, + { + "from": [2, 3, 0], + "to": [14, 15, 16], + "color": 9, + "faces": { + "north": {"uv": [0, 0, 6, 6], "texture": "#missing"}, + "east": {"uv": [0, 0, 8, 6], "texture": "#missing"}, + "south": {"uv": [0, 0, 6, 6], "texture": "#missing"}, + "west": {"uv": [0, 0, 8, 6], "texture": "#missing"}, + "up": {"uv": [0, 0, 6, 8], "texture": "#missing"}, + "down": {"uv": [0, 0, 6, 8], "texture": "#missing"} + } + }, + { + "from": [1, 9, 12], + "to": [15, 16, 14], + "color": 1, + "faces": { + "north": {"uv": [0, 0, 7, 3.5], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 3.5], "texture": "#missing"}, + "south": {"uv": [0, 0, 7, 3.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 1, 3.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 7, 1], "texture": "#missing"} + } + }, + { + "from": [1, 9, 2], + "to": [15, 16, 4], + "color": 1, + "faces": { + "north": {"uv": [0, 0, 7, 3.5], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 3.5], "texture": "#missing"}, + "south": {"uv": [0, 0, 7, 3.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 1, 3.5], "texture": "#missing"}, + "up": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 7, 1], "texture": "#missing"} + } + }, + { + "from": [0, 14, 5], + "to": [6, 16, 11], + "color": 5, + "faces": { + "north": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "south": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 3, 1], "texture": "#missing"}, + "up": {"uv": [0, 0, 3, 3], "texture": "#missing"}, + "down": {"uv": [0, 0, 3, 3], "texture": "#missing"} + } + }, + { + "from": [1, 12, 6], + "to": [2, 14, 10], + "color": 5, + "faces": { + "north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "south": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 2, 1], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 2], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_input_interface.png new file mode 100644 index 0000000000000000000000000000000000000000..0833c7b67858fea79654115be289fcf51c626c96 GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFcYrymj$l8}&KYHF&jt*xe}CMPE+CMK4+$Tj%a%6Onk&H|6f zVg?4j{UFR}!5XXr6qG1&jVKAuPb(=;EJ|evNX*PD(erZ+Q83jr)HC|Mhj|-N&9>AC z&ooa@Ed~xChm}E!k(GfF$npYWX($`yObte6us9QtZOF(3_D2+uo!QO;7S95*L7=yc zk>LfkGTC z!nQfc@f>HKYa61u c3fq*J8N}D9Pd%B`Y6G&<)78&qol`;+04~pH3jhEB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_output_interface.png new file mode 100644 index 0000000000000000000000000000000000000000..23ee29bf12b4f46a65c98974baa650aa8fb50c5b GIT binary patch literal 471 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF9wzis@nw*@Rn3&kHE#YUX`CkB4au#?* z7BevL?FV5-3)Wy2prAyFYeY$Kep*R+Vo@qXKw@TIiJqTph=Qq}p`Ow2Jzopr07MLFXaE2J literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_bearing.png new file mode 100644 index 0000000000000000000000000000000000000000..0752f0dc117b1d11cca53381d74f7b56a05dbc9f GIT binary patch literal 454 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFnsj=rI_L zW+?+uY63e03s9wjk+A{e0*I*~8(9}XOqv2@g8&oITqdx}AWI7%3#!Y|zyKuM$$!_m zj%|-HkQwOd;us=v*|+a4Z-W7c%X+^C=^5)TJYuTa@ZYUf;^O!A=^qLia`{!XtK4tY zNX+mG3Z8L?IV;U%*^b>G554UCyCljq=Jox9=1NZ6m7NuJjH>LQ-Ev`U;>)U1XdYjX#r$Gbr~8MfMh%Q?>g79?GXkt zGdx`!LnJP{_MPNyFyLV^4@qGEA?(7u!IRNagTe9tRsnl~e-$e46Axs{Z|p5~Rd?U! zrDYOlcP3Qv+nFZ4oyVVUe#{?YWEQlhBw~%o cqhHER;sQSe&xO{mN(R~Q>FVdQ&MBb@0L-Us761SM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_controller.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_controller.png new file mode 100644 index 0000000000000000000000000000000000000000..8f803caa85f13197af3b2cb80dfb7fc6e8118fcc GIT binary patch literal 484 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFG!o%GA`fB5Cm+ zAd9oWBeIx*fp0$uGg`0)s{jQhN?apKg7ec#$`gxH83GbB^GfvmTtgI0^$hile(z!4 z22`^xHNrE^(^HFq1IS@zkYZ$IU<9(ffLI#J202!Pkr^z`1Y{dBGJ$;)1!QNovw+33 zfNT)xEn{SO0rVt{MzfRwC^dndfd#12z{uEuaRJ0skd3ShASO)#vO$0eXf6|2Wss!> zkOkFcXkY-6?c~4fT*tOY7|2Zaba4!kxSX6I5E2v=BmxXHkq|SpG9Hlx0qF1jPc+p7q(1}WMyXamW_;^hTO3(Rbn9bP0l+XkKr<7_* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_housing.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_housing.png new file mode 100644 index 0000000000000000000000000000000000000000..986c10b9795e52bc13040228faff7643372644d1 GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFr4ns@!zI%=l+@cC0&83m!!3`@OYxRqy` z=Z8(Wl2mof@>$gP9d$tsVkwnN;*xlzvaJhW6gO;{`;zsO;K4-4wp5R|tHkzuSa1C1 ck$649W{QmPE|;$}D?zqnsj=pPu3W+?+uY63e0 z3s9wjk+A{e0*I*~8(9}XOqv2@g8&oITqdx}AWI7%3#!Y|zyKuM$$!_mj%|-Hkm>B{ z;us=vIXNN3$jB@#OsK(NN&}DB436$eLLCnorW{JJXuPt5p_H@HMZ}RunWLFi>1l%j mdsZv+rjr4?B?2W*dGRr@nF|T&pVO!W8SUxn=d#Wzp$Pz=`&e`U literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png b/src/main/resources/assets/overdrive_that_matters/textures/block/flywheel_shaft_top.png new file mode 100644 index 0000000000000000000000000000000000000000..62235518a63593510cebd703a96126900c89c4c7 GIT binary patch literal 467 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFnsj z=rui@dCc3{baF2P$5*$%B~h~_G6Tfo4u XG*kSzX4J+zAS*px{an^LB{Ts5e5_=c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/generator_block.png new file mode 100644 index 0000000000000000000000000000000000000000..f3227160663a5b485b3ea52b696694f7d9d0ce56 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFIesvJDxTz#fVMvNPLR zz~WgzHVE{VF*3XW`V&T@S;_#En!wJ$0#s>WWNg5=0Aec0M%D!olcoUKAixAPmkF#g z$kGDHg6c9fFaXJR^51o?W7{JPWCnP;IEF}EPHtdub7WIfO-&X}7k6*l@TKqExyaSq zjau5)Ms0m|=2`#?b1+x13a?twMONXHFXmVZt1zXr6f`a|+hD|@DXF>Af>BqLh1t=O XVfP)2Rx6n%F_1l;u6{1-oD!M