Merge branch 'mc1.15/dev' into mc1.16/dev
This commit is contained in:
simibubi
commit
ecd5858ece
40 changed files with 260 additions and 39 deletions
|
|
@ -337,7 +337,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
|
||||
ab2a1bf8f37f1c64d00538867f4c3a97195bd3c4 assets/create/blockstates/radial_chassis.json
|
||||
d2e6f19325be65457e94bea44fd52863c0f66be7 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
|
||||
|
|
@ -401,17 +401,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
|
||||
7f40117f3618fe7b3e793f4095edf5a4c78a732f assets/create/lang/en_ud.json
|
||||
2374914313bffb7e0c8eca4ee952bf18158dc66b assets/create/lang/en_us.json
|
||||
1d997e77464bb29350f3b3398bf02f0c0da988d7 assets/create/lang/unfinished/de_de.json
|
||||
a21aaff4598a8449da43a37c27f6bc59c2034b7d assets/create/lang/unfinished/fr_fr.json
|
||||
d02931a8a882aa2a052e2b426a4f8cf324207930 assets/create/lang/unfinished/it_it.json
|
||||
27b19e1752900956d594bac0c12fe55c3e2dac59 assets/create/lang/unfinished/ja_jp.json
|
||||
9b00cb37522adaead03daeef6c2ed404ac513c8c assets/create/lang/unfinished/ko_kr.json
|
||||
af4ad46aad61bb9049ee31806eeefcf6bfe747d0 assets/create/lang/unfinished/nl_nl.json
|
||||
f0ea00bac89f85c4d3e46b1b9800d9ef46bc4b98 assets/create/lang/unfinished/pt_br.json
|
||||
cfc293f9ed53cac9a0c0e7da8ccac72877bcecd1 assets/create/lang/unfinished/ru_ru.json
|
||||
ab1dd5d3f6fcbec7b622f5da263a1365374dbca1 assets/create/lang/unfinished/zh_cn.json
|
||||
8bb8625cf3b710c114c1ca5e3bfb94d6ac9b1a76 assets/create/lang/en_ud.json
|
||||
848a057a4b3e84c0f1ef9bbd01646b87e1903e5f assets/create/lang/en_us.json
|
||||
e5647da894fcc56bb8c6a068c28db8a6881342f6 assets/create/lang/unfinished/de_de.json
|
||||
2613c0b9b87bfd1e982e73890a8f2bd3f0e38be4 assets/create/lang/unfinished/fr_fr.json
|
||||
8afc394564890f3949459026732de840c026120e assets/create/lang/unfinished/it_it.json
|
||||
afebad8276bcd46942cae88499c85ae74bdd9e16 assets/create/lang/unfinished/ja_jp.json
|
||||
2764bf19ed427a2f2f7c0d40e5742ef03a1b8ca9 assets/create/lang/unfinished/ko_kr.json
|
||||
4a95a57c4df6fb9322cc9fcca6939cce34d7fc40 assets/create/lang/unfinished/nl_nl.json
|
||||
bcc94f62217bf70e5c8a29cd0bbfb9b613f204bd assets/create/lang/unfinished/pt_br.json
|
||||
75b93204c8913fb8c063f2f3131bab9b7cfb2182 assets/create/lang/unfinished/ru_ru.json
|
||||
e01057fac180ae4721014cc1d47d3e2308dc9772 assets/create/lang/unfinished/zh_cn.json
|
||||
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
|
||||
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
|
||||
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
|
||||
|
|
@ -1187,6 +1187,7 @@ bc6e7469744604e578200ea87690e4dd3b25e447 assets/create/models/item/andesite_enca
|
|||
7490819e7e5445019b6b8cb2538f12a5b6717a46 assets/create/models/item/andesite_funnel.json
|
||||
75b8b00c2418b9660d35a7fabd0774925cf1c02f assets/create/models/item/andesite_pillar.json
|
||||
795541cf7205d90531a23cd5b388f93a03bbf925 assets/create/models/item/andesite_tunnel.json
|
||||
cf9e35bfea0b0a324e1c6384990425b3d359792c assets/create/models/item/bar_of_chocolate.json
|
||||
421e481b7fbca4c4a1080ed703401eb25375e087 assets/create/models/item/basin.json
|
||||
ffdb36349fa2e50451c208585162b6a8386ec494 assets/create/models/item/belt_connector.json
|
||||
9044243882cfd49a2827e1b910a4c9b0e46daa47 assets/create/models/item/birch_window.json
|
||||
|
|
@ -1209,6 +1210,7 @@ f7aca6aff65e1de269a99cf2a280d9841b7a0076 assets/create/models/item/brass_sheet.j
|
|||
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
|
||||
329c17cd2ac693babf6f05d0be94cfb1683a87cc assets/create/models/item/builders_tea.json
|
||||
3e232a103f7f916fc11edb4d541ca99fe7b44181 assets/create/models/item/cart_assembler.json
|
||||
36a680c6d0cd485402b72056cead58fd3dbff5f8 assets/create/models/item/chest_minecart_contraption.json
|
||||
99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets/create/models/item/chiseled_dark_scoria.json
|
||||
|
|
@ -2781,6 +2783,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
|
||||
|
|
@ -3075,6 +3078,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
|
||||
|
|
@ -3141,6 +3145,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
|
||||
|
|
@ -3573,7 +3578,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
|
||||
81d3eb40b048160fcc2d6bb7ff12b49276297efd data/forge/tags/blocks/glass_panes.json
|
||||
|
|
|
|||
|
|
@ -413,6 +413,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",
|
||||
|
|
@ -420,6 +421,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",
|
||||
|
|
|
|||
|
|
@ -419,6 +419,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",
|
||||
|
|
@ -426,6 +427,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",
|
||||
|
|
@ -1756,6 +1758,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_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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",
|
||||
|
|
@ -1757,6 +1759,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_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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",
|
||||
|
|
@ -1757,6 +1759,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_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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",
|
||||
|
|
@ -1757,6 +1759,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_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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": "色彩の化合物",
|
||||
|
|
@ -1757,6 +1759,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": "_吸収された光_から鍛造されたクロマチックマテリアル。",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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": "색채 혼합물",
|
||||
|
|
@ -1757,6 +1759,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": "_흡수된_ _빛_으로 제련된 색채 혼합물입니다.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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",
|
||||
|
|
@ -1757,6 +1759,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_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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",
|
||||
|
|
@ -1757,6 +1759,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_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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": "Хроматический компаунд",
|
||||
|
|
@ -1757,6 +1759,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": "Хроматический материал, _добытый_ _из_ _поглощенного_ _света_.",
|
||||
|
||||
|
|
|
|||
|
|
@ -420,6 +420,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",
|
||||
|
|
@ -427,6 +428,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": "异彩化合物",
|
||||
|
|
@ -1757,6 +1759,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": "一种用_光辉_锻造的化合物材料.",
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "create:item/bar_of_chocolate"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "create:item/builders_tea"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "create:compacting",
|
||||
"ingredients": [
|
||||
{
|
||||
"fluid": "create:chocolate",
|
||||
"nbt": {},
|
||||
"amount": 250
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "create:bar_of_chocolate"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"type": "create:emptying",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "create:builders_tea"
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "minecraft:glass_bottle"
|
||||
},
|
||||
{
|
||||
"fluid": "create:tea",
|
||||
"amount": 250
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"type": "create:filling",
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "minecraft:glass_bottle"
|
||||
},
|
||||
{
|
||||
"fluid": "create:tea",
|
||||
"nbt": {},
|
||||
"amount": 250
|
||||
}
|
||||
],
|
||||
"results": [
|
||||
{
|
||||
"item": "create:builders_tea"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
"values": [
|
||||
"create:blaze_cake_base",
|
||||
"create:blaze_cake",
|
||||
"create:builders_tea",
|
||||
"minecraft:glass_bottle",
|
||||
"minecraft:potion",
|
||||
"minecraft:splash_potion",
|
||||
|
|
|
|||
|
|
@ -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.ITag;
|
||||
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))
|
||||
|
|
|
|||
|
|
@ -608,7 +608,14 @@ public abstract class Contraption {
|
|||
int index = 0;
|
||||
for (MountedStorage mountedStorage : storage.values())
|
||||
handlers[index++] = mountedStorage.getItemHandler();
|
||||
|
||||
IFluidHandler[] fluidHandlers = new IFluidHandler[fluidStorage.size()];
|
||||
index = 0;
|
||||
for (MountedFluidStorage mountedStorage : fluidStorage.values())
|
||||
fluidHandlers[index++] = mountedStorage.getFluidHandler();
|
||||
|
||||
inventory = new CombinedInvWrapper(handlers);
|
||||
fluidInventory = new CombinedTankWrapper(fluidHandlers);
|
||||
|
||||
if (nbt.contains("BoundsFront"))
|
||||
bounds = NBTHelper.readAABB(nbt.getList("BoundsFront", 5));
|
||||
|
|
|
|||
|
|
@ -126,7 +126,8 @@ public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity imp
|
|||
if (!contraption.assemble(world, pos))
|
||||
return;
|
||||
|
||||
AllTriggers.triggerForNearbyPlayers(AllTriggers.WINDMILL, world, pos, 5);
|
||||
if (isWindmill())
|
||||
AllTriggers.triggerForNearbyPlayers(AllTriggers.WINDMILL, world, pos, 5);
|
||||
if (contraption.getSailBlocks() >= 16 * 8)
|
||||
AllTriggers.triggerForNearbyPlayers(AllTriggers.MAXED_WINDMILL, world, pos, 5);
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,7 @@ public class FillingBySpout {
|
|||
return results.isEmpty() ? ItemStack.EMPTY : results.get(0);
|
||||
}
|
||||
}
|
||||
|
||||
return GenericItemFilling.fillItem(world, requiredAmount, stack, availableFluid);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import java.util.List;
|
|||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
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;
|
||||
|
|
@ -23,9 +24,7 @@ import net.minecraft.block.BlockState;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.PotionItem;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
import net.minecraft.particles.BlockParticleData;
|
||||
import net.minecraft.particles.IParticleData;
|
||||
import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.potion.PotionUtils;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.tileentity.TileEntityType;
|
||||
|
|
@ -242,10 +241,8 @@ public class SpoutTileEntity extends SmartTileEntity {
|
|||
protected void spawnProcessingParticles(FluidStack fluid) {
|
||||
Vector3d 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;
|
||||
|
|
@ -253,11 +250,9 @@ public class SpoutTileEntity extends SmartTileEntity {
|
|||
protected void spawnSplash(FluidStack fluid) {
|
||||
Vector3d 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++) {
|
||||
Vector3d m = VecHelper.offsetRandomly(Vector3d.ZERO, world.rand, 0.25f);
|
||||
Vector3d m = VecHelper.offsetRandomly(Vector3d.ZERO, world.rand, 0.125f);
|
||||
m = new Vector3d(m.x, Math.abs(m.y), m.z);
|
||||
world.addOptionalParticle(particle, vec.x, vec.y, vec.z, m.x, m.y, m.z);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ public class AxisPipeBlock extends RotatedPillarBlock implements IWrenchableWith
|
|||
if (blockTypeChanged && !world.isRemote)
|
||||
FluidPropagator.propagateChangedPipe(world, pos, state);
|
||||
if (state != newState && !isMoving)
|
||||
removeBracket(world, pos).ifPresent(stack -> Block.spawnAsEntity(world, pos, stack));
|
||||
removeBracket(world, pos, true).ifPresent(stack -> Block.spawnAsEntity(world, pos, stack));
|
||||
if (state.hasTileEntity() && (blockTypeChanged || !newState.hasTileEntity()))
|
||||
world.removeTileEntity(pos);
|
||||
}
|
||||
|
|
@ -127,12 +127,12 @@ public class AxisPipeBlock extends RotatedPillarBlock implements IWrenchableWith
|
|||
}
|
||||
|
||||
@Override
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos) {
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos, boolean inOnReplacedContext) {
|
||||
BracketedTileEntityBehaviour behaviour = TileEntityBehaviour.get(world, pos, BracketedTileEntityBehaviour.TYPE);
|
||||
if (behaviour == null)
|
||||
return Optional.empty();
|
||||
BlockState bracket = behaviour.getBracket();
|
||||
behaviour.removeBracket();
|
||||
behaviour.removeBracket(inOnReplacedContext);
|
||||
if (bracket == Blocks.AIR.getDefaultState())
|
||||
return Optional.empty();
|
||||
return Optional.of(new ItemStack(bracket.getBlock()));
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWren
|
|||
if (blockTypeChanged && !world.isRemote)
|
||||
FluidPropagator.propagateChangedPipe(world, pos, state);
|
||||
if (state != newState && !isMoving)
|
||||
removeBracket(world, pos).ifPresent(stack -> Block.spawnAsEntity(world, pos, stack));
|
||||
removeBracket(world, pos, true).ifPresent(stack -> Block.spawnAsEntity(world, pos, stack));
|
||||
if (state.hasTileEntity() && (blockTypeChanged || !newState.hasTileEntity()))
|
||||
world.removeTileEntity(pos);
|
||||
}
|
||||
|
|
@ -261,13 +261,13 @@ public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWren
|
|||
}
|
||||
|
||||
@Override
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos) {
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos, boolean inOnReplacedContext) {
|
||||
BracketedTileEntityBehaviour behaviour =
|
||||
BracketedTileEntityBehaviour.get(world, pos, BracketedTileEntityBehaviour.TYPE);
|
||||
if (behaviour == null)
|
||||
return Optional.empty();
|
||||
BlockState bracket = behaviour.getBracket();
|
||||
behaviour.removeBracket();
|
||||
behaviour.removeBracket(inOnReplacedContext);
|
||||
if (bracket == Blocks.AIR.getDefaultState())
|
||||
return Optional.empty();
|
||||
return Optional.of(new ItemStack(bracket.getBlock()));
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ public abstract class AbstractShaftBlock extends RotatedPillarKineticBlock imple
|
|||
@SuppressWarnings("deprecation")
|
||||
public void onReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean isMoving) {
|
||||
if (state != newState && !isMoving)
|
||||
removeBracket(world, pos).ifPresent(stack -> Block.spawnAsEntity(world, pos, stack));
|
||||
removeBracket(world, pos, true).ifPresent(stack -> Block.spawnAsEntity(world, pos, stack));
|
||||
super.onReplaced(state, world, pos, newState, isMoving);
|
||||
}
|
||||
|
||||
|
|
@ -102,12 +102,12 @@ public abstract class AbstractShaftBlock extends RotatedPillarKineticBlock imple
|
|||
}
|
||||
|
||||
@Override
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos) {
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos, boolean inOnReplacedContext) {
|
||||
BracketedTileEntityBehaviour behaviour = TileEntityBehaviour.get(world, pos, BracketedTileEntityBehaviour.TYPE);
|
||||
if (behaviour == null)
|
||||
return Optional.empty();
|
||||
BlockState bracket = behaviour.getBracket();
|
||||
behaviour.removeBracket();
|
||||
behaviour.removeBracket(inOnReplacedContext);
|
||||
if (bracket == Blocks.AIR.getDefaultState())
|
||||
return Optional.empty();
|
||||
return Optional.of(new ItemStack(bracket.getBlock()));
|
||||
|
|
|
|||
|
|
@ -62,13 +62,16 @@ public class BracketedTileEntityBehaviour extends TileEntityBehaviour {
|
|||
AllTriggers.triggerFor(trigger.apply(state), player);
|
||||
}
|
||||
|
||||
public void removeBracket() {
|
||||
public void removeBracket(boolean inOnReplacedContext) {
|
||||
World world = getWorld();
|
||||
if (!world.isRemote)
|
||||
world.playEvent(2001, getPos(), Block.getStateId(getBracket()));
|
||||
this.bracket = Optional.empty();
|
||||
reRender = true;
|
||||
tileEntity.notifyUpdate();
|
||||
if (inOnReplacedContext)
|
||||
tileEntity.sendData();
|
||||
else
|
||||
tileEntity.notifyUpdate();
|
||||
}
|
||||
|
||||
public boolean isBacketPresent() {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import net.minecraft.world.World;
|
|||
|
||||
public interface IWrenchableWithBracket extends IWrenchable {
|
||||
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos);
|
||||
public Optional<ItemStack> removeBracket(IBlockReader world, BlockPos pos, boolean inOnReplacedContext);
|
||||
|
||||
@Override
|
||||
default ActionResultType onWrenched(BlockState state, ItemUseContext context) {
|
||||
|
|
@ -31,7 +31,7 @@ public interface IWrenchableWithBracket extends IWrenchable {
|
|||
default boolean tryRemoveBracket(ItemUseContext context) {
|
||||
World world = context.getWorld();
|
||||
BlockPos pos = context.getPos();
|
||||
Optional<ItemStack> bracket = removeBracket(world, pos);
|
||||
Optional<ItemStack> bracket = removeBracket(world, pos, false);
|
||||
BlockState blockState = world.getBlockState(pos);
|
||||
if (bracket.isPresent()) {
|
||||
PlayerEntity player = context.getPlayer();
|
||||
|
|
|
|||
|
|
@ -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_));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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.HONEY_BOTTLE)),
|
||||
|
||||
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())),
|
||||
|
|
|
|||
|
|
@ -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 |
BIN
src/main/resources/assets/create/textures/item/builders_tea.png
Normal file
BIN
src/main/resources/assets/create/textures/item/builders_tea.png
Normal file
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 |
Loading…
Reference in a new issue