From 35f5da41c356a4a898a4829765ab48406a564239 Mon Sep 17 00:00:00 2001 From: thepigcat Date: Mon, 9 Sep 2024 18:11:31 +0200 Subject: [PATCH] bunch of textures n stuff --- .../5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d | 4 +- .../7383b985a2cdbb3a068dc5fd3ae4ba545545c370 | 43 +++++----- .../modjam/blockstates/deep_sea_drain.json | 5 +- .../modjam/models/block/deep_sea_drain.json | 11 +-- .../models/block/deep_sea_drain_part_0.json | 1 + .../block/deep_sea_drain_part_0_open.json | 1 + .../models/block/deep_sea_drain_part_1.json | 1 + .../block/deep_sea_drain_part_1_open.json | 1 + .../models/block/deep_sea_drain_part_2.json | 1 + .../block/deep_sea_drain_part_2_open.json | 1 + .../models/block/deep_sea_drain_part_3.json | 1 + .../block/deep_sea_drain_part_3_open.json | 1 + .../models/block/deep_sea_drain_part_4.json | 1 + .../block/deep_sea_drain_part_4_open.json | 1 + .../models/block/deep_sea_drain_part_5.json | 1 + .../block/deep_sea_drain_part_5_open.json | 1 + .../models/block/deep_sea_drain_part_6.json | 1 + .../block/deep_sea_drain_part_6_open.json | 1 + .../models/block/deep_sea_drain_part_7.json | 1 + .../block/deep_sea_drain_part_7_open.json | 1 + .../models/block/deep_sea_drain_part_8.json | 1 + .../block/deep_sea_drain_part_8_open.json | 1 + .../modjam/datagen/BlockModelProvider.java | 28 +++++-- .../modjam/datagen/ItemModelProvider.java | 3 + .../modjam/registries/MJAugments.java | 2 +- .../modjam/registries/MJBlocks.java | 7 +- .../modjam/registries/MJItems.java | 9 +++ .../modjam/models/item/ancient_valve.json | 76 ++++++++++++++++++ .../block/multiblock/drain/bottom_0.png | Bin 0 -> 326 bytes .../block/multiblock/drain/bottom_1.png | Bin 0 -> 321 bytes .../block/multiblock/drain/bottom_2.png | Bin 0 -> 282 bytes .../block/multiblock/drain/bottom_3.png | Bin 0 -> 316 bytes .../block/multiblock/drain/bottom_4.png | Bin 0 -> 364 bytes .../block/multiblock/drain/bottom_5.png | Bin 0 -> 242 bytes .../block/multiblock/drain/bottom_6.png | Bin 0 -> 319 bytes .../block/multiblock/drain/bottom_7.png | Bin 0 -> 289 bytes .../block/multiblock/drain/bottom_8.png | Bin 0 -> 286 bytes .../drain/drain_bottom_unformed.png | Bin 0 -> 383 bytes .../multiblock/drain/drain_side_unformed.png | Bin 0 -> 468 bytes .../multiblock/drain/drain_top_unformed.png | Bin 0 -> 356 bytes 40 files changed, 167 insertions(+), 39 deletions(-) create mode 100644 src/main/resources/assets/modjam/models/item/ancient_valve.json create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_0.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_1.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_2.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_3.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_4.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_5.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_6.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_7.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_8.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_bottom_unformed.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_side_unformed.png create mode 100644 src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_top_unformed.png diff --git a/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d b/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d index 14e6c5c5..fc8242a4 100644 --- a/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d +++ b/src/generated/resources/.cache/5db5b310cf1abc4c7f33d2d565e2a2290a7f6c4d @@ -1,4 +1,4 @@ -// 1.21.1 2024-09-09T14:03:58.044427722 Item Models: modjam +// 1.21.1 2024-09-09T17:27:09.269854152 Item Models: modjam 51765874ad3111adf69684269ad9a422bfbaac4a assets/modjam/models/item/aquarine_steel_block.json e674d6859446f65b4ee805ed6e9f47d6cde82515 assets/modjam/models/item/aquarine_steel_ingot.json 098a336dd0b210f2b650174de2346a665b921edd assets/modjam/models/item/aquarine_steel_wrench.json @@ -11,5 +11,7 @@ a6585e714ae7922fe5d8319e566b7acc247e2cd1 assets/modjam/models/item/crowbar.json 4d48047a9639345841262719f87f57c3494e4a55 assets/modjam/models/item/deep_sea_drain.json 945ba48b672ffdee7c76e0939012a2b60ce471a6 assets/modjam/models/item/eas_bucket.json 5b6b9e8621c065cb4167e4b6dfdfaecb0fd7186d assets/modjam/models/item/eas_vial.json +054c0dfda629903fcf6880f0db40241af562a1a8 assets/modjam/models/item/gear.json f0f9891cd57b3a66f7440a71b925348bb8ea745b assets/modjam/models/item/glass_vial.json dab337d602d93b0a4930b69e652b1155300c6502 assets/modjam/models/item/prism_monocle.json +3a80dac2ed65f9c211115988d17e81af34d02e3d assets/modjam/models/item/rusty_gear.json diff --git a/src/generated/resources/.cache/7383b985a2cdbb3a068dc5fd3ae4ba545545c370 b/src/generated/resources/.cache/7383b985a2cdbb3a068dc5fd3ae4ba545545c370 index 6badb7ff..f50f6cb1 100644 --- a/src/generated/resources/.cache/7383b985a2cdbb3a068dc5fd3ae4ba545545c370 +++ b/src/generated/resources/.cache/7383b985a2cdbb3a068dc5fd3ae4ba545545c370 @@ -1,10 +1,10 @@ -// 1.21.1 2024-09-09T14:03:58.046449552 Block States: modjam +// 1.21.1 2024-09-09T16:28:40.662678864 Block States: modjam af3ef9c17c60ced537516e8aa1215fcb76e3683e assets/modjam/blockstates/aquarine_steel_block.json 865a45a4d022b56bc54dc32dae4b666af2df7d6f assets/modjam/blockstates/aquatic_catalyst.json 6e42254717fc67a953282f50517eb06c02193129 assets/modjam/blockstates/chiseled_dark_prismarine.json 3f474de85f7cf428f3ecd383cde71be56c940ecd assets/modjam/blockstates/crate.json 791da2d01b6b33bb1ce175d5c9c1fa5b737c9dfc assets/modjam/blockstates/dark_prismarine_pillar.json -81a19158e82814c2a6cabea6ace048a6662cd753 assets/modjam/blockstates/deep_sea_drain.json +ff480f6623e46679671977b783f08e28c536578d assets/modjam/blockstates/deep_sea_drain.json 74a08c3614f8cf6dace6f155476015776d839ce1 assets/modjam/blockstates/deep_sea_drain_part.json 5ca1917566d04d2f7fefbfa648958c06d3238f67 assets/modjam/models/block/aquarine_steel_block.json 4d2484ce030aeac9f86e39b1dffd193afb69271f assets/modjam/models/block/aquatic_catalyst.json @@ -17,24 +17,25 @@ af3ef9c17c60ced537516e8aa1215fcb76e3683e assets/modjam/blockstates/aquarine_stee d195e7fac58d30252394633078e3b283847c384d assets/modjam/models/block/chiseled_dark_prismarine.json b6b3bf2f98df9f895638d69f1cf04dba1857ee0f assets/modjam/models/block/dark_prismarine_pillar.json ab7fa2e5661f50dd875326f2a48bea18e8e8563b assets/modjam/models/block/dark_prismarine_pillar_horizontal.json -229a84489c5c75185f23047daa02bb2e88bb629c assets/modjam/models/block/deep_sea_drain.json -fa5bdbfc78d2fc92af71c3dc60be4fac60dd7e6a assets/modjam/models/block/deep_sea_drain_part_0.json -fa5bdbfc78d2fc92af71c3dc60be4fac60dd7e6a assets/modjam/models/block/deep_sea_drain_part_0_open.json -67b322ac6de88740ee5e4dfb3fdf8cca66db5f1b assets/modjam/models/block/deep_sea_drain_part_1.json -723d1070567117b01740b5fef825ead83ae71e1a assets/modjam/models/block/deep_sea_drain_part_1_open.json -14a2615ae2c61bfa812929502f17038309ec6aec assets/modjam/models/block/deep_sea_drain_part_2.json -14a2615ae2c61bfa812929502f17038309ec6aec assets/modjam/models/block/deep_sea_drain_part_2_open.json -51af7b5f4afa576c001798043ccff9125930420d assets/modjam/models/block/deep_sea_drain_part_3.json -62f934bbb84fcde12d170bdc8c26862dc3443923 assets/modjam/models/block/deep_sea_drain_part_3_open.json -229a84489c5c75185f23047daa02bb2e88bb629c assets/modjam/models/block/deep_sea_drain_part_4.json -229a84489c5c75185f23047daa02bb2e88bb629c assets/modjam/models/block/deep_sea_drain_part_4_open.json -01f2a0382651e3606db21359a5b448d3d6e339f6 assets/modjam/models/block/deep_sea_drain_part_5.json -016323403a6c062beba13dfdc7a8384682aa12a4 assets/modjam/models/block/deep_sea_drain_part_5_open.json -e62c525fbab24ea430735bd81bf71581eceed9c9 assets/modjam/models/block/deep_sea_drain_part_6.json -e62c525fbab24ea430735bd81bf71581eceed9c9 assets/modjam/models/block/deep_sea_drain_part_6_open.json -c6666b1b7a9b97708afc337463d65c098bcd0c38 assets/modjam/models/block/deep_sea_drain_part_7.json -8149cf16f075d4a3e9ccb4f224376ed7011e3db9 assets/modjam/models/block/deep_sea_drain_part_7_open.json -c726d4f7c530beadc3bb9035ea46017faba9f4f2 assets/modjam/models/block/deep_sea_drain_part_8.json -c726d4f7c530beadc3bb9035ea46017faba9f4f2 assets/modjam/models/block/deep_sea_drain_part_8_open.json +288e0dd8275caa16b1debf82fb87d5b6b9c2175e assets/modjam/models/block/deep_sea_drain.json +32cb4d59ede1d49cf7a318d433dd0ee72eeffb05 assets/modjam/models/block/deep_sea_drain_formed.json +e4fd8bf4276d4c0da47e06644ea61cc0c9d1bdca assets/modjam/models/block/deep_sea_drain_part_0.json +e4fd8bf4276d4c0da47e06644ea61cc0c9d1bdca assets/modjam/models/block/deep_sea_drain_part_0_open.json +883fda918f9898a3f20c6cd55405311fc67a62a8 assets/modjam/models/block/deep_sea_drain_part_1.json +51e24c02d98ac1e9928c89c2eab8c979a0934f05 assets/modjam/models/block/deep_sea_drain_part_1_open.json +1d2ce3ebd7f662200dcc74b1d4c3b64748384192 assets/modjam/models/block/deep_sea_drain_part_2.json +1d2ce3ebd7f662200dcc74b1d4c3b64748384192 assets/modjam/models/block/deep_sea_drain_part_2_open.json +44082e5455cd6bbfe8ae9418b5c44613e77c5fc6 assets/modjam/models/block/deep_sea_drain_part_3.json +38c8ce2be3ed63128be928a5dd83e4fcd08cb4e8 assets/modjam/models/block/deep_sea_drain_part_3_open.json +aa489c5924d0650a9fa4d356733607ede7ccc5f2 assets/modjam/models/block/deep_sea_drain_part_4.json +aa489c5924d0650a9fa4d356733607ede7ccc5f2 assets/modjam/models/block/deep_sea_drain_part_4_open.json +c03d789c3ef0909ff022ddeb32bf0c63c81ca393 assets/modjam/models/block/deep_sea_drain_part_5.json +d42eaa1900eba7c984d8db8ffc31720dfd177ebb assets/modjam/models/block/deep_sea_drain_part_5_open.json +c8637f48439a1ac02569133cefb5384679d960d1 assets/modjam/models/block/deep_sea_drain_part_6.json +c8637f48439a1ac02569133cefb5384679d960d1 assets/modjam/models/block/deep_sea_drain_part_6_open.json +dc03f74fefb762e78ba124ce40cb95e0458605cf assets/modjam/models/block/deep_sea_drain_part_7.json +8f50b14d4cba9562f637420552572abc77a2de39 assets/modjam/models/block/deep_sea_drain_part_7_open.json +0b1a1d1db1b9b846cafcbb80457f2580666e32c4 assets/modjam/models/block/deep_sea_drain_part_8.json +0b1a1d1db1b9b846cafcbb80457f2580666e32c4 assets/modjam/models/block/deep_sea_drain_part_8_open.json 944f8a549bbc7f13a4b7022e63d680f6d533d68b assets/modjam/models/block/rusty_crate.json e9266445328047f5d61b4e0d111da3842d005fa8 assets/modjam/models/block/rusty_crate_open.json diff --git a/src/generated/resources/assets/modjam/blockstates/deep_sea_drain.json b/src/generated/resources/assets/modjam/blockstates/deep_sea_drain.json index 8099d2a3..d4ec821a 100644 --- a/src/generated/resources/assets/modjam/blockstates/deep_sea_drain.json +++ b/src/generated/resources/assets/modjam/blockstates/deep_sea_drain.json @@ -1,7 +1,10 @@ { "variants": { - "": { + "formed=false": { "model": "modjam:block/deep_sea_drain" + }, + "formed=true": { + "model": "modjam:block/deep_sea_drain_formed" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain.json index 223a84ac..8f0d8359 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain.json @@ -1,10 +1,11 @@ { "parent": "minecraft:block/cube", "textures": { - "east": "modjam:block/multiblock/drain/side_1", - "north": "modjam:block/multiblock/drain/side_1", - "south": "modjam:block/multiblock/drain/side_1", - "up": "modjam:block/multiblock/drain/top_4", - "west": "modjam:block/multiblock/drain/side_1" + "down": "modjam:block/multiblock/drain/drain_bottom_unformed", + "east": "modjam:block/multiblock/drain/drain_side_unformed", + "north": "modjam:block/multiblock/drain/drain_side_unformed", + "south": "modjam:block/multiblock/drain/drain_side_unformed", + "up": "modjam:block/multiblock/drain/drain_top_unformed", + "west": "modjam:block/multiblock/drain/drain_side_unformed" } } \ No newline at end of file diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0.json index d901f547..48259787 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_0", "east": "modjam:block/multiblock/drain/side_0", "north": "modjam:block/multiblock/drain/side_2", "south": "modjam:block/multiblock/drain/side_2", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0_open.json index d901f547..48259787 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_0_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_0", "east": "modjam:block/multiblock/drain/side_0", "north": "modjam:block/multiblock/drain/side_2", "south": "modjam:block/multiblock/drain/side_2", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1.json index 68fe4b31..4e850b66 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_1", "east": "modjam:block/multiblock/drain/side_1", "north": "modjam:block/multiblock/drain/side_1", "south": "modjam:block/multiblock/drain/side_1", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1_open.json index 66276b46..f230cc0f 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_1_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_1", "east": "modjam:block/multiblock/drain/side_1_open", "north": "modjam:block/multiblock/drain/side_1_open", "south": "modjam:block/multiblock/drain/side_1_open", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2.json index b2e84eb7..6970da0c 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_2", "east": "modjam:block/multiblock/drain/side_2", "north": "modjam:block/multiblock/drain/side_0", "south": "modjam:block/multiblock/drain/side_0", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2_open.json index b2e84eb7..6970da0c 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_2_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_2", "east": "modjam:block/multiblock/drain/side_2", "north": "modjam:block/multiblock/drain/side_0", "south": "modjam:block/multiblock/drain/side_0", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3.json index 7b8677d1..0caacc0b 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_3", "east": "modjam:block/multiblock/drain/side_1", "north": "modjam:block/multiblock/drain/side_1", "south": "modjam:block/multiblock/drain/side_1", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3_open.json index ce5b23e2..4b277c94 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_3_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_3", "east": "modjam:block/multiblock/drain/side_1_open", "north": "modjam:block/multiblock/drain/side_1_open", "south": "modjam:block/multiblock/drain/side_1_open", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4.json index 223a84ac..fcb5d210 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_4", "east": "modjam:block/multiblock/drain/side_1", "north": "modjam:block/multiblock/drain/side_1", "south": "modjam:block/multiblock/drain/side_1", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4_open.json index 223a84ac..fcb5d210 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_4_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_4", "east": "modjam:block/multiblock/drain/side_1", "north": "modjam:block/multiblock/drain/side_1", "south": "modjam:block/multiblock/drain/side_1", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5.json index 2508ec93..fd5bd95f 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_5", "east": "modjam:block/multiblock/drain/side_1", "north": "modjam:block/multiblock/drain/side_1", "south": "modjam:block/multiblock/drain/side_1", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5_open.json index 2fa17b96..748d0cbc 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_5_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_5", "east": "modjam:block/multiblock/drain/side_1_open", "north": "modjam:block/multiblock/drain/side_1_open", "south": "modjam:block/multiblock/drain/side_1_open", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6.json index 2c1f6f3e..23601f06 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_6", "east": "modjam:block/multiblock/drain/side_2", "north": "modjam:block/multiblock/drain/side_0", "south": "modjam:block/multiblock/drain/side_0", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6_open.json index 2c1f6f3e..23601f06 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_6_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_6", "east": "modjam:block/multiblock/drain/side_2", "north": "modjam:block/multiblock/drain/side_0", "south": "modjam:block/multiblock/drain/side_0", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7.json index 25f1d1a6..042d5538 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_7", "east": "modjam:block/multiblock/drain/side_1", "north": "modjam:block/multiblock/drain/side_1", "south": "modjam:block/multiblock/drain/side_1", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7_open.json index 53ec91ca..2cfc8d87 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_7_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_7", "east": "modjam:block/multiblock/drain/side_1_open", "north": "modjam:block/multiblock/drain/side_1_open", "south": "modjam:block/multiblock/drain/side_1_open", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8.json index a4d5767a..fd8cb18f 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_8", "east": "modjam:block/multiblock/drain/side_0", "north": "modjam:block/multiblock/drain/side_2", "south": "modjam:block/multiblock/drain/side_2", diff --git a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8_open.json b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8_open.json index a4d5767a..fd8cb18f 100644 --- a/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8_open.json +++ b/src/generated/resources/assets/modjam/models/block/deep_sea_drain_part_8_open.json @@ -1,6 +1,7 @@ { "parent": "minecraft:block/cube", "textures": { + "down": "modjam:block/multiblock/drain/bottom_8", "east": "modjam:block/multiblock/drain/side_0", "north": "modjam:block/multiblock/drain/side_2", "south": "modjam:block/multiblock/drain/side_2", diff --git a/src/main/java/com/portingdeadmods/modjam/datagen/BlockModelProvider.java b/src/main/java/com/portingdeadmods/modjam/datagen/BlockModelProvider.java index 8a9df3f3..64fce9c4 100644 --- a/src/main/java/com/portingdeadmods/modjam/datagen/BlockModelProvider.java +++ b/src/main/java/com/portingdeadmods/modjam/datagen/BlockModelProvider.java @@ -18,6 +18,7 @@ import net.neoforged.neoforge.client.model.generators.*; import net.neoforged.neoforge.common.data.ExistingFileHelper; import org.apache.commons.lang3.IntegerRange; +import org.jetbrains.annotations.NotNull; public class BlockModelProvider extends BlockStateProvider { public BlockModelProvider(PackOutput output, ExistingFileHelper existingFileHelper) { @@ -57,13 +58,23 @@ private ModelFile rustedCrateModel(CrateBlock block,boolean open) { private void drainController(Block drainController) { Multiblock multiblock = MJMultiblocks.DRAIN.get(); - BlockModelBuilder builder = models().withExistingParent(name(drainController), "cube"); - builder.texture("up", multiblockTexture(multiblock, "top_4")) - .texture("north", multiblockTexture(multiblock, "side_1")) - .texture("east", multiblockTexture(multiblock, "side_1")) - .texture("south", multiblockTexture(multiblock, "side_1")) - .texture("west", multiblockTexture(multiblock, "side_1")); - simpleBlock(drainController, builder); + ModelFile unformedModel = drainControllerModel(drainController, multiblock, false); + getVariantBuilder(drainController).partialState().with(DrainMultiblock.FORMED, false) + .modelForState().modelFile(unformedModel).addModel(); + ModelFile formedModel = drainControllerModel(drainController, multiblock, true); + getVariantBuilder(drainController).partialState().with(DrainMultiblock.FORMED, true) + .modelForState().modelFile(formedModel).addModel(); + } + + private @NotNull BlockModelBuilder drainControllerModel(Block drainController, Multiblock multiblock, boolean formed) { + BlockModelBuilder builder = models().withExistingParent(name(drainController) + (formed ? "_formed" : ""), "cube"); + builder.texture("up", multiblockTexture(multiblock, formed ? "top_4" : "drain_top_unformed")) + .texture("down", multiblockTexture(multiblock, formed ? "bottom_4" : "drain_bottom_unformed")) + .texture("north", multiblockTexture(multiblock, "drain_side_unformed")) + .texture("east", multiblockTexture(multiblock, "drain_side_unformed")) + .texture("south", multiblockTexture(multiblock, "drain_side_unformed")) + .texture("west", multiblockTexture(multiblock, "drain_side_unformed")); + return builder; } private void drainPart(Block drainPartBlock, IntegerRange range) { @@ -85,18 +96,21 @@ private ModelFile drainPartModel(Block drainPartBlock, int index, boolean laserP // TODO: Clean up if (index % 2 != 0) { builder.texture("up", multiblockTexture(multiblock, "top_" + index)) + .texture("down", multiblockTexture(multiblock, "bottom_" + index)) .texture("north", multiblockTexture(multiblock, "side_1" + postfix)) .texture("east", multiblockTexture(multiblock, "side_1" + postfix)) .texture("south", multiblockTexture(multiblock, "side_1" + postfix)) .texture("west", multiblockTexture(multiblock, "side_1" + postfix)); } else if (index == 0 || index == 2) { builder.texture("up", multiblockTexture(multiblock, "top_" + index)) + .texture("down", multiblockTexture(multiblock, "bottom_" + index)) .texture("north", multiblockTexture(multiblock, "side_" + (2 - index % 3))) .texture("east", multiblockTexture(multiblock, "side_" + index % 3)) .texture("south", multiblockTexture(multiblock, "side_" + (2 - index % 3))) .texture("west", multiblockTexture(multiblock, "side_" + index % 3)); } else { builder.texture("up", multiblockTexture(multiblock, "top_" + index)) + .texture("down", multiblockTexture(multiblock, "bottom_" + index)) .texture("north", multiblockTexture(multiblock, "side_" + index % 3)) .texture("east", multiblockTexture(multiblock, "side_" + (2 - index % 3))) .texture("south", multiblockTexture(multiblock, "side_" + index % 3)) diff --git a/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java b/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java index 9c60d508..dafddf02 100644 --- a/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java +++ b/src/main/java/com/portingdeadmods/modjam/datagen/ItemModelProvider.java @@ -25,6 +25,9 @@ protected void registerModels() { basicItem(MJItems.AQUARINE_STEEL_INGOT.get()); basicItem(MJItems.ATLANTIC_GOLD_INGOT.get()); + basicItem(MJItems.RUSTY_GEAR.get()); + basicItem(MJItems.GEAR.get()); + basicItem(MJItems.GLASS_VIAL.get()); basicItem(MJItems.ELECTROLYTE_ALGAE_SERUM_VIAL.get()); diff --git a/src/main/java/com/portingdeadmods/modjam/registries/MJAugments.java b/src/main/java/com/portingdeadmods/modjam/registries/MJAugments.java index 1c44a3b8..1f1a2223 100644 --- a/src/main/java/com/portingdeadmods/modjam/registries/MJAugments.java +++ b/src/main/java/com/portingdeadmods/modjam/registries/MJAugments.java @@ -13,7 +13,7 @@ public final class MJAugments { public static final DeferredRegister AUGMENTS = DeferredRegister.create(MJRegistries.AUGMENT, ModJam.MODID); - public static final Supplier DISALLOW_BREAKING = AUGMENTS.register("disallow_breaking", DisallowBreakingAugment::new); public static final Supplier GIVE_DIAMOND = AUGMENTS.register("give_diamond", GiveDiamondAugment::new); + public static final Supplier DISALLOW_BREAKING = AUGMENTS.register("disallow_breaking", DisallowBreakingAugment::new); public static final Supplier THROW_SNOWBALL = AUGMENTS.register("throw_snowball", ThrowSnowballAugment::new); } diff --git a/src/main/java/com/portingdeadmods/modjam/registries/MJBlocks.java b/src/main/java/com/portingdeadmods/modjam/registries/MJBlocks.java index 325a2656..f72887c3 100644 --- a/src/main/java/com/portingdeadmods/modjam/registries/MJBlocks.java +++ b/src/main/java/com/portingdeadmods/modjam/registries/MJBlocks.java @@ -21,6 +21,8 @@ public final class MJBlocks { public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(ModJam.MODID); + public static final DeferredBlock CRATE = registerBlockAndItem("crate", CrateBlock::new, + BlockBehaviour.Properties.ofFullCopy(Blocks.BARREL)); public static final DeferredBlock DARK_PRISMARINE_PILLAR = registerBlockAndItem("dark_prismarine_pillar", RotatedPillarBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_PRISMARINE)); public static final DeferredBlock CHISELED_DARK_PRISMARINE = registerBlockAndItem("chiseled_dark_prismarine", Block::new, @@ -29,9 +31,8 @@ public final class MJBlocks { BlockBehaviour.Properties.ofFullCopy(Blocks.IRON_BLOCK)); public static final DeferredBlock AQUATIC_CATALYST = registerBlockAndItem("aquatic_catalyst", AquaticCatalystBlock::new, BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_PRISMARINE).lightLevel(state -> state.getValue(AquaticCatalystBlock.CORE_ACTIVE) ? 12 : 0)); - public static final DeferredBlock CRATE = registerBlockAndItem("crate", CrateBlock::new, - BlockBehaviour.Properties.ofFullCopy(Blocks.BARREL)); - + public static final DeferredBlock PRISMARINE_RELAY = registerBlockAndItem("prismarine_relay", RotatedPillarBlock::new, + BlockBehaviour.Properties.ofFullCopy(Blocks.DARK_PRISMARINE)); // MULTIBLOCKS public static final DeferredBlock DRAIN = registerBlockAndItem("deep_sea_drain", DrainBlock::new, diff --git a/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java b/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java index 7032ce73..9aef7cf2 100644 --- a/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java +++ b/src/main/java/com/portingdeadmods/modjam/registries/MJItems.java @@ -27,6 +27,15 @@ public final class MJItems { public static final DeferredItem ATLANTIC_GOLD_INGOT = registerItem("atlantic_gold_ingot", Item::new, new Item.Properties()); + public static final DeferredItem RUSTY_GEAR = registerItem("rusty_gear", + Item::new, new Item.Properties()); + public static final DeferredItem GEAR = registerItem("gear", + Item::new, new Item.Properties()); + public static final DeferredItem ANCIENT_VALVE = registerItem("ancient_valve", + Item::new, new Item.Properties()); + public static final DeferredItem VALVE = registerItem("valve", + Item::new, new Item.Properties()); + public static final DeferredItem GLASS_VIAL = registerItem("glass_vial", Item::new, new Item.Properties()); public static final DeferredItem ELECTROLYTE_ALGAE_SERUM_VIAL = registerItem("eas_vial", Item::new, new Item.Properties()); diff --git a/src/main/resources/assets/modjam/models/item/ancient_valve.json b/src/main/resources/assets/modjam/models/item/ancient_valve.json new file mode 100644 index 00000000..180108cb --- /dev/null +++ b/src/main/resources/assets/modjam/models/item/ancient_valve.json @@ -0,0 +1,76 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "modjam:item/ancient_valve_handle", + "6": "modjam:item/ancient_valve_wheel", + "particle": "modjam:item/ancient_valve_wheel" + }, + "elements": [ + { + "from": [0, 2, 0], + "to": [16, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [-14, 2, -14]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#6"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#6"} + } + }, + { + "from": [6, 0, 6], + "to": [10, 2, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 0, 7]}, + "faces": { + "north": {"uv": [4, 0, 8, 2], "texture": "#1"}, + "east": {"uv": [4, 2, 8, 4], "texture": "#1"}, + "south": {"uv": [4, 4, 8, 6], "texture": "#1"}, + "west": {"uv": [4, 6, 8, 8], "texture": "#1"}, + "up": {"uv": [4, 4, 0, 0], "texture": "#1"}, + "down": {"uv": [4, 4, 0, 8], "texture": "#1"} + } + } + ], + "gui_light": "front", + "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], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "translation": [0, 2, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 0.5] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -3], + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_0.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_0.png new file mode 100644 index 0000000000000000000000000000000000000000..a287e518c86a553167ac8cdd3389705c522dff48 GIT binary patch literal 326 zcmV-M0lEH(P)%051_q$me;^bMGA_Cks_g<9&^= zjD2x2Y^FF(g@K>RndD->{hXR@AnAqo)FjBgF4CdX=QTkwuJ*EXE!sO zO#;ZwZWmSt@p;uET!<#`_d7Xp>>`p(Sy%<##eK}d>h=CO>T#~M<{V&4;|j6|$lXCQ zi@1KmLv)|cM+g&v39Fvge&_BtKq)2B+voqQ1^|bw;YYx44#2D4CJ&tCrjs?xX zfyB%=%*zA#;6TQgnJ*nz2!C(Fo=>n19Ek?`HJ^(DydfeSNF>^ncQa%p6 z)kgBzER$O6UEtfEvvAjSeGB-hp46}?5-a7LzXlk~=QDi97-Y0Pdv*siyJm(`%FyK3 z^g?L{)>?bYW`f!lQHx#dsvipvNP*TY2wI|tgrJtU#&HI@3hv42+RzC z)*1lr4nRZzU}m%L$QKbotreBKR-TO08mPq=Kzlkpl>OKQVQzou)Ca)x z`CJ;+yc@ckJ59{`^?2V(W|gHbYuuam<_unI{SA_8jIlInW$zehz>-8WTQ-sdv@_J3 zf1@lA# O0000OBbn9mZFYdjv0F9Mw- zLC)FBn^lWs)>_>Q5oxcrvhVvqHYnKlomwmJ_Zxuib^{C08#4^z)<~hu=j!z*I^Z0%qot`*{v(Vi%-*ifpk2fN~sz z2Ukq*{hvT4UX%6m)q}WZ_0!BSGjh({?{|0nIuAO__*n;eaqV-Itr%g<=lC%`pN}VM zkYb18xQoOGDZVVJrIg`EuIu_mFr}0nBr|;;w$1C+?~A3Sl=uUfv+lq6l$K)v0000< KMNUMnLSTaOxS{<3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_5.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_5.png new file mode 100644 index 0000000000000000000000000000000000000000..1a905467f163e456cff93d5b313abb7e3c5cf82f GIT binary patch literal 242 zcmVk2krh8$YcG7t%n%WX2$&hn3;+-j zJKlSTyQ9{MWm!;?q{OT9JkJNLFoA*GU!C*LGwmjUt*c!65wCp_Vnd-T{nSR>t%pioX<2(n}EARgH+q2bcwxl6eW!8a$6?{435%f skJOP3?M6-T(jq07*qoM6N<$f_8Ri761SM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_6.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_6.png new file mode 100644 index 0000000000000000000000000000000000000000..9c28c2353b869abd67500b6a749b74dbd2dd4a4d GIT binary patch literal 319 zcmV-F0l@x=P)643(o#U>tTy@D_HK~<%cvS}0ZegMf$%FjdZ R%B27R002ovPDHLkV1f%cj`#oo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_7.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_7.png new file mode 100644 index 0000000000000000000000000000000000000000..2d9588819d171f2a4dca06aa02be0a61d01da657 GIT binary patch literal 289 zcmV++0p9+JP)%N4Se;{OVZ5Vl$>2gsWN`*WV>U#%4u_kF{M|E{$n z_LhC$G3NvT5D@@i&Iuw)^FD|O<+?8X5`~%3TEiG)DS7ow`QhL=j+J0$^xhvM5YYl> z<89x_u`#O=5jItYs)CuJs;L??zd*}@9SjoHtY*pvHOLm1WDpT~<;}K-lz7M9ZrnlU z@Z~^Nm%3N7TI?@=+u!cnJLx<8QvxJBE<@wP()CB(lS)a<|$z}5S00000NkvXXu0mjfm$ZZw literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_8.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/bottom_8.png new file mode 100644 index 0000000000000000000000000000000000000000..b05f1206e8d438ec6f49062ff9bd33b79665a41d GIT binary patch literal 286 zcmV+(0pb3MP)9Q0GBDk1Y6pOJLW-)Fw8lTV4YhBkj5di?qtkXmUkGbE> zKt%VSvMdV#Kvlua003t0-l}^0V|?Ftlx^GakCfJ0S0zep#clV`^9&I|ac8Zy0~yhG z+swes5D`qCkbBO3f3v6P%t^mM09*`4AeqT11^^{fXXdYfaSk1WNYy{(;pKMD^Lzrh z_-fPx$IY~r8R5*=glCi4nFbqV`4G{!YCS~gVjs5@cNVCm?F&KG}Ww002ovPDHLkV1hjqwLJg; literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_side_unformed.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_side_unformed.png new file mode 100644 index 0000000000000000000000000000000000000000..2342b5e49cc654ae01d58027e6927906b257d00e GIT binary patch literal 468 zcmV;_0W1EAP)Px$j!8s8R5*>5lRa+RKoEsL30z>ZML<(-yh*2qjoLs4%)%FN;S2a|xj-(F%B7*k zh1i8MV43TMi_HQQz!dVXmr9xpKoIl$-aHOx>-Bn6N&%phVi*Q;%YCI(s)_MJDMek^ z0Q7y&VzHp>Iz)sJ0stZcko>YN2_ayuW!5y!c#8TzRsgJ4D>j=ARaGU#h?XNq^WLMi z#(U2^Ps9NsghX3JD9bWEc^qIq3n-UKFnfmY=_1pDo51;Nx)O;Hs+97ZDM5yB)?D#>4O99ptxudPGqpV@%5D zAoJXbjm|kj2sq~u5xn;)e>$MZ_jb-r3Ws4}zu%*j`s;s)gZ}{i#Nq(t)OzRu0000< KMNUMnLSTY)pw+to literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_top_unformed.png b/src/main/resources/assets/modjam/textures/block/multiblock/drain/drain_top_unformed.png new file mode 100644 index 0000000000000000000000000000000000000000..bd72182e9f19d1ed32970184d2bf6e7913f12d84 GIT binary patch literal 356 zcmV-q0h|7bP)Px$9!W$&R5*>5lQEKmFbqW>89ZxK5$HE94LuF_KL97l&QRi{0%u&1BC%HnGPA47 zlBKWzWh?8tZdFPFpp?RUk2L8krD9Hq=SnG>rU77@ChEFo97nX)IOhP+S_4GCEK8ho zSZm4pzF)Up|6{rLp0;fnhJow#2LNLX0L!w(L}N_!FPCqMqF|n9PFqA{4EoDN|6Ep_ z%PIkuvhtvPmmolb?;cCc2>>U6x~?N-St!r$k=})YCK8N!bvd$7Ea$QV2$!EgWISOo zj$_hkt6w%aoIyYf5myZF6_-bAy;~l6mTcku6RoxU)#iCl*gOH+A*0^!hisMr0000