diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 06dfa4fe4..f703dacbb 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -205,7 +205,7 @@ d13940ed213d7acbc6ebe3bdd21175ef89e4d613 assets/create/blockstates/encased_fluid 8bc601601858042859cd834e7fa391a8235d3d75 assets/create/blockstates/exposed_copper_tile_slab.json 8a87e42262f3f161b0e6fe10b795ff00eccf768f assets/create/blockstates/exposed_copper_tile_stairs.json fb41aa1a0828c9256b3f886fdcb55bb54252ba09 assets/create/blockstates/exposed_copper_tiles.json -65f5fa4b779af5150993b20174404ec93bfc4303 assets/create/blockstates/fluid_pipe.json +bb74442749b6bd688d45d919b541dbd66bbeb18a assets/create/blockstates/fluid_pipe.json f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json 5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json 95b0775bf4d619ca5b0a42dbdc47c6f2c15d7b3d assets/create/blockstates/flywheel.json @@ -1013,26 +1013,38 @@ e63e6e0bd97cd73953a6079ff3005b33ace5a648 assets/create/models/block/exposed_copp 67e3bfb61e3237a2cf863189411fdbf4cf898638 assets/create/models/block/exposed_copper_tile_stairs_inner.json c833caddf850cbec1f7b590b064773b8c64feeb1 assets/create/models/block/exposed_copper_tile_stairs_outer.json d23e75ad96bb2e670f88d8c7361dfbfc9a2e3b2c assets/create/models/block/exposed_copper_tiles.json -71f74388319567d4ab13c508bf3b4d59f1a19b2f assets/create/models/block/fluid_pipe/ld_x.json -bd6b0c6d773e3996d949de55873d20b0e192499d assets/create/models/block/fluid_pipe/ld_y.json -ddba92d010016a0147ceecc30a30c9c1622d3daa assets/create/models/block/fluid_pipe/ld_z.json -451b1d6934cb5dfe24b8adcc3b4a03a0d2be854c assets/create/models/block/fluid_pipe/lr_x.json -0276dc98fdac701d6dd8759325bbb9cab1fd4e9d assets/create/models/block/fluid_pipe/lr_y.json -c7b8990a135f7c85f4c746b9d65ccd12f1c91682 assets/create/models/block/fluid_pipe/lr_z.json -4613bc343fa2989234cca21d407bf23131856729 assets/create/models/block/fluid_pipe/lu_x.json -596ac821bce7ce390ff7db9a8f4e33504b657e78 assets/create/models/block/fluid_pipe/lu_y.json -693cdb2c8673161b2c12a05826ef881293db43d1 assets/create/models/block/fluid_pipe/lu_z.json -05159abc175a1fc9f4909ffa13090d0e142fa526 assets/create/models/block/fluid_pipe/none_x.json -e96e9c244b9392a0b328caa6084dc78bebca8b03 assets/create/models/block/fluid_pipe/none_y.json -85129ba2b9b8794e4e9424ad4428a5d7a5b56c41 assets/create/models/block/fluid_pipe/none_z.json -9d99fcd87fddfdf6f525e4d81cf08f1abfd3c749 assets/create/models/block/fluid_pipe/rd_x.json -4d823bc466fc21d080e2fcac3c8fdeb8f74a5f98 assets/create/models/block/fluid_pipe/rd_y.json -26d9d1c0f249a301d03497a1455335d1654f6db3 assets/create/models/block/fluid_pipe/rd_z.json -7cd3f00c05a2beb1b438c8daa415db258095bf2b assets/create/models/block/fluid_pipe/ru_x.json -c09f2f36e3df4642b48f9e331d5000c4f58047ca assets/create/models/block/fluid_pipe/ru_y.json -690c9c3dd5ad31a5f885ecaac4aa6d3a1ccbf7fe assets/create/models/block/fluid_pipe/ru_z.json -2635da812f9dec0c408fed329b3962bd14972d95 assets/create/models/block/fluid_pipe/ud_x.json -4a0d4fb1aaf05b8f388e4add0f45d2a22dde2ce6 assets/create/models/block/fluid_pipe/ud_y.json +254807760fd69eb103e89244f758525dd3dc40e3 assets/create/models/block/fluid_pipe/d_x.json +4eff30466cd0f81ea1cf7e6d99de7d24848afc20 assets/create/models/block/fluid_pipe/d_y.json +d33d12a8d8c8b7adcf0f3a3e69f4be14dfb74727 assets/create/models/block/fluid_pipe/d_z.json +c86a37ba578dd3006f87b0ede91f9643e69cbc5c assets/create/models/block/fluid_pipe/l_x.json +b904bc8ffbd8bfaee0e6ff47a990b4f8f980702a assets/create/models/block/fluid_pipe/l_y.json +e357fbe982a7585d654ab95865269eb33e5ebd9f assets/create/models/block/fluid_pipe/l_z.json +6fd71a19479cd725dd80288c8ce9d35bf90cedbe assets/create/models/block/fluid_pipe/ld_x.json +d1b75f433b702ede960d45572d484d4b5ce6c2f7 assets/create/models/block/fluid_pipe/ld_y.json +143736eb49ba163c8f457145ab3064ac12dd8ee9 assets/create/models/block/fluid_pipe/ld_z.json +026be5e1cce95985fdb86f655257514d1cb1bc45 assets/create/models/block/fluid_pipe/lr_x.json +a611ec9ef8647d31efccf916d144a652ad18740a assets/create/models/block/fluid_pipe/lr_y.json +abb8810d05128749bd7ffbbbd9d7c425886d8ef3 assets/create/models/block/fluid_pipe/lr_z.json +eefb0e3b0ed7b6d5a99ff715d4aae42db4133343 assets/create/models/block/fluid_pipe/lu_x.json +a55a9ef109c4166c767459f88bce4f5c614fe13e assets/create/models/block/fluid_pipe/lu_y.json +d933b8a9e5d166cb6b250eb8f359180872daa276 assets/create/models/block/fluid_pipe/lu_z.json +8d2a247dcb09c4bc07c2c88ceaebc45f2f29ccaf assets/create/models/block/fluid_pipe/none_x.json +817252a6729ca8dc52753de47dbfe0b30c33dfa8 assets/create/models/block/fluid_pipe/none_y.json +ddba92d010016a0147ceecc30a30c9c1622d3daa assets/create/models/block/fluid_pipe/none_z.json +968fc1c2d555592134554bd16abb0b38629a76dd assets/create/models/block/fluid_pipe/r_x.json +c8fee17269f33f5e55ff0b019e535e9506dd964b assets/create/models/block/fluid_pipe/r_y.json +f63e221319b2703083e55f4034ed2d7b7a79a5da assets/create/models/block/fluid_pipe/r_z.json +070e6bc21df3875e8aa6effa72207f7429a989a3 assets/create/models/block/fluid_pipe/rd_x.json +e7fa64a1960a20b465b6ba63a8492da3d0d4b8ab assets/create/models/block/fluid_pipe/rd_y.json +2e2552573d8248426dee656291599f91a0d62f81 assets/create/models/block/fluid_pipe/rd_z.json +9fce43e8ffcfbde0d237ce953ad04fbd26228fa6 assets/create/models/block/fluid_pipe/ru_x.json +d4f2deb2dc78b46ae1551e7b49b36bf8d71802a0 assets/create/models/block/fluid_pipe/ru_y.json +724179ab01791c502f24e310bb841f68eed5436f assets/create/models/block/fluid_pipe/ru_z.json +4a3c1229fb9ce2bd117c4d5063ef61420c8da81b assets/create/models/block/fluid_pipe/u_x.json +1b55e0296ccfff6ea59769b08d0199737a125cf6 assets/create/models/block/fluid_pipe/u_y.json +3406864795e3b59497be674d5d5356dfbfa8dec9 assets/create/models/block/fluid_pipe/u_z.json +763b489129b920c640bbf5911ed8899124ee6a82 assets/create/models/block/fluid_pipe/ud_x.json +c13d818fa02a76abc089b7bd3ae0e7e9e4d1ecbb assets/create/models/block/fluid_pipe/ud_y.json f7d3a9ff5a0d050f5822dba9ec6cb68a2e4cdecf assets/create/models/block/fluid_pipe/ud_z.json b1e94d2858c3a8807def6c5131b6f63fe586fb91 assets/create/models/block/framed_glass.json d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/framed_glass_pane_noside.json diff --git a/src/generated/resources/assets/create/blockstates/fluid_pipe.json b/src/generated/resources/assets/create/blockstates/fluid_pipe.json index e76540a4a..b781259c3 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -5,9 +5,7 @@ "down": "true" }, "apply": { - "model": "create:block/fluid_pipe/block_end", - "x": 180, - "y": 90 + "model": "create:block/fluid_pipe/connection/down" } }, { @@ -15,8 +13,7 @@ "up": "true" }, "apply": { - "model": "create:block/fluid_pipe/block_end", - "y": 90 + "model": "create:block/fluid_pipe/connection/up" } }, { @@ -24,8 +21,7 @@ "north": "true" }, "apply": { - "model": "create:block/fluid_pipe/block_end", - "x": 90 + "model": "create:block/fluid_pipe/connection/north" } }, { @@ -33,9 +29,7 @@ "south": "true" }, "apply": { - "model": "create:block/fluid_pipe/block_end", - "x": 90, - "y": 180 + "model": "create:block/fluid_pipe/connection/south" } }, { @@ -43,9 +37,7 @@ "west": "true" }, "apply": { - "model": "create:block/fluid_pipe/block_end", - "x": 90, - "y": 270 + "model": "create:block/fluid_pipe/connection/west" } }, { @@ -53,16 +45,14 @@ "east": "true" }, "apply": { - "model": "create:block/fluid_pipe/block_end", - "x": 90, - "y": 90 + "model": "create:block/fluid_pipe/connection/east" } }, { "when": { "up": "true", - "north": "true", - "south": "false", + "south": "true", + "north": "false", "down": "false" }, "apply": { @@ -72,8 +62,8 @@ { "when": { "up": "true", - "north": "false", - "south": "true", + "south": "false", + "north": "true", "down": "false" }, "apply": { @@ -83,8 +73,8 @@ { "when": { "up": "false", - "north": "true", - "south": "false", + "south": "true", + "north": "false", "down": "true" }, "apply": { @@ -94,8 +84,8 @@ { "when": { "up": "false", - "north": "false", - "south": "true", + "south": "false", + "north": "true", "down": "true" }, "apply": { @@ -105,8 +95,8 @@ { "when": { "up": "true", - "north": "false", "south": "false", + "north": "false", "down": "true" }, "apply": { @@ -116,41 +106,30 @@ { "when": { "up": "true", - "north": "false", "south": "false", + "north": "false", "down": "false" }, "apply": { - "model": "create:block/fluid_pipe/ud_x" + "model": "create:block/fluid_pipe/u_x" } }, { "when": { "up": "false", - "north": "false", "south": "false", + "north": "false", "down": "true" }, "apply": { - "model": "create:block/fluid_pipe/ud_x" + "model": "create:block/fluid_pipe/d_x" } }, { "when": { "up": "false", - "north": "true", "south": "true", - "down": "false" - }, - "apply": { - "model": "create:block/fluid_pipe/lr_x" - } - }, - { - "when": { - "up": "false", "north": "true", - "south": "false", "down": "false" }, "apply": { @@ -160,19 +139,30 @@ { "when": { "up": "false", - "north": "false", "south": "true", + "north": "false", "down": "false" }, "apply": { - "model": "create:block/fluid_pipe/lr_x" + "model": "create:block/fluid_pipe/l_x" } }, { "when": { "up": "false", - "north": "false", "south": "false", + "north": "true", + "down": "false" + }, + "apply": { + "model": "create:block/fluid_pipe/r_x" + } + }, + { + "when": { + "up": "false", + "south": "false", + "north": "false", "down": "false" }, "apply": { @@ -182,8 +172,8 @@ { "when": { "south": "true", - "west": "true", - "east": "false", + "east": "true", + "west": "false", "north": "false" }, "apply": { @@ -193,8 +183,8 @@ { "when": { "south": "true", - "west": "false", - "east": "true", + "east": "false", + "west": "true", "north": "false" }, "apply": { @@ -204,8 +194,8 @@ { "when": { "south": "false", - "west": "true", - "east": "false", + "east": "true", + "west": "false", "north": "true" }, "apply": { @@ -215,8 +205,8 @@ { "when": { "south": "false", - "west": "false", - "east": "true", + "east": "false", + "west": "true", "north": "true" }, "apply": { @@ -226,8 +216,8 @@ { "when": { "south": "true", - "west": "false", "east": "false", + "west": "false", "north": "true" }, "apply": { @@ -237,41 +227,30 @@ { "when": { "south": "true", - "west": "false", "east": "false", + "west": "false", "north": "false" }, "apply": { - "model": "create:block/fluid_pipe/ud_y" + "model": "create:block/fluid_pipe/u_y" } }, { "when": { "south": "false", - "west": "false", "east": "false", + "west": "false", "north": "true" }, "apply": { - "model": "create:block/fluid_pipe/ud_y" + "model": "create:block/fluid_pipe/d_y" } }, { "when": { "south": "false", - "west": "true", "east": "true", - "north": "false" - }, - "apply": { - "model": "create:block/fluid_pipe/lr_y" - } - }, - { - "when": { - "south": "false", "west": "true", - "east": "false", "north": "false" }, "apply": { @@ -281,19 +260,30 @@ { "when": { "south": "false", - "west": "false", "east": "true", + "west": "false", "north": "false" }, "apply": { - "model": "create:block/fluid_pipe/lr_y" + "model": "create:block/fluid_pipe/l_y" } }, { "when": { "south": "false", - "west": "false", "east": "false", + "west": "true", + "north": "false" + }, + "apply": { + "model": "create:block/fluid_pipe/r_y" + } + }, + { + "when": { + "south": "false", + "east": "false", + "west": "false", "north": "false" }, "apply": { @@ -363,7 +353,7 @@ "down": "false" }, "apply": { - "model": "create:block/fluid_pipe/ud_z" + "model": "create:block/fluid_pipe/u_z" } }, { @@ -374,7 +364,7 @@ "down": "true" }, "apply": { - "model": "create:block/fluid_pipe/ud_z" + "model": "create:block/fluid_pipe/d_z" } }, { @@ -396,7 +386,7 @@ "down": "false" }, "apply": { - "model": "create:block/fluid_pipe/lr_z" + "model": "create:block/fluid_pipe/l_z" } }, { @@ -407,7 +397,7 @@ "down": "false" }, "apply": { - "model": "create:block/fluid_pipe/lr_z" + "model": "create:block/fluid_pipe/r_z" } }, { diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/d_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/d_x.json new file mode 100644 index 000000000..3558c8253 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/d_x.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_x", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "west": { + "texture": "#0", + "uv": [ + 4.0, + 0.0, + 0.0, + 4.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/d_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/d_y.json new file mode 100644 index 000000000..1b9e2d9f3 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/d_y.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_y", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "down": { + "texture": "#0", + "uv": [ + 4.0, + 0.0, + 0.0, + 4.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 0.0, + 0.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/d_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/d_z.json new file mode 100644 index 000000000..164f39db4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/d_z.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_z", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 4.0, + 0.0, + 0.0, + 4.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/l_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/l_x.json new file mode 100644 index 000000000..5970e786e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/l_x.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_x", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "west": { + "texture": "#0", + "uv": [ + 8.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 4.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/l_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/l_y.json new file mode 100644 index 000000000..b945d3a5e --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/l_y.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_y", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "down": { + "texture": "#0", + "uv": [ + 8.0, + 0.0, + 4.0, + 4.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/l_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/l_z.json new file mode 100644 index 000000000..013502fb4 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/l_z.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_z", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 4.0, + 0.0, + 8.0, + 4.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 8.0, + 0.0, + 4.0, + 4.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ld_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ld_x.json index d3b137105..2eecf4331 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ld_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ld_x.json @@ -16,19 +16,19 @@ "west": { "texture": "#0", "uv": [ - 12.0, - 8.0, 16.0, - 12.0 + 0.0, + 12.0, + 4.0 ] }, "east": { "texture": "#0", "uv": [ - 16.0, - 8.0, 12.0, - 12.0 + 0.0, + 16.0, + 4.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ld_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ld_y.json index 93b1f2f0b..5d80c4299 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ld_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ld_y.json @@ -16,19 +16,19 @@ "down": { "texture": "#0", "uv": [ - 12.0, - 8.0, 16.0, - 12.0 + 0.0, + 12.0, + 4.0 ] }, "up": { "texture": "#0", "uv": [ - 12.0, - 12.0, 16.0, - 8.0 + 4.0, + 12.0, + 0.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ld_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ld_z.json index aa3608193..c7e3cf959 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ld_z.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ld_z.json @@ -17,18 +17,18 @@ "texture": "#0", "uv": [ 12.0, - 8.0, + 0.0, 16.0, - 12.0 + 4.0 ] }, "south": { "texture": "#0", "uv": [ 16.0, - 8.0, + 0.0, 12.0, - 12.0 + 4.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/lr_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/lr_x.json index c8506a3d2..517b5a1a7 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/lr_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/lr_x.json @@ -16,19 +16,19 @@ "west": { "texture": "#0", "uv": [ - 4.0, - 12.0, 8.0, - 16.0 + 8.0, + 4.0, + 12.0 ] }, "east": { "texture": "#0", "uv": [ - 8.0, - 12.0, 4.0, - 16.0 + 8.0, + 8.0, + 12.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/lr_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/lr_y.json index a9372c05b..f4c2c9005 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/lr_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/lr_y.json @@ -16,19 +16,19 @@ "down": { "texture": "#0", "uv": [ - 4.0, - 12.0, 8.0, - 16.0 + 8.0, + 4.0, + 12.0 ] }, "up": { "texture": "#0", "uv": [ - 4.0, - 16.0, 8.0, - 12.0 + 12.0, + 4.0, + 8.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/lr_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/lr_z.json index 19639eed6..cff1c6617 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/lr_z.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/lr_z.json @@ -17,18 +17,18 @@ "texture": "#0", "uv": [ 4.0, - 12.0, 8.0, - 16.0 + 8.0, + 12.0 ] }, "south": { "texture": "#0", "uv": [ 8.0, - 12.0, + 8.0, 4.0, - 16.0 + 12.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/lu_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/lu_x.json index c9dedbac2..255a5e69a 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/lu_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/lu_x.json @@ -16,19 +16,19 @@ "west": { "texture": "#0", "uv": [ - 8.0, + 16.0, + 4.0, 12.0, - 12.0, - 16.0 + 8.0 ] }, "east": { "texture": "#0", "uv": [ 12.0, - 12.0, - 8.0, - 16.0 + 4.0, + 16.0, + 8.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/lu_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/lu_y.json index 57973f079..aba38ba06 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/lu_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/lu_y.json @@ -16,19 +16,19 @@ "down": { "texture": "#0", "uv": [ - 8.0, + 16.0, + 4.0, 12.0, - 12.0, - 16.0 + 8.0 ] }, "up": { "texture": "#0", "uv": [ - 8.0, 16.0, + 8.0, 12.0, - 12.0 + 4.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/lu_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/lu_z.json index abd9e917f..e161f7d9e 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/lu_z.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/lu_z.json @@ -16,19 +16,19 @@ "north": { "texture": "#0", "uv": [ - 8.0, 12.0, - 12.0, - 16.0 + 4.0, + 16.0, + 8.0 ] }, "south": { "texture": "#0", "uv": [ + 16.0, + 4.0, 12.0, - 12.0, - 8.0, - 16.0 + 8.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/none_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/none_x.json index bdfe58fcc..19fc21af8 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/none_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/none_x.json @@ -16,19 +16,19 @@ "west": { "texture": "#0", "uv": [ - 12.0, - 12.0, 16.0, - 16.0 + 8.0, + 12.0, + 12.0 ] }, "east": { "texture": "#0", "uv": [ + 12.0, + 8.0, 16.0, - 12.0, - 12.0, - 16.0 + 12.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/none_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/none_y.json index 70c27d759..678f90c01 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/none_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/none_y.json @@ -16,19 +16,19 @@ "down": { "texture": "#0", "uv": [ - 12.0, - 12.0, 16.0, - 16.0 + 8.0, + 12.0, + 12.0 ] }, "up": { "texture": "#0", "uv": [ + 16.0, 12.0, - 16.0, - 16.0, - 12.0 + 12.0, + 8.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/none_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/none_z.json index 07ad60ca2..aa3608193 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/none_z.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/none_z.json @@ -17,18 +17,18 @@ "texture": "#0", "uv": [ 12.0, - 12.0, + 8.0, 16.0, - 16.0 + 12.0 ] }, "south": { "texture": "#0", "uv": [ 16.0, + 8.0, 12.0, - 12.0, - 16.0 + 12.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/r_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/r_x.json new file mode 100644 index 000000000..0a203d17b --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/r_x.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_x", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "west": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 0.0, + 8.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/r_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/r_y.json new file mode 100644 index 000000000..dc6ef7551 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/r_y.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_y", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "down": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 0.0, + 8.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 4.0, + 8.0, + 0.0, + 4.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/r_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/r_z.json new file mode 100644 index 000000000..1b9989f71 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/r_z.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_z", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 0.0, + 8.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/rd_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/rd_x.json index a4985972c..28e95bdd8 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/rd_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/rd_x.json @@ -16,19 +16,19 @@ "west": { "texture": "#0", "uv": [ - 8.0, - 8.0, 12.0, - 12.0 + 0.0, + 8.0, + 4.0 ] }, "east": { "texture": "#0", "uv": [ + 8.0, + 0.0, 12.0, - 8.0, - 8.0, - 12.0 + 4.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/rd_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/rd_y.json index 44873ab6d..49be4ff73 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/rd_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/rd_y.json @@ -16,19 +16,19 @@ "down": { "texture": "#0", "uv": [ - 8.0, - 8.0, 12.0, - 12.0 + 0.0, + 8.0, + 4.0 ] }, "up": { "texture": "#0", "uv": [ + 12.0, + 4.0, 8.0, - 12.0, - 12.0, - 8.0 + 0.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/rd_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/rd_z.json index aa1a4287f..aea5222da 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/rd_z.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/rd_z.json @@ -17,18 +17,18 @@ "texture": "#0", "uv": [ 8.0, - 8.0, + 0.0, 12.0, - 12.0 + 4.0 ] }, "south": { "texture": "#0", "uv": [ 12.0, + 0.0, 8.0, - 8.0, - 12.0 + 4.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ru_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ru_x.json index e4b999baf..70e855868 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ru_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ru_x.json @@ -16,19 +16,19 @@ "west": { "texture": "#0", "uv": [ - 0.0, 12.0, 4.0, - 16.0 + 8.0, + 8.0 ] }, "east": { "texture": "#0", "uv": [ + 8.0, 4.0, 12.0, - 0.0, - 16.0 + 8.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ru_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ru_y.json index 7e79d97ae..0643a61c2 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ru_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ru_y.json @@ -16,19 +16,19 @@ "down": { "texture": "#0", "uv": [ - 0.0, 12.0, 4.0, - 16.0 + 8.0, + 8.0 ] }, "up": { "texture": "#0", "uv": [ - 0.0, - 16.0, - 4.0, - 12.0 + 12.0, + 8.0, + 8.0, + 4.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ru_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ru_z.json index 39f86452e..4de9fbd37 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ru_z.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ru_z.json @@ -16,19 +16,19 @@ "north": { "texture": "#0", "uv": [ - 0.0, - 12.0, + 8.0, 4.0, - 16.0 + 12.0, + 8.0 ] }, "south": { "texture": "#0", "uv": [ - 4.0, 12.0, - 0.0, - 16.0 + 4.0, + 8.0, + 8.0 ] } } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/u_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/u_x.json new file mode 100644 index 000000000..670d0c4ed --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/u_x.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_x", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "west": { + "texture": "#0", + "uv": [ + 8.0, + 4.0, + 4.0, + 8.0 + ] + }, + "east": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/u_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/u_y.json new file mode 100644 index 000000000..b8974bc12 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/u_y.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_y", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "down": { + "texture": "#0", + "uv": [ + 8.0, + 4.0, + 4.0, + 8.0 + ] + }, + "up": { + "texture": "#0", + "uv": [ + 8.0, + 8.0, + 4.0, + 4.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/u_z.json b/src/generated/resources/assets/create/models/block/fluid_pipe/u_z.json new file mode 100644 index 000000000..b099c2278 --- /dev/null +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/u_z.json @@ -0,0 +1,37 @@ +{ + "parent": "create:block/fluid_pipe/core_z", + "elements": [ + { + "from": [ + 4, + 4, + 4 + ], + "to": [ + 12, + 12, + 12 + ], + "faces": { + "north": { + "texture": "#0", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "south": { + "texture": "#0", + "uv": [ + 8.0, + 4.0, + 4.0, + 8.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ud_x.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ud_x.json index 989f7e59f..45d6f7256 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ud_x.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ud_x.json @@ -16,18 +16,18 @@ "west": { "texture": "#0", "uv": [ - 0.0, - 8.0, 4.0, + 8.0, + 0.0, 12.0 ] }, "east": { "texture": "#0", "uv": [ - 4.0, - 8.0, 0.0, + 8.0, + 4.0, 12.0 ] } diff --git a/src/generated/resources/assets/create/models/block/fluid_pipe/ud_y.json b/src/generated/resources/assets/create/models/block/fluid_pipe/ud_y.json index 3fcb663f8..bffc0517e 100644 --- a/src/generated/resources/assets/create/models/block/fluid_pipe/ud_y.json +++ b/src/generated/resources/assets/create/models/block/fluid_pipe/ud_y.json @@ -16,18 +16,18 @@ "down": { "texture": "#0", "uv": [ - 0.0, - 8.0, 4.0, + 8.0, + 0.0, 12.0 ] }, "up": { "texture": "#0", "uv": [ - 0.0, - 12.0, 4.0, + 12.0, + 0.0, 8.0 ] } diff --git a/src/main/java/com/simibubi/create/AllSpriteShifts.java b/src/main/java/com/simibubi/create/AllSpriteShifts.java index b1d254ee5..c7e854ce5 100644 --- a/src/main/java/com/simibubi/create/AllSpriteShifts.java +++ b/src/main/java/com/simibubi/create/AllSpriteShifts.java @@ -51,7 +51,7 @@ public class AllSpriteShifts { CHASSIS_STICKY = omni("linear_chassis_end_sticky"); public static final CTSpriteShiftEntry BRASS_TUNNEL_TOP = vertical("brass_tunnel_top"), - FLUID_TANK = getCT(CTType.CROSS, "fluid_tank"), + FLUID_TANK = getCT(CTType.RECTANGLE, "fluid_tank"), CREATIVE_FLUID_TANK = getCT(CTType.CROSS, "creative_fluid_tank"); public static final Couple VAULT_TOP = vault("top"), VAULT_FRONT = vault("front"), diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java index 16324255d..ca218aeab 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/PipeAttachmentModel.java @@ -52,8 +52,9 @@ public class PipeAttachmentModel extends BakedModelWrapperWithData { public List getQuads(BlockState state, Direction side, Random rand, IModelData data) { List quads = super.getQuads(state, side, rand, data); if (data.hasProperty(PIPE_PROPERTY)) { - quads = new ArrayList<>(quads); - addQuads(quads, state, side, rand, data, data.getData(PIPE_PROPERTY)); + PipeModelData pipeData = data.getData(PIPE_PROPERTY); + quads = side != null && pipeData.hasRim(side) ? new ArrayList<>() : new ArrayList<>(quads); + addQuads(quads, state, side, rand, data, pipeData); } return quads; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java index 980336ef6..bbca4c39d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java @@ -20,7 +20,6 @@ import com.simibubi.create.foundation.utility.Iterate; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; -import net.minecraft.core.Direction.AxisDirection; import net.minecraft.network.protocol.game.DebugPackets; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionHand; @@ -46,9 +45,13 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.ticks.TickPriority; -public class FluidPipeBlock extends PipeBlock implements SimpleWaterloggedBlock, IWrenchableWithBracket, ITE { +public class FluidPipeBlock extends PipeBlock + implements SimpleWaterloggedBlock, IWrenchableWithBracket, ITE { + + private static final VoxelShape OCCLUSION_BOX = Block.box(4, 4, 4, 12, 12, 12); public FluidPipeBlock(Properties properties) { super(4 / 16f, properties); @@ -179,23 +182,23 @@ public class FluidPipeBlock extends PipeBlock implements SimpleWaterloggedBlock, return transport.canHaveFlowToward(neighbour, direction.getOpposite()); } - public static boolean shouldDrawRim(BlockAndTintGetter world, BlockPos pos, BlockState state, - Direction direction) { + public static boolean shouldDrawRim(BlockAndTintGetter world, BlockPos pos, BlockState state, Direction direction) { BlockPos offsetPos = pos.relative(direction); BlockState facingState = world.getBlockState(offsetPos); if (!isPipe(facingState)) return true; if (!canConnectTo(world, offsetPos, facingState, direction)) return true; - if (!isCornerOrEndPipe(world, pos, state)) - return false; - if (FluidPropagator.getStraightPipeAxis(facingState) != null) - return true; - if (!shouldDrawCasing(world, pos, state) && shouldDrawCasing(world, offsetPos, facingState)) - return true; - if (isCornerOrEndPipe(world, offsetPos, facingState)) - return direction.getAxisDirection() == AxisDirection.POSITIVE; - return true; + return false; +// if (!isCornerOrEndPipe(world, pos, state)) +// return false; +// if (FluidPropagator.getStraightPipeAxis(facingState) != null) +// return true; +// if (!shouldDrawCasing(world, pos, state) && shouldDrawCasing(world, offsetPos, facingState)) +// return true; +// if (isCornerOrEndPipe(world, offsetPos, facingState)) +// return direction.getAxisDirection() == AxisDirection.POSITIVE; +// return true; } public static boolean isOpenAt(BlockState state, Direction direction) { @@ -323,4 +326,14 @@ public class FluidPipeBlock extends PipeBlock implements SimpleWaterloggedBlock, return AllTileEntities.FLUID_PIPE.get(); } + @Override + public boolean supportsExternalFaceHiding(BlockState state) { + return false; + } + + @Override + public VoxelShape getOcclusionShape(BlockState pState, BlockGetter pLevel, BlockPos pPos) { + return OCCLUSION_BOX; + } + } diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java index 6b6a93dab..65ed570de 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java @@ -60,7 +60,7 @@ public class FluidPipeTileEntity extends SmartTileEntity implements ITransformab AttachmentTypes attachment = super.getRenderedRimAttachment(world, pos, state, direction); if (attachment == AttachmentTypes.RIM && AllBlocks.ENCASED_FLUID_PIPE.has(state)) - return AttachmentTypes.RIM; + return AttachmentTypes.NONE; BlockPos offsetPos = pos.relative(direction); if (!FluidPipeBlock.isPipe(world.getBlockState(offsetPos))) { @@ -68,7 +68,7 @@ public class FluidPipeTileEntity extends SmartTileEntity implements ITransformab TileEntityBehaviour.get(world, offsetPos, FluidTransportBehaviour.TYPE); if (pipeBehaviour != null && pipeBehaviour.canHaveFlowToward(world.getBlockState(offsetPos), direction.getOpposite())) - return AttachmentTypes.NONE; + return AttachmentTypes.RIM; } if (attachment == AttachmentTypes.RIM && !FluidPipeBlock.shouldDrawRim(world, pos, state, direction)) diff --git a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java index 56469dbaa..308ed2a28 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java @@ -47,6 +47,9 @@ public class StraightPipeTileEntity extends SmartTileEntity { Axis axis = IAxisPipe.getAxisOf(state); Axis otherAxis = IAxisPipe.getAxisOf(otherState); + if (attachment == AttachmentTypes.RIM && FluidPipeBlock.isPipe(otherState)) + return AttachmentTypes.NONE; + if (axis == otherAxis && axis != null) if (state.getBlock() == otherState.getBlock() || direction.getAxisDirection() == AxisDirection.POSITIVE) return AttachmentTypes.NONE; diff --git a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java index b9babc18c..88b5e8e52 100644 --- a/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/BlockStateGen.java @@ -390,17 +390,26 @@ public class BlockStateGen { String RD = "rd"; String LR = "lr"; String UD = "ud"; + String U = "u"; + String D = "d"; + String L = "l"; + String R = "r"; + String NONE = "none"; - List orientations = ImmutableList.of(LU, RU, LD, RD, LR, UD, NONE); + List orientations = ImmutableList.of(LU, RU, LD, RD, LR, UD, U, D, L, R, NONE); Map> uvs = ImmutableMap.>builder() - .put(LU, Pair.of(8, 12)) - .put(RU, Pair.of(0, 12)) - .put(LD, Pair.of(12, 8)) - .put(RD, Pair.of(8, 8)) - .put(LR, Pair.of(4, 12)) + .put(LU, Pair.of(12, 4)) + .put(RU, Pair.of(8, 4)) + .put(LD, Pair.of(12, 0)) + .put(RD, Pair.of(8, 0)) + .put(LR, Pair.of(4, 8)) .put(UD, Pair.of(0, 8)) - .put(NONE, Pair.of(12, 12)) + .put(U, Pair.of(4, 4)) + .put(D, Pair.of(0, 0)) + .put(L, Pair.of(4, 0)) + .put(R, Pair.of(0, 4)) + .put(NONE, Pair.of(12, 8)) .build(); Map coreTemplates = new IdentityHashMap<>(); @@ -408,7 +417,6 @@ public class BlockStateGen { for (Axis axis : Iterate.axes) coreTemplates.put(axis, p.modLoc(path + "/core_" + axis.getSerializedName())); - ModelFile end = AssetLookup.partialBaseModel(c, p, "end"); for (Axis axis : Iterate.axes) { ResourceLocation parent = coreTemplates.get(axis); @@ -429,11 +437,17 @@ public class BlockStateGen { float u = pair.getKey(); float v = pair.getValue(); if (d == Direction.UP) - builder.uvs(u, v + 4, u + 4, v); - else if (d.getAxisDirection() == AxisDirection.POSITIVE) + builder.uvs(u + 4, v + 4, u, v); + if (d == Direction.DOWN) builder.uvs(u + 4, v, u, v + 4); - else + if (d == Direction.NORTH) builder.uvs(u, v, u + 4, v + 4); + if (d == Direction.SOUTH) + builder.uvs(u + 4, v, u, v + 4); + if (d == Direction.EAST) + builder.uvs(u, v, u + 4, v + 4); + if (d == Direction.WEST) + builder.uvs(u + 4, v, u, v + 4); builder.texture("#0"); }) .end()); @@ -441,14 +455,15 @@ public class BlockStateGen { } MultiPartBlockStateBuilder builder = p.getMultipartBuilder(c.get()); - for (Direction d : Iterate.directions) + for (Direction d : Iterate.directions) { + ModelFile end = p.models() + .getExistingFile(p.modLoc(path + "/connection/" + d.getSerializedName())); builder.part() .modelFile(end) - .rotationX(d == Direction.UP ? 0 : d == Direction.DOWN ? 180 : 90) - .rotationY((int) (d.toYRot() + 180) % 360) .addModel() .condition(FluidPipeBlock.PROPERTY_BY_DIRECTION.get(d), true) .end(); + } for (Axis axis : Iterate.axes) { putPart(coreModels, builder, axis, LU, true, false, true, false); @@ -456,11 +471,11 @@ public class BlockStateGen { putPart(coreModels, builder, axis, LD, false, true, true, false); putPart(coreModels, builder, axis, RD, false, true, false, true); putPart(coreModels, builder, axis, UD, true, true, false, false); - putPart(coreModels, builder, axis, UD, true, false, false, false); - putPart(coreModels, builder, axis, UD, false, true, false, false); + putPart(coreModels, builder, axis, U, true, false, false, false); + putPart(coreModels, builder, axis, D, false, true, false, false); putPart(coreModels, builder, axis, LR, false, false, true, true); - putPart(coreModels, builder, axis, LR, false, false, true, false); - putPart(coreModels, builder, axis, LR, false, false, false, true); + putPart(coreModels, builder, axis, L, false, false, true, false); + putPart(coreModels, builder, axis, R, false, false, false, true); putPart(coreModels, builder, axis, NONE, false, false, false, false); } }; @@ -470,13 +485,24 @@ public class BlockStateGen { Axis axis, String s, boolean up, boolean down, boolean left, boolean right) { Direction positiveAxis = Direction.get(AxisDirection.POSITIVE, axis); Map propertyMap = FluidPipeBlock.PROPERTY_BY_DIRECTION; + + Direction upD = Pointing.UP.getCombinedDirection(positiveAxis); + Direction leftD = Pointing.LEFT.getCombinedDirection(positiveAxis); + Direction rightD = Pointing.RIGHT.getCombinedDirection(positiveAxis); + Direction downD = Pointing.DOWN.getCombinedDirection(positiveAxis); + + if (axis == Axis.Y || axis == Axis.X) { + leftD = leftD.getOpposite(); + rightD = rightD.getOpposite(); + } + builder.part() .modelFile(coreModels.get(Pair.of(s, axis))) .addModel() - .condition(propertyMap.get(Pointing.UP.getCombinedDirection(positiveAxis)), up) - .condition(propertyMap.get(Pointing.LEFT.getCombinedDirection(positiveAxis)), left) - .condition(propertyMap.get(Pointing.RIGHT.getCombinedDirection(positiveAxis)), right) - .condition(propertyMap.get(Pointing.DOWN.getCombinedDirection(positiveAxis)), down) + .condition(propertyMap.get(upD), up) + .condition(propertyMap.get(leftD), left) + .condition(propertyMap.get(rightD), right) + .condition(propertyMap.get(downD), down) .end(); } diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/block_end.json b/src/main/resources/assets/create/models/block/fluid_pipe/block_end.json deleted file mode 100644 index 0b922ee40..000000000 --- a/src/main/resources/assets/create/models/block/fluid_pipe/block_end.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "credit": "Made with Blockbench", - "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" - }, - "elements": [ - { - "from": [4, 12, 4], - "to": [12, 16, 12], - "faces": { - "north": {"uv": [0, 6, 4, 8], "rotation": 0, "texture": "#0"}, - "east": {"uv": [0, 6, 4, 8], "rotation": 0, "texture": "#0"}, - "south": {"uv": [0, 6, 4, 8], "rotation": 0, "texture": "#0"}, - "west": {"uv": [0, 6, 4, 8], "rotation": 0, "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/casing.json b/src/main/resources/assets/create/models/block/fluid_pipe/casing.json index dad29e032..7cec3a5d7 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/casing.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/casing.json @@ -1,20 +1,20 @@ { "credit": "Made with Blockbench", "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [2, 2, 2], - "to": [14, 14, 14], + "from": [3, 3, 3], + "to": [13, 13, 13], "faces": { - "north": {"uv": [0, 0, 6, 6], "texture": "#0"}, - "east": {"uv": [0, 0, 6, 6], "texture": "#0"}, - "south": {"uv": [0, 0, 6, 6], "texture": "#0"}, - "west": {"uv": [0, 0, 6, 6], "texture": "#0"}, - "up": {"uv": [0, 0, 6, 6], "texture": "#0"}, - "down": {"uv": [0, 0, 6, 6], "texture": "#0"} + "north": {"uv": [1, 11, 6, 16], "texture": "#0"}, + "east": {"uv": [1, 11, 6, 16], "texture": "#0"}, + "south": {"uv": [1, 11, 6, 16], "texture": "#0"}, + "west": {"uv": [1, 11, 6, 16], "texture": "#0"}, + "up": {"uv": [1, 11, 6, 16], "texture": "#0"}, + "down": {"uv": [1, 11, 6, 16], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/connection/down.json b/src/main/resources/assets/create/models/block/fluid_pipe/connection/down.json new file mode 100644 index 000000000..c2096c835 --- /dev/null +++ b/src/main/resources/assets/create/models/block/fluid_pipe/connection/down.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "create:block/pipes", + "particle": "create:block/pipes" + }, + "elements": [ + { + "from": [4, 0, 4], + "to": [12, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, -16]}, + "faces": { + "north": {"uv": [0, 6, 4, 8], "texture": "#0", "cullface": "down"}, + "east": {"uv": [0, 6, 4, 8], "texture": "#0", "cullface": "down"}, + "south": {"uv": [4, 6, 0, 8], "texture": "#0", "cullface": "down"}, + "west": {"uv": [4, 6, 0, 8], "texture": "#0", "cullface": "down"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/connection/east.json b/src/main/resources/assets/create/models/block/fluid_pipe/connection/east.json new file mode 100644 index 000000000..a423068c9 --- /dev/null +++ b/src/main/resources/assets/create/models/block/fluid_pipe/connection/east.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "create:block/pipes", + "particle": "create:block/pipes" + }, + "elements": [ + { + "from": [12, 4, 4], + "to": [16, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, -16]}, + "faces": { + "north": {"uv": [0, 6, 4, 8], "rotation": 90, "texture": "#0", "cullface": "east"}, + "south": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#0", "cullface": "east"}, + "up": {"uv": [4, 0, 0, 2], "rotation": 90, "texture": "#0", "cullface": "east"}, + "down": {"uv": [4, 6, 0, 8], "rotation": 270, "texture": "#0", "cullface": "east"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/connection/north.json b/src/main/resources/assets/create/models/block/fluid_pipe/connection/north.json new file mode 100644 index 000000000..fc419689d --- /dev/null +++ b/src/main/resources/assets/create/models/block/fluid_pipe/connection/north.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "create:block/pipes", + "particle": "create:block/pipes" + }, + "elements": [ + { + "from": [4, 4, 0], + "to": [12, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]}, + "faces": { + "east": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#0", "cullface": "north"}, + "west": {"uv": [0, 6, 4, 8], "rotation": 90, "texture": "#0", "cullface": "north"}, + "up": {"uv": [0, 6, 4, 8], "rotation": 180, "texture": "#0", "cullface": "north"}, + "down": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#0", "cullface": "north"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/connection/south.json b/src/main/resources/assets/create/models/block/fluid_pipe/connection/south.json new file mode 100644 index 000000000..47efd545a --- /dev/null +++ b/src/main/resources/assets/create/models/block/fluid_pipe/connection/south.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "create:block/pipes", + "particle": "create:block/pipes" + }, + "elements": [ + { + "from": [4, 4, 12], + "to": [12, 12, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 8, 0]}, + "faces": { + "east": {"uv": [0, 6, 4, 8], "rotation": 90, "texture": "#0", "cullface": "south"}, + "west": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#0", "cullface": "south"}, + "up": {"uv": [0, 0, 4, 2], "rotation": 180, "texture": "#0", "cullface": "south"}, + "down": {"uv": [0, 6, 4, 8], "rotation": 180, "texture": "#0", "cullface": "south"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/connection/up.json b/src/main/resources/assets/create/models/block/fluid_pipe/connection/up.json new file mode 100644 index 000000000..91b453be6 --- /dev/null +++ b/src/main/resources/assets/create/models/block/fluid_pipe/connection/up.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "create:block/pipes", + "particle": "create:block/pipes" + }, + "elements": [ + { + "from": [4, 12, 4], + "to": [12, 16, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, -16]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "texture": "#0", "cullface": "up"}, + "east": {"uv": [0, 0, 4, 2], "texture": "#0", "cullface": "up"}, + "south": {"uv": [4, 0, 0, 2], "texture": "#0", "cullface": "up"}, + "west": {"uv": [4, 0, 0, 2], "texture": "#0", "cullface": "up"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/connection/west.json b/src/main/resources/assets/create/models/block/fluid_pipe/connection/west.json new file mode 100644 index 000000000..3955a86f5 --- /dev/null +++ b/src/main/resources/assets/create/models/block/fluid_pipe/connection/west.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 32], + "textures": { + "0": "create:block/pipes", + "particle": "create:block/pipes" + }, + "elements": [ + { + "from": [0, 4, 4], + "to": [4, 12, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [16, 0, -16]}, + "faces": { + "north": {"uv": [0, 0, 4, 2], "rotation": 90, "texture": "#0", "cullface": "west"}, + "south": {"uv": [0, 6, 4, 8], "rotation": 90, "texture": "#0", "cullface": "west"}, + "up": {"uv": [4, 6, 0, 8], "rotation": 90, "texture": "#0", "cullface": "west"}, + "down": {"uv": [4, 0, 0, 2], "rotation": 270, "texture": "#0", "cullface": "west"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/core_x.json b/src/main/resources/assets/create/models/block/fluid_pipe/core_x.json index d07c8dd0f..53f7ce4d0 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/core_x.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/core_x.json @@ -1,16 +1,16 @@ { "credit": "Made with Blockbench", "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes_connected", + "particle": "create:block/pipes_connected" }, "elements": [ { "from": [4, 4, 4], "to": [12, 12, 12], "faces": { - "east": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#0"}, - "west": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#0"} + "east": {"uv": [16, 8, 12, 12], "rotation": 180, "texture": "#0"}, + "west": {"uv": [16, 8, 12, 12], "rotation": 180, "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/core_y.json b/src/main/resources/assets/create/models/block/fluid_pipe/core_y.json index 5a527d649..82d4926b2 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/core_y.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/core_y.json @@ -1,16 +1,16 @@ { "credit": "Made with Blockbench", "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes_connected", + "particle": "create:block/pipes_connected" }, "elements": [ { "from": [4, 4, 4], "to": [12, 12, 12], "faces": { - "up": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#0"}, - "down": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#0"} + "up": {"uv": [16, 8, 12, 12], "rotation": 180, "texture": "#0"}, + "down": {"uv": [16, 8, 12, 12], "rotation": 180, "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/core_z.json b/src/main/resources/assets/create/models/block/fluid_pipe/core_z.json index eecf66667..1605b2243 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/core_z.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/core_z.json @@ -1,16 +1,16 @@ { "credit": "Made with Blockbench", "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes_connected", + "particle": "create:block/pipes_connected" }, "elements": [ { "from": [4, 4, 4], "to": [12, 12, 12], "faces": { - "north": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#0"}, - "south": {"uv": [1, 1, 5, 5], "rotation": 180, "texture": "#0"} + "north": {"uv": [12, 8, 16, 12], "rotation": 180, "texture": "#0"}, + "south": {"uv": [12, 8, 16, 12], "rotation": 180, "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/drain/down.json b/src/main/resources/assets/create/models/block/fluid_pipe/drain/down.json index 5da83c4d1..c73cedaab 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/drain/down.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/drain/down.json @@ -1,41 +1,45 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/pipe_drain", - "particle": "create:block/fluid_pipe", - "1_0": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [4.5, -3.9, 4.5], - "to": [11.5, -0.9, 11.5], + "from": [4.95, -3.95, 4.95], + "to": [11.05, -0.95, 11.05], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 7, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 7, 3], "texture": "#0"}, - "south": {"uv": [0, 0, 7, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 7, 3], "texture": "#0"}, - "up": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "down": {"uv": [0, 3, 7, 10], "texture": "#0"} + "north": {"uv": [12, 8, 13.5, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [12, 8, 13.5, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [12, 8, 13.5, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [12, 8, 13.5, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [13, 8, 16, 11], "rotation": 90, "texture": "#0"} } }, { - "from": [3.1, -1.1, 3.1], - "to": [12.9, 1, 12.9], + "from": [2.95, -0.95, 2.95], + "to": [13.05, 2, 13.05], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 5, 11, 6], "rotation": 180, "texture": "#1_0"}, - "east": {"uv": [11, 6, 6, 5], "texture": "#1_0"}, - "south": {"uv": [6, 5, 11, 6], "rotation": 180, "texture": "#1_0"}, - "west": {"uv": [11, 6, 6, 5], "texture": "#1_0"}, - "up": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"}, - "down": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"} + "north": {"uv": [9, 9.5, 4, 8], "texture": "#0"}, + "east": {"uv": [4, 8, 9, 9.5], "rotation": 180, "texture": "#0"}, + "south": {"uv": [4, 8, 9, 9.5], "rotation": 180, "texture": "#0"}, + "west": {"uv": [9, 9.5, 4, 8], "texture": "#0"}, + "up": {"uv": [6, 11, 11, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11, 11, 16, 16], "rotation": 90, "texture": "#0"} } - } - ], - "groups": [0, + }, { - "name": "up", - "origin": [8, 8, 8], - "children": [1] + "from": [4, 2, 4], + "to": [12, 4, 12], + "faces": { + "north": {"uv": [0, 9, 4, 10], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 10], "texture": "#0"}, + "south": {"uv": [4, 9, 0, 10], "texture": "#0"}, + "west": {"uv": [4, 9, 0, 10], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/drain/east.json b/src/main/resources/assets/create/models/block/fluid_pipe/drain/east.json index 70b1659c3..4988f8568 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/drain/east.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/drain/east.json @@ -1,41 +1,45 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/pipe_drain", - "particle": "create:block/fluid_pipe", - "1_0": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [16.9, 4.5, 4.5], - "to": [19.9, 11.5, 11.5], + "from": [12, 4, 4], + "to": [14, 12, 12], "faces": { - "north": {"uv": [0, 0, 7, 3], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 3, 7, 10], "rotation": 180, "texture": "#0"}, - "south": {"uv": [0, 0, 7, 3], "rotation": 270, "texture": "#0"}, - "west": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "up": {"uv": [0, 0, 7, 3], "rotation": 270, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 3], "rotation": 270, "texture": "#0"} + "north": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 8, 0, 9], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 9, 0, 10], "rotation": 270, "texture": "#0"} } }, { - "from": [15, 3.1, 3.1], - "to": [17.1, 12.9, 12.9], + "from": [16.95, 4.95, 4.95], + "to": [19.95, 11.05, 11.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [11, 6, 6, 5], "rotation": 90, "texture": "#1_0"}, - "east": {"uv": [6, 0, 11, 5], "rotation": 270, "texture": "#1_0"}, - "south": {"uv": [11, 6, 6, 5], "rotation": 270, "texture": "#1_0"}, - "west": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"}, - "up": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#1_0"}, - "down": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#1_0"} + "north": {"uv": [12, 8, 13.5, 11], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 8, 16, 11], "texture": "#0"}, + "south": {"uv": [12, 8, 13.5, 11], "texture": "#0"}, + "up": {"uv": [12, 8, 13.5, 11], "texture": "#0"}, + "down": {"uv": [12, 8, 13.5, 11], "texture": "#0"} } - } - ], - "groups": [0, + }, { - "name": "up", - "origin": [8, 8, 8], - "children": [1] + "from": [14, 2.95, 2.95], + "to": [16.95, 13.05, 13.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 9.5, 4, 8], "rotation": 90, "texture": "#0"}, + "east": {"uv": [11, 11, 16, 16], "texture": "#0"}, + "south": {"uv": [4, 8, 9, 9.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 11, 11, 16], "texture": "#0"}, + "up": {"uv": [4, 8, 9, 9.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 9.5, 4, 8], "rotation": 270, "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/drain/north.json b/src/main/resources/assets/create/models/block/fluid_pipe/drain/north.json index ebf01b1b8..e976a46b3 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/drain/north.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/drain/north.json @@ -1,41 +1,46 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/pipe_drain", - "particle": "create:block/fluid_pipe", - "1_0": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [4.5, 4.5, -3.9], - "to": [11.5, 11.5, -0.9], + "from": [4, 4, 2], + "to": [12, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 3, 7, 10], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 7, 3], "rotation": 270, "texture": "#0"}, - "south": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "west": {"uv": [0, 0, 7, 3], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 7, 3], "rotation": 180, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 3], "texture": "#0"} + "east": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 9, 4, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 8, 4, 9], "rotation": 180, "texture": "#0"} } }, { - "from": [3.1, 3.1, -1.1], - "to": [12.9, 12.9, 1], + "from": [2.95, 2.95, -0.95], + "to": [13.05, 13.05, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 34, 8]}, "faces": { - "north": {"uv": [6, 0, 11, 5], "rotation": 270, "texture": "#1_0"}, - "east": {"uv": [11, 6, 6, 5], "rotation": 270, "texture": "#1_0"}, - "south": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"}, - "west": {"uv": [11, 6, 6, 5], "rotation": 90, "texture": "#1_0"}, - "up": {"uv": [6, 5, 11, 6], "texture": "#1_0"}, - "down": {"uv": [6, 5, 11, 6], "rotation": 180, "texture": "#1_0"} + "north": {"uv": [11, 11, 16, 16], "texture": "#0"}, + "east": {"uv": [4, 8, 9, 9.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 11, 11, 16], "texture": "#0"}, + "west": {"uv": [9, 9.5, 4, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 8, 9, 9.5], "texture": "#0"}, + "down": {"uv": [9, 9.5, 4, 8], "texture": "#0"} } - } - ], - "groups": [0, + }, { - "name": "up", - "origin": [8, 8, 8], - "children": [1] + "from": [4.95, 4.95, -3.95], + "to": [11.05, 11.05, -0.95], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 34, 8]}, + "faces": { + "north": {"uv": [13, 8, 16, 11], "texture": "#0"}, + "east": {"uv": [12, 8, 13.5, 11], "texture": "#0"}, + "west": {"uv": [12, 8, 13.5, 11], "rotation": 180, "texture": "#0"}, + "up": {"uv": [12, 8, 13.5, 11], "rotation": 270, "texture": "#0"}, + "down": {"uv": [12, 8, 13.5, 11], "rotation": 90, "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/drain/south.json b/src/main/resources/assets/create/models/block/fluid_pipe/drain/south.json index df3dd6fc1..9ea449b07 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/drain/south.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/drain/south.json @@ -1,41 +1,46 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/pipe_drain", - "particle": "create:block/fluid_pipe", - "1_0": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [4.5, 4.5, 16.9], - "to": [11.5, 11.5, 19.9], + "from": [4, 4, 12], + "to": [12, 12, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 7, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 3, 7, 10], "texture": "#0"}, - "west": {"uv": [0, 0, 7, 3], "rotation": 270, "texture": "#0"}, - "up": {"uv": [0, 0, 7, 3], "texture": "#0"}, - "down": {"uv": [0, 0, 7, 3], "rotation": 180, "texture": "#0"} + "east": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 4, 9], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 9, 4, 10], "rotation": 180, "texture": "#0"} } }, { - "from": [3.1, 3.1, 15], - "to": [12.9, 12.9, 17.1], + "from": [4.95, 4.95, 16.95], + "to": [11.05, 11.05, 19.95], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 34, 8]}, "faces": { - "north": {"uv": [6, 0, 11, 5], "rotation": 270, "texture": "#1_0"}, - "east": {"uv": [11, 6, 6, 5], "rotation": 90, "texture": "#1_0"}, - "south": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"}, - "west": {"uv": [11, 6, 6, 5], "rotation": 270, "texture": "#1_0"}, - "up": {"uv": [6, 5, 11, 6], "rotation": 180, "texture": "#1_0"}, - "down": {"uv": [6, 5, 11, 6], "texture": "#1_0"} + "east": {"uv": [13.5, 8, 12, 11], "texture": "#0"}, + "south": {"uv": [16, 8, 13, 11], "texture": "#0"}, + "west": {"uv": [13.5, 8, 12, 11], "rotation": 180, "texture": "#0"}, + "up": {"uv": [13.5, 8, 12, 11], "rotation": 270, "texture": "#0"}, + "down": {"uv": [13.5, 8, 12, 11], "rotation": 90, "texture": "#0"} } - } - ], - "groups": [0, + }, { - "name": "up", - "origin": [8, 8, 8], - "children": [1] + "from": [2.95, 2.95, 14], + "to": [13.05, 13.05, 16.95], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 34, 8]}, + "faces": { + "north": {"uv": [11, 11, 6, 16], "texture": "#0"}, + "east": {"uv": [4, 9.5, 9, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [16, 11, 11, 16], "texture": "#0"}, + "west": {"uv": [9, 8, 4, 9.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 9.5, 9, 8], "texture": "#0"}, + "down": {"uv": [9, 8, 4, 9.5], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/drain/up.json b/src/main/resources/assets/create/models/block/fluid_pipe/drain/up.json index 327970657..47d0f8b70 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/drain/up.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/drain/up.json @@ -1,41 +1,45 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/pipe_drain", - "particle": "create:block/fluid_pipe", - "1_0": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [4.5, 16.9, 4.5], - "to": [11.5, 19.9, 11.5], + "from": [4, 12, 4], + "to": [12, 14, 12], "faces": { - "north": {"uv": [0, 0, 7, 3], "rotation": 180, "texture": "#0"}, - "east": {"uv": [0, 0, 7, 3], "rotation": 180, "texture": "#0"}, - "south": {"uv": [0, 0, 7, 3], "rotation": 180, "texture": "#0"}, - "west": {"uv": [0, 0, 7, 3], "rotation": 180, "texture": "#0"}, - "up": {"uv": [0, 3, 7, 10], "texture": "#0"}, - "down": {"uv": [0, 0, 0, 0], "texture": "#0"} + "north": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "east": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "south": {"uv": [4, 8, 0, 9], "texture": "#0"}, + "west": {"uv": [4, 8, 0, 9], "texture": "#0"} } }, { - "from": [3.1, 15, 3.1], - "to": [12.9, 17.1, 12.9], + "from": [2.95, 14, 2.95], + "to": [13.05, 16.95, 13.05], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 5, 11, 6], "texture": "#1_0"}, - "east": {"uv": [11, 6, 6, 5], "rotation": 180, "texture": "#1_0"}, - "south": {"uv": [6, 5, 11, 6], "texture": "#1_0"}, - "west": {"uv": [11, 6, 6, 5], "rotation": 180, "texture": "#1_0"}, - "up": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"}, - "down": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"} + "north": {"uv": [9, 8, 4, 9.5], "texture": "#0"}, + "east": {"uv": [4, 9.5, 9, 8], "rotation": 180, "texture": "#0"}, + "south": {"uv": [4, 9.5, 9, 8], "rotation": 180, "texture": "#0"}, + "west": {"uv": [9, 8, 4, 9.5], "texture": "#0"}, + "up": {"uv": [16, 11, 11, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11, 11, 6, 16], "rotation": 90, "texture": "#0"} } - } - ], - "groups": [0, + }, { - "name": "up", - "origin": [8, 8, 8], - "children": [1] + "from": [4.95, 16.95, 4.95], + "to": [11.05, 19.95, 11.05], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 8, 12, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [13.5, 8, 12, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [13.5, 8, 12, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [13.5, 8, 12, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [16, 8, 13, 11], "rotation": 90, "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/drain/west.json b/src/main/resources/assets/create/models/block/fluid_pipe/drain/west.json index 0ae3c2d7d..0ea514eb5 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/drain/west.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/drain/west.json @@ -1,41 +1,45 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/pipe_drain", - "particle": "create:block/fluid_pipe", - "1_0": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [-3.9, 4.5, 4.5], - "to": [-0.9, 11.5, 11.5], + "from": [2, 4, 4], + "to": [4, 12, 12], "faces": { - "north": {"uv": [0, 0, 7, 3], "rotation": 270, "texture": "#0"}, - "east": {"uv": [0, 0, 0, 0], "texture": "#0"}, - "south": {"uv": [0, 0, 7, 3], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 3, 7, 10], "rotation": 180, "texture": "#0"}, - "up": {"uv": [0, 0, 7, 3], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 7, 3], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 9, 0, 10], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 8, 0, 9], "rotation": 270, "texture": "#0"} } }, { - "from": [-1.1, 3.1, 3.1], - "to": [1, 12.9, 12.9], + "from": [-0.95, 2.95, 2.95], + "to": [2, 13.05, 13.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [11, 6, 6, 5], "rotation": 270, "texture": "#1_0"}, - "east": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#1_0"}, - "south": {"uv": [11, 6, 6, 5], "rotation": 90, "texture": "#1_0"}, - "west": {"uv": [6, 0, 11, 5], "rotation": 270, "texture": "#1_0"}, - "up": {"uv": [6, 5, 11, 6], "rotation": 270, "texture": "#1_0"}, - "down": {"uv": [6, 5, 11, 6], "rotation": 270, "texture": "#1_0"} + "north": {"uv": [9, 8, 4, 9.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [11, 11, 6, 16], "texture": "#0"}, + "south": {"uv": [4, 9.5, 9, 8], "rotation": 90, "texture": "#0"}, + "west": {"uv": [16, 11, 11, 16], "texture": "#0"}, + "up": {"uv": [4, 9.5, 9, 8], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 8, 4, 9.5], "rotation": 270, "texture": "#0"} } - } - ], - "groups": [0, + }, { - "name": "up", - "origin": [8, 8, 8], - "children": [1] + "from": [-3.95, 4.95, 4.95], + "to": [-0.95, 11.05, 11.05], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [13.5, 8, 12, 11], "rotation": 180, "texture": "#0"}, + "south": {"uv": [13.5, 8, 12, 11], "texture": "#0"}, + "west": {"uv": [16, 8, 13, 11], "texture": "#0"}, + "up": {"uv": [13.5, 8, 12, 11], "texture": "#0"}, + "down": {"uv": [13.5, 8, 12, 11], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/item.json b/src/main/resources/assets/create/models/block/fluid_pipe/item.json index c68b548bd..290c4511f 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/item.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/item.json @@ -2,68 +2,70 @@ "credit": "Made with Blockbench", "parent": "block/block", "textures": { - "1": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "1": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { "from": [4, 4, 4], "to": [12, 12, 12], "faces": { - "north": {"uv": [4, 12, 8, 16], "rotation": 180, "texture": "#1"}, - "east": {"uv": [4, 12, 8, 16], "rotation": 180, "texture": "#1"}, - "south": {"uv": [4, 12, 8, 16], "rotation": 180, "texture": "#1"}, - "west": {"uv": [4, 12, 8, 16], "rotation": 180, "texture": "#1"}, - "up": {"uv": [4, 12, 8, 16], "rotation": 270, "texture": "#1"}, - "down": {"uv": [4, 12, 8, 16], "rotation": 90, "texture": "#1"} - } - }, - { - "from": [4, 4, 0], - "to": [12, 12, 4], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]}, - "faces": { - "east": {"uv": [0, 8, 4, 6], "rotation": 270, "texture": "#1"}, - "west": {"uv": [0, 8, 4, 6], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 8, 4, 6], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 8, 4, 6], "rotation": 180, "texture": "#1"} + "east": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 0, 4, 4], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#1"} } }, { "from": [4, 4, 12], - "to": [12, 12, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 16]}, + "to": [12, 12, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "east": {"uv": [0, 6, 4, 8], "rotation": 270, "texture": "#1"}, - "west": {"uv": [0, 6, 4, 8], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 6, 4, 8], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0, 6, 4, 8], "rotation": 180, "texture": "#1"} + "north": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "east": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 8, 4, 9], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 9, 4, 10], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [4, 4, 2], + "to": [12, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "east": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 0, 0], "texture": "#1"}, + "west": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 9, 4, 10], "rotation": 180, "texture": "#1"}, + "down": {"uv": [0, 8, 4, 9], "rotation": 180, "texture": "#1"} } }, { "from": [3, 3, 0], "to": [13, 13, 2], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 0]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 28, 8]}, "faces": { - "north": {"uv": [6, 0, 11, 5], "rotation": 180, "texture": "#1"}, - "east": {"uv": [6, 6, 11, 5], "rotation": 90, "texture": "#1"}, - "south": {"uv": [6, 0, 11, 5], "rotation": 180, "texture": "#1"}, - "west": {"uv": [6, 6, 11, 5], "rotation": 90, "texture": "#1"}, - "up": {"uv": [6, 6, 11, 5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [6, 6, 11, 5], "texture": "#1"} + "north": {"uv": [11, 11, 16, 16], "texture": "#1"}, + "east": {"uv": [10.5, 11, 11.5, 16], "texture": "#1"}, + "south": {"uv": [6, 11, 11, 16], "texture": "#1"}, + "west": {"uv": [11.5, 16, 10.5, 11], "texture": "#1"}, + "up": {"uv": [10.5, 11, 11.5, 16], "rotation": 270, "texture": "#1"}, + "down": {"uv": [11.5, 16, 10.5, 11], "rotation": 270, "texture": "#1"} } }, { "from": [3, 3, 14], "to": [13, 13, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 16]}, + "rotation": {"angle": 0, "axis": "y", "origin": [8, 28, 8]}, "faces": { - "north": {"uv": [11, 0, 6, 5], "rotation": 180, "texture": "#1"}, - "east": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#1"}, - "south": {"uv": [11, 0, 6, 5], "rotation": 180, "texture": "#1"}, - "west": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#1"}, - "up": {"uv": [6, 5, 11, 6], "rotation": 180, "texture": "#1"}, - "down": {"uv": [6, 5, 11, 6], "texture": "#1"} + "north": {"uv": [6, 11, 11, 16], "texture": "#1"}, + "east": {"uv": [11.5, 16, 10.5, 11], "texture": "#1"}, + "south": {"uv": [11, 11, 16, 16], "texture": "#1"}, + "west": {"uv": [10.5, 11, 11.5, 16], "texture": "#1"}, + "up": {"uv": [11.5, 16, 10.5, 11], "rotation": 270, "texture": "#1"}, + "down": {"uv": [10.5, 11, 11.5, 16], "rotation": 270, "texture": "#1"} } } ], diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/rim/down.json b/src/main/resources/assets/create/models/block/fluid_pipe/rim/down.json index 5b7108e2b..7c4fbfd08 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/rim/down.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/rim/down.json @@ -1,20 +1,31 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [3.1, -1.1, 3.1], - "to": [12.9, 1, 12.9], + "from": [4, 2, 4], + "to": [12, 4, 12], "faces": { - "north": {"uv": [6, 6, 11, 5], "texture": "#0"}, - "east": {"uv": [11, 5, 6, 6], "rotation": 180, "texture": "#0"}, - "south": {"uv": [6, 6, 11, 5], "texture": "#0"}, - "west": {"uv": [11, 5, 6, 6], "rotation": 180, "texture": "#0"}, - "up": {"uv": [11, 0, 6, 5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [11, 0, 6, 5], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 9, 4, 10], "texture": "#0"}, + "east": {"uv": [0, 9, 4, 10], "texture": "#0"}, + "south": {"uv": [4, 9, 0, 10], "texture": "#0"}, + "west": {"uv": [4, 9, 0, 10], "texture": "#0"} + } + }, + { + "from": [3, 0, 3], + "to": [13, 2, 13], + "faces": { + "north": {"uv": [10.5, 11, 11.5, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [10.5, 11, 11.5, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [10.5, 11, 11.5, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [10.5, 11, 11.5, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6, 11, 11, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11, 11, 16, 16], "rotation": 270, "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/rim/east.json b/src/main/resources/assets/create/models/block/fluid_pipe/rim/east.json index e1083fa1d..bcf8b29b2 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/rim/east.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/rim/east.json @@ -1,20 +1,31 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [15, 3.1, 3.1], - "to": [17.1, 12.9, 12.9], + "from": [12, 4, 4], + "to": [14, 12, 12], "faces": { - "north": {"uv": [6, 6, 11, 5], "rotation": 90, "texture": "#0"}, - "east": {"uv": [11, 0, 6, 5], "texture": "#0"}, - "south": {"uv": [6, 6, 11, 5], "rotation": 270, "texture": "#0"}, - "west": {"uv": [11, 0, 6, 5], "texture": "#0"}, - "up": {"uv": [11, 5, 6, 6], "rotation": 90, "texture": "#0"}, - "down": {"uv": [11, 5, 6, 6], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 8, 0, 9], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 9, 0, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [14, 3, 3], + "to": [16, 13, 13], + "faces": { + "north": {"uv": [11.5, 16, 10.5, 11], "texture": "#0"}, + "east": {"uv": [11, 11, 16, 16], "texture": "#0"}, + "south": {"uv": [10.5, 11, 11.5, 16], "texture": "#0"}, + "west": {"uv": [6, 11, 11, 16], "texture": "#0"}, + "up": {"uv": [11.5, 16, 10.5, 11], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10.5, 11, 11.5, 16], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/rim/north.json b/src/main/resources/assets/create/models/block/fluid_pipe/rim/north.json index 01fccd96e..95c358d6f 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/rim/north.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/rim/north.json @@ -1,21 +1,33 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [3.1, 3.1, -1.1], - "to": [12.9, 12.9, 1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -5]}, + "from": [4, 4, 2], + "to": [12, 12, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 0, 11, 5], "texture": "#0"}, - "east": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#0"}, - "south": {"uv": [6, 0, 11, 5], "texture": "#0"}, - "west": {"uv": [6, 5, 11, 6], "rotation": 270, "texture": "#0"}, - "up": {"uv": [6, 5, 11, 6], "texture": "#0"}, - "down": {"uv": [6, 5, 11, 6], "rotation": 180, "texture": "#0"} + "east": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 9, 4, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 8, 4, 9], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 3, 0], + "to": [13, 13, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 28, 8]}, + "faces": { + "north": {"uv": [11, 11, 16, 16], "texture": "#0"}, + "east": {"uv": [10.5, 11, 11.5, 16], "texture": "#0"}, + "south": {"uv": [6, 11, 11, 16], "texture": "#0"}, + "west": {"uv": [11.5, 16, 10.5, 11], "texture": "#0"}, + "up": {"uv": [10.5, 11, 11.5, 16], "rotation": 270, "texture": "#0"}, + "down": {"uv": [11.5, 16, 10.5, 11], "rotation": 270, "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/rim/south.json b/src/main/resources/assets/create/models/block/fluid_pipe/rim/south.json index 232f4f172..6ec31266d 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/rim/south.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/rim/south.json @@ -1,21 +1,33 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [3.1, 3.1, 15], - "to": [12.9, 12.9, 17.1], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 21]}, + "from": [4, 4, 12], + "to": [12, 12, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, "faces": { - "north": {"uv": [6, 0, 11, 5], "texture": "#0"}, - "east": {"uv": [6, 5, 11, 6], "rotation": 270, "texture": "#0"}, - "south": {"uv": [6, 0, 11, 5], "texture": "#0"}, - "west": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#0"}, - "up": {"uv": [11, 6, 6, 5], "texture": "#0"}, - "down": {"uv": [11, 6, 6, 5], "rotation": 180, "texture": "#0"} + "east": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 4, 9], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 9, 4, 10], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 3, 14], + "to": [13, 13, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 28, 8]}, + "faces": { + "north": {"uv": [6, 11, 11, 16], "texture": "#0"}, + "east": {"uv": [11.5, 16, 10.5, 11], "texture": "#0"}, + "south": {"uv": [11, 11, 16, 16], "texture": "#0"}, + "west": {"uv": [10.5, 11, 11.5, 16], "texture": "#0"}, + "up": {"uv": [11.5, 16, 10.5, 11], "rotation": 270, "texture": "#0"}, + "down": {"uv": [10.5, 11, 11.5, 16], "rotation": 270, "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/rim/up.json b/src/main/resources/assets/create/models/block/fluid_pipe/rim/up.json index 3e6661e40..31dcef358 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/rim/up.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/rim/up.json @@ -1,20 +1,31 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [3.1, 15, 3.1], - "to": [12.9, 17.1, 12.9], + "from": [3, 14, 3], + "to": [13, 16, 13], "faces": { - "north": {"uv": [6, 5, 11, 6], "texture": "#0"}, - "east": {"uv": [11, 6, 6, 5], "rotation": 180, "texture": "#0"}, - "south": {"uv": [6, 5, 11, 6], "texture": "#0"}, - "west": {"uv": [11, 6, 6, 5], "rotation": 180, "texture": "#0"}, - "up": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [6, 0, 11, 5], "rotation": 90, "texture": "#0"} + "north": {"uv": [11.5, 16, 10.5, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [11.5, 16, 10.5, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [11.5, 16, 10.5, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [11.5, 16, 10.5, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [11, 11, 16, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 11, 11, 16], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [4, 12, 4], + "to": [12, 14, 12], + "faces": { + "north": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "east": {"uv": [0, 8, 4, 9], "texture": "#0"}, + "south": {"uv": [4, 8, 0, 9], "texture": "#0"}, + "west": {"uv": [4, 8, 0, 9], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/models/block/fluid_pipe/rim/west.json b/src/main/resources/assets/create/models/block/fluid_pipe/rim/west.json index 5b164d994..3c1db8081 100644 --- a/src/main/resources/assets/create/models/block/fluid_pipe/rim/west.json +++ b/src/main/resources/assets/create/models/block/fluid_pipe/rim/west.json @@ -1,20 +1,31 @@ { "credit": "Made with Blockbench", + "texture_size": [32, 32], "textures": { - "0": "create:block/fluid_pipe", - "particle": "create:block/fluid_pipe" + "0": "create:block/pipes", + "particle": "create:block/pipes" }, "elements": [ { - "from": [-1.1, 3.1, 3.1], - "to": [1, 12.9, 12.9], + "from": [2, 4, 4], + "to": [4, 12, 12], "faces": { - "north": {"uv": [6, 5, 11, 6], "rotation": 90, "texture": "#0"}, - "east": {"uv": [6, 0, 11, 5], "texture": "#0"}, - "south": {"uv": [6, 5, 11, 6], "rotation": 270, "texture": "#0"}, - "west": {"uv": [6, 0, 11, 5], "texture": "#0"}, - "up": {"uv": [11, 6, 6, 5], "rotation": 90, "texture": "#0"}, - "down": {"uv": [11, 6, 6, 5], "rotation": 90, "texture": "#0"} + "north": {"uv": [0, 8, 4, 9], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 4, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [4, 9, 0, 10], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 8, 0, 9], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [0, 3, 3], + "to": [2, 13, 13], + "faces": { + "north": {"uv": [10.5, 11, 11.5, 16], "texture": "#0"}, + "east": {"uv": [6, 11, 11, 16], "texture": "#0"}, + "south": {"uv": [11.5, 16, 10.5, 11], "texture": "#0"}, + "west": {"uv": [11, 11, 16, 16], "texture": "#0"}, + "up": {"uv": [10.5, 11, 11.5, 16], "rotation": 180, "texture": "#0"}, + "down": {"uv": [11.5, 16, 10.5, 11], "texture": "#0"} } } ] diff --git a/src/main/resources/assets/create/textures/block/fluid_tank.png b/src/main/resources/assets/create/textures/block/fluid_tank.png index 64217ddfa..511031ce4 100644 Binary files a/src/main/resources/assets/create/textures/block/fluid_tank.png and b/src/main/resources/assets/create/textures/block/fluid_tank.png differ diff --git a/src/main/resources/assets/create/textures/block/fluid_tank_connected.png b/src/main/resources/assets/create/textures/block/fluid_tank_connected.png index 0e062f8de..5ae2872b1 100644 Binary files a/src/main/resources/assets/create/textures/block/fluid_tank_connected.png and b/src/main/resources/assets/create/textures/block/fluid_tank_connected.png differ diff --git a/src/main/resources/assets/create/textures/block/pipe_drain.png b/src/main/resources/assets/create/textures/block/pipe_drain.png deleted file mode 100644 index 261ead298..000000000 Binary files a/src/main/resources/assets/create/textures/block/pipe_drain.png and /dev/null differ diff --git a/src/main/resources/assets/create/textures/block/pipes.png b/src/main/resources/assets/create/textures/block/pipes.png new file mode 100644 index 000000000..809231fb4 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/pipes.png differ diff --git a/src/main/resources/assets/create/textures/block/pipes_connected.png b/src/main/resources/assets/create/textures/block/pipes_connected.png new file mode 100644 index 000000000..5de34fa72 Binary files /dev/null and b/src/main/resources/assets/create/textures/block/pipes_connected.png differ