A flock of fluids

- Added Fluids for chocolate, honey, milk and tea
This commit is contained in:
simibubi 2020-12-03 20:41:55 +01:00
parent 00b01cac55
commit 16705c5cb5
58 changed files with 702 additions and 182 deletions

View file

@ -46,6 +46,7 @@ e81608346d43406ee72cae0f78b8bcfb37ba2d75 assets/create/blockstates/brown_seat.js
2ca82a3c4bf7ba1a9cf3bb674e786d9b23b020a4 assets/create/blockstates/chiseled_limestone.json
cbcdab42d01f8085db9e5f8db884f8adf7f17625 assets/create/blockstates/chiseled_scoria.json
291952556c52fba2af5bbd793c71af81abd27e71 assets/create/blockstates/chiseled_weathered_limestone.json
470e8c6a9c37b91fa745bc4f6e9d3740bd72467e assets/create/blockstates/chocolate.json
b59324f051f21d8ce1a48a08f4721a61a3c414d6 assets/create/blockstates/chute.json
4947c261310445fa55b92038326ac82967d192dd assets/create/blockstates/clockwork_bearing.json
1f33834c685e3243882acfe20183fe64dfa872be assets/create/blockstates/clutch.json
@ -139,7 +140,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_
fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json
b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json
6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json
fe9169716dd21a81a3710a89f0a9b7ea4dcd4d51 assets/create/blockstates/fluid_pipe.json
499aade14db59f62b46e8a266998feb41e1922a1 assets/create/blockstates/fluid_pipe.json
f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json
5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json
e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json
@ -175,6 +176,7 @@ a5ec5401ba9f3e102a2e1b35837f643847afbca4 assets/create/blockstates/gray_seat.jso
13059309684db0cc7a0f1f4fce2407cf06cce80a assets/create/blockstates/green_seat.json
f4a0fc68e8daaa0a47cdc951ced4310057a874b0 assets/create/blockstates/green_valve_handle.json
6ab675fa06317e6d07c0c1a453e7bb43e3f46b3b assets/create/blockstates/hand_crank.json
4572b90f5d6c586e145f2c7a55664c3cb734bd2b assets/create/blockstates/honey.json
be3bef7e091d8b50bfc1c6b7275946d1f636aefd assets/create/blockstates/horizontal_framed_glass.json
18d9fdaa1352a7e2ec91135e46dae5c02ccd8f8f assets/create/blockstates/horizontal_framed_glass_pane.json
30ec347dfc827a9ae52cf3da964b828005acede1 assets/create/blockstates/hose_pulley.json
@ -333,7 +335,7 @@ e8b0a401c10d1ba67ed71ba31bd5f9bc28571b65 assets/create/blockstates/powered_toggl
d06cd9a1101b18d306a786320aab12018b1325d6 assets/create/blockstates/purple_sail.json
92957119abd5fbcca36a113b2a80255fd70fc303 assets/create/blockstates/purple_seat.json
61035f8afe75ff7bbd291da5d8690bcbebe679eb assets/create/blockstates/purple_valve_handle.json
8d7e653bfd9846e684a0d3725595714a19201017 assets/create/blockstates/radial_chassis.json
9e7ea57c58889fa0021e3c4f19da3f763108399f assets/create/blockstates/radial_chassis.json
45877c4d90a7185c2f304edbd67379d800920439 assets/create/blockstates/red_sail.json
da1b08387af7afa0855ee8d040f620c01f20660a assets/create/blockstates/red_seat.json
722fc77bbf387af8a4016e42cbf9501d2b968881 assets/create/blockstates/red_valve_handle.json
@ -395,17 +397,17 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j
6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
d85a97025cad5fad4410a1bc46b59b3b72096524 assets/create/lang/en_ud.json
57c7008d6c3d1deda3eaf5703acecbd8464beb8f assets/create/lang/en_us.json
f1cd3a70b1567ad73681ad42ca0d754882845b4a assets/create/lang/unfinished/de_de.json
4358a9a4ae0cd69944590eb1b636c318e07679d8 assets/create/lang/unfinished/fr_fr.json
3f2ed1c2d1ae12ffe890be971ef498211d404426 assets/create/lang/unfinished/it_it.json
921f766a873e1c215a5874164bcbb580c6e63020 assets/create/lang/unfinished/ja_jp.json
ea1d59990f4ce87ca33ae14000869762bb517fcb assets/create/lang/unfinished/ko_kr.json
5d87a8b82204010fbd9ed765b566026be0a02ae6 assets/create/lang/unfinished/nl_nl.json
25157ef8e492c71b2d0d840048b660d92d1a3644 assets/create/lang/unfinished/pt_br.json
47a8850c0e417a32c1c47d273f0aac11808f7ddf assets/create/lang/unfinished/ru_ru.json
e2b80140f0ffd04335d7551c0feff9aa3c9913b9 assets/create/lang/unfinished/zh_cn.json
f3dbaf7f4421e8af956ecf17ce7cedef28cbbfe8 assets/create/lang/en_ud.json
9697cd407f7a049b129fe5e76c6a17969bcf9e68 assets/create/lang/en_us.json
062b0e2a0aac1eea9a3de85e66377091ae21f76d assets/create/lang/unfinished/de_de.json
8a117682ad45996564fc6cf6c22c92d7f17ad29a assets/create/lang/unfinished/fr_fr.json
1c3a68ebd422f6d40d178162f4ab7b627a48f49b assets/create/lang/unfinished/it_it.json
349213d72b60ed084ffd8dd18eadcf97f97a1fe5 assets/create/lang/unfinished/ja_jp.json
d29a71eb5c3955d487a1c3ff5bd7b065dc89e7f7 assets/create/lang/unfinished/ko_kr.json
0245f101e497d0895a7a070a3b4c07a3f62ad465 assets/create/lang/unfinished/nl_nl.json
12ec39553e80e1d740093b50860cbd2b506b08ba assets/create/lang/unfinished/pt_br.json
1ad44c155b71cdcd3c1a8763758e8b9f53941ee2 assets/create/lang/unfinished/ru_ru.json
f750f0cee38a3020c92ca6dae48b28f84b22f007 assets/create/lang/unfinished/zh_cn.json
846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json
1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json
1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json
@ -511,6 +513,7 @@ cd7751090cf3d55296b8e415d0af9b6f18d69770 assets/create/models/block/chiseled_gab
d2e195aa2e90c712e51d855a9a4a334b52f62a69 assets/create/models/block/chiseled_limestone.json
ac07568fa7b2d3fa84d0fe89a498514d30514291 assets/create/models/block/chiseled_scoria.json
ecb2b85ee210dce329d2be66b98d0f0d4e6fc223 assets/create/models/block/chiseled_weathered_limestone.json
4156227e18c0896ce83f260f71b939abbbf4f01e assets/create/models/block/chocolate.json
30fe120af3cb32faf0729df4d2cdf868f804be17 assets/create/models/block/clockwork_bearing.json
70406933cc4fa5471af6e562fd84a397347dba17 assets/create/models/block/copper_casing.json
b2c528cfd24a5cb0cb96c45d0a914f1090f8c32b assets/create/models/block/copper_valve_handle.json
@ -751,6 +754,7 @@ a68cd40ffb769b195437107f4a2c2188b222b74a assets/create/models/block/gray_sail.js
17b651233c62b928f0228562a7f6e7a2b7b2d6b7 assets/create/models/block/green_sail.json
1438b8ce54ac5557b8f10dcef94f3525eae19461 assets/create/models/block/green_seat.json
cc7ce9b6bc687ad5027a67c3bf22bdf5bcd71674 assets/create/models/block/green_valve_handle.json
5bbe7e5322020d205d2c60bc14e4b45b317a193c assets/create/models/block/honey.json
9730fcb02f679087e81e24c836751e625be6a298 assets/create/models/block/horizontal_framed_glass.json
d13df8a5920c5778d98081fb0e97f045e2fd46a2 assets/create/models/block/horizontal_framed_glass_pane_noside.json
3e975bec02e2670ce2b1868cebcbd780a5ebf3f8 assets/create/models/block/horizontal_framed_glass_pane_noside_alt.json
@ -1155,6 +1159,7 @@ afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets/create/models/item/chiseled_gabb
0cb1692f6cdd007ac690fd1f0222dde3429d136f assets/create/models/item/chiseled_limestone.json
a47fbe5f2da79080d99ef0975bfa8da4d08f8be4 assets/create/models/item/chiseled_scoria.json
70232ce9b88119fb383717e2c1ad113f7aad6a99 assets/create/models/item/chiseled_weathered_limestone.json
eabf1870127d78c920305228eb51ddf36c44d016 assets/create/models/item/chocolate_bucket.json
fe67c3f380d17735a9436a4579a8be1a02b8e4a0 assets/create/models/item/chute.json
d418205c83d3e57c830755ee8c09e2962353e493 assets/create/models/item/cinder_flour.json
c1da21be9f1af4f7a2ef4ec9cd92195d65ada316 assets/create/models/item/clockwork_bearing.json
@ -1298,6 +1303,7 @@ ecb9f32f62d3fa43fb226ab85adc2eb229fdfb77 assets/create/models/item/green_valve_h
398b1a7c76c7bdb6a23b1248fdce98f6d835467f assets/create/models/item/hand_crank.json
cfab82a2cf7495d21778c1de9730a26afbdd523d assets/create/models/item/handheld_blockzapper.json
dee43bf1a9c211a752fac2c07aeba123f7f0c914 assets/create/models/item/handheld_worldshaper.json
967695ab65edb8cb19e9759425f2d12d75406122 assets/create/models/item/honey_bucket.json
e7ec65ad5be13cae5f7d60836b8df9e4a5baad56 assets/create/models/item/horizontal_framed_glass.json
f0e3b2b8a553b6e61746c922c27302dabfff71b6 assets/create/models/item/horizontal_framed_glass_pane.json
ff92f6a9dfb73a6ee1eaaed3279c89390ff04a80 assets/create/models/item/hose_pulley.json
@ -2862,6 +2868,8 @@ ddda28bb6efc43b7e3149756daf53e1664187283 data/create/recipes/dolomite_cobbleston
500ecdfdcf34e9d26256948e206aab4f0b79e659 data/create/recipes/dolomite_cobblestone_wall_from_dolomite_cobblestone_stonecutting.json
ff39e629b242ae91e23aec86b0a1f757dd938305 data/create/recipes/dolomite_pillar.json
b4a8d14d9a20e812e0acb691b5b511a87e8b0576 data/create/recipes/dolomite_pillar_from_dolomite_stonecutting.json
20b7c7c62fa2e33199e08188dd8836844a6d9cfd data/create/recipes/emptying/honey_bottle.json
28a0f9a45671de2e6db19fa66374e245feeed142 data/create/recipes/emptying/milk_bucket.json
0e11aa1accb71ed62e212f23a7069b7b7b4e8119 data/create/recipes/fancy_andesite_bricks_from_andesite_stonecutting.json
8b86fc9a9416adeaab3f26192a73a481887675c3 data/create/recipes/fancy_andesite_bricks_slab.json
c7b762b25c7a6705dba3e922e981be851ac4f36b data/create/recipes/fancy_andesite_bricks_slab_from_fancy_andesite_bricks_stonecutting.json
@ -2925,6 +2933,8 @@ bd355332d17adcb0460b1d43146ca288efb78395 data/create/recipes/fancy_weathered_lim
d2ab9ce73636773165564506580f2ec13bd1fc50 data/create/recipes/fancy_weathered_limestone_bricks_stairs_from_fancy_weathered_limestone_bricks_stonecutting.json
36947f27d2b2e57b00440fd5acd06a7554e5a387 data/create/recipes/fancy_weathered_limestone_bricks_wall.json
1d0e41ca98e48073c72adf4077610c96e592f9a5 data/create/recipes/fancy_weathered_limestone_bricks_wall_from_fancy_weathered_limestone_bricks_stonecutting.json
c8ca74a6cd071308a1750a2ad1153e79422598a0 data/create/recipes/filling/honey_bottle.json
c83e77a9799b6ca34dd73aa76b56159f2103c48c data/create/recipes/filling/milk_bucket.json
5b8bbde7f8b270ab75fac18d6858f2fadbc0efa3 data/create/recipes/framed_glass_from_glass_colorless_stonecutting.json
d697de0c9b706ca4e18da7a2d769e7e5fe8d769d data/create/recipes/framed_glass_pane.json
a0dae50faaa1b7142bb4309675e3084c68daa547 data/create/recipes/gabbro_bricks_from_gabbro_stonecutting.json
@ -3043,9 +3053,11 @@ eec880075efd6008b604a4b8064d782752b4bad6 data/create/recipes/milling/wool.json
b3cc5e61bab40ca6135dc1f706f3ab447e9f78bf data/create/recipes/mixing/andesite_alloy.json
ce9dc7dacb85cb23a7187c19a115b40e597ad36b data/create/recipes/mixing/andesite_alloy_from_zinc.json
3417f9399ce0fb32fc4bce94c772b40d780c9006 data/create/recipes/mixing/brass_ingot.json
ab602a53a5d8d057aad910dd1c5529cde2d587ab data/create/recipes/mixing/chocolate.json
0e29b4ce13750aab5a60ae54cbec8776569b35e0 data/create/recipes/mixing/chromatic_compound.json
d9a3dff1288d675ab812eef1eb73cb27dcc71bd2 data/create/recipes/mixing/crushed_brass.json
00b165ea38d834c7955440e87062004a8182c3f8 data/create/recipes/mixing/gunpowder.json
0f89b3f2d81585591513619b8d1e8694eb874316 data/create/recipes/mixing/tea.json
3279bd1a34217a19bc9992a2ad87629390dd003f data/create/recipes/mixing/temp_cobble.json
3295a2195707f952a83deb3bed10b43570b215e5 data/create/recipes/mixing/temp_lava.json
1998c6f84f871d6da58ec29d729401d18f8f1aa1 data/create/recipes/mossy_andesite_from_andesite_stonecutting.json
@ -3301,6 +3313,8 @@ d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores/zinc.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json
f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/blocks/storage_blocks/copper.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/blocks/storage_blocks/zinc.json
391c9b2be5740aea943a8a5fe27eb327e2d973b0 data/forge/tags/fluids/honey.json
aa729fedc4fcca0f0a18bf7b00075af06bf5357f data/forge/tags/fluids/milk.json
d9ffc62a496946fc4848934e7c0a6e917337f8be data/forge/tags/items/beacon_payment.json
05ca51cdc60a5e109b5a0e3b782de13d34ebcb24 data/forge/tags/items/cobblestone.json
16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/items/glass/colorless.json
@ -3330,6 +3344,7 @@ f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/co
29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/blocks/slabs.json
0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data/minecraft/tags/blocks/stairs.json
92584f914c53e00c111f9ff5e3894e2e3594946b data/minecraft/tags/blocks/walls.json
09d26bcd0f94459f945219997277c4fbf14adeb7 data/minecraft/tags/fluids/water.json
29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/items/slabs.json
0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data/minecraft/tags/items/stairs.json
92584f914c53e00c111f9ff5e3894e2e3594946b data/minecraft/tags/items/walls.json

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "create:block/chocolate"
}
}
}

View file

@ -60,10 +60,10 @@
},
{
"when": {
"down": "false",
"south": "false",
"north": "true",
"up": "true",
"south": "false"
"down": "false",
"up": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lu_x"
@ -71,10 +71,10 @@
},
{
"when": {
"down": "false",
"south": "true",
"north": "false",
"up": "true",
"south": "true"
"down": "false",
"up": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ru_x"
@ -82,10 +82,10 @@
},
{
"when": {
"down": "true",
"south": "false",
"north": "true",
"up": "false",
"south": "false"
"down": "true",
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ld_x"
@ -93,10 +93,10 @@
},
{
"when": {
"down": "true",
"south": "true",
"north": "false",
"up": "false",
"south": "true"
"down": "true",
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/rd_x"
@ -104,10 +104,10 @@
},
{
"when": {
"south": "false",
"north": "false",
"down": "true",
"north": "false",
"up": "true",
"south": "false"
"up": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
@ -115,10 +115,10 @@
},
{
"when": {
"south": "false",
"north": "false",
"down": "false",
"north": "false",
"up": "true",
"south": "false"
"up": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
@ -126,10 +126,10 @@
},
{
"when": {
"south": "false",
"north": "false",
"down": "true",
"north": "false",
"up": "false",
"south": "false"
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_x"
@ -137,10 +137,10 @@
},
{
"when": {
"down": "false",
"south": "true",
"north": "true",
"up": "false",
"south": "true"
"down": "false",
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
@ -148,10 +148,10 @@
},
{
"when": {
"down": "false",
"south": "false",
"north": "true",
"up": "false",
"south": "false"
"down": "false",
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
@ -159,10 +159,10 @@
},
{
"when": {
"down": "false",
"south": "true",
"north": "false",
"up": "false",
"south": "true"
"down": "false",
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_x"
@ -170,10 +170,10 @@
},
{
"when": {
"down": "false",
"south": "false",
"north": "false",
"up": "false",
"south": "false"
"down": "false",
"up": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_x"
@ -181,10 +181,10 @@
},
{
"when": {
"south": "true",
"west": "true",
"east": "false",
"north": "false",
"south": "true"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lu_y"
@ -192,10 +192,10 @@
},
{
"when": {
"south": "true",
"west": "false",
"east": "true",
"north": "false",
"south": "true"
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/ru_y"
@ -203,10 +203,10 @@
},
{
"when": {
"south": "false",
"west": "true",
"east": "false",
"north": "true",
"south": "false"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ld_y"
@ -214,10 +214,10 @@
},
{
"when": {
"south": "false",
"west": "false",
"east": "true",
"north": "true",
"south": "false"
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/rd_y"
@ -225,10 +225,10 @@
},
{
"when": {
"south": "true",
"west": "false",
"east": "false",
"north": "true",
"south": "true"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_y"
@ -236,10 +236,10 @@
},
{
"when": {
"south": "true",
"west": "false",
"east": "false",
"north": "false",
"south": "true"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_y"
@ -247,10 +247,10 @@
},
{
"when": {
"south": "false",
"west": "false",
"east": "false",
"north": "true",
"south": "false"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/ud_y"
@ -258,10 +258,10 @@
},
{
"when": {
"south": "false",
"west": "true",
"east": "true",
"north": "false",
"south": "false"
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_y"
@ -269,10 +269,10 @@
},
{
"when": {
"south": "false",
"west": "true",
"east": "false",
"north": "false",
"south": "false"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/lr_y"
@ -280,10 +280,10 @@
},
{
"when": {
"south": "false",
"west": "false",
"east": "true",
"north": "false",
"south": "false"
"east": "true"
},
"apply": {
"model": "create:block/fluid_pipe/lr_y"
@ -291,10 +291,10 @@
},
{
"when": {
"south": "false",
"west": "false",
"east": "false",
"north": "false",
"south": "false"
"east": "false"
},
"apply": {
"model": "create:block/fluid_pipe/none_y"

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "create:block/honey"
}
}
}

View file

@ -89,8 +89,8 @@
},
{
"when": {
"sticky_west": "true",
"axis": "x"
"axis": "x",
"sticky_west": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky",
@ -99,8 +99,8 @@
},
{
"when": {
"sticky_west": "true",
"axis": "y"
"axis": "y",
"sticky_west": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_y_sticky",
@ -109,8 +109,8 @@
},
{
"when": {
"sticky_west": "true",
"axis": "z"
"axis": "z",
"sticky_west": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_z_sticky",
@ -119,8 +119,8 @@
},
{
"when": {
"sticky_west": "false",
"axis": "x"
"axis": "x",
"sticky_west": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_x",
@ -129,8 +129,8 @@
},
{
"when": {
"sticky_west": "false",
"axis": "y"
"axis": "y",
"sticky_west": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_y",
@ -139,8 +139,8 @@
},
{
"when": {
"sticky_west": "false",
"axis": "z"
"axis": "z",
"sticky_west": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_z",
@ -149,8 +149,8 @@
},
{
"when": {
"sticky_north": "true",
"axis": "x"
"axis": "x",
"sticky_north": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky"
@ -158,8 +158,8 @@
},
{
"when": {
"sticky_north": "true",
"axis": "y"
"axis": "y",
"sticky_north": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_y_sticky",
@ -168,8 +168,8 @@
},
{
"when": {
"sticky_north": "true",
"axis": "z"
"axis": "z",
"sticky_north": "true"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky",
@ -178,8 +178,8 @@
},
{
"when": {
"sticky_north": "false",
"axis": "x"
"axis": "x",
"sticky_north": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_x"
@ -187,8 +187,8 @@
},
{
"when": {
"sticky_north": "false",
"axis": "y"
"axis": "y",
"sticky_north": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_y",
@ -197,8 +197,8 @@
},
{
"when": {
"sticky_north": "false",
"axis": "z"
"axis": "z",
"sticky_north": "false"
},
"apply": {
"model": "create:block/radial_chassis_side_x",

View file

@ -47,6 +47,7 @@
"block.create.chiseled_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
"block.create.chiseled_scoria": "\u0250\u0131\u0279o\u0254S p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
"block.create.chiseled_weathered_limestone": "\u01DDuo\u0287s\u01DD\u026F\u0131\uA780 p\u01DD\u0279\u01DD\u0265\u0287\u0250\u01DDM p\u01DD\u05DF\u01DDs\u0131\u0265\u0186",
"block.create.chocolate": "\u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186",
"block.create.chute": "\u01DD\u0287n\u0265\u0186",
"block.create.clockwork_bearing": "bu\u0131\u0279\u0250\u01DD\u15FA \u029E\u0279o\u028D\u029E\u0254o\u05DF\u0186",
"block.create.clutch": "\u0265\u0254\u0287n\u05DF\u0186",
@ -176,6 +177,7 @@
"block.create.green_seat": "\u0287\u0250\u01DDS u\u01DD\u01DD\u0279\u2141",
"block.create.green_valve_handle": "\u01DD\u05DFpu\u0250H \u01DD\u028C\u05DF\u0250\u039B u\u01DD\u01DD\u0279\u2141",
"block.create.hand_crank": "\u029Eu\u0250\u0279\u0186 pu\u0250H",
"block.create.honey": "\u028E\u01DDuoH",
"block.create.horizontal_framed_glass": "ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH",
"block.create.horizontal_framed_glass_pane": "\u01DDu\u0250\u0500 ss\u0250\u05DF\u2141 p\u01DD\u026F\u0250\u0279\u2132 \u05DF\u0250\u0287uoz\u0131\u0279oH",
"block.create.hose_pulley": "\u028E\u01DD\u05DF\u05DFn\u0500 \u01DDsoH",
@ -400,7 +402,11 @@
"entity.create.seat": "\u0287\u0250\u01DDS",
"entity.create.stationary_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u028E\u0279\u0250uo\u0131\u0287\u0250\u0287S",
"entity.create.super_glue": "\u01DDn\u05DF\u2141 \u0279\u01DDdnS",
"fluid.create.flowing_potion": "uo\u0131\u0287o\u0500",
"fluid.create.chocolate": "\u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186",
"fluid.create.honey": "\u028E\u01DDuoH",
"fluid.create.milk": "\u029E\u05DF\u0131W",
"fluid.create.potion": "uo\u0131\u0287o\u0500",
"fluid.create.tea": "\u0250\u01DD\u27D8 s,\u0279\u01DDp\u05DF\u0131n\u15FA",
"item.create.andesite_alloy": "\u028Eo\u05DF\u05DF\u2C6F \u01DD\u0287\u0131s\u01DDpu\u2C6F",
"item.create.attribute_filter": "\u0279\u01DD\u0287\u05DF\u0131\u2132 \u01DD\u0287nq\u0131\u0279\u0287\u0287\u2C6F",
"item.create.belt_connector": "\u0287\u05DF\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW",
@ -410,6 +416,7 @@
"item.create.brass_nugget": "\u0287\u01DDbbnN ss\u0250\u0279\u15FA",
"item.create.brass_sheet": "\u0287\u01DD\u01DD\u0265S ss\u0250\u0279\u15FA",
"item.create.chest_minecart_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W \u0287s\u01DD\u0265\u0186",
"item.create.chocolate_bucket": "\u0287\u01DD\u029E\u0254n\u15FA \u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186",
"item.create.chromatic_compound": "punod\u026Fo\u0186 \u0254\u0131\u0287\u0250\u026Fo\u0279\u0265\u0186",
"item.create.cinder_flour": "\u0279no\u05DF\u2132 \u0279\u01DDpu\u0131\u0186",
"item.create.copper_ingot": "\u0287obuI \u0279\u01DDddo\u0186",
@ -433,6 +440,7 @@
"item.create.golden_sheet": "\u0287\u01DD\u01DD\u0265S u\u01DDp\u05DFo\u2141",
"item.create.handheld_blockzapper": "\u0279\u01DDdd\u0250z\u029E\u0254o\u05DF\u15FA p\u05DF\u01DD\u0265pu\u0250H",
"item.create.handheld_worldshaper": "\u0279\u01DDd\u0250\u0265sp\u05DF\u0279oM p\u05DF\u01DD\u0265pu\u0250H",
"item.create.honey_bucket": "\u0287\u01DD\u029E\u0254n\u15FA \u028E\u01DDuoH",
"item.create.integrated_circuit": "\u0287\u0131n\u0254\u0279\u0131\u0186 p\u01DD\u0287\u0250\u0279b\u01DD\u0287uI",
"item.create.iron_sheet": "\u0287\u01DD\u01DD\u0265S uo\u0279I",
"item.create.lapis_sheet": "\u0287\u01DD\u01DD\u0265S s\u0131d\u0250\uA780",

View file

@ -50,6 +50,7 @@
"block.create.chiseled_limestone": "Chiseled Limestone",
"block.create.chiseled_scoria": "Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "Chiseled Weathered Limestone",
"block.create.chocolate": "Chocolate",
"block.create.chute": "Chute",
"block.create.clockwork_bearing": "Clockwork Bearing",
"block.create.clutch": "Clutch",
@ -179,6 +180,7 @@
"block.create.green_seat": "Green Seat",
"block.create.green_valve_handle": "Green Valve Handle",
"block.create.hand_crank": "Hand Crank",
"block.create.honey": "Honey",
"block.create.horizontal_framed_glass": "Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "Horizontal Framed Glass Pane",
"block.create.hose_pulley": "Hose Pulley",
@ -405,7 +407,11 @@
"entity.create.stationary_contraption": "Stationary Contraption",
"entity.create.super_glue": "Super Glue",
"fluid.create.flowing_potion": "Potion",
"fluid.create.chocolate": "Chocolate",
"fluid.create.honey": "Honey",
"fluid.create.milk": "Milk",
"fluid.create.potion": "Potion",
"fluid.create.tea": "Builder's Tea",
"item.create.andesite_alloy": "Andesite Alloy",
"item.create.attribute_filter": "Attribute Filter",
@ -416,6 +422,7 @@
"item.create.brass_nugget": "Brass Nugget",
"item.create.brass_sheet": "Brass Sheet",
"item.create.chest_minecart_contraption": "Chest Minecart Contraption",
"item.create.chocolate_bucket": "Chocolate Bucket",
"item.create.chromatic_compound": "Chromatic Compound",
"item.create.cinder_flour": "Cinder Flour",
"item.create.copper_ingot": "Copper Ingot",
@ -439,6 +446,7 @@
"item.create.golden_sheet": "Golden Sheet",
"item.create.handheld_blockzapper": "Handheld Blockzapper",
"item.create.handheld_worldshaper": "Handheld Worldshaper",
"item.create.honey_bucket": "Honey Bucket",
"item.create.integrated_circuit": "Integrated Circuit",
"item.create.iron_sheet": "Iron Sheet",
"item.create.lapis_sheet": "Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1054",
"_": "Missing Localizations: 1062",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing",
"block.create.clutch": "Kupplung",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "UNLOCALIZED: Hand Crank",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy",
"item.create.attribute_filter": "UNLOCALIZED: Attribute Filter",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "UNLOCALIZED: Brass Nugget",
"item.create.brass_sheet": "UNLOCALIZED: Brass Sheet",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "UNLOCALIZED: Copper Ingot",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "Blockpistole",
"item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit",
"item.create.iron_sheet": "Eisenblech",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 684",
"_": "Missing Localizations: 692",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "Roulement mécanique horloger",
"block.create.clutch": "Embrayage",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "Manivelle",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "Fenêtre en verre horizontale",
"block.create.horizontal_framed_glass_pane": "Vitre encadrée horizontale",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "Alliage d'andésite",
"item.create.attribute_filter": "Filtre d'attribut",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "Pépite de laiton",
"item.create.brass_sheet": "Plaques de laiton",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "Composé chromatique",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "Lingot de cuivre",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "Blockzappeur portable",
"item.create.handheld_worldshaper": "Térraformeur portable",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "Circuit intégré",
"item.create.iron_sheet": "Plaque de Fer",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 668",
"_": "Missing Localizations: 676",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "Supporto del Orologio",
"block.create.clutch": "Frizione",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "Manovella",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "Finestra Orizzontale Vetro",
"block.create.horizontal_framed_glass_pane": "Pannello di Finestra Orizzontale Vetro",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "Lega di Andesite",
"item.create.attribute_filter": "Filtro Attributi",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "Pepita di Ottone",
"item.create.brass_sheet": "Lamiera di Ottone",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "Composto Cromatico",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "Lingotto di Rame",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "Zapper di Blocchi Portatile",
"item.create.handheld_worldshaper": "Plasmatore del Mondo Portatile",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "Circuito Integrato",
"item.create.iron_sheet": "Lamiera di Ferro",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 667",
"_": "Missing Localizations: 675",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "時計仕掛けのベアリング",
"block.create.clutch": "クラッチ",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "ハンドクランク",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "横型ガラス窓",
"block.create.horizontal_framed_glass_pane": "横型ガラス窓板",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "安山岩合金",
"item.create.attribute_filter": "属性フィルター",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "真鍮ナゲット",
"item.create.brass_sheet": "真鍮シート",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "色彩の化合物",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "銅インゴット",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "携帯型ブロックザッパー",
"item.create.handheld_worldshaper": "携帯型ワールドシェイパー",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "集積回路",
"item.create.iron_sheet": "鉄板",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 668",
"_": "Missing Localizations: 676",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "시계 베어링",
"block.create.clutch": "클러치",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "핸드 크랭크",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "수평 유리",
"block.create.horizontal_framed_glass_pane": "수평 유리판",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "안산암 합금",
"item.create.attribute_filter": "속성 필터 틀",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "황동 조각",
"item.create.brass_sheet": "황동 판",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "색채 혼합물",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "구리 주괴",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "휴대용 블럭발사기",
"item.create.handheld_worldshaper": "휴대용 세계편집기",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "집적 회로",
"item.create.iron_sheet": "철 판",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 995",
"_": "Missing Localizations: 1003",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing",
"block.create.clutch": "Koppeling",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "UNLOCALIZED: Hand Crank",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy",
"item.create.attribute_filter": "UNLOCALIZED: Attribute Filter",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "Brons klompje",
"item.create.brass_sheet": "Brons Platen",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "Koperstaaf",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "Blokzapper",
"item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit",
"item.create.iron_sheet": "IJzeren Platen",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1061",
"_": "Missing Localizations: 1069",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "UNLOCALIZED: Chiseled Limestone",
"block.create.chiseled_scoria": "UNLOCALIZED: Chiseled Scoria",
"block.create.chiseled_weathered_limestone": "UNLOCALIZED: Chiseled Weathered Limestone",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "UNLOCALIZED: Clockwork Bearing",
"block.create.clutch": "Embreagem",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "UNLOCALIZED: Hand Crank",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "UNLOCALIZED: Horizontal Framed Glass",
"block.create.horizontal_framed_glass_pane": "UNLOCALIZED: Horizontal Framed Glass Pane",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "UNLOCALIZED: Stationary Contraption",
"entity.create.super_glue": "UNLOCALIZED: Super Glue",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy",
"item.create.attribute_filter": "UNLOCALIZED: Attribute Filter",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "UNLOCALIZED: Brass Nugget",
"item.create.brass_sheet": "UNLOCALIZED: Brass Sheet",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "UNLOCALIZED: Copper Ingot",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "UNLOCALIZED: Golden Sheet",
"item.create.handheld_blockzapper": "Blockzapper Portátil",
"item.create.handheld_worldshaper": "UNLOCALIZED: Handheld Worldshaper",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "UNLOCALIZED: Integrated Circuit",
"item.create.iron_sheet": "Placas de Ferro",
"item.create.lapis_sheet": "UNLOCALIZED: Lapis Sheet",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 337",
"_": "Missing Localizations: 345",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "Резной известняк",
"block.create.chiseled_scoria": "Резной пепел",
"block.create.chiseled_weathered_limestone": "Выветренный резной известняк",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "Часовой механизм",
"block.create.clutch": "Сцепление",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "Рукоятка",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "Горизонтальное обрамлённое стекло",
"block.create.horizontal_framed_glass_pane": "Горизонтальная обрамлённая стеклянная панель",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "Стационарная штуковина",
"entity.create.super_glue": "Супер клей",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "Андезитовый сплав",
"item.create.attribute_filter": "Фильтр атрибутов",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "Кусочек латуни",
"item.create.brass_sheet": "Латунный лист",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "Хроматический компаунд",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "Медный слиток",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "Золотой лист",
"item.create.handheld_blockzapper": "Ручная блоковая пушка",
"item.create.handheld_worldshaper": "Ручной редактор мира",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "Интегральная схема",
"item.create.iron_sheet": "Железный лист",
"item.create.lapis_sheet": "Лазуритовый лист",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 350",
"_": "Missing Localizations: 358",
"_": "->------------------------] Game Elements [------------------------<-",
@ -51,6 +51,7 @@
"block.create.chiseled_limestone": "錾制石灰岩",
"block.create.chiseled_scoria": "錾制熔渣",
"block.create.chiseled_weathered_limestone": "錾制风化石灰岩",
"block.create.chocolate": "UNLOCALIZED: Chocolate",
"block.create.chute": "UNLOCALIZED: Chute",
"block.create.clockwork_bearing": "时钟轴承",
"block.create.clutch": "离合器",
@ -180,6 +181,7 @@
"block.create.green_seat": "UNLOCALIZED: Green Seat",
"block.create.green_valve_handle": "UNLOCALIZED: Green Valve Handle",
"block.create.hand_crank": "手摇曲柄",
"block.create.honey": "UNLOCALIZED: Honey",
"block.create.horizontal_framed_glass": "竖直边框玻璃",
"block.create.horizontal_framed_glass_pane": "竖直边框玻璃板",
"block.create.hose_pulley": "UNLOCALIZED: Hose Pulley",
@ -406,7 +408,11 @@
"entity.create.stationary_contraption": "固定结构",
"entity.create.super_glue": "强力胶",
"fluid.create.flowing_potion": "UNLOCALIZED: Potion",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.milk": "UNLOCALIZED: Milk",
"fluid.create.potion": "UNLOCALIZED: Potion",
"fluid.create.tea": "UNLOCALIZED: Builder's Tea",
"item.create.andesite_alloy": "安山合金",
"item.create.attribute_filter": "属性过滤器",
@ -417,6 +423,7 @@
"item.create.brass_nugget": "黄铜粒",
"item.create.brass_sheet": "黄铜板",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "异彩化合物",
"item.create.cinder_flour": "UNLOCALIZED: Cinder Flour",
"item.create.copper_ingot": "铜锭",
@ -440,6 +447,7 @@
"item.create.golden_sheet": "金板",
"item.create.handheld_blockzapper": "手持式方块放置器",
"item.create.handheld_worldshaper": "手持式环境塑形器",
"item.create.honey_bucket": "UNLOCALIZED: Honey Bucket",
"item.create.integrated_circuit": "集成电路板",
"item.create.iron_sheet": "铁板",
"item.create.lapis_sheet": "青金石板",

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "create:fluid/chocolate_still"
}
}

View file

@ -0,0 +1,5 @@
{
"textures": {
"particle": "block/honey_block_top"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "create:item/chocolate_bucket"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "create:item/honey_bucket"
}
}

View file

@ -0,0 +1,17 @@
{
"type": "create:emptying",
"ingredients": [
{
"item": "minecraft:honey_bottle"
}
],
"results": [
{
"item": "minecraft:glass_bottle"
},
{
"fluid": "create:honey",
"amount": 250
}
]
}

View file

@ -0,0 +1,17 @@
{
"type": "create:emptying",
"ingredients": [
{
"item": "minecraft:milk_bucket"
}
],
"results": [
{
"item": "minecraft:bucket"
},
{
"fluid": "create:milk",
"amount": 1000
}
]
}

View file

@ -0,0 +1,17 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:glass_bottle"
},
{
"fluidTag": "forge:honey",
"amount": 250
}
],
"results": [
{
"item": "minecraft:honey_bottle"
}
]
}

View file

@ -0,0 +1,17 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:bucket"
},
{
"fluidTag": "forge:milk",
"amount": 1000
}
],
"results": [
{
"item": "minecraft:milk_bucket"
}
]
}

View file

@ -0,0 +1,22 @@
{
"type": "create:mixing",
"ingredients": [
{
"item": "minecraft:sugar"
},
{
"item": "minecraft:cocoa_beans"
},
{
"fluidTag": "forge:milk",
"amount": 250
}
],
"results": [
{
"fluid": "create:chocolate",
"amount": 250
}
],
"heatRequirement": "heated"
}

View file

@ -0,0 +1,24 @@
{
"type": "create:mixing",
"ingredients": [
{
"tag": "minecraft:leaves"
},
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 250
},
{
"fluidTag": "forge:milk",
"amount": 250
}
],
"results": [
{
"fluid": "create:tea",
"amount": 500
}
],
"heatRequirement": "heated"
}

View file

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"create:flowing_honey",
"create:honey"
]
}

View file

@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"create:flowing_milk",
"create:milk"
]
}

View file

@ -0,0 +1,9 @@
{
"replace": false,
"values": [
"create:flowing_honey",
"create:honey",
"create:flowing_chocolate",
"create:chocolate"
]
}

View file

@ -1,21 +1,93 @@
package com.simibubi.create;
import javax.annotation.Nullable;
import com.simibubi.create.content.contraptions.fluids.VirtualFluid;
import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid;
import com.simibubi.create.content.contraptions.fluids.potion.PotionFluid.PotionFluidAttributes;
import com.simibubi.create.content.palettes.AllPaletteBlocks;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.tterrag.registrate.util.entry.RegistryEntry;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.IFluidState;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fluids.ForgeFlowingFluid;
public class AllFluids {
private static final CreateRegistrate REGISTRATE = Create.registrate();
public static RegistryEntry<PotionFluid> POTION =
REGISTRATE.virtualFluid("potion", PotionFluidAttributes::new, PotionFluid::new)
.lang(f -> "fluid.create.flowing_potion", "Potion")
.lang(f -> "fluid.create.potion", "Potion")
.register();
public static RegistryEntry<VirtualFluid> TEA = REGISTRATE.virtualFluid("tea")
.lang(f -> "fluid.create.tea", "Builder's Tea")
.register();
public static RegistryEntry<VirtualFluid> MILK = REGISTRATE.virtualFluid("milk")
.lang(f -> "fluid.create.milk", "Milk")
.tag(AllTags.forgeFluidTag("milk"))
.register();
public static RegistryEntry<ForgeFlowingFluid.Flowing> HONEY =
REGISTRATE.fluid("honey", new ResourceLocation("block/honey_block_top"), Create.asResource("fluid/honey_flow"))
.lang(f -> "fluid.create.honey", "Honey")
.attributes(b -> b.viscosity(500)
.density(1400))
.properties(p -> p.levelDecreasePerBlock(2)
.tickRate(25)
.slopeFindDistance(3)
.explosionResistance(100f))
.tag(AllTags.forgeFluidTag("honey"))
.register();
public static RegistryEntry<ForgeFlowingFluid.Flowing> CHOCOLATE = REGISTRATE.standardFluid("chocolate")
.lang(f -> "fluid.create.chocolate", "Chocolate")
.attributes(b -> b.viscosity(500)
.density(1400))
.properties(p -> p.levelDecreasePerBlock(2)
.tickRate(25)
.slopeFindDistance(3)
.explosionResistance(100f))
.register();
// Load this class
public static void register() {}
@OnlyIn(Dist.CLIENT)
public static void assignRenderLayers() {
makeTranslucent(HONEY);
}
@OnlyIn(Dist.CLIENT)
private static void makeTranslucent(RegistryEntry<? extends ForgeFlowingFluid> entry) {
ForgeFlowingFluid fluid = entry.get();
RenderTypeLookup.setRenderLayer(fluid, RenderType.getTranslucent());
RenderTypeLookup.setRenderLayer(fluid.getStillFluid(), RenderType.getTranslucent());
}
@Nullable
public static BlockState getLavaInteraction(IFluidState fluidState) {
Fluid fluid = fluidState.getFluid();
if (fluid.isEquivalentTo(HONEY.get()))
return fluidState.isSource() ? AllPaletteBlocks.LIMESTONE.getDefaultState()
: AllPaletteBlocks.LIMESTONE_VARIANTS.registeredBlocks.get(0)
.getDefaultState();
if (fluid.isEquivalentTo(CHOCOLATE.get()))
return fluidState.isSource() ? AllPaletteBlocks.SCORIA.getDefaultState()
: AllPaletteBlocks.SCORIA_VARIANTS.registeredBlocks.get(0)
.getDefaultState();
return null;
}
}

View file

@ -13,11 +13,13 @@ import com.tterrag.registrate.util.nullness.NonNullFunction;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.fluid.Fluid;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.FluidTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.Tag;
import net.minecraft.tags.TagCollection;
@ -41,6 +43,10 @@ public class AllTags {
public static Tag<Item> forgeItemTag(String name) {
return forgeTag(ItemTags.getCollection(), name);
}
public static Tag<Fluid> forgeFluidTag(String name) {
return forgeTag(FluidTags.getContainer(), name);
}
public static <T> Tag<T> forgeTag(TagCollection<T> collection, String name) {
return tag(collection, "forge", name);

View file

@ -73,6 +73,7 @@ public class CreateClient {
//AllTileEntities.registerRenderers();
AllEntityTypes.registerRenderers();
getColorHandler().init();
AllFluids.assignRenderLayers();
IResourceManager resourceManager = Minecraft.getInstance()
.getResourceManager();

View file

@ -0,0 +1,47 @@
package com.simibubi.create.content.contraptions.fluids;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.IFluidState;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraftforge.fluids.ForgeFlowingFluid;
public class VirtualFluid extends ForgeFlowingFluid {
public VirtualFluid(Properties properties) {
super(properties);
}
@Override
public Fluid getStillFluid() {
return super.getStillFluid();
}
@Override
public Fluid getFlowingFluid() {
return this;
}
@Override
public Item getFilledBucket() {
return Items.AIR;
}
@Override
protected BlockState getBlockState(IFluidState state) {
return Blocks.AIR.getDefaultState();
}
@Override
public boolean isSource(IFluidState p_207193_1_) {
return false;
}
@Override
public int getLevel(IFluidState p_207192_1_) {
return 0;
}
}

View file

@ -4,13 +4,9 @@ import java.util.Collection;
import java.util.List;
import com.simibubi.create.AllFluids;
import com.simibubi.create.content.contraptions.fluids.VirtualFluid;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.IFluidState;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.potion.EffectInstance;
@ -20,10 +16,9 @@ import net.minecraft.potion.Potions;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.ForgeFlowingFluid;
import net.minecraftforge.registries.ForgeRegistries;
public class PotionFluid extends ForgeFlowingFluid {
public class PotionFluid extends VirtualFluid {
public enum BottleType {
REGULAR, SPLASH, LINGERING;
@ -41,36 +36,6 @@ public class PotionFluid extends ForgeFlowingFluid {
return fluidStack;
}
@Override
public Fluid getStillFluid() {
return this;
}
@Override
public Fluid getFlowingFluid() {
return this;
}
@Override
public Item getFilledBucket() {
return Items.AIR;
}
@Override
protected BlockState getBlockState(IFluidState state) {
return Blocks.AIR.getDefaultState();
}
@Override
public boolean isSource(IFluidState p_207193_1_) {
return false;
}
@Override
public int getLevel(IFluidState p_207192_1_) {
return 0;
}
public static class PotionFluidAttributes extends FluidAttributes {
public PotionFluidAttributes(Builder builder, Fluid fluid) {

View file

@ -8,6 +8,7 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.Create;
import com.simibubi.create.foundation.fluid.FluidHelper;
import com.simibubi.create.foundation.fluid.FluidIngredient;
import com.simibubi.create.foundation.utility.Lang;
@ -155,6 +156,7 @@ public class ProcessingRecipeBuilder<T extends ProcessingRecipe<?>> {
}
public ProcessingRecipeBuilder<T> output(Fluid fluid, int amount) {
fluid = FluidHelper.convertToStill(fluid);
return output(new FluidStack(fluid, amount));
}

View file

@ -1,6 +1,10 @@
package com.simibubi.create.events;
import java.util.ArrayList;
import java.util.List;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.simibubi.create.AllFluids;
import com.simibubi.create.Create;
import com.simibubi.create.CreateClient;
import com.simibubi.create.content.contraptions.KineticDebugger;
@ -29,15 +33,19 @@ import com.simibubi.create.foundation.tileEntity.behaviour.linked.LinkRenderer;
import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueRenderer;
import com.simibubi.create.foundation.utility.AnimationTickHolder;
import com.simibubi.create.foundation.utility.ServerSpeedProvider;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ActiveRenderInfo;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.IFluidState;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.EntityViewRenderEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
import net.minecraftforge.client.event.RenderWorldLastEvent;
@ -49,9 +57,6 @@ import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import java.util.ArrayList;
import java.util.List;
@EventBusSubscriber(value = Dist.CLIENT)
public class ClientEvents {
@ -72,11 +77,11 @@ public class ClientEvents {
CreateClient.schematicSender.tick();
CreateClient.schematicAndQuillHandler.tick();
CreateClient.schematicHandler.tick();
ContraptionHandler.tick(world);
CapabilityMinecartController.tick(world);
CouplingPhysics.tick(world);
ScreenOpener.tick();
ServerSpeedProvider.clientTick();
BeltConnectorHandler.tick();
@ -96,9 +101,9 @@ public class ClientEvents {
ArmInteractionPointHandler.tick();
SailBlockPlacementHelper.tick();
PistonPolePlacementHelper.tick();
CreateClient.outliner.tickOutlines();
CreateClient.outliner.tickOutlines();
}
@SubscribeEvent
public static void onLoadWorld(WorldEvent.Load event) {
CreateClient.bufferCache.invalidate();
@ -112,13 +117,13 @@ public class ClientEvents {
ms.push();
ms.translate(-view.getX(), -view.getY(), -view.getZ());
SuperRenderTypeBuffer buffer = SuperRenderTypeBuffer.getInstance();
CouplingRenderer.renderAll(ms, buffer);
CreateClient.schematicHandler.render(ms, buffer);
CreateClient.outliner.renderOutlines(ms, buffer);
// CollisionDebugger.render(ms, buffer);
buffer.draw();
ms.pop();
}
@ -171,4 +176,44 @@ public class ClientEvents {
return !(Minecraft.getInstance().world == null || Minecraft.getInstance().player == null);
}
@SubscribeEvent
public static void getFogDensity(EntityViewRenderEvent.FogDensity event) {
ActiveRenderInfo info = event.getInfo();
IFluidState fluidState = info.getFluidState();
if (fluidState.isEmpty())
return;
Fluid fluid = fluidState.getFluid();
if (fluid.isEquivalentTo(AllFluids.CHOCOLATE.get())) {
event.setDensity(5f);
event.setCanceled(true);
}
if (fluid.isEquivalentTo(AllFluids.HONEY.get())) {
event.setDensity(1.5f);
event.setCanceled(true);
}
}
@SubscribeEvent
public static void getFogColor(EntityViewRenderEvent.FogColors event) {
ActiveRenderInfo info = event.getInfo();
IFluidState fluidState = info.getFluidState();
if (fluidState.isEmpty())
return;
Fluid fluid = fluidState.getFluid();
if (fluid.isEquivalentTo(AllFluids.CHOCOLATE.get())) {
event.setRed(98 / 256f);
event.setGreen(32 / 256f);
event.setBlue(32 / 256f);
}
if (fluid.isEquivalentTo(AllFluids.HONEY.get())) {
event.setRed(234 / 256f);
event.setGreen(174 / 256f);
event.setBlue(47 / 256f);
}
}
}

View file

@ -1,5 +1,6 @@
package com.simibubi.create.events;
import com.simibubi.create.AllFluids;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionHandler;
import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingPhysics;
@ -9,14 +10,20 @@ import com.simibubi.create.content.contraptions.fluids.recipe.PotionMixingRecipe
import com.simibubi.create.content.contraptions.wrench.WrenchItem;
import com.simibubi.create.content.schematics.ServerSchematicLoader;
import com.simibubi.create.foundation.command.AllCommands;
import com.simibubi.create.foundation.utility.Debug;
import com.simibubi.create.foundation.fluid.FluidHelper;
import com.simibubi.create.foundation.utility.Iterate;
import com.simibubi.create.foundation.utility.ServerSpeedProvider;
import com.simibubi.create.foundation.utility.WorldAttached;
import com.simibubi.create.foundation.utility.recipe.RecipeFinder;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.fluid.IFluidState;
import net.minecraft.resources.IReloadableResourceManager;
import net.minecraft.tags.FluidTags;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorld;
import net.minecraft.world.World;
import net.minecraftforge.event.AttachCapabilitiesEvent;
@ -27,6 +34,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import net.minecraftforge.event.entity.player.AttackEntityEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.world.BlockEvent.FluidPlaceBlockEvent;
import net.minecraftforge.event.world.ChunkEvent;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@ -54,6 +62,28 @@ public class CommonEvents {
CapabilityMinecartController.onChunkUnloaded(event);
}
@SubscribeEvent
public static void whenFluidsMeet(FluidPlaceBlockEvent event) {
BlockState blockState = event.getOriginalState();
IFluidState fluidState = blockState.getFluidState();
BlockPos pos = event.getPos();
IWorld world = event.getWorld();
if (fluidState.isSource() && FluidHelper.isLava(fluidState.getFluid()))
return;
for (Direction direction : Iterate.directions) {
IFluidState metFluidState = fluidState.isSource() ? fluidState : world.getFluidState(pos.offset(direction));
if (!metFluidState.isTagged(FluidTags.WATER))
continue;
BlockState lavaInteraction = AllFluids.getLavaInteraction(metFluidState);
if (lavaInteraction == null)
continue;
event.setNewState(lavaInteraction);
break;
}
}
@SubscribeEvent
public static void onWorldTick(WorldTickEvent event) {
if (event.phase == Phase.START)
@ -123,7 +153,7 @@ public class CommonEvents {
public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
CapabilityMinecartController.attach(event);
}
@SubscribeEvent
public static void startTracking(PlayerEvent.StartTracking event) {
CapabilityMinecartController.startTracking(event);

View file

@ -6,13 +6,13 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import com.simibubi.create.Create;
import com.simibubi.create.CreateClient;
import com.simibubi.create.content.AllSections;
import com.simibubi.create.content.contraptions.fluids.VirtualFluid;
import com.simibubi.create.content.contraptions.relays.encased.CasingConnectivity;
import com.simibubi.create.foundation.block.IBlockVertexColor;
import com.simibubi.create.foundation.block.connected.CTModel;
@ -133,6 +133,16 @@ public class CreateRegistrate extends AbstractRegistrate<CreateRegistrate> {
Create.asResource("fluid/" + name + "_flow"), attributesFactory, factory));
}
public FluidBuilder<VirtualFluid, CreateRegistrate> virtualFluid(String name) {
return entry(name,
c -> new VirtualFluidBuilder<>(self(), self(), name, c, Create.asResource("fluid/" + name + "_still"),
Create.asResource("fluid/" + name + "_flow"), null, VirtualFluid::new));
}
public FluidBuilder<ForgeFlowingFluid.Flowing, CreateRegistrate> standardFluid(String name) {
return fluid(name, Create.asResource("fluid/" + name + "_still"), Create.asResource("fluid/" + name + "_flow"));
}
/* Util */
public static <T extends Block> NonNullConsumer<? super T> connectedTextures(ConnectedTextureBehaviour behavior) {

View file

@ -1,23 +1,30 @@
package com.simibubi.create.foundation.data.recipe;
import com.simibubi.create.AllFluids;
import com.simibubi.create.AllRecipeTypes;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.Items;
public class EmptyingRecipeGen extends ProcessingRecipeGen {
/*
* potion/bottles are handled internally now. keeping this builder for reference
* potion/water bottles are handled internally
*/
// GeneratedRecipe
//
// WATER_BOTTLE = create("water_bottle", b -> b
// .require(NBTIngredient.fromStacks(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.WATER)))
// .output(Fluids.WATER, 250)
// .output(Items.GLASS_BOTTLE))
//
// ;
GeneratedRecipe
HONEY_BOTTLE = create("honey_bottle", b -> b
.require(Items.field_226638_pX_)
.output(AllFluids.HONEY.get(), 250)
.output(Items.GLASS_BOTTLE)),
MILK_BUCKET = create("milk_bucket", b -> b
.require(Items.MILK_BUCKET)
.output(AllFluids.MILK.get(), 1000)
.output(Items.BUCKET))
;
public EmptyingRecipeGen(DataGenerator p_i48262_1_) {
super(p_i48262_1_);

View file

@ -1,22 +1,25 @@
package com.simibubi.create.foundation.data.recipe;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.AllTags;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.Items;
public class FillingRecipeGen extends ProcessingRecipeGen {
/*
* potion/bottles are handled internally now. keeping this builder for reference
*/
// GeneratedRecipe
//
// WATER_BOTTLE = create("water_bottle", b -> b.require(Items.GLASS_BOTTLE)
// .require(FluidTags.WATER, 250)
// .output(PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.WATER)))
//
// ;
GeneratedRecipe
HONEY_BOTTLE = create("honey_bottle", b -> b
.require(AllTags.forgeFluidTag("honey"), 250)
.require(Items.GLASS_BOTTLE)
.output(Items.field_226638_pX_)),
MILK_BUCKET = create("milk_bucket", b -> b
.require(AllTags.forgeFluidTag("milk"), 1000)
.require(Items.BUCKET)
.output(Items.MILK_BUCKET))
;
public FillingRecipeGen(DataGenerator p_i48262_1_) {
super(p_i48262_1_);

View file

@ -1,5 +1,6 @@
package com.simibubi.create.foundation.data.recipe;
import com.simibubi.create.AllFluids;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.AllTags;
@ -24,6 +25,19 @@ public class MixingRecipeGen extends ProcessingRecipeGen {
.output(Fluids.LAVA, 25)
.requiresHeat(HeatCondition.SUPERHEATED)),
TEA = create("tea", b -> b.require(Fluids.WATER, 250)
.require(AllTags.forgeFluidTag("milk"), 250)
.require(ItemTags.LEAVES)
.output(AllFluids.TEA.get(), 500)
.requiresHeat(HeatCondition.HEATED)),
CHOCOLATE = create("chocolate", b -> b
.require(AllTags.forgeFluidTag("milk"), 250)
.require(Items.SUGAR)
.require(Items.COCOA_BEANS)
.output(AllFluids.CHOCOLATE.get(), 250)
.requiresHeat(HeatCondition.HEATED)),
BRASS_INGOT = create("brass_ingot", b -> b.require(I.copper())
.require(I.zinc())
.output(AllItems.BRASS_INGOT.get(), 2)

View file

@ -41,6 +41,7 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
FluidStackIngredient ingredient = new FluidStackIngredient();
ingredient.fluid = fluid;
ingredient.amountRequired = amount;
ingredient.fixFlowing();
return ingredient;
}
@ -48,6 +49,7 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
FluidStackIngredient ingredient = new FluidStackIngredient();
ingredient.fluid = fluidStack.getFluid();
ingredient.amountRequired = fluidStack.getAmount();
ingredient.fixFlowing();
if (fluidStack.hasTag())
ingredient.tagToMatch = fluidStack.getTag();
return ingredient;
@ -140,6 +142,11 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
public FluidStackIngredient() {
tagToMatch = new CompoundNBT();
}
void fixFlowing() {
if (fluid instanceof FlowingFluid)
fluid = ((FlowingFluid) fluid).getStillFluid();
}
@Override
protected boolean testInternal(FluidStack t) {

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 302 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 297 B