More content, who dis?

- Sprite touch-ups by vectorwing
- Builders Tea
- Bar of Chocolate
- Fixed spouts not rendering fluid particles of virtual fluid types
- Fixed spouts filling bottles inconsistently
This commit is contained in:
simibubi 2020-12-18 15:13:57 +01:00
parent 68e7d3c34c
commit 6c6760ef17
33 changed files with 243 additions and 31 deletions

View file

@ -397,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
a1a3d65289fe343efdd96b0c2a67e07798309a85 assets/create/lang/en_ud.json
eb83696a4bbd182c523335c05cac256cbb3fb139 assets/create/lang/en_us.json
28cbc503716981312d508cfa44fe760109ba5d4e assets/create/lang/unfinished/de_de.json
46443fc2d228f8507e0aabee549f0a7d0bd2c5dd assets/create/lang/unfinished/fr_fr.json
efdcea3e9f712c95bcf358be2b5da96f83eb59ed assets/create/lang/unfinished/it_it.json
2423352fa39149573fb05f789a0e25af2bb3e27c assets/create/lang/unfinished/ja_jp.json
18a430ee9e42257a19aceed5a0513e59f3aa9748 assets/create/lang/unfinished/ko_kr.json
0547293db4d18fd6d7878486cda6f91e30c096d9 assets/create/lang/unfinished/nl_nl.json
58b2f3e357ea31e9f793c87ec5c3aaefbdb7f776 assets/create/lang/unfinished/pt_br.json
ce5929f1cf653fff4406bf62280ac285617bce7f assets/create/lang/unfinished/ru_ru.json
6c7677eed73ad50616ec22b70f9487f8ef5eda11 assets/create/lang/unfinished/zh_cn.json
31207c4c02766ef3d971c8a62425539aa47ab196 assets/create/lang/en_ud.json
c25023a8712cef9532a464a28d57803a4c14c471 assets/create/lang/en_us.json
0886daed78e5e3ca95da68504530c0d792c488f1 assets/create/lang/unfinished/de_de.json
accce7e58f6c4eb92d78854e2e06eafc02151383 assets/create/lang/unfinished/fr_fr.json
a6e798ccf2024944e5af9b7a4bec7db25ca1bb92 assets/create/lang/unfinished/it_it.json
28d9715653dceba2c1979b01f8678b51c5a01fae assets/create/lang/unfinished/ja_jp.json
14d22de8eda3bcf6b9f34b01727b215e4f3a75ea assets/create/lang/unfinished/ko_kr.json
30e51cad97b9cc340e7e6dfb6b710e62078c6282 assets/create/lang/unfinished/nl_nl.json
3b878fc11e4fb5e7ed896924ff5d4c9056004dfd assets/create/lang/unfinished/pt_br.json
a7437b35df6b41659b32f430fab55dddc97c5b96 assets/create/lang/unfinished/ru_ru.json
39819bd2f7d19ebf911fb1efefcf6043c8538cb6 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
@ -1129,6 +1129,7 @@ bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_enca
7490819e7e5445019b6b8cb2538f12a5b6717a46 assets/create/models/item/andesite_funnel.json
75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json
c0e35daccfb398947532e9499d6bda963387cd9c assets/create/models/item/andesite_tunnel.json
54875c992ec4e314826ca37257e64a96f1c0907e assets/create/models/item/bar_of_chocolate.json
421e481b7fbca4c4a1080ed703401eb25375e087 assets/create/models/item/basin.json
1da382e7e58eaa9788f5b1d92221ccac573e068f assets/create/models/item/belt_connector.json
9044243882cfd49a2827e1b910a4c9b0e46daa47 assets/create/models/item/birch_window.json
@ -1151,6 +1152,7 @@ a37be4a0ec9bf6c381527403c57ced4f81abd67c assets/create/models/item/brass_nugget.
427bef12405e2a99fbf49e27ea5944add244252a assets/create/models/item/brass_tunnel.json
24df6f8391d8ba09cef46e69d65d32ea770745cd assets/create/models/item/brown_seat.json
54211d3bdbeba2ea4dbaed43daa740ae3331640f assets/create/models/item/brown_valve_handle.json
a7a17c99ed261f771dabcd0e287281eb1d714139 assets/create/models/item/builders_tea.json
3e232a103f7f916fc11edb4d541ca99fe7b44181 assets/create/models/item/cart_assembler.json
c9be9d3f8d01ed7e283fdcf347c88458af13460a assets/create/models/item/chest_minecart_contraption.json
99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets/create/models/item/chiseled_dark_scoria.json
@ -2705,6 +2707,7 @@ da9a919b476954c1de34826aa7706bf6056a8f12 data/create/recipes/chiseled_scoria_fro
09faa4ddcf9f3907dcdb3ab3e8b68c1deb2486e5 data/create/recipes/chiseled_weathered_limestone_from_weathered_limestone_stonecutting.json
ca137d5bce3b5f10069041657fdf630529d06bda data/create/recipes/compacting/andesite_from_flint.json
f7879d404d7a848d818278b4e788f285a9087e63 data/create/recipes/compacting/blaze_cake.json
27c23592d8fec03072a04544d3598ca9b1c798ff data/create/recipes/compacting/chocolate.json
7b2ef15dd28d1d8a450ea49a82dfb361d1adde4c data/create/recipes/compacting/diorite_from_flint.json
7657603e95ccf83dd0d4b104635db66e531d092a data/create/recipes/compacting/granite_from_flint.json
19526da3a59fc136654ff1bc93c0251581f397a9 data/create/recipes/crafting/appliances/dough.json
@ -2997,6 +3000,7 @@ 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
d81ceba2946286d374801e698a4ca2116395cbad data/create/recipes/emptying/builders_tea.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
@ -3063,6 +3067,7 @@ d2ab9ce73636773165564506580f2ec13bd1fc50 data/create/recipes/fancy_weathered_lim
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
133e79f78a7f2c2f63ac7695d2be57d56e8955f4 data/create/recipes/filling/blaze_cake.json
642e96ce5dd2f31e7a33c6ef4060eecb0bf2aa86 data/create/recipes/filling/builders_tea.json
5bec6c2068a3c1005810d18bd45ce916389b5423 data/create/recipes/filling/glowstone.json
5eb6227ccb6fa940b662d3ec029c3bd61fe61c8d data/create/recipes/filling/grass_block.json
244f27eadefefbc966ac384ac087c57d19484321 data/create/recipes/filling/gunpowder.json
@ -3487,7 +3492,7 @@ eac71740fb12bdb38b5dfaa2268613d7ba82b809 data/create/tags/blocks/windmill_sails.
081f5aa35602fc27af2ca01ea9f2fd5e7eb284dc data/create/tags/items/create_ingots.json
94c62bf22678ef55b2b8a5398a7960e5b00682dc data/create/tags/items/crushed_ores.json
6cdeeac1689f7b5bfd9bc40b462143d8eaf3ad0b data/create/tags/items/seats.json
3d5cdbbf58f23e9aa0bf15c200905254b93a14ed data/create/tags/items/upright_on_belt.json
43ae6f21db7b43984e163af11f4e6cc80459803a data/create/tags/items/upright_on_belt.json
50936b211d94167a35ec78c89954082a336b6269 data/create/tags/items/valve_handles.json
16bcb8fcbe9170c2c11f1ca8d99d8b36cd812bbd data/forge/tags/blocks/glass/colorless.json
81ced867d24ec814942909965dd4576eff1db685 data/forge/tags/blocks/glass_panes.json

View file

@ -409,6 +409,7 @@
"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.bar_of_chocolate": "\u01DD\u0287\u0250\u05DFo\u0254o\u0265\u0186 \u025FO \u0279\u0250\u15FA",
"item.create.belt_connector": "\u0287\u05DF\u01DD\u15FA \u05DF\u0250\u0254\u0131u\u0250\u0265\u0254\u01DDW",
"item.create.blaze_cake": "\u01DD\u029E\u0250\u0186 \u01DDz\u0250\u05DF\u15FA",
"item.create.blaze_cake_base": "\u01DDs\u0250\u15FA \u01DD\u029E\u0250\u0186 \u01DDz\u0250\u05DF\u15FA",
@ -416,6 +417,7 @@
"item.create.brass_ingot": "\u0287obuI ss\u0250\u0279\u15FA",
"item.create.brass_nugget": "\u0287\u01DDbbnN ss\u0250\u0279\u15FA",
"item.create.brass_sheet": "\u0287\u01DD\u01DD\u0265S ss\u0250\u0279\u15FA",
"item.create.builders_tea": "\u0250\u01DD\u27D8 s,\u0279\u01DDp\u05DF\u0131n\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",

View file

@ -415,6 +415,7 @@
"item.create.andesite_alloy": "Andesite Alloy",
"item.create.attribute_filter": "Attribute Filter",
"item.create.bar_of_chocolate": "Bar Of Chocolate",
"item.create.belt_connector": "Mechanical Belt",
"item.create.blaze_cake": "Blaze Cake",
"item.create.blaze_cake_base": "Blaze Cake Base",
@ -422,6 +423,7 @@
"item.create.brass_ingot": "Brass Ingot",
"item.create.brass_nugget": "Brass Nugget",
"item.create.brass_sheet": "Brass Sheet",
"item.create.builders_tea": "Builder's Tea",
"item.create.chest_minecart_contraption": "Chest Minecart Contraption",
"item.create.chocolate_bucket": "Chocolate Bucket",
"item.create.chromatic_compound": "Chromatic Compound",
@ -1752,6 +1754,9 @@
"item.create.super_glue.tooltip.condition2": "When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "_Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "A Chromatic material forged from _absorbed_ _light_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1207",
"_": "Missing Localizations: 1211",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy",
"item.create.attribute_filter": "UNLOCALIZED: Attribute Filter",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "Mechanischer Riemen",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "UNLOCALIZED: Brass Ingot",
"item.create.brass_nugget": "UNLOCALIZED: Brass Nugget",
"item.create.brass_sheet": "UNLOCALIZED: Brass Sheet",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "UNLOCALIZED: REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "UNLOCALIZED: A Chromatic material forged from _absorbed_ _light_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 858",
"_": "Missing Localizations: 862",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "Alliage d'andésite",
"item.create.attribute_filter": "Filtre d'attribut",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "Tapis roulant",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "Lingot de laiton",
"item.create.brass_nugget": "Pépite de laiton",
"item.create.brass_sheet": "Plaques de laiton",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "Composé chromatique",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "ÉCLAT RAFFINÉ",
"item.create.refined_radiance.tooltip.summary": "Un matériau chromatique forgé à partir de _lumière_ _absorbée_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 842",
"_": "Missing Localizations: 846",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "Lega di Andesite",
"item.create.attribute_filter": "Filtro Attributi",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "Nastro Meccanico",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "Lingotto di Ottone",
"item.create.brass_nugget": "Pepita di Ottone",
"item.create.brass_sheet": "Lamiera di Ottone",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "Composto Cromatico",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "RADIANCE RAFFINATA",
"item.create.refined_radiance.tooltip.summary": "Un Materiale Cromatico forgiato dalla _luce_ _assorbita_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 841",
"_": "Missing Localizations: 845",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "安山岩合金",
"item.create.attribute_filter": "属性フィルター",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "メカニカルベルト",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "真鍮インゴット",
"item.create.brass_nugget": "真鍮ナゲット",
"item.create.brass_sheet": "真鍮シート",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "色彩の化合物",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "洗練された放射",
"item.create.refined_radiance.tooltip.summary": "_吸収された光_から鍛造されたクロマチックマテリアル。",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 842",
"_": "Missing Localizations: 846",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "안산암 합금",
"item.create.attribute_filter": "속성 필터 틀",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "기계식 벨트",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "황동 주괴",
"item.create.brass_nugget": "황동 조각",
"item.create.brass_sheet": "황동 판",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "색채 혼합물",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "_흡수된_ _빛_으로 제련된 색채 혼합물입니다.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1148",
"_": "Missing Localizations: 1152",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy",
"item.create.attribute_filter": "UNLOCALIZED: Attribute Filter",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "Mechanische Transportband",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "UNLOCALIZED: Brass Ingot",
"item.create.brass_nugget": "Brons klompje",
"item.create.brass_sheet": "Brons Platen",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "UNLOCALIZED: REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "UNLOCALIZED: A Chromatic material forged from _absorbed_ _light_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 1214",
"_": "Missing Localizations: 1218",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "UNLOCALIZED: Andesite Alloy",
"item.create.attribute_filter": "UNLOCALIZED: Attribute Filter",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "Esteira Mecânica",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "UNLOCALIZED: Brass Ingot",
"item.create.brass_nugget": "UNLOCALIZED: Brass Nugget",
"item.create.brass_sheet": "UNLOCALIZED: Brass Sheet",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "UNLOCALIZED: When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "UNLOCALIZED: _Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "UNLOCALIZED: REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "UNLOCALIZED: A Chromatic material forged from _absorbed_ _light_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 517",
"_": "Missing Localizations: 521",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "Андезитовый сплав",
"item.create.attribute_filter": "Фильтр атрибутов",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "Механический ремень",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "Латунный слиток",
"item.create.brass_nugget": "Кусочек латуни",
"item.create.brass_sheet": "Латунный лист",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "Хроматический компаунд",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "Кода в другой руке",
"item.create.super_glue.tooltip.behaviour2": "Автоматически _прикрепляет_ _блоки_, расположенные от основной руки, к той _стороне_, _против_ _которой_ они были.",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "Хроматический материал, _добытый_ _из_ _поглощенного_ _света_.",

