mirror of
https://github.com/Creators-of-Create/Create.git
synced 2025-03-04 06:44:40 +01:00
Merge remote-tracking branch 'origin/mc1.20.1/feature-dev' into mc1.21.1/dev
This commit is contained in:
simibubi
commit
9cc6f3316e
38 changed files with 721 additions and 577 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.947566918 Create's Sequenced Assembly Recipes
|
||||
// 1.21.1 2025-02-02T12:32:00.8411485 Create's Sequenced Assembly Recipes
|
||||
6acf60d5a4765260756a6ca3bfe09661ae8badef data/create/recipe/sequenced_assembly/precision_mechanism.json
|
||||
651fc851e0162789e8f4c28fbe617dcca8431453 data/create/recipe/sequenced_assembly/sturdy_sheet.json
|
||||
443bf1a2df3f99c164c4f83f8db16a45a8d9d624 data/create/recipe/sequenced_assembly/track.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.947635084 Create's Advancements
|
||||
// 1.21.1 2025-02-02T12:32:00.9109615 Create's Advancements
|
||||
5876d95160eca4e05f94dbc9c4ff44ce83cbbb2b data/create/advancement/andesite_alloy.json
|
||||
b124cd0229367b711f4e9650115a5579825e44e2 data/create/advancement/andesite_casing.json
|
||||
ee674ceca35306b53838dde10ed55d8f506650f8 data/create/advancement/anvil_plough.json
|
||||
|
|
@ -61,8 +61,8 @@ d3d5db28c9997262c18a1ac3906e573150b77975 data/create/advancement/mechanical_pres
|
|||
213511913bc129a6c0b6f2742e8c0b75bb3d7141 data/create/advancement/mechanical_pump_0.json
|
||||
27fbaeed944dec5536262e199c03f2c59488375e data/create/advancement/millstone.json
|
||||
b1ec5fdada815373bb9b93396fb4395bacac31a9 data/create/advancement/musical_arm.json
|
||||
400a9ecfe4eec29b009f12cb5b7e38cb433dead0 data/create/advancement/package_chute_throw.json
|
||||
996597053ec9a5c3fbd3edd3ec678964768e4219 data/create/advancement/packager.json
|
||||
400a9ecfe4eec29b009f12cb5b7e38cb433dead0 data/create/advancement/package_chute_throw.json
|
||||
00da13ba89426acc57a0bb6695fd240cef798e36 data/create/advancement/pipe_organ.json
|
||||
27ec1ced6e27b8818a4769efaee627edfeca5216 data/create/advancement/portable_storage_interface.json
|
||||
402328e7ca2ccbe1ccbf0932df7356ed46742d7c data/create/advancement/potato_cannon.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.943400496 Create Train Hat Information
|
||||
// 1.21.1 2025-02-02T12:32:00.8206905 Create Train Hat Information
|
||||
be16d47aa64e673b1107a36ce06475016e316fca assets/minecraft/train_hat_info/axolotl.json
|
||||
b8ae6d9c8014439f4049622e0d6e79b9d6716260 assets/minecraft/train_hat_info/bat.json
|
||||
5053a6c9fb412dfac1bf17eb0f57f9fd314198e4 assets/minecraft/train_hat_info/bee.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.967666154 Create's Mechanical Crafting Recipes
|
||||
// 1.21.1 2025-02-02T12:32:00.9199378 Create's Mechanical Crafting Recipes
|
||||
d5d008e80899b20f1c7d76ff52af0183bb57d9d0 data/create/recipe/mechanical_crafting/crushing_wheel.json
|
||||
d9ca4ced8302f3f8baeddd7fd68210eb91f4631f data/create/recipe/mechanical_crafting/extendo_grip.json
|
||||
42d4b73c0e74daa18e97889d11919b8701a45aa2 data/create/recipe/mechanical_crafting/potato_cannon.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.948223923 Create's Standard Recipes
|
||||
// 1.21.1 2025-02-02T12:32:00.915949 Create's Standard Recipes
|
||||
489f0a3e3d8571c4897f49eada95a23290a472dc data/create/advancement/recipes/combat/crafting/appliances/netherite_backtank.json
|
||||
b024ae44179c47b9be8fa35acc763c22b7b01b2e data/create/advancement/recipes/combat/crafting/appliances/netherite_backtank_from_netherite.json
|
||||
41d2909fcf45f9098c0ee306810c16168d4e8ae4 data/create/advancement/recipes/combat/crafting/appliances/netherite_diving_boots.json
|
||||
|
|
@ -185,9 +185,9 @@ bf93994f593bb39a2a6b4cec9b7aa374cb19b188 data/create/advancement/recipes/misc/cr
|
|||
f25de39b0f4699b9f1daec66421f64a55b6dbfe2 data/create/advancement/recipes/misc/crafting/logistics/factory_gauge.json
|
||||
8663dc32d8fe2b675012a1f287540c76668c2c78 data/create/advancement/recipes/misc/crafting/logistics/factory_gauge_clear.json
|
||||
4dad99555c2fe2e99d9298bebac0d4f9e338b4df data/create/advancement/recipes/misc/crafting/logistics/item_hatch.json
|
||||
fec5b9f52f7e007f0f8ecee1c451ea4913e29f4f data/create/advancement/recipes/misc/crafting/logistics/package_frogport.json
|
||||
7735696ae9056f7586971bf0fc8ee04d18ab37b7 data/create/advancement/recipes/misc/crafting/logistics/packager.json
|
||||
11849198f80c9781d6e312fe9fbe7d1c8ea05c18 data/create/advancement/recipes/misc/crafting/logistics/packager_from_conversion.json
|
||||
fec5b9f52f7e007f0f8ecee1c451ea4913e29f4f data/create/advancement/recipes/misc/crafting/logistics/package_frogport.json
|
||||
a1e752febfbd65786f2e5310b47fbe8d662c5e63 data/create/advancement/recipes/misc/crafting/logistics/powered_latch.json
|
||||
8f21cb6b00a3ba7dd60698f88e33dad8ce5af61a data/create/advancement/recipes/misc/crafting/logistics/powered_toggle_latch.json
|
||||
15e95363ece7478016c4dc002f946ed74edf6c02 data/create/advancement/recipes/misc/crafting/logistics/pulse_extender.json
|
||||
|
|
@ -198,11 +198,11 @@ d20b6524266aeead6e8d700967a4c6b85f952902 data/create/advancement/recipes/misc/cr
|
|||
0a5b5aedf18ce5d1cc0bc1620d6b537ce89593fa data/create/advancement/recipes/misc/crafting/logistics/redstone_requester.json
|
||||
7654f5831a2a4111043c82532cf5c3a9b12589fb data/create/advancement/recipes/misc/crafting/logistics/redstone_requester_clear.json
|
||||
1dc2e58450e209f8ef0b2bb1edce1b907383f356 data/create/advancement/recipes/misc/crafting/logistics/repackager_from_conversion.json
|
||||
978cf1d71604ac074cfa2de3905c13b049a8e444 data/create/advancement/recipes/misc/crafting/logistics/stockpile_switch.json
|
||||
eec6a4ecc84bbc0ea4dc5442464e795638b27aa6 data/create/advancement/recipes/misc/crafting/logistics/stock_link.json
|
||||
24c357740d4fe5fe9ad14b9560f7a08381e87bcf data/create/advancement/recipes/misc/crafting/logistics/stock_link_clear.json
|
||||
57e738b9520c4f2157f595b4c8e375327f2f5215 data/create/advancement/recipes/misc/crafting/logistics/stock_ticker.json
|
||||
e27585868586db7f740ab021884465856232ca2e data/create/advancement/recipes/misc/crafting/logistics/stock_ticker_clear.json
|
||||
978cf1d71604ac074cfa2de3905c13b049a8e444 data/create/advancement/recipes/misc/crafting/logistics/stockpile_switch.json
|
||||
a8dc78072d06bc48ff672a074f446c4e8c1d80ad data/create/advancement/recipes/misc/crafting/materials/andesite_alloy.json
|
||||
70182d6887e70b0051bc191ead27a405018b5117 data/create/advancement/recipes/misc/crafting/materials/andesite_alloy_block.json
|
||||
1476372fee9f49ad7d6ba3ebcf35016a002260f9 data/create/advancement/recipes/misc/crafting/materials/andesite_alloy_from_block.json
|
||||
|
|
@ -234,9 +234,9 @@ e7950816a9466d52db2b7936d41514556176eb06 data/create/advancement/recipes/misc/cr
|
|||
a5d4a6d5b25d1cfff096121d08ced42fc14dbe2d data/create/advancement/recipes/misc/crafting/materials/zinc_nugget_from_decompacting.json
|
||||
661d8a52cb069d2eb3652d32f16db625f6d6085d data/create/advancement/recipes/misc/crafting/palettes/scorchia.json
|
||||
1b03d166a730ce8281b809bd000b7f0054b9a453 data/create/advancement/recipes/misc/crafting/schematics/empty_schematic.json
|
||||
a6083a8cb62bb89189ae6b24e296f86db41c7699 data/create/advancement/recipes/misc/crafting/schematics/schematicannon.json
|
||||
1fd9ac6c86981f37bcb2a83c1e41dee711326b89 data/create/advancement/recipes/misc/crafting/schematics/schematic_and_quill.json
|
||||
f12b0b50c9eedb5fe586162f4b95b408e959ffac data/create/advancement/recipes/misc/crafting/schematics/schematic_table.json
|
||||
a6083a8cb62bb89189ae6b24e296f86db41c7699 data/create/advancement/recipes/misc/crafting/schematics/schematicannon.json
|
||||
c21f08d80359a242004a484b4313ddbbb76e5c2d data/create/advancement/recipes/misc/crafting/tree_fertilizer.json
|
||||
c9c291c510c616cbc1c2ab291b174d8ff0d2d463 data/create/advancement/recipes/misc/smelting/bread.json
|
||||
9ca18682184387126e715d6f321fcee3120bc61f data/create/advancement/recipes/misc/smelting/copper_ingot_from_crushed.json
|
||||
|
|
@ -463,9 +463,9 @@ d439c719d4091a68a77138efa47ce353cb7e6b8a data/create/recipe/crafting/logistics/d
|
|||
352b6a1a8f3b0a70d15cf3eaea95c77515ee4f0a data/create/recipe/crafting/logistics/factory_gauge.json
|
||||
7b09481688982f7b1f78550db94736c91da4364e data/create/recipe/crafting/logistics/factory_gauge_clear.json
|
||||
28295e21a01b3e28a8b6b4d8e803b82e5520b008 data/create/recipe/crafting/logistics/item_hatch.json
|
||||
d08ad62fbc754be2f73f4fd4652a992864f602da data/create/recipe/crafting/logistics/package_frogport.json
|
||||
5dacf1011f4f856c336ea82953d35e488ff89c30 data/create/recipe/crafting/logistics/packager.json
|
||||
1500607d23fede3c0cc81b84de772f136c17e445 data/create/recipe/crafting/logistics/packager_from_conversion.json
|
||||
d08ad62fbc754be2f73f4fd4652a992864f602da data/create/recipe/crafting/logistics/package_frogport.json
|
||||
c58be916b2f7cb728d182b0d4ad3a66bbdb36b75 data/create/recipe/crafting/logistics/powered_latch.json
|
||||
3fe7cd194a137bc1ceafb4169463c1c6929e3b49 data/create/recipe/crafting/logistics/powered_toggle_latch.json
|
||||
eaa697a040bdf8a8572534bcbd9b8f96bb9dfe90 data/create/recipe/crafting/logistics/pulse_extender.json
|
||||
|
|
@ -476,11 +476,11 @@ c48677fbce18cb7076b8e7c096e954fc860cf957 data/create/recipe/crafting/logistics/r
|
|||
e6cea336ce6c34777236b08981b0c136fd49759e data/create/recipe/crafting/logistics/redstone_requester.json
|
||||
ced496591848f04f328b3a172a92d319d86dd623 data/create/recipe/crafting/logistics/redstone_requester_clear.json
|
||||
d3faeadd5658ad6b5a259eb7998b8dea5625c8d4 data/create/recipe/crafting/logistics/repackager_from_conversion.json
|
||||
4a0e13f4fb9970f8d567c579d56e8e1d8d7160d8 data/create/recipe/crafting/logistics/stockpile_switch.json
|
||||
ba9ebe90fc60b310423ae59938cf3c501376f4b1 data/create/recipe/crafting/logistics/stock_link.json
|
||||
a5c159b421d293d78c3eff019a0c4679ee7b27f6 data/create/recipe/crafting/logistics/stock_link_clear.json
|
||||
92009c38319c560efd70a6c237b65fdb0aae155a data/create/recipe/crafting/logistics/stock_ticker.json
|
||||
224f788956f101d9519dd4f29c6021317fa01305 data/create/recipe/crafting/logistics/stock_ticker_clear.json
|
||||
4a0e13f4fb9970f8d567c579d56e8e1d8d7160d8 data/create/recipe/crafting/logistics/stockpile_switch.json
|
||||
9977c29c5187e7d960d45418ebf10d683c3aa33a data/create/recipe/crafting/materials/andesite_alloy.json
|
||||
1fb9b09ffee15f90f7c5f40ca0bd091bb478111e data/create/recipe/crafting/materials/andesite_alloy_block.json
|
||||
156eb4e2b4751735a4fde6c19909c2c1a176b100 data/create/recipe/crafting/materials/andesite_alloy_from_block.json
|
||||
|
|
@ -512,9 +512,9 @@ a77386c15ac46fb7e4123b649262aba1633593d7 data/create/recipe/crafting/materials/e
|
|||
84a564917585b07938ab5f3ffd29d8a7a0cd01a4 data/create/recipe/crafting/materials/zinc_nugget_from_decompacting.json
|
||||
3535d2e052bebd0bb86cb648900a52279af0171b data/create/recipe/crafting/palettes/scorchia.json
|
||||
e73a660925d6cf80e1b8d81d35f53d56b28b7af2 data/create/recipe/crafting/schematics/empty_schematic.json
|
||||
8b4fd3bc6a3be08b9eb9de3dc3d346bda4701050 data/create/recipe/crafting/schematics/schematicannon.json
|
||||
ee1bf4fe136d0d10ab786b3a7b4a759fb6ef60ea data/create/recipe/crafting/schematics/schematic_and_quill.json
|
||||
a6dac63c7b0c818c0ab461310a352092a4b61083 data/create/recipe/crafting/schematics/schematic_table.json
|
||||
8b4fd3bc6a3be08b9eb9de3dc3d346bda4701050 data/create/recipe/crafting/schematics/schematicannon.json
|
||||
11ead95f608e6027cf43434423658e9955fb01d7 data/create/recipe/crafting/tree_fertilizer.json
|
||||
be41a76d909d0d6fe0ae73482a3f4ad4cd7aac85 data/create/recipe/smelting/bread.json
|
||||
19c396a20a7b784a739e4b532ed1852186c50923 data/create/recipe/smelting/copper_ingot_from_crushed.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.947499355 Create's Damage Type Tags
|
||||
// 1.21.1 2025-02-02T12:32:00.8401521 Create's Damage Type Tags
|
||||
7884716b2f4bb1330ff215366bb4bab06e4728c2 data/minecraft/tags/damage_type/bypasses_armor.json
|
||||
1fcad1f89265fba8bdb05b03a1dfcc88d7b7a550 data/minecraft/tags/damage_type/is_explosion.json
|
||||
08324c61115b72bb8a6370d7f34d84d9a31afd16 data/minecraft/tags/damage_type/is_fire.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-31T16:32:01.065278432 Create's Processing Recipes
|
||||
// 1.21.1 2025-02-02T12:32:00.8246808 Create's Processing Recipes
|
||||
f3b53b8fd8eaccb466d28f0b801e4046758782d7 data/create/recipe/compacting/andesite_from_flint.json
|
||||
8addd735263ee2d36941da9655d6c305e2b7e5ee data/create/recipe/compacting/blaze_cake.json
|
||||
50229c8ccff8b3420456dfb007236dce812b8145 data/create/recipe/compacting/chocolate.json
|
||||
|
|
@ -97,18 +97,18 @@ df364151c75a7d84446b2c6213e339115bc9d298 data/create/recipe/crushing/diorite_rec
|
|||
9e89294e53a94a05af47948c21ad192ef18f7710 data/create/recipe/crushing/emerald_ore.json
|
||||
9c3989fd9e72e21353803f475a08b8f199717c1f data/create/recipe/crushing/gilded_blackstone.json
|
||||
3c4c78e3a7137022f8f6e90324af6c8f97050e80 data/create/recipe/crushing/glowstone.json
|
||||
b036b1654d2deec20aca95ff43b60c7d0b28b2fc data/create/recipe/crushing/gold_ore.json
|
||||
95b76da439260151355fff74b3b7398ce13d6968 data/create/recipe/crushing/golden_horse_armor.json
|
||||
b036b1654d2deec20aca95ff43b60c7d0b28b2fc data/create/recipe/crushing/gold_ore.json
|
||||
cc939ba59b95db1c7a034df6f9e656772074a5fd data/create/recipe/crushing/gravel.json
|
||||
17ab2d789c9c2df122b6a96ab06bbe2c02592a93 data/create/recipe/crushing/iron_horse_armor.json
|
||||
c9a47b29ba75ba29c8cb630fe32c4bf2f1f1d1ae data/create/recipe/crushing/iron_ore.json
|
||||
855b6655dea911724ee68d07b993f17440ac422e data/create/recipe/crushing/lapis_ore.json
|
||||
85ba14be0fa0dace966ce37615e9e6fd8eac6b43 data/create/recipe/crushing/lead_ore.json
|
||||
e170bc17a796c73a05d2d77a85c086cfaac55c31 data/create/recipe/crushing/leather_horse_armor.json
|
||||
0e847495bbfc2a15edfa278ceb33ef42e4bed7ee data/create/recipe/crushing/netherrack.json
|
||||
07e8991a2161aab4dd73bb74900fd0c70aad2847 data/create/recipe/crushing/nether_gold_ore.json
|
||||
c7c0d94707c2858a87d01cff6b284d7fb85acdbe data/create/recipe/crushing/nether_quartz_ore.json
|
||||
0380b9416b263de2ee6a6cd1f4064df2e243c047 data/create/recipe/crushing/nether_wart_block.json
|
||||
0e847495bbfc2a15edfa278ceb33ef42e4bed7ee data/create/recipe/crushing/netherrack.json
|
||||
10b41130f930f00104746d9cf8a94bddec143d66 data/create/recipe/crushing/nickel_ore.json
|
||||
66f75530e30d8572bdbf4696a32edc5a7850ac00 data/create/recipe/crushing/obsidian.json
|
||||
17cacb19493b9bbe7236b19a2a50a817c449a915 data/create/recipe/crushing/ochrum.json
|
||||
|
|
@ -178,42 +178,42 @@ df820cfc0ebc1cbd510e9847b36345314320ecf7 data/create/recipe/cutting/compat/regio
|
|||
7a01147d3c7d8fb9acb870b33e5a792328f88c3c data/create/recipe/deploying/cogwheel.json
|
||||
1230f449873262e79585752d3430e5f7f383bcb2 data/create/recipe/deploying/large_cogwheel.json
|
||||
dc35369da8514a5650704fd39e84861cce084b5d data/create/recipe/deploying/waxed_copper_block_from_adding_wax.json
|
||||
7b7d596cdaa4000222177b405c04c6e8906561b4 data/create/recipe/deploying/waxed_copper_shingles_from_adding_wax.json
|
||||
afbe0c612651ee90651ee7b39683c8baac2a115e data/create/recipe/deploying/waxed_copper_shingle_slab_from_adding_wax.json
|
||||
66cd83c15d46692f27deaac280ef782bb2bd7909 data/create/recipe/deploying/waxed_copper_shingle_stairs_from_adding_wax.json
|
||||
7b7d596cdaa4000222177b405c04c6e8906561b4 data/create/recipe/deploying/waxed_copper_shingles_from_adding_wax.json
|
||||
bcb9750b7c3504996d6177d5980128af018942a8 data/create/recipe/deploying/waxed_copper_tiles_from_adding_wax.json
|
||||
eecd6194b0efc2bee321ba7fac7348cd3f5911ab data/create/recipe/deploying/waxed_copper_tile_slab_from_adding_wax.json
|
||||
dfc1f8f6b0d1b6d23c9125c97eba31dadc370904 data/create/recipe/deploying/waxed_copper_tile_stairs_from_adding_wax.json
|
||||
bcb9750b7c3504996d6177d5980128af018942a8 data/create/recipe/deploying/waxed_copper_tiles_from_adding_wax.json
|
||||
e260cded2b746bd79afaaa1e086cf2f0faffde76 data/create/recipe/deploying/waxed_cut_copper_from_adding_wax.json
|
||||
33e338242aff64f9d52169392d2eb8e617b8da5c data/create/recipe/deploying/waxed_cut_copper_slab_from_adding_wax.json
|
||||
5f4671548b18634ae440d7c64c4c97e5e533601b data/create/recipe/deploying/waxed_cut_copper_stairs_from_adding_wax.json
|
||||
ff182d5c0c4b832ff566691d9b680c9039c55c16 data/create/recipe/deploying/waxed_exposed_copper_from_adding_wax.json
|
||||
eff2e77f004873e695e419afc71a7011328d3de8 data/create/recipe/deploying/waxed_exposed_copper_shingles_from_adding_wax.json
|
||||
5a7a622d5b340f83ba2d32fe53620744c5193a32 data/create/recipe/deploying/waxed_exposed_copper_shingle_slab_from_adding_wax.json
|
||||
b895ef423e64936b5d94ee54a6527316ed48d9d6 data/create/recipe/deploying/waxed_exposed_copper_shingle_stairs_from_adding_wax.json
|
||||
eff2e77f004873e695e419afc71a7011328d3de8 data/create/recipe/deploying/waxed_exposed_copper_shingles_from_adding_wax.json
|
||||
9d566e599cc05aefde637faab1957813a5b6f3f7 data/create/recipe/deploying/waxed_exposed_copper_tiles_from_adding_wax.json
|
||||
582083e0fed8760cde2c53aa2b02237eb59a3df0 data/create/recipe/deploying/waxed_exposed_copper_tile_slab_from_adding_wax.json
|
||||
fec9d744770bfc517a72a2be45701aab6f3040b2 data/create/recipe/deploying/waxed_exposed_copper_tile_stairs_from_adding_wax.json
|
||||
9d566e599cc05aefde637faab1957813a5b6f3f7 data/create/recipe/deploying/waxed_exposed_copper_tiles_from_adding_wax.json
|
||||
0f18c91f36e3abae99a7dca72f3d80e59f03cf7d data/create/recipe/deploying/waxed_exposed_cut_copper_from_adding_wax.json
|
||||
7ed36f4f3abfd37aec13a273b87d97c8ccc36cb4 data/create/recipe/deploying/waxed_exposed_cut_copper_slab_from_adding_wax.json
|
||||
9cd5a6c71b5102ef2660e8a5c650cbd2c2327580 data/create/recipe/deploying/waxed_exposed_cut_copper_stairs_from_adding_wax.json
|
||||
97b7b3f65807328d0a036cb66ee53d898504da77 data/create/recipe/deploying/waxed_oxidized_copper_from_adding_wax.json
|
||||
bd37d658666b2912c07b6daa6adaff99a479223a data/create/recipe/deploying/waxed_oxidized_copper_shingles_from_adding_wax.json
|
||||
07c82e555617f9d9166f2d2c9068ac421eb0b37a data/create/recipe/deploying/waxed_oxidized_copper_shingle_slab_from_adding_wax.json
|
||||
d0c7805681e3ed6a6bc5775d42c702af924e8785 data/create/recipe/deploying/waxed_oxidized_copper_shingle_stairs_from_adding_wax.json
|
||||
bd37d658666b2912c07b6daa6adaff99a479223a data/create/recipe/deploying/waxed_oxidized_copper_shingles_from_adding_wax.json
|
||||
41c879946a24ff330466476bdee9148859398842 data/create/recipe/deploying/waxed_oxidized_copper_tiles_from_adding_wax.json
|
||||
af72234311a9abf5c57c767c05274c466dceac53 data/create/recipe/deploying/waxed_oxidized_copper_tile_slab_from_adding_wax.json
|
||||
b35d22f891d1c9cab4340399e3426c96132b3fc7 data/create/recipe/deploying/waxed_oxidized_copper_tile_stairs_from_adding_wax.json
|
||||
41c879946a24ff330466476bdee9148859398842 data/create/recipe/deploying/waxed_oxidized_copper_tiles_from_adding_wax.json
|
||||
9d78f4d16273015d181be586f91e77f3b82ee18f data/create/recipe/deploying/waxed_oxidized_cut_copper_from_adding_wax.json
|
||||
2a9c57a8ca9b013b7bc11d2588d4ba00b402f97f data/create/recipe/deploying/waxed_oxidized_cut_copper_slab_from_adding_wax.json
|
||||
5670c074c0f1961a5e499953a49c7e3f1f617ebf data/create/recipe/deploying/waxed_oxidized_cut_copper_stairs_from_adding_wax.json
|
||||
58679c5c37eaa5a52ef9e0f4f7cc695c58ddee96 data/create/recipe/deploying/waxed_weathered_copper_from_adding_wax.json
|
||||
5817055c1cf3ae572ffbe2765f3e519fda4c3342 data/create/recipe/deploying/waxed_weathered_copper_shingles_from_adding_wax.json
|
||||
e962429c48ed12bb2d7b299719513c23a2088879 data/create/recipe/deploying/waxed_weathered_copper_shingle_slab_from_adding_wax.json
|
||||
2321ea4ed39d09b12a80be8df2c7c1dc4c6d2c18 data/create/recipe/deploying/waxed_weathered_copper_shingle_stairs_from_adding_wax.json
|
||||
5817055c1cf3ae572ffbe2765f3e519fda4c3342 data/create/recipe/deploying/waxed_weathered_copper_shingles_from_adding_wax.json
|
||||
b635490492a22f88e24003bffb09c4d5e3fa2d61 data/create/recipe/deploying/waxed_weathered_copper_tiles_from_adding_wax.json
|
||||
d0fc937a3e7ae42fb1891b7b87adb2b57292e01d data/create/recipe/deploying/waxed_weathered_copper_tile_slab_from_adding_wax.json
|
||||
6852ea4c7f27520fb3388ec641be4cb94d907199 data/create/recipe/deploying/waxed_weathered_copper_tile_stairs_from_adding_wax.json
|
||||
b635490492a22f88e24003bffb09c4d5e3fa2d61 data/create/recipe/deploying/waxed_weathered_copper_tiles_from_adding_wax.json
|
||||
9ab3ba5847c3abbc17c476436978141f2c039ce9 data/create/recipe/deploying/waxed_weathered_cut_copper_from_adding_wax.json
|
||||
733dd94b46186c19fdecced5d8231e46ea612cf2 data/create/recipe/deploying/waxed_weathered_cut_copper_slab_from_adding_wax.json
|
||||
cd4c050e6ad9227bf293768f2d8b965c0ecafeab data/create/recipe/deploying/waxed_weathered_cut_copper_stairs_from_adding_wax.json
|
||||
|
|
@ -236,8 +236,8 @@ baa9b649e7f8cb84fefde87807272493bd25ecf4 data/create/recipe/filling/compat/vampi
|
|||
def8c3ddc6a1ab712a852a9032cd17c635a77a05 data/create/recipe/filling/glowstone.json
|
||||
dc3dd440dddde9bf48bfd025e25ed62c014cdfa7 data/create/recipe/filling/grass_block.json
|
||||
8e22c0233d9468f73e54506a8184c12bd27040d0 data/create/recipe/filling/gunpowder.json
|
||||
284d74a7379dfe1d7de6d981f2ac505c63f27af0 data/create/recipe/filling/honey_bottle.json
|
||||
4c9df6860825650b0e4c5b43a42380c0e93ff39d data/create/recipe/filling/honeyed_apple.json
|
||||
284d74a7379dfe1d7de6d981f2ac505c63f27af0 data/create/recipe/filling/honey_bottle.json
|
||||
c7595e20709c2841c1b791587553508da79f274e data/create/recipe/filling/redstone.json
|
||||
61a74572465c447faefeee9c36849b2d9a6b3eab data/create/recipe/filling/sweet_roll.json
|
||||
2fe00e53157d4cd4ce63943ab91b06287eab288c data/create/recipe/haunting/blackstone.json
|
||||
|
|
@ -383,8 +383,8 @@ d3b22c9efb4864435ad04b4f4b37be84744be8a5 data/create/recipe/milling/compat/byg/y
|
|||
41dc64aa6474c4d77640bc1fcf737e95bf0184d0 data/create/recipe/milling/compat/byg/yellow_tulip.json
|
||||
c4bb4792f94656eeb360c1357dc3775b16f90d7b data/create/recipe/milling/compat/druidcraft/lavender.json
|
||||
c3aa28c1057a6e7bc18a5c011ffdadd76958788c data/create/recipe/milling/compat/environmental/bird_of_paradise.json
|
||||
d656a9217252e65cbbc77b66f2c98391346e18bc data/create/recipe/milling/compat/environmental/blue_delphinium.json
|
||||
a5afd57da173a6a9c79fe651984a3c91d7bd59d5 data/create/recipe/milling/compat/environmental/bluebell.json
|
||||
d656a9217252e65cbbc77b66f2c98391346e18bc data/create/recipe/milling/compat/environmental/blue_delphinium.json
|
||||
ac581e04ff1e62a042ef529a5955126b6b0aedbf data/create/recipe/milling/compat/environmental/cartwheel.json
|
||||
b682af4dfb74ae6ba5bc1d2310c2331f9035f4e8 data/create/recipe/milling/compat/environmental/dianthus.json
|
||||
9780300e04a4dbeec213747b5d0e5a136e7193b0 data/create/recipe/milling/compat/environmental/magenta_hibiscus.json
|
||||
|
|
@ -584,11 +584,11 @@ cccf4ef0891992687dcb7ce5c644499d93210b8a data/create/recipe/splashing/sand.json
|
|||
519726a953f73a86726bae736d53863fc65a7529 data/create/recipe/splashing/stained_glass.json
|
||||
957b1bdcb78546ba2343734c1764c9929adf6249 data/create/recipe/splashing/stained_glass_pane.json
|
||||
5f27e164f7ced5a5281ac0da2d7c4a5eebd605d6 data/create/recipe/splashing/supplementaries/blackboard.json
|
||||
81925ca89d12f430ab1cf342df18b1f5f5983c59 data/create/recipe/splashing/the_vault/ornate_chain_rusty.json
|
||||
aff9e32cffa157ab8e90f3ca498bf439073ee432 data/create/recipe/splashing/thermal/crushed_raw_lead.json
|
||||
b9d8b6b51145a8e16a431c1ee11d6732bb74191a data/create/recipe/splashing/thermal/crushed_raw_nickel.json
|
||||
e2d5a1f7b5ec86426ef183487b2d33c6794f9fef data/create/recipe/splashing/thermal/crushed_raw_silver.json
|
||||
0ca49330c7403cd3ad4f2e3629355780c699dcdc data/create/recipe/splashing/thermal/crushed_raw_tin.json
|
||||
81925ca89d12f430ab1cf342df18b1f5f5983c59 data/create/recipe/splashing/the_vault/ornate_chain_rusty.json
|
||||
ddb906670ff9de8a2d5a224a890b1e4317871ce4 data/create/recipe/splashing/wheat_flour.json
|
||||
a883796342143a5f2b5bc68d230b725964abdb8f data/create/recipe/splashing/white_concrete_powder.json
|
||||
d09bcaa2334e05e6cce37b7342c7de84ce954bb9 data/create/recipe/splashing/wool.json
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.948048341 Create's Custom Sounds
|
||||
// 1.21.1 2025-02-02T12:32:00.912957 Create's Custom Sounds
|
||||
0bca17432111ff732e5188cd3098201330e386bc assets/create/sounds.json
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,2 +1,2 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.947425309 Create's Recipe Serializer Tags
|
||||
// 1.21.1 2025-02-02T12:32:00.8401521 Create's Recipe Serializer Tags
|
||||
0d8718f7383761bc5d7bc45306ed266ebf25dc1d data/create/tags/recipe_serializer/automation_ignore.json
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.21.1 2025-01-26T10:17:25.948107009 Create's Generated Registry Entries
|
||||
// 1.21.1 2025-02-02T12:32:00.9139541 Create's Generated Registry Entries
|
||||
030ede1044384c4117ac1e491bf5c78bbd2842f5 data/create/damage_type/crush.json
|
||||
92b0416950ffeb3ba68811e587177c2f8811c2c5 data/create/damage_type/cuckoo_surprise.json
|
||||
d2a4fdb64f4ba817e13a7b20c73fd1ca34b825fc data/create/damage_type/fan_fire.json
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@
|
|||
"block.create.blue_table_cloth": "ɥʇoןƆ ǝןqɐ⟘ ǝnןᗺ",
|
||||
"block.create.blue_toolbox": "xoqןoo⟘ ǝnןᗺ",
|
||||
"block.create.blue_valve_handle": "ǝןpuɐH ǝʌןɐΛ ǝnןᗺ",
|
||||
"block.create.bound_cardboard_block": "pɹɐoqpɹɐƆ ɟo ʞɔoןq punoᗺ",
|
||||
"block.create.bound_cardboard_block": "pɹɐoqpɹɐƆ ɟo ʞɔoןᗺ punoᗺ",
|
||||
"block.create.brass_bars": "sɹɐᗺ ssɐɹᗺ",
|
||||
"block.create.brass_belt_funnel": "ןǝuunℲ ʇןǝᗺ ssɐɹᗺ",
|
||||
"block.create.brass_block": "ssɐɹᗺ ɟo ʞɔoןᗺ",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
"block.create.industrial_iron_window_pane": "ǝuɐԀ ʍopuıM uoɹI ןɐıɹʇsnpuI",
|
||||
"block.create.item_drain": "uıɐɹᗡ ɯǝʇI",
|
||||
"block.create.item_hatch": "ɥɔʇɐH ɯǝʇI",
|
||||
"block.create.item_hatch.tooltip.behaviour1": "˙pǝɹɹǝɟsuɐɹʇ ǝq ‾ʇou‾ ןןıʍ ‾sʇuǝʇuoɔ ɥʇıʍ‾ sɯǝʇı puɐ ‾sɯǝʇı ɹɐqʇoH‾ ˙uo pǝɔɐןd sı ʇı ‾ɹǝuıɐʇuoɔ‾ ǝɥʇ oʇuı sɯǝʇı ɹnoʎ ‾sʇısodǝᗡ‾",
|
||||
"block.create.item_hatch.tooltip.behaviour1": "˙sɯǝʇı ɹɐqʇoH ʇdǝɔxǝ ‾buıɥʇʎɹǝʌǝ‾ ‾ʇısodǝp‾ oʇ ‾ʞɔıןɔ-ʞɐǝuS‾ ˙uo pǝɔɐןd sı ʇı ‾ɹǝuıɐʇuoɔ‾ ǝɥʇ oʇuı ‾ɯǝʇı pןǝɥ‾ ɹnoʎ ‾sʇısodǝᗡ‾",
|
||||
"block.create.item_hatch.tooltip.condition1": "pǝʞɔıןƆ-ᴚ uǝɥM",
|
||||
"block.create.item_hatch.tooltip.summary": "˙ɯǝןqoɹd s,ǝsןǝ ǝuoǝɯos ʇı sǝʞɐɯ puɐ ɹǝʇʇnןɔ ‾ʎɹoʇuǝʌuı‾ ɹnoʎ ‾sǝʌןos ʎןʞɔınὉ‾",
|
||||
"block.create.item_vault": "ʇןnɐΛ ɯǝʇI",
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@
|
|||
"block.create.blue_table_cloth": "Blue Table Cloth",
|
||||
"block.create.blue_toolbox": "Blue Toolbox",
|
||||
"block.create.blue_valve_handle": "Blue Valve Handle",
|
||||
"block.create.bound_cardboard_block": "Bound block of Cardboard",
|
||||
"block.create.bound_cardboard_block": "Bound Block of Cardboard",
|
||||
"block.create.brass_bars": "Brass Bars",
|
||||
"block.create.brass_belt_funnel": "Brass Belt Funnel",
|
||||
"block.create.brass_block": "Block of Brass",
|
||||
|
|
@ -521,7 +521,7 @@
|
|||
"block.create.industrial_iron_window_pane": "Industrial Iron Window Pane",
|
||||
"block.create.item_drain": "Item Drain",
|
||||
"block.create.item_hatch": "Item Hatch",
|
||||
"block.create.item_hatch.tooltip.behaviour1": "_Deposits_ your items into the _container_ it is placed on. _Hotbar items_ and items _with contents_ will _not_ be transferred.",
|
||||
"block.create.item_hatch.tooltip.behaviour1": "_Deposits_ your _held item_ into the _container_ it is placed on. _Sneak-click_ to _deposit_ _everything_ except Hotbar items.",
|
||||
"block.create.item_hatch.tooltip.condition1": "When R-Clicked",
|
||||
"block.create.item_hatch.tooltip.summary": "_Quickly solves_ your _inventory_ clutter and makes it someone else's problem.",
|
||||
"block.create.item_vault": "Item Vault",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"criteria": {
|
||||
"has_glass_panes_colorless": {
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"items": "#c:glass_panes/colorless"
|
||||
}
|
||||
]
|
||||
},
|
||||
"trigger": "minecraft:inventory_changed"
|
||||
},
|
||||
"has_the_recipe": {
|
||||
"conditions": {
|
||||
"recipe": "create:framed_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
},
|
||||
"trigger": "minecraft:recipe_unlocked"
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"has_the_recipe",
|
||||
"has_glass_panes_colorless"
|
||||
]
|
||||
],
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"create:framed_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"criteria": {
|
||||
"has_glass_panes_colorless": {
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"items": "#c:glass_panes/colorless"
|
||||
}
|
||||
]
|
||||
},
|
||||
"trigger": "minecraft:inventory_changed"
|
||||
},
|
||||
"has_the_recipe": {
|
||||
"conditions": {
|
||||
"recipe": "create:horizontal_framed_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
},
|
||||
"trigger": "minecraft:recipe_unlocked"
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"has_the_recipe",
|
||||
"has_glass_panes_colorless"
|
||||
]
|
||||
],
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"create:horizontal_framed_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"criteria": {
|
||||
"has_glass_panes_colorless": {
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"items": "#c:glass_panes/colorless"
|
||||
}
|
||||
]
|
||||
},
|
||||
"trigger": "minecraft:inventory_changed"
|
||||
},
|
||||
"has_the_recipe": {
|
||||
"conditions": {
|
||||
"recipe": "create:tiled_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
},
|
||||
"trigger": "minecraft:recipe_unlocked"
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"has_the_recipe",
|
||||
"has_glass_panes_colorless"
|
||||
]
|
||||
],
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"create:tiled_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"criteria": {
|
||||
"has_glass_panes_colorless": {
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"items": "#c:glass_panes/colorless"
|
||||
}
|
||||
]
|
||||
},
|
||||
"trigger": "minecraft:inventory_changed"
|
||||
},
|
||||
"has_the_recipe": {
|
||||
"conditions": {
|
||||
"recipe": "create:vertical_framed_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
},
|
||||
"trigger": "minecraft:recipe_unlocked"
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"has_the_recipe",
|
||||
"has_glass_panes_colorless"
|
||||
]
|
||||
],
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"create:vertical_framed_glass_pane_from_glass_panes_colorless_stonecutting"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"type": "minecraft:stonecutting",
|
||||
"ingredient": {
|
||||
"tag": "c:glass_panes/colorless"
|
||||
},
|
||||
"result": {
|
||||
"count": 1,
|
||||
"id": "create:framed_glass_pane"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"type": "minecraft:stonecutting",
|
||||
"ingredient": {
|
||||
"tag": "c:glass_panes/colorless"
|
||||
},
|
||||
"result": {
|
||||
"count": 1,
|
||||
"id": "create:horizontal_framed_glass_pane"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"type": "minecraft:stonecutting",
|
||||
"ingredient": {
|
||||
"tag": "c:glass_panes/colorless"
|
||||
},
|
||||
"result": {
|
||||
"count": 1,
|
||||
"id": "create:tiled_glass_pane"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
{
|
||||
"type": "minecraft:stonecutting",
|
||||
"ingredient": {
|
||||
"tag": "c:glass_panes/colorless"
|
||||
},
|
||||
"result": {
|
||||
"count": 1,
|
||||
"id": "create:vertical_framed_glass_pane"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"values": [
|
||||
"create:tiled_glass_pane",
|
||||
"create:framed_glass_pane",
|
||||
"create:horizontal_framed_glass_pane",
|
||||
"create:vertical_framed_glass_pane"
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"values": [
|
||||
"create:tiled_glass_pane",
|
||||
"create:framed_glass_pane",
|
||||
"create:horizontal_framed_glass_pane",
|
||||
"create:vertical_framed_glass_pane"
|
||||
]
|
||||
}
|
||||
|
|
@ -2639,7 +2639,7 @@ public class AllBlocks {
|
|||
.add(LootItem.lootTableItem(AllBlocks.CARDBOARD_BLOCK.asItem()))))))
|
||||
.item(CardboardBlockItem::new)
|
||||
.build()
|
||||
.lang("Bound block of Cardboard")
|
||||
.lang("Bound Block of Cardboard")
|
||||
.register();
|
||||
|
||||
public static final BlockEntry<ExperienceBlock> EXPERIENCE_BLOCK =
|
||||
|
|
|
|||
|
|
@ -1208,12 +1208,11 @@ public abstract class Contraption {
|
|||
|
||||
BoundingBox boundingBox = optionalBoundingBox.get();
|
||||
BlockPos newControllerPos = new BlockPos(boundingBox.minX(), boundingBox.minY(), boundingBox.minZ());
|
||||
BlockPos newLocalPos = toLocalPos(newControllerPos);
|
||||
BlockPos otherPos = transform.unapply(newControllerPos);
|
||||
|
||||
multiblockParts.forEach(info -> info.nbt().put("Controller", NbtUtils.writeBlockPos(newControllerPos)));
|
||||
|
||||
if (controllerPos.equals(newLocalPos))
|
||||
if (controllerPos.equals(otherPos))
|
||||
return;
|
||||
|
||||
// swap nbt data to the new controller position
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@ import com.simibubi.create.content.kinetics.belt.behaviour.TransportedItemStackH
|
|||
import com.simibubi.create.content.kinetics.fan.processing.AllFanProcessingTypes;
|
||||
import com.simibubi.create.content.kinetics.fan.processing.FanProcessing;
|
||||
import com.simibubi.create.content.kinetics.fan.processing.FanProcessingType;
|
||||
import com.simibubi.create.content.kinetics.fan.processing.FanProcessingTypeRegistry;
|
||||
import com.simibubi.create.foundation.advancement.AllAdvancements;
|
||||
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
|
||||
import com.simibubi.create.infrastructure.config.AllConfigs;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,6 @@ package com.simibubi.create.content.kinetics.steamEngine;
|
|||
import java.util.Objects;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import com.simibubi.create.AllPartialModels;
|
||||
import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
|
||||
|
||||
|
|
@ -27,18 +25,17 @@ public class SteamEngineVisual extends AbstractBlockEntityVisual<SteamEngineBloc
|
|||
protected final TransformedInstance linkage;
|
||||
protected final TransformedInstance connector;
|
||||
|
||||
@Nullable
|
||||
private Float lastAngle = null;
|
||||
private Float lastAngle = Float.NaN;
|
||||
|
||||
public SteamEngineVisual(VisualizationContext context, SteamEngineBlockEntity blockEntity, float partialTick) {
|
||||
super(context, blockEntity, partialTick);
|
||||
|
||||
piston = instancerProvider().instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.ENGINE_PISTON))
|
||||
.createInstance();
|
||||
.createInstance();
|
||||
linkage = instancerProvider().instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.ENGINE_LINKAGE))
|
||||
.createInstance();
|
||||
.createInstance();
|
||||
connector = instancerProvider().instancer(InstanceTypes.TRANSFORMED, Models.partial(AllPartialModels.ENGINE_CONNECTOR))
|
||||
.createInstance();
|
||||
.createInstance();
|
||||
|
||||
animate();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import net.minecraft.core.HolderLookup;
|
|||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
|
@ -71,7 +72,7 @@ public class FactoryPanelBlockEntity extends SmartBlockEntity {
|
|||
return;
|
||||
|
||||
if (activePanels() == 0)
|
||||
level.destroyBlock(worldPosition, false);
|
||||
level.setBlockAndUpdate(worldPosition, Blocks.AIR.defaultBlockState());
|
||||
|
||||
if (AllBlocks.FACTORY_GAUGE.has(getBlockState())) {
|
||||
boolean shouldBeRestocker = AllBlocks.PACKAGER
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@ import com.simibubi.create.foundation.gui.AllGuiTextures;
|
|||
import com.simibubi.create.foundation.gui.AllIcons;
|
||||
import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen;
|
||||
import com.simibubi.create.foundation.gui.widget.IconButton;
|
||||
import com.simibubi.create.foundation.gui.widget.Indicator;
|
||||
import com.simibubi.create.foundation.gui.widget.Indicator.State;
|
||||
import com.simibubi.create.foundation.item.TooltipHelper;
|
||||
import net.createmod.catnip.platform.CatnipServices;
|
||||
|
||||
|
|
@ -119,15 +117,11 @@ public abstract class AbstractFilterScreen<F extends AbstractFilterMenu> extends
|
|||
|
||||
public void handleIndicators() {
|
||||
for (IconButton button : getTooltipButtons())
|
||||
button.active = isButtonEnabled(button);
|
||||
for (Indicator indicator : getIndicators())
|
||||
indicator.state = isIndicatorOn(indicator) ? State.ON : State.OFF;
|
||||
button.green = !isButtonEnabled(button);
|
||||
}
|
||||
|
||||
protected abstract boolean isButtonEnabled(IconButton button);
|
||||
|
||||
protected abstract boolean isIndicatorOn(Indicator indicator);
|
||||
|
||||
protected List<IconButton> getTooltipButtons() {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
|
@ -136,10 +130,6 @@ public abstract class AbstractFilterScreen<F extends AbstractFilterMenu> extends
|
|||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
protected List<Indicator> getIndicators() {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
private void fillToolTip(IconButton button, Component tooltip) {
|
||||
if (!button.isHoveredOrFocused())
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -63,8 +63,8 @@ public class AttributeFilterMenu extends AbstractFilterMenu {
|
|||
|
||||
@Override
|
||||
protected void addFilterSlots() {
|
||||
this.addSlot(new SlotItemHandler(ghostInventory, 0, 16, 24));
|
||||
this.addSlot(new SlotItemHandler(ghostInventory, 1, 22, 59) {
|
||||
this.addSlot(new SlotItemHandler(ghostInventory, 0, 16, 27));
|
||||
this.addSlot(new SlotItemHandler(ghostInventory, 1, 16, 62) {
|
||||
@Override
|
||||
public boolean mayPickup(Player playerIn) {
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import com.simibubi.create.content.logistics.item.filter.attribute.ItemAttribute
|
|||
import com.simibubi.create.foundation.gui.AllGuiTextures;
|
||||
import com.simibubi.create.foundation.gui.AllIcons;
|
||||
import com.simibubi.create.foundation.gui.widget.IconButton;
|
||||
import com.simibubi.create.foundation.gui.widget.Indicator;
|
||||
import com.simibubi.create.foundation.gui.widget.Label;
|
||||
import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
|
||||
import com.simibubi.create.foundation.utility.CreateLang;
|
||||
|
|
@ -51,7 +50,6 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
|
|||
private Component selectedT = CreateLang.translateDirect(PREFIX + "selected_attributes");
|
||||
|
||||
private IconButton whitelistDis, whitelistCon, blacklist;
|
||||
private Indicator whitelistDisIndicator, whitelistConIndicator, blacklistIndicator;
|
||||
private IconButton add;
|
||||
private IconButton addInverted;
|
||||
|
||||
|
|
@ -73,34 +71,29 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
|
|||
int x = leftPos;
|
||||
int y = topPos;
|
||||
|
||||
whitelistDis = new IconButton(x + 47, y + 61, AllIcons.I_WHITELIST_OR);
|
||||
whitelistDis = new IconButton(x + 38, y + 61, AllIcons.I_WHITELIST_OR);
|
||||
whitelistDis.withCallback(() -> {
|
||||
menu.whitelistMode = AttributeFilterWhitelistMode.WHITELIST_DISJ;
|
||||
sendOptionUpdate(Option.WHITELIST);
|
||||
});
|
||||
whitelistDis.setToolTip(allowDisN);
|
||||
whitelistCon = new IconButton(x + 65, y + 61, AllIcons.I_WHITELIST_AND);
|
||||
whitelistCon = new IconButton(x + 56, y + 61, AllIcons.I_WHITELIST_AND);
|
||||
whitelistCon.withCallback(() -> {
|
||||
menu.whitelistMode = AttributeFilterWhitelistMode.WHITELIST_CONJ;
|
||||
sendOptionUpdate(Option.WHITELIST2);
|
||||
});
|
||||
whitelistCon.setToolTip(allowConN);
|
||||
blacklist = new IconButton(x + 83, y + 61, AllIcons.I_WHITELIST_NOT);
|
||||
blacklist = new IconButton(x + 74, y + 61, AllIcons.I_WHITELIST_NOT);
|
||||
blacklist.withCallback(() -> {
|
||||
menu.whitelistMode = AttributeFilterWhitelistMode.BLACKLIST;
|
||||
sendOptionUpdate(Option.BLACKLIST);
|
||||
});
|
||||
blacklist.setToolTip(denyN);
|
||||
|
||||
whitelistDisIndicator = new Indicator(x + 47, y + 55, CommonComponents.EMPTY);
|
||||
whitelistConIndicator = new Indicator(x + 65, y + 55, CommonComponents.EMPTY);
|
||||
blacklistIndicator = new Indicator(x + 83, y + 55, CommonComponents.EMPTY);
|
||||
addRenderableWidgets(blacklist, whitelistCon, whitelistDis);
|
||||
|
||||
addRenderableWidgets(blacklist, whitelistCon, whitelistDis, blacklistIndicator, whitelistConIndicator,
|
||||
whitelistDisIndicator);
|
||||
|
||||
addRenderableWidget(add = new IconButton(x + 182, y + 23, AllIcons.I_ADD));
|
||||
addRenderableWidget(addInverted = new IconButton(x + 200, y + 23, AllIcons.I_ADD_INVERTED_ATTRIBUTE));
|
||||
addRenderableWidget(add = new IconButton(x + 182, y + 26, AllIcons.I_ADD));
|
||||
addRenderableWidget(addInverted = new IconButton(x + 200, y + 26, AllIcons.I_ADD_INVERTED_ATTRIBUTE));
|
||||
add.withCallback(() -> {
|
||||
handleAddedAttibute(false);
|
||||
});
|
||||
|
|
@ -112,9 +105,9 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
|
|||
|
||||
handleIndicators();
|
||||
|
||||
attributeSelectorLabel = new Label(x + 43, y + 28, CommonComponents.EMPTY).colored(0xF3EBDE)
|
||||
attributeSelectorLabel = new Label(x + 43, y + 31, CommonComponents.EMPTY).colored(0xF3EBDE)
|
||||
.withShadow();
|
||||
attributeSelector = new SelectionScrollInput(x + 39, y + 23, 137, 18);
|
||||
attributeSelector = new SelectionScrollInput(x + 39, y + 26, 137, 18);
|
||||
attributeSelector.forOptions(Arrays.asList(CommonComponents.EMPTY));
|
||||
attributeSelector.removeCallback();
|
||||
referenceItemChanged(menu.ghostInventory.getStackInSlot(0));
|
||||
|
|
@ -189,7 +182,7 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
|
|||
PoseStack matrixStack = graphics.pose();
|
||||
matrixStack.pushPose();
|
||||
matrixStack.translate(0, 0, 150);
|
||||
graphics.renderItemDecorations(font, stack, leftPos + 22, topPos + 59,
|
||||
graphics.renderItemDecorations(font, stack, leftPos + 16, topPos + 62,
|
||||
String.valueOf(selectedAttributes.size() - 1));
|
||||
matrixStack.popPose();
|
||||
|
||||
|
|
@ -226,11 +219,6 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
|
|||
return Arrays.asList(denyDESC.plainCopy(), allowConDESC.plainCopy(), allowDisDESC.plainCopy());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Indicator> getIndicators() {
|
||||
return Arrays.asList(blacklistIndicator, whitelistConIndicator, whitelistDisIndicator);
|
||||
}
|
||||
|
||||
protected boolean handleAddedAttibute(boolean inverted) {
|
||||
int index = attributeSelector.getState();
|
||||
if (index >= attributesOfItem.size())
|
||||
|
|
@ -271,15 +259,4 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isIndicatorOn(Indicator indicator) {
|
||||
if (indicator == blacklistIndicator)
|
||||
return menu.whitelistMode == AttributeFilterWhitelistMode.BLACKLIST;
|
||||
if (indicator == whitelistConIndicator)
|
||||
return menu.whitelistMode == AttributeFilterWhitelistMode.WHITELIST_CONJ;
|
||||
if (indicator == whitelistDisIndicator)
|
||||
return menu.whitelistMode == AttributeFilterWhitelistMode.WHITELIST_DISJ;
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public class FilterMenu extends AbstractFilterMenu {
|
|||
@Override
|
||||
protected void addFilterSlots() {
|
||||
int x = 23;
|
||||
int y = 22;
|
||||
int y = 25;
|
||||
for (int row = 0; row < 2; ++row)
|
||||
for (int col = 0; col < 9; ++col)
|
||||
this.addSlot(new SlotItemHandler(ghostInventory, col + row * 9, x + col * 18, y + row * 18));
|
||||
|
|
|
|||
|
|
@ -7,10 +7,8 @@ import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
|
|||
import com.simibubi.create.foundation.gui.AllGuiTextures;
|
||||
import com.simibubi.create.foundation.gui.AllIcons;
|
||||
import com.simibubi.create.foundation.gui.widget.IconButton;
|
||||
import com.simibubi.create.foundation.gui.widget.Indicator;
|
||||
import com.simibubi.create.foundation.utility.CreateLang;
|
||||
|
||||
import net.minecraft.network.chat.CommonComponents;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
import net.minecraft.world.entity.player.Inventory;
|
||||
|
|
@ -31,8 +29,6 @@ public class FilterScreen extends AbstractFilterScreen<FilterMenu> {
|
|||
|
||||
private IconButton whitelist, blacklist;
|
||||
private IconButton respectNBT, ignoreNBT;
|
||||
private Indicator whitelistIndicator, blacklistIndicator;
|
||||
private Indicator respectNBTIndicator, ignoreNBTIndicator;
|
||||
|
||||
public FilterScreen(FilterMenu menu, Inventory inv, Component title) {
|
||||
super(menu, inv, title, AllGuiTextures.FILTER);
|
||||
|
|
@ -58,9 +54,7 @@ public class FilterScreen extends AbstractFilterScreen<FilterMenu> {
|
|||
sendOptionUpdate(Option.WHITELIST);
|
||||
});
|
||||
whitelist.setToolTip(allowN);
|
||||
blacklistIndicator = new Indicator(x + 18, y + 69, CommonComponents.EMPTY);
|
||||
whitelistIndicator = new Indicator(x + 36, y + 69, CommonComponents.EMPTY);
|
||||
addRenderableWidgets(blacklist, whitelist, blacklistIndicator, whitelistIndicator);
|
||||
addRenderableWidgets(blacklist, whitelist);
|
||||
|
||||
respectNBT = new IconButton(x + 60, y + 75, AllIcons.I_RESPECT_NBT);
|
||||
respectNBT.withCallback(() -> {
|
||||
|
|
@ -74,9 +68,7 @@ public class FilterScreen extends AbstractFilterScreen<FilterMenu> {
|
|||
sendOptionUpdate(Option.IGNORE_DATA);
|
||||
});
|
||||
ignoreNBT.setToolTip(ignoreDataN);
|
||||
respectNBTIndicator = new Indicator(x + 60, y + 69, CommonComponents.EMPTY);
|
||||
ignoreNBTIndicator = new Indicator(x + 78, y + 69, CommonComponents.EMPTY);
|
||||
addRenderableWidgets(respectNBT, ignoreNBT, respectNBTIndicator, ignoreNBTIndicator);
|
||||
addRenderableWidgets(respectNBT, ignoreNBT);
|
||||
|
||||
handleIndicators();
|
||||
}
|
||||
|
|
@ -91,11 +83,6 @@ public class FilterScreen extends AbstractFilterScreen<FilterMenu> {
|
|||
return Arrays.asList(denyDESC.plainCopy(), allowDESC.plainCopy(), respectDataDESC.plainCopy(), ignoreDataDESC.plainCopy());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<Indicator> getIndicators() {
|
||||
return Arrays.asList(blacklistIndicator, whitelistIndicator, respectNBTIndicator, ignoreNBTIndicator);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isButtonEnabled(IconButton button) {
|
||||
if (button == blacklist)
|
||||
|
|
@ -109,17 +96,4 @@ public class FilterScreen extends AbstractFilterScreen<FilterMenu> {
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isIndicatorOn(Indicator indicator) {
|
||||
if (indicator == blacklistIndicator)
|
||||
return menu.blacklist;
|
||||
if (indicator == whitelistIndicator)
|
||||
return !menu.blacklist;
|
||||
if (indicator == respectNBTIndicator)
|
||||
return menu.respectNBT;
|
||||
if (indicator == ignoreNBTIndicator)
|
||||
return !menu.respectNBT;
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import com.simibubi.create.content.logistics.box.PackageStyles;
|
|||
import com.simibubi.create.content.logistics.filter.FilterScreenPacket.Option;
|
||||
import com.simibubi.create.foundation.gui.AllGuiTextures;
|
||||
import com.simibubi.create.foundation.gui.widget.IconButton;
|
||||
import com.simibubi.create.foundation.gui.widget.Indicator;
|
||||
|
||||
import net.createmod.catnip.gui.element.GuiGameElement;
|
||||
import net.createmod.catnip.platform.CatnipServices;
|
||||
|
|
@ -100,9 +99,4 @@ public class PackageFilterScreen extends AbstractFilterScreen<PackageFilterMenu>
|
|||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isIndicatorOn(Indicator indicator) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -562,8 +562,8 @@ public class StockKeeperRequestScreen extends AbstractSimiContainerScreen<StockK
|
|||
ms.popPose();
|
||||
}
|
||||
|
||||
if (itemsToOrder.size() > 8) {
|
||||
graphics.drawString(font, Component.literal("[+" + (itemsToOrder.size() - 8) + "]"), x + windowWidth - 40,
|
||||
if (itemsToOrder.size() > 9) {
|
||||
graphics.drawString(font, Component.literal("[+" + (itemsToOrder.size() - 9) + "]"), x + windowWidth - 40,
|
||||
orderY + 21, 0xF8F8EC);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ import com.simibubi.create.foundation.block.connected.ConnectedTextureBehaviour;
|
|||
import com.simibubi.create.foundation.block.connected.GlassPaneCTBehaviour;
|
||||
import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour;
|
||||
import com.tterrag.registrate.builders.BlockBuilder;
|
||||
import com.tterrag.registrate.builders.ItemBuilder;
|
||||
import com.tterrag.registrate.providers.DataGenContext;
|
||||
import com.tterrag.registrate.providers.RegistrateBlockstateProvider;
|
||||
import com.tterrag.registrate.providers.RegistrateRecipeProvider;
|
||||
|
|
@ -33,6 +34,7 @@ import net.minecraft.data.recipes.ShapedRecipeBuilder;
|
|||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.ItemLike;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
|
|
@ -41,7 +43,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
|
|||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.state.properties.WoodType;
|
||||
import net.minecraft.world.level.material.MapColor;
|
||||
|
||||
import net.neoforged.neoforge.client.model.generators.ConfiguredModel;
|
||||
import net.neoforged.neoforge.client.model.generators.ModelFile;
|
||||
import net.neoforged.neoforge.common.Tags;
|
||||
|
|
@ -164,7 +165,7 @@ public class WindowGen {
|
|||
ResourceLocation itemSideTexture = Create.asResource(palettesDir() + name);
|
||||
ResourceLocation topTexture = Create.asResource(palettesDir() + "framed_glass_pane_top");
|
||||
Supplier<Supplier<RenderType>> renderType = () -> RenderType::cutoutMipped;
|
||||
return connectedGlassPane(name, parent, ctshift, sideTexture, itemSideTexture, topTexture, renderType)
|
||||
return connectedGlassPane(name, parent, ctshift, sideTexture, itemSideTexture, topTexture, renderType, true)
|
||||
.register();
|
||||
}
|
||||
|
||||
|
|
@ -173,7 +174,7 @@ public class WindowGen {
|
|||
Supplier<Supplier<RenderType>> renderType) {
|
||||
ResourceLocation topTexture = Create.asResource(palettesDir() + name + "_pane_top");
|
||||
ResourceLocation sideTexture = Create.asResource(palettesDir() + name);
|
||||
return connectedGlassPane(name, parent, ctshift, sideTexture, sideTexture, topTexture, renderType);
|
||||
return connectedGlassPane(name, parent, ctshift, sideTexture, sideTexture, topTexture, renderType, false);
|
||||
}
|
||||
|
||||
public static BlockEntry<ConnectedGlassPaneBlock> woodenWindowPane(WoodType woodType,
|
||||
|
|
@ -188,7 +189,7 @@ public class WindowGen {
|
|||
ResourceLocation topTexture = ResourceLocation.withDefaultNamespace("block/" + woodName + "_planks");
|
||||
ResourceLocation sideTexture = Create.asResource(palettesDir() + name);
|
||||
return connectedGlassPane(name, parent, () -> AllSpriteShifts.getWoodenWindow(woodType), sideTexture,
|
||||
sideTexture, topTexture, renderType).register();
|
||||
sideTexture, topTexture, renderType, false).register();
|
||||
}
|
||||
|
||||
public static BlockEntry<GlassPaneBlock> standardGlassPane(String name, Supplier<? extends Block> parent,
|
||||
|
|
@ -196,12 +197,12 @@ public class WindowGen {
|
|||
NonNullBiConsumer<DataGenContext<Block, GlassPaneBlock>, RegistrateBlockstateProvider> stateProvider =
|
||||
(c, p) -> p.paneBlock(c.get(), sideTexture, topTexture);
|
||||
return glassPane(name, parent, sideTexture, topTexture, GlassPaneBlock::new, renderType, $ -> {
|
||||
}, stateProvider).register();
|
||||
}, stateProvider, true).register();
|
||||
}
|
||||
|
||||
private static BlockBuilder<ConnectedGlassPaneBlock, CreateRegistrate> connectedGlassPane(String name,
|
||||
Supplier<? extends Block> parent, Supplier<CTSpriteShiftEntry> ctshift, ResourceLocation sideTexture,
|
||||
ResourceLocation itemSideTexture, ResourceLocation topTexture, Supplier<Supplier<RenderType>> renderType) {
|
||||
ResourceLocation itemSideTexture, ResourceLocation topTexture, Supplier<Supplier<RenderType>> renderType, boolean colorless) {
|
||||
NonNullConsumer<? super ConnectedGlassPaneBlock> connectedTextures = ctshift == null ? $ -> {
|
||||
} : connectedTextures(() -> new GlassPaneCTBehaviour(ctshift.get()));
|
||||
String CGPparents = "block/connected_glass_pane/";
|
||||
|
|
@ -219,7 +220,7 @@ public class WindowGen {
|
|||
noSideAlt.apply(p));
|
||||
|
||||
return glassPane(name, parent, itemSideTexture, topTexture, ConnectedGlassPaneBlock::new, renderType,
|
||||
connectedTextures, stateProvider);
|
||||
connectedTextures, stateProvider, colorless);
|
||||
}
|
||||
|
||||
private static Function<RegistrateBlockstateProvider, ModelFile> getPaneModelProvider(String CGPparents,
|
||||
|
|
@ -234,28 +235,46 @@ public class WindowGen {
|
|||
Supplier<? extends Block> parent, ResourceLocation sideTexture, ResourceLocation topTexture,
|
||||
NonNullFunction<Properties, G> factory, Supplier<Supplier<RenderType>> renderType,
|
||||
NonNullConsumer<? super G> connectedTextures,
|
||||
NonNullBiConsumer<DataGenContext<Block, G>, RegistrateBlockstateProvider> stateProvider) {
|
||||
NonNullBiConsumer<DataGenContext<Block, G>, RegistrateBlockstateProvider> stateProvider, boolean colorless) {
|
||||
name += "_pane";
|
||||
|
||||
return REGISTRATE.block(name, factory)
|
||||
|
||||
|
||||
ItemBuilder<BlockItem, BlockBuilder<G, CreateRegistrate>> itemBuilder = REGISTRATE.block(name, factory)
|
||||
.onRegister(connectedTextures)
|
||||
.addLayer(renderType)
|
||||
.initialProperties(() -> Blocks.GLASS_PANE)
|
||||
.properties(p -> p.mapColor(parent.get()
|
||||
.defaultMapColor()))
|
||||
.blockstate(stateProvider)
|
||||
.recipe((c, p) -> ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, c.get(), 16)
|
||||
.pattern("###")
|
||||
.pattern("###")
|
||||
.define('#', parent.get())
|
||||
.unlockedBy("has_ingredient", RegistrateRecipeProvider.has(parent.get()))
|
||||
.save(p))
|
||||
.tag(Tags.Blocks.GLASS_PANES)
|
||||
.recipe((c, p) -> {
|
||||
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, c.get(), 16)
|
||||
.pattern("###")
|
||||
.pattern("###")
|
||||
.define('#', parent.get())
|
||||
.unlockedBy("has_ingredient", RegistrateRecipeProvider.has(parent.get()))
|
||||
.save(p);
|
||||
if (colorless)
|
||||
p.stonecutting(DataIngredient.tag(Tags.Items.GLASS_PANES_COLORLESS), RecipeCategory.BUILDING_BLOCKS,
|
||||
c::get);
|
||||
})
|
||||
.loot((t, g) -> t.dropWhenSilkTouch(g))
|
||||
.item()
|
||||
.tag(Tags.Items.GLASS_PANES)
|
||||
.item();
|
||||
|
||||
if (colorless)
|
||||
itemBuilder.tag(Tags.Items.GLASS_PANES, Tags.Items.GLASS_PANES_COLORLESS);
|
||||
else
|
||||
itemBuilder.tag(Tags.Items.GLASS_PANES);
|
||||
|
||||
BlockBuilder<G, CreateRegistrate> blockBuilder = itemBuilder
|
||||
.model((c, p) -> p.generated(c, sideTexture))
|
||||
.build();
|
||||
|
||||
if (colorless)
|
||||
blockBuilder.tag(Tags.Blocks.GLASS_PANES, Tags.Blocks.GLASS_PANES_COLORLESS);
|
||||
else
|
||||
blockBuilder.tag(Tags.Blocks.GLASS_PANES);
|
||||
|
||||
return blockBuilder;
|
||||
}
|
||||
|
||||
private static String palettesDir() {
|
||||
|
|
|
|||
|
|
@ -203,7 +203,7 @@
|
|||
|
||||
"block.create.item_hatch.tooltip.summary": "_Quickly solves_ your _inventory_ clutter and makes it someone else's problem.",
|
||||
"block.create.item_hatch.tooltip.condition1": "When R-Clicked",
|
||||
"block.create.item_hatch.tooltip.behaviour1": "_Deposits_ your items into the _container_ it is placed on. _Hotbar items_ and items _with contents_ will _not_ be transferred.",
|
||||
"block.create.item_hatch.tooltip.behaviour1": "_Deposits_ your _held item_ into the _container_ it is placed on. _Sneak-click_ to _deposit_ _everything_ except Hotbar items.",
|
||||
|
||||
"block.create.clipboard.tooltip.summary": "_Keeps your notes_ and makes you look more professional.",
|
||||
"block.create.clipboard.tooltip.condition1": "When R-Clicked",
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.8 KiB |
Loading…
Add table
Reference in a new issue