View file

@ -1,5 +1,5 @@
{
"_": "Missing Localizations: 525",
"_": "Missing Localizations: 529",
"_": "->------------------------] Game Elements [------------------------<-",
@ -416,6 +416,7 @@
"item.create.andesite_alloy": "安山合金",
"item.create.attribute_filter": "属性过滤器",
"item.create.bar_of_chocolate": "UNLOCALIZED: Bar Of Chocolate",
"item.create.belt_connector": "传送带",
"item.create.blaze_cake": "UNLOCALIZED: Blaze Cake",
"item.create.blaze_cake_base": "UNLOCALIZED: Blaze Cake Base",
@ -423,6 +424,7 @@
"item.create.brass_ingot": "黄铜锭",
"item.create.brass_nugget": "黄铜粒",
"item.create.brass_sheet": "黄铜板",
"item.create.builders_tea": "UNLOCALIZED: Builder's Tea",
"item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption",
"item.create.chocolate_bucket": "UNLOCALIZED: Chocolate Bucket",
"item.create.chromatic_compound": "异彩化合物",
@ -1753,6 +1755,9 @@
"item.create.super_glue.tooltip.condition2": "在副手上时",
"item.create.super_glue.tooltip.behaviour2": "主手放置的方块会被_直接_黏在所放置的方块上",
"item.create.builders_tea.tooltip": "UNLOCALIZED: BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "UNLOCALIZED: The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "一种用_光辉_锻造的化合物材料.",

View file

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

View file

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

View file

@ -0,0 +1,15 @@
{
"type": "create:compacting",
"ingredients": [
{
"fluid": "create:chocolate",
"nbt": {},
"amount": 250
}
],
"results": [
{
"item": "create:bar_of_chocolate"
}
]
}

View file

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

View file

@ -0,0 +1,18 @@
{
"type": "create:filling",
"ingredients": [
{
"item": "minecraft:glass_bottle"
},
{
"fluid": "create:tea",
"nbt": {},
"amount": 250
}
],
"results": [
{
"item": "create:builders_tea"
}
]
}

View file

@ -3,6 +3,7 @@
"values": [
"create:blaze_cake_base",
"create:blaze_cake",
"create:builders_tea",
"minecraft:glass_bottle",
"minecraft:potion",
"minecraft:splash_potion",

View file

@ -21,6 +21,7 @@ import com.simibubi.create.content.contraptions.relays.belt.item.BeltConnectorIt
import com.simibubi.create.content.contraptions.relays.gearbox.VerticalGearboxItem;
import com.simibubi.create.content.contraptions.wrench.WrenchItem;
import com.simibubi.create.content.contraptions.wrench.WrenchModel;
import com.simibubi.create.content.curiosities.BuildersTeaItem;
import com.simibubi.create.content.curiosities.ChromaticCompoundColor;
import com.simibubi.create.content.curiosities.ChromaticCompoundItem;
import com.simibubi.create.content.curiosities.CombustibleItem;
@ -49,8 +50,8 @@ import com.simibubi.create.foundation.item.TagDependentIngredientItem;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.tterrag.registrate.util.entry.ItemEntry;
import net.minecraft.item.Food;
import net.minecraft.item.Item;
import net.minecraft.item.Item.Properties;
import net.minecraft.item.Rarity;
import net.minecraft.tags.Tag;
import net.minecraft.util.ResourceLocation;
@ -109,6 +110,19 @@ public class AllItems {
.tag(AllItemTags.UPRIGHT_ON_BELT.tag)
.register();
public static final ItemEntry<Item> BAR_OF_CHOCOLATE = REGISTRATE.item("bar_of_chocolate", Item::new)
.properties(p -> p.food(new Food.Builder().hunger(5)
.saturation(0.6F)
.build()))
.lang("Bar of Chocolate")
.register();
public static final ItemEntry<BuildersTeaItem> BUILDERS_TEA = REGISTRATE.item("builders_tea", BuildersTeaItem::new)
.tag(AllItemTags.UPRIGHT_ON_BELT.tag)
.properties(p -> p.maxStackSize(16))
.lang("Builder's Tea")
.register();
public static final ItemEntry<ChromaticCompoundItem> CHROMATIC_COMPOUND =
REGISTRATE.item("chromatic_compound", ChromaticCompoundItem::new)
.properties(p -> p.rarity(Rarity.UNCOMMON))

View file

@ -52,6 +52,7 @@ public class FillingBySpout {
return results.isEmpty() ? ItemStack.EMPTY : results.get(0);
}
}
return GenericItemFilling.fillItem(world, requiredAmount, stack, availableFluid);
}

View file

@ -82,7 +82,7 @@ public class GenericItemFilling {
toFill.setAmount(requiredAmount);
availableFluid.shrink(requiredAmount);
if (stack.getItem() == Items.GLASS_BOTTLE && canFillGlassBottleInternally(availableFluid)) {
if (stack.getItem() == Items.GLASS_BOTTLE && canFillGlassBottleInternally(toFill)) {
ItemStack fillBottle = ItemStack.EMPTY;
if (FluidHelper.isWater(toFill.getFluid()))
fillBottle = PotionUtils.addPotionToItemStack(new ItemStack(Items.POTION), Potions.WATER);

View file

@ -6,6 +6,7 @@ import static com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProce
import java.util.ArrayList;
import java.util.List;
import com.simibubi.create.content.contraptions.fluids.FluidFX;
import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
import com.simibubi.create.foundation.advancement.AllTriggers;
import com.simibubi.create.foundation.tileEntity.SmartTileEntity;
@ -167,10 +168,8 @@ public class SpoutTileEntity extends SmartTileEntity {
protected void spawnProcessingParticles(FluidStack fluid) {
Vec3d vec = VecHelper.getCenterOf(pos);
vec = vec.subtract(0, 8 / 16f, 0);
IParticleData particle = new BlockParticleData(ParticleTypes.BLOCK, fluid.getFluid()
.getDefaultState()
.getBlockState());
world.addOptionalParticle(particle, vec.x, vec.y, vec.z, 0, -.5f, 0);
IParticleData particle = FluidFX.getFluidParticle(fluid);
world.addOptionalParticle(particle, vec.x, vec.y, vec.z, 0, -.1f, 0);
}
protected static int SPLASH_PARTICLE_COUNT = 20;
@ -178,11 +177,9 @@ public class SpoutTileEntity extends SmartTileEntity {
protected void spawnSplash(FluidStack fluid) {
Vec3d vec = VecHelper.getCenterOf(pos);
vec = vec.subtract(0, 2 - 5 / 16f, 0);
IParticleData particle = new BlockParticleData(ParticleTypes.BLOCK, fluid.getFluid()
.getDefaultState()
.getBlockState());
IParticleData particle = FluidFX.getFluidParticle(fluid);
for (int i = 0; i < SPLASH_PARTICLE_COUNT; i++) {
Vec3d m = VecHelper.offsetRandomly(Vec3d.ZERO, world.rand, 0.25f);
Vec3d m = VecHelper.offsetRandomly(Vec3d.ZERO, world.rand, 0.125f);
m = new Vec3d(m.x, Math.abs(m.y), m.z);
world.addOptionalParticle(particle, vec.x, vec.y, vec.z, m.x, m.y, m.z);
}

View file

@ -0,0 +1,62 @@
package com.simibubi.create.content.curiosities;
import net.minecraft.advancements.CriteriaTriggers;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.UseAction;
import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects;
import net.minecraft.stats.Stats;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.world.World;
public class BuildersTeaItem extends Item {
public BuildersTeaItem(Properties p_i48487_1_) {
super(p_i48487_1_);
}
public ItemStack onItemUseFinish(ItemStack stack, World world, LivingEntity entity) {
PlayerEntity playerentity = entity instanceof PlayerEntity ? (PlayerEntity) entity : null;
if (playerentity instanceof ServerPlayerEntity)
CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayerEntity) playerentity, stack);
if (!world.isRemote)
entity.addPotionEffect(new EffectInstance(Effects.HASTE, 3 * 60 * 20, 0, false, false, false));
if (playerentity != null) {
playerentity.addStat(Stats.ITEM_USED.get(this));
playerentity.getFoodStats().addStats(1, .6F);
if (!playerentity.abilities.isCreativeMode)
stack.shrink(1);
}
if (playerentity == null || !playerentity.abilities.isCreativeMode) {
if (stack.isEmpty())
return new ItemStack(Items.GLASS_BOTTLE);
if (playerentity != null)
playerentity.inventory.addItemStackToInventory(new ItemStack(Items.GLASS_BOTTLE));
}
return stack;
}
public int getUseDuration(ItemStack p_77626_1_) {
return 42;
}
public UseAction getUseAction(ItemStack p_77661_1_) {
return UseAction.DRINK;
}
public ActionResult<ItemStack> onItemRightClick(World p_77659_1_, PlayerEntity p_77659_2_, Hand p_77659_3_) {
p_77659_2_.setActiveHand(p_77659_3_);
return ActionResult.success(p_77659_2_.getHeldItem(p_77659_3_));
}
}

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.content.palettes.AllPaletteBlocks;
@ -20,6 +21,9 @@ public class CompactingRecipeGen extends ProcessingRecipeGen {
.require(Items.RED_SAND)
.output(Blocks.GRANITE, 1)),
CHOCOLATE = create("chocolate", b -> b.require(AllFluids.CHOCOLATE.get(), 250)
.output(AllItems.BAR_OF_CHOCOLATE.get(), 1)),
DIORITE = create("diorite_from_flint", b -> b.require(Items.FLINT)
.require(Items.FLINT)
.require(Fluids.LAVA, 100)

View file

@ -1,6 +1,7 @@
package com.simibubi.create.foundation.data.recipe;
import com.simibubi.create.AllFluids;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllRecipeTypes;
import net.minecraft.data.DataGenerator;
@ -19,6 +20,11 @@ public class EmptyingRecipeGen extends ProcessingRecipeGen {
.output(AllFluids.HONEY.get(), 250)
.output(Items.GLASS_BOTTLE)),
BUILDERS_TEA = create("builders_tea", b -> b
.require(AllItems.BUILDERS_TEA.get())
.output(AllFluids.TEA.get(), 250)
.output(Items.GLASS_BOTTLE)),
MILK_BUCKET = create("milk_bucket", b -> b
.require(Items.MILK_BUCKET)
.output(AllFluids.MILK.get(), 1000)

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;
@ -18,6 +19,10 @@ public class FillingRecipeGen extends ProcessingRecipeGen {
.require(Items.GLASS_BOTTLE)
.output(Items.field_226638_pX_)),
BUILDERS_TEA = create("builders_tea", b -> b.require(AllFluids.TEA.get(), 250)
.require(Items.GLASS_BOTTLE)
.output(AllItems.BUILDERS_TEA.get())),
BLAZE_CAKE = create("blaze_cake", b -> b.require(Fluids.LAVA, 250)
.require(AllItems.BLAZE_CAKE_BASE.get())
.output(AllItems.BLAZE_CAKE.get())),

View file

@ -628,6 +628,9 @@
"item.create.super_glue.tooltip.condition2": "When Held in Offhand",
"item.create.super_glue.tooltip.behaviour2": "_Automatically_ _attaches_ blocks placed from the main hand to the _side_ they were _placed_ _against._",
"item.create.builders_tea.tooltip": "BUILDERS TEA",
"item.create.builders_tea.tooltip.summary": "The perfect drink to get the day started- _Motivating_ and _Saturating._",
"item.create.refined_radiance.tooltip": "REFINED RADIANCE",
"item.create.refined_radiance.tooltip.summary": "A Chromatic material forged from _absorbed_ _light_.",

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 436 B

After

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 346 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 B

After

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 384 B