mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Forgwards Facing

Browse source 
- Fixed frogports not always facing the correct direction on the client
- Added new copper block deploying recipes
- Fixed backtank air not being consumed by extendo grips
- Fixed clipboards not dropping with written contents
This commit is contained in:
simibubi 2025-02-06 11:08:28 +01:00
parent 8074e64d4b
commit 7ff29fd207
63 changed files with 1071 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
View file

@ -1,4 +1,4 @@
// 1.21.1 2025-02-05T22:51:51.1663056 Create's Processing Recipes
// 1.21.1 2025-02-06T09:54:29.0966625 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
@ -180,9 +180,17 @@ dfec91c7487a4ba0e46946625406f5b6c15971ab data/create/recipe/cutting/compat/immer
55911633cf3545a31159cc36c59d428b975c7b55 data/create/recipe/cutting/compat/regions_unexplored/silver_birch_log.json
df820cfc0ebc1cbd510e9847b36345314320ecf7 data/create/recipe/cutting/compat/regions_unexplored/silver_birch_wood.json
558e81291da72b7f042b3b3270744b2c05ddc6fa data/create/recipe/cutting/stripped_bamboo_block.json
ae568b2b28b8f2bda248687be30a3fd7a5138646 data/create/recipe/deploying/chiseled_copper_from_deoxidising.json
f2f912f415daa85ab6a4ebef5fe71382bef40153 data/create/recipe/deploying/chiseled_copper_from_removing_wax.json
7a01147d3c7d8fb9acb870b33e5a792328f88c3c data/create/recipe/deploying/cogwheel.json
71823595ba3f587a0940125d87f2d33a99d317d8 data/create/recipe/deploying/copper_block_from_deoxidising.json
2e94155860aae80bc3c66e92cb0815cf259dfff4 data/create/recipe/deploying/copper_block_from_removing_wax.json
461d89cad1007cddf1a8d3366c5c3da900162cb2 data/create/recipe/deploying/copper_bulb_from_deoxidising.json
8b7c6d8a5b7d7a391fad19718327f817ffeb46bc data/create/recipe/deploying/copper_bulb_from_removing_wax.json
8fac0b7b4ad490e87298f4f5ef04db90ed536e7f data/create/recipe/deploying/copper_door_from_deoxidising.json
bdf17aefbd34ae2c82eaede06126d06c736c1b70 data/create/recipe/deploying/copper_door_from_removing_wax.json
3b46f8b01ff7cf5812069ea8442d374752e2a942 data/create/recipe/deploying/copper_grate_from_deoxidising.json
b41f7c02b813dae72c4a57b68f008eb25dc1709b data/create/recipe/deploying/copper_grate_from_removing_wax.json
05053abe2e15cc6eb885c220e7c4fcac983611eb data/create/recipe/deploying/copper_shingles_from_deoxidising.json
aec726a5c61af90cd67bf30b8f3db07253fd42d0 data/create/recipe/deploying/copper_shingles_from_removing_wax.json
728e234e700be32ee721e245e274eb050ef4f606 data/create/recipe/deploying/copper_shingle_slab_from_deoxidising.json
@ -195,14 +203,24 @@ c0960ea4e0379f56b653262052fb2de3c4b0bce7 data/create/recipe/deploying/copper_til
7e7f8c3decba1506b22b72b644a2025318fc8822 data/create/recipe/deploying/copper_tile_slab_from_removing_wax.json
a6eaa28d82bda3f6b24b408f7c67aab88c93829e data/create/recipe/deploying/copper_tile_stairs_from_deoxidising.json
4066d8d646a9ce873cac5177beb2fa107b290956 data/create/recipe/deploying/copper_tile_stairs_from_removing_wax.json
270c6979d6ecd786c8dbe302a305e7e1fc3824dd data/create/recipe/deploying/copper_trapdoor_from_deoxidising.json
56327955a328c63fef57b88402463f9d7936b7f2 data/create/recipe/deploying/copper_trapdoor_from_removing_wax.json
a45a2f53e770e9f7435b0159e2a6ffe13d91d82d data/create/recipe/deploying/cut_copper_from_deoxidising.json
a0f38792e9b993a793e6c35a4e0e0c68906218c9 data/create/recipe/deploying/cut_copper_from_removing_wax.json
45db539abee9c99e5683f993b003bfe4e27afa67 data/create/recipe/deploying/cut_copper_slab_from_deoxidising.json
7cf609fef56ed53becf7a55e134aaa2d1093ab40 data/create/recipe/deploying/cut_copper_slab_from_removing_wax.json
cffe8fdd5375773b8d91cd375c3d47e03774675f data/create/recipe/deploying/cut_copper_stairs_from_deoxidising.json
4fb27e34f4315be61b0708c53800ee72bf6809a1 data/create/recipe/deploying/cut_copper_stairs_from_removing_wax.json
55cd484ea3f2741d409d78642d46d04e1b6494c2 data/create/recipe/deploying/exposed_chiseled_copper_from_deoxidising.json
0de9402d4deaf48794ca02530db05ceb033f8069 data/create/recipe/deploying/exposed_chiseled_copper_from_removing_wax.json
da8ff7aeb7f6873dfc538674280ee4154a3a6017 data/create/recipe/deploying/exposed_copper_bulb_from_deoxidising.json
42a74d979b975123020a4d633226e47cfd6d8004 data/create/recipe/deploying/exposed_copper_bulb_from_removing_wax.json
9db28df6d84ca82a62cf8c611ec482b4af1afd19 data/create/recipe/deploying/exposed_copper_door_from_deoxidising.json
20919232510c0d66cf688a6a7979c44ca7f221e6 data/create/recipe/deploying/exposed_copper_door_from_removing_wax.json
13bf7a638b279a2b84d68bbcde2ef2a0e6957f97 data/create/recipe/deploying/exposed_copper_from_deoxidising.json
faaa8eab8175bb55c7ade06491d0be3419a2258d data/create/recipe/deploying/exposed_copper_from_removing_wax.json
43ce2c8ae5e0d06d6a2028c1c178384e82e322ff data/create/recipe/deploying/exposed_copper_grate_from_deoxidising.json
266ead870e51ed8ea8073b908a3b9e011098953a data/create/recipe/deploying/exposed_copper_grate_from_removing_wax.json
09353cbd6cd87e622668303cc83d5cf6c96d14f4 data/create/recipe/deploying/exposed_copper_shingles_from_deoxidising.json
e5f64c97b09c9609f2bfb1c7e9a931f016144961 data/create/recipe/deploying/exposed_copper_shingles_from_removing_wax.json
9bac720038284c15807b1af46fb737061fc408e1 data/create/recipe/deploying/exposed_copper_shingle_slab_from_deoxidising.json
@ -215,6 +233,8 @@ ff93d9667bc252c5f7323d6613756ad884499eac data/create/recipe/deploying/exposed_co
68777658e9ecac0653cd22a154edd7af06b36138 data/create/recipe/deploying/exposed_copper_tile_slab_from_removing_wax.json
fc936eb34042c2fdb751a4f5b53c7bd283aa8f82 data/create/recipe/deploying/exposed_copper_tile_stairs_from_deoxidising.json
ea381bc5a0adcb7f1b74e7dac02e988b5e93f056 data/create/recipe/deploying/exposed_copper_tile_stairs_from_removing_wax.json
e643ba29006fde9c73897b8c812c342719a41cd1 data/create/recipe/deploying/exposed_copper_trapdoor_from_deoxidising.json
0b958018c2e775d3a9d11d717d4b9cd535192747 data/create/recipe/deploying/exposed_copper_trapdoor_from_removing_wax.json
1612bd37a109f7876ac03c5988dc7d6ddfad0ff8 data/create/recipe/deploying/exposed_cut_copper_from_deoxidising.json
6151c9f5925ead0056d338fdfd673500902e417d data/create/recipe/deploying/exposed_cut_copper_from_removing_wax.json
a44eaf00ef5e746c62aa72552a37447676fcd385 data/create/recipe/deploying/exposed_cut_copper_slab_from_deoxidising.json
@ -222,58 +242,91 @@ a44eaf00ef5e746c62aa72552a37447676fcd385 data/create/recipe/deploying/exposed_cu
5ecc9b889c9012616454d3ddeff1608fe87a0f93 data/create/recipe/deploying/exposed_cut_copper_stairs_from_deoxidising.json
98ac326a1e2c80fd0f3cb73c7ad80b86ba7cf980 data/create/recipe/deploying/exposed_cut_copper_stairs_from_removing_wax.json
1230f449873262e79585752d3430e5f7f383bcb2 data/create/recipe/deploying/large_cogwheel.json
cdb4974bec2beb1ce56527e658ca5eaccd17f741 data/create/recipe/deploying/oxidized_chiseled_copper_from_removing_wax.json
6a590ddaa8d4a27ec7a10a7ffd8e8c11ce74135e data/create/recipe/deploying/oxidized_copper_bulb_from_removing_wax.json
c17362d4760acb311fc00bde41b443f1a1def64a data/create/recipe/deploying/oxidized_copper_door_from_removing_wax.json
051faceb93f5cba4be8632198272500bcf461334 data/create/recipe/deploying/oxidized_copper_from_removing_wax.json
93e0ac0a9d59dfff80d24c8506430732edf00109 data/create/recipe/deploying/oxidized_copper_grate_from_removing_wax.json
00cad77046b42466fb40798f11480d7370cab579 data/create/recipe/deploying/oxidized_copper_shingles_from_removing_wax.json
deecff3e485442af83fb01d16b0a46d98e5214bb data/create/recipe/deploying/oxidized_copper_shingle_slab_from_removing_wax.json
162ddbeb10da4eec0709813d3f55465a658e76d1 data/create/recipe/deploying/oxidized_copper_shingle_stairs_from_removing_wax.json
6f4ad2120309481203e1ac839263099bb7e36ea0 data/create/recipe/deploying/oxidized_copper_tiles_from_removing_wax.json
dff292537e007aabdffdf997509838c6168799b4 data/create/recipe/deploying/oxidized_copper_tile_slab_from_removing_wax.json
42cc953f2f2cf2b2af7d3d1480abf6d7d363abec data/create/recipe/deploying/oxidized_copper_tile_stairs_from_removing_wax.json
e58b27fa3c64f6fb646e63d9b7c569ddac4b7842 data/create/recipe/deploying/oxidized_copper_trapdoor_from_removing_wax.json
58e6abf60ee8d830143fa6a48830c3d20acfc8c0 data/create/recipe/deploying/oxidized_cut_copper_from_removing_wax.json
52eb357d1d13edc250726f70c7b3639cb902a933 data/create/recipe/deploying/oxidized_cut_copper_slab_from_removing_wax.json
5daf82089854fda3a264b26303fe02764539a87e data/create/recipe/deploying/oxidized_cut_copper_stairs_from_removing_wax.json
028377bb3e5947a9e740b8f90a6deba4afe0a68b data/create/recipe/deploying/waxed_chiseled_copper_from_adding_wax.json
dc35369da8514a5650704fd39e84861cce084b5d data/create/recipe/deploying/waxed_copper_block_from_adding_wax.json
99883a2b414c89d69970eb823c4936c427ab14ef data/create/recipe/deploying/waxed_copper_bulb_from_adding_wax.json
0a1fa71a4bcf095bb54ad18193623061ceb1adb5 data/create/recipe/deploying/waxed_copper_door_from_adding_wax.json
c6246f059c40552f9c4f4841be4d4a85e2a481bc data/create/recipe/deploying/waxed_copper_grate_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
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
be8550d27ee9fd45d476a501a80637fbad058d24 data/create/recipe/deploying/waxed_copper_trapdoor_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
213df481c5da2099ac71c37eb36a78dbcc9a94bb data/create/recipe/deploying/waxed_exposed_chiseled_copper_from_adding_wax.json
4f82ab400aa9658daadcf30e24096eede9de47a6 data/create/recipe/deploying/waxed_exposed_copper_bulb_from_adding_wax.json
2d56a54f80735bbc7b0983c04cd1ea68618a9b67 data/create/recipe/deploying/waxed_exposed_copper_door_from_adding_wax.json
ff182d5c0c4b832ff566691d9b680c9039c55c16 data/create/recipe/deploying/waxed_exposed_copper_from_adding_wax.json
98c8682010aac1ea4870542b15da4946e81bb769 data/create/recipe/deploying/waxed_exposed_copper_grate_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
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
07303100aec1e789b884553224018ecc08419e79 data/create/recipe/deploying/waxed_exposed_copper_trapdoor_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
5895a6fdfbcebc5416e53591c31d99ceab44fc71 data/create/recipe/deploying/waxed_oxidized_chiseled_copper_from_adding_wax.json
a61253b47c244b44c59b70d8fdc4f9f4d734dec5 data/create/recipe/deploying/waxed_oxidized_copper_bulb_from_adding_wax.json
0d0c44152716a75a8fb63328e5432d9a1428eb83 data/create/recipe/deploying/waxed_oxidized_copper_door_from_adding_wax.json
97b7b3f65807328d0a036cb66ee53d898504da77 data/create/recipe/deploying/waxed_oxidized_copper_from_adding_wax.json
7174d27f6e0a64828dcc5480de28cdc9c9e05527 data/create/recipe/deploying/waxed_oxidized_copper_grate_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
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
2886bb09f2c6eb9287a8048827711b80f8130fdc data/create/recipe/deploying/waxed_oxidized_copper_trapdoor_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
d1d7efd53e4469ead011b2fa9864f2e21b3de5cd data/create/recipe/deploying/waxed_weathered_chiseled_copper_from_adding_wax.json
2087860f166ae182fbe5241f35928435f24e3352 data/create/recipe/deploying/waxed_weathered_copper_bulb_from_adding_wax.json
51058d2ddaeb8b8d1ce155b7784e221b4982f6cf data/create/recipe/deploying/waxed_weathered_copper_door_from_adding_wax.json
58679c5c37eaa5a52ef9e0f4f7cc695c58ddee96 data/create/recipe/deploying/waxed_weathered_copper_from_adding_wax.json
18cb9d8c2f13014ec0bc2622560ca6792d94c6b9 data/create/recipe/deploying/waxed_weathered_copper_grate_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
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
b0cd28e59270df4a029346cca234fb372fbe8f4e data/create/recipe/deploying/waxed_weathered_copper_trapdoor_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
f1cb1c4865ef1e021b582c676b31f14aa0f013bf data/create/recipe/deploying/weathered_chiseled_copper_from_deoxidising.json
a13e375ca0f0226341446c5adfb3c899fca325d0 data/create/recipe/deploying/weathered_chiseled_copper_from_removing_wax.json
336f10d9f846aa79b91641361d686f200d3dad1e data/create/recipe/deploying/weathered_copper_bulb_from_deoxidising.json
c5b6f4e0e2bb4fa03108f5f1d316a46b4b6baec0 data/create/recipe/deploying/weathered_copper_bulb_from_removing_wax.json
ce34e821d4e2f6120920392b2b860bf070615c55 data/create/recipe/deploying/weathered_copper_door_from_deoxidising.json
3946bcf44705f2c9ed53a226ae3a57eec9d7befe data/create/recipe/deploying/weathered_copper_door_from_removing_wax.json
20c2fefb17fcdde2b817b1634d805dececf8b0e5 data/create/recipe/deploying/weathered_copper_from_deoxidising.json
ba026a1c407eca2f8acc66a10a1fcc97cb318b1e data/create/recipe/deploying/weathered_copper_from_removing_wax.json
0da33300f1dfff2ee350e167a885116531e57090 data/create/recipe/deploying/weathered_copper_grate_from_deoxidising.json
eecbaaf62c563f173d7959d80225c4938c94cb0f data/create/recipe/deploying/weathered_copper_grate_from_removing_wax.json
5e01f5da2ad67a939a7630bf2607a0159d1dd177 data/create/recipe/deploying/weathered_copper_shingles_from_deoxidising.json
7f962473189c296c02f5e97fa3e920cc7e26f112 data/create/recipe/deploying/weathered_copper_shingles_from_removing_wax.json
4c903ea6449f7ef494c66e20671a323b6703fa05 data/create/recipe/deploying/weathered_copper_shingle_slab_from_deoxidising.json
@ -286,6 +339,8 @@ ba026a1c407eca2f8acc66a10a1fcc97cb318b1e data/create/recipe/deploying/weathered_
18bbbcdbf4e57e6fe567b3494f492332745cd6fc data/create/recipe/deploying/weathered_copper_tile_slab_from_removing_wax.json
a24e82558aa7aee7840f6310531cec46b626cee4 data/create/recipe/deploying/weathered_copper_tile_stairs_from_deoxidising.json
6b8b807ebd14158d2d14c5210d5c60c781d112db data/create/recipe/deploying/weathered_copper_tile_stairs_from_removing_wax.json
f8b3feffe9a7d1b81e71bb3d92e13314bcbfa019 data/create/recipe/deploying/weathered_copper_trapdoor_from_deoxidising.json
dc4787ba1f311f9e3cb73ce25c04aebdd685dcb0 data/create/recipe/deploying/weathered_copper_trapdoor_from_removing_wax.json
45dfc86b09a4b777974026697bfd444063920374 data/create/recipe/deploying/weathered_cut_copper_from_deoxidising.json
b19f74374347bb123ad32b9d1bb680763467fe1d data/create/recipe/deploying/weathered_cut_copper_from_removing_wax.json
58cf0f39fd70e58a97a8458907ea6af393efe5b8 data/create/recipe/deploying/weathered_cut_copper_slab_from_deoxidising.json

17
src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/chiseled_copper_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_bulb_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_bulb_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_door_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_door_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_grate_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_grate_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/copper_trapdoor_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_chiseled_copper_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_exposed_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_bulb_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_exposed_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_door_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_exposed_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_grate_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_exposed_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/exposed_copper_trapdoor_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_exposed_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:exposed_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/oxidized_chiseled_copper_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_oxidized_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:oxidized_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/oxidized_copper_bulb_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_oxidized_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:oxidized_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/oxidized_copper_door_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_oxidized_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:oxidized_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/oxidized_copper_grate_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_oxidized_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:oxidized_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/oxidized_copper_trapdoor_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_oxidized_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:oxidized_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_chiseled_copper_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:chiseled_copper"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_copper_bulb_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:copper_bulb"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_copper_door_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:copper_door"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_copper_grate_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:copper_grate"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_copper_trapdoor_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:copper_trapdoor"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_exposed_chiseled_copper_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_chiseled_copper"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_exposed_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_bulb_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_bulb"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_exposed_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_door_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_door"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_exposed_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_grate_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_grate"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_exposed_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_exposed_copper_trapdoor_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:exposed_copper_trapdoor"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_exposed_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_oxidized_chiseled_copper_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_chiseled_copper"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_oxidized_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_bulb_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_bulb"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_oxidized_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_door_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_door"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_oxidized_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_grate_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_grate"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_oxidized_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_oxidized_copper_trapdoor_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_trapdoor"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_oxidized_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_weathered_chiseled_copper_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_chiseled_copper"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_weathered_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_bulb_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_bulb"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_weathered_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_door_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_door"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_weathered_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_grate_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_grate"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_weathered_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/waxed_weathered_copper_trapdoor_from_adding_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:weathered_copper_trapdoor"
},
{
"item": "minecraft:honeycomb_block"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:waxed_weathered_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_chiseled_copper_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_weathered_chiseled_copper"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_chiseled_copper"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_bulb_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_weathered_copper_bulb"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_bulb"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_door_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_weathered_copper_door"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_door"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_grate_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_weathered_copper_grate"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_grate"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_deoxidising.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:oxidized_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_trapdoor"
}
]
}

17
src/generated/resources/data/create/recipe/deploying/weathered_copper_trapdoor_from_removing_wax.json Normal file
View file

@ -0,0 +1,17 @@
{
"type": "create:deploying",
"ingredients": [
{
"item": "minecraft:waxed_weathered_copper_trapdoor"
},
{
"tag": "minecraft:axes"
}
],
"keepHeldItem": true,
"results": [
{
"item": "minecraft:weathered_copper_trapdoor"
}
]
}

2
src/main/java/com/simibubi/create/content/equipment/armor/BacktankUtil.java
View file

@ -134,7 +134,7 @@ public class BacktankUtil {
List<ItemStack> backtanks = getAllWithAir(entity);
if (backtanks.isEmpty())
return false;
int cost = maxAirWithoutEnchants() / usesPerTank;
int cost = Math.max(maxAirWithoutEnchants() / usesPerTank, 1);
consumeAir(entity, backtanks.getFirst(), cost);
return true;
}

2
src/main/java/com/simibubi/create/content/equipment/clipboard/ClipboardBlock.java
View file

@ -125,7 +125,7 @@ public class ClipboardBlock extends FaceAttachedHorizontalDirectionalBlock
}
@Override
public ItemStack getCloneItemStack(BlockState state, HitResult target, LevelReader level, BlockPos pos, Player player) {
public ItemStack getCloneItemStack(LevelReader level, BlockPos pos, BlockState state) {
if (level.getBlockEntity(pos) instanceof ClipboardBlockEntity cbe)
return cbe.dataContainer;
return new ItemStack(this);

9
src/main/java/com/simibubi/create/content/equipment/potatoCannon/PotatoCannonItem.java
View file

@ -125,7 +125,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP
@Override
public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
ItemStack stack = player.getItemInHand(hand);
return findAmmoInInventory(world, player, stack).map(itemStack -> {
return findAmmoInInventory(world, player, stack).map(ammoIn -> {
if (ShootableGadgetItemMethods.shouldSwap(player, stack, hand, this::isCannon))
return InteractionResultHolder.fail(stack);
@ -142,6 +142,7 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP
.subtract(player.position()
.add(0, player.getEyeHeight(), 0));
ItemStack itemStack = ammoIn.copy();
PotatoCannonProjectileType projectileType = PotatoProjectileTypeManager.getTypeForStack(itemStack)
.orElse(BuiltinPotatoProjectileTypes.FALLBACK);
Vec3 lookVec = player.getLookAngle();
@ -178,9 +179,9 @@ public class PotatoCannonItem extends ProjectileWeaponItem implements CustomArmP
}
if (!player.isCreative()) {
itemStack.shrink(1);
if (itemStack.isEmpty())
player.getInventory().removeItem(itemStack);
ammoIn.shrink(1);
if (ammoIn.isEmpty())
player.getInventory().removeItem(ammoIn);
}
if (!BacktankUtil.canAbsorbDamage(player, maxUses()))

2
src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java
View file

@ -139,7 +139,7 @@ public class ChainConveyorInteractionHandler {
if (AllBlocks.PACKAGE_FROGPORT.isIn(mainHandItem)) {
PackagePortTargetSelectionHandler.exactPositionOfTarget = selectedBakedPosition;
PackagePortTargetSelectionHandler.activePackageTarget =
new PackagePortTarget.ChainConveyorFrogportTarget(selectedLift, selectedChainPosition, selectedConnection);
new PackagePortTarget.ChainConveyorFrogportTarget(selectedLift, selectedChainPosition, selectedConnection, false);
return true;
}

8
src/main/java/com/simibubi/create/content/logistics/filter/AttributeFilterScreen.java
View file

@ -15,6 +15,7 @@ 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.Label;
import com.simibubi.create.foundation.gui.widget.ScrollInput;
import com.simibubi.create.foundation.gui.widget.SelectionScrollInput;
import com.simibubi.create.foundation.utility.CreateLang;
@ -145,9 +146,10 @@ public class AttributeFilterScreen extends AbstractFilterScreen<AttributeFilterM
add.active = true;
addInverted.active = true;
attributeSelector.titled(stack.getHoverName()
.plainCopy()
.append("..."));
attributeSelector.titled(CreateLang.text(stack.getHoverName()
.getString() + "...")
.color(ScrollInput.HEADER_RGB.getRGB())
.component());
attributesOfItem.clear();
for (Map.Entry<ResourceKey<ItemAttributeType>, ItemAttributeType> entrySet : AllRegistries.ITEM_ATTRIBUTE_TYPES.entrySet())
attributesOfItem.addAll(entrySet.getValue().getAllAttributes(stack, minecraft.level));

11
src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTarget.java
View file

@ -73,13 +73,15 @@ public abstract class PackagePortTarget {
public static final MapCodec<ChainConveyorFrogportTarget> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
BlockPos.CODEC.fieldOf("relative_pos").forGetter(i -> i.relativePos),
Codec.FLOAT.fieldOf("chain_pos").forGetter(i -> i.chainPos),
BlockPos.CODEC.optionalFieldOf("connection").forGetter(i -> Optional.ofNullable(i.connection))
BlockPos.CODEC.optionalFieldOf("connection").forGetter(i -> Optional.ofNullable(i.connection)),
Codec.BOOL.fieldOf("flipped").forGetter(i -> i.flipped)
).apply(instance, ChainConveyorFrogportTarget::new));
public static final StreamCodec<ByteBuf, ChainConveyorFrogportTarget> STREAM_CODEC = StreamCodec.composite(
BlockPos.STREAM_CODEC, i -> i.relativePos,
ByteBufCodecs.FLOAT, i -> i.chainPos,
CatnipStreamCodecBuilders.nullable(BlockPos.STREAM_CODEC), i -> i.connection,
ByteBufCodecs.BOOL, i -> i.flipped,
ChainConveyorFrogportTarget::new
);
@ -88,14 +90,15 @@ public abstract class PackagePortTarget {
public BlockPos connection;
public boolean flipped;
public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, Optional<BlockPos> connection) {
this(relativePos, chainPos, connection.orElse(null));
public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, Optional<BlockPos> connection, boolean flipped) {
this(relativePos, chainPos, connection.orElse(null), flipped);
}
public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, @Nullable BlockPos connection) {
public ChainConveyorFrogportTarget(BlockPos relativePos, float chainPos, @Nullable BlockPos connection, boolean flipped) {
super(relativePos);
this.chainPos = chainPos;
this.connection = connection;
this.flipped = flipped;
}
@Override

92
src/main/java/com/simibubi/create/foundation/data/recipe/DeployingRecipeGen.java
View file

@ -25,9 +25,9 @@ public class DeployingRecipeGen extends ProcessingRecipeGen {
GeneratedRecipe
COGWHEEL = create("cogwheel", b -> b.require(I.shaft())
.require(I.planks())
.output(I.cog())),
COGWHEEL = create("cogwheel", b -> b.require(I.shaft())
.require(I.planks())
.output(I.cog())),
LARGE_COGWHEEL = create("large_cogwheel", b -> b.require(I.cog())
.require(I.planks())
@ -35,47 +35,75 @@ public class DeployingRecipeGen extends ProcessingRecipeGen {
GeneratedRecipe
CB1 = addWax(() -> Blocks.WAXED_COPPER_BLOCK, () -> Blocks.COPPER_BLOCK),
CB2 = addWax(() -> Blocks.WAXED_EXPOSED_COPPER, () -> Blocks.EXPOSED_COPPER),
CB3 = addWax(() -> Blocks.WAXED_WEATHERED_COPPER, () -> Blocks.WEATHERED_COPPER),
CB4 = addWax(() -> Blocks.WAXED_OXIDIZED_COPPER, () -> Blocks.OXIDIZED_COPPER),
COPPER_BLOCK = oxidizationChain(
List.of(() -> Blocks.COPPER_BLOCK, () -> Blocks.EXPOSED_COPPER, () -> Blocks.WEATHERED_COPPER, () -> Blocks.OXIDIZED_COPPER),
List.of(() -> Blocks.WAXED_COPPER_BLOCK, () -> Blocks.WAXED_EXPOSED_COPPER, () -> Blocks.WAXED_WEATHERED_COPPER, () -> Blocks.WAXED_OXIDIZED_COPPER)),
CCB1 = addWax(() -> Blocks.WAXED_CUT_COPPER, () -> Blocks.CUT_COPPER),
CCB2 = addWax(() -> Blocks.WAXED_EXPOSED_CUT_COPPER, () -> Blocks.EXPOSED_CUT_COPPER),
CCB3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER, () -> Blocks.WEATHERED_CUT_COPPER),
CCB4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER, () -> Blocks.OXIDIZED_CUT_COPPER),
COPPER_BULB = oxidizationChain(
List.of(() -> Blocks.COPPER_BULB, () -> Blocks.EXPOSED_COPPER_BULB, () -> Blocks.WEATHERED_COPPER_BULB, () -> Blocks.OXIDIZED_COPPER_BULB),
List.of(() -> Blocks.WAXED_COPPER_BULB, () -> Blocks.WAXED_EXPOSED_COPPER_BULB, () -> Blocks.WAXED_WEATHERED_COPPER_BULB, () -> Blocks.WAXED_OXIDIZED_COPPER_BULB)),
CCST1 = addWax(() -> Blocks.WAXED_CUT_COPPER_STAIRS, () -> Blocks.CUT_COPPER_STAIRS),
CCST2 = addWax(() -> Blocks.WAXED_EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.EXPOSED_CUT_COPPER_STAIRS),
CCST3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.WEATHERED_CUT_COPPER_STAIRS),
CCST4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER_STAIRS, () -> Blocks.OXIDIZED_CUT_COPPER_STAIRS),
CHISELED_COPPER = oxidizationChain(
List.of(() -> Blocks.CHISELED_COPPER, () -> Blocks.EXPOSED_CHISELED_COPPER, () -> Blocks.WEATHERED_CHISELED_COPPER, () -> Blocks.OXIDIZED_CHISELED_COPPER),
List.of(() -> Blocks.WAXED_CHISELED_COPPER, () -> Blocks.WAXED_EXPOSED_CHISELED_COPPER, () -> Blocks.WAXED_WEATHERED_CHISELED_COPPER, () -> Blocks.WAXED_OXIDIZED_CHISELED_COPPER)),
CCS1 = addWax(() -> Blocks.WAXED_CUT_COPPER_SLAB, () -> Blocks.CUT_COPPER_SLAB),
CCS2 = addWax(() -> Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, () -> Blocks.EXPOSED_CUT_COPPER_SLAB),
CCS3 = addWax(() -> Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB),
CCS4 = addWax(() -> Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB);
COPPER_GRATE = oxidizationChain(
List.of(() -> Blocks.COPPER_GRATE, () -> Blocks.EXPOSED_COPPER_GRATE, () -> Blocks.WEATHERED_COPPER_GRATE, () -> Blocks.OXIDIZED_COPPER_GRATE),
List.of(() -> Blocks.WAXED_COPPER_GRATE, () -> Blocks.WAXED_EXPOSED_COPPER_GRATE, () -> Blocks.WAXED_WEATHERED_COPPER_GRATE, () -> Blocks.WAXED_OXIDIZED_COPPER_GRATE)),
GeneratedRecipe
COPPER_DOOR = oxidizationChain(
List.of(() -> Blocks.COPPER_DOOR, () -> Blocks.EXPOSED_COPPER_DOOR, () -> Blocks.WEATHERED_COPPER_DOOR, () -> Blocks.OXIDIZED_COPPER_DOOR),
List.of(() -> Blocks.WAXED_COPPER_DOOR, () -> Blocks.WAXED_EXPOSED_COPPER_DOOR, () -> Blocks.WAXED_WEATHERED_COPPER_DOOR, () -> Blocks.WAXED_OXIDIZED_COPPER_DOOR)),
CB_OX = oxidizationChain(List.of(() -> Blocks.COPPER_BLOCK, () -> Blocks.EXPOSED_COPPER, () -> Blocks.WEATHERED_COPPER, () -> Blocks.OXIDIZED_COPPER)),
CCB_OX = oxidizationChain(List.of(() -> Blocks.CUT_COPPER, () -> Blocks.EXPOSED_CUT_COPPER, () -> Blocks.WEATHERED_CUT_COPPER, () -> Blocks.OXIDIZED_CUT_COPPER)),
CCST_OX = oxidizationChain(List.of(() -> Blocks.CUT_COPPER_STAIRS, () -> Blocks.EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.OXIDIZED_CUT_COPPER_STAIRS)),
CCS_OX = oxidizationChain(List.of(() -> Blocks.CUT_COPPER_SLAB, () -> Blocks.EXPOSED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB));
COPPER_TRAPDOOR = oxidizationChain(
List.of(() -> Blocks.COPPER_TRAPDOOR, () -> Blocks.EXPOSED_COPPER_TRAPDOOR, () -> Blocks.WEATHERED_COPPER_TRAPDOOR, () -> Blocks.OXIDIZED_COPPER_TRAPDOOR),
List.of(() -> Blocks.WAXED_COPPER_TRAPDOOR, () -> Blocks.WAXED_EXPOSED_COPPER_TRAPDOOR, () -> Blocks.WAXED_WEATHERED_COPPER_TRAPDOOR, () -> Blocks.WAXED_OXIDIZED_COPPER_TRAPDOOR)),
CUT_COPPER = oxidizationChain(
List.of(() -> Blocks.CUT_COPPER, () -> Blocks.EXPOSED_CUT_COPPER, () -> Blocks.WEATHERED_CUT_COPPER, () -> Blocks.OXIDIZED_CUT_COPPER),
List.of(() -> Blocks.WAXED_CUT_COPPER, () -> Blocks.WAXED_EXPOSED_CUT_COPPER, () -> Blocks.WAXED_WEATHERED_CUT_COPPER, () -> Blocks.WAXED_OXIDIZED_CUT_COPPER)),
CUT_COPPER_STAIRS = oxidizationChain(
List.of(() -> Blocks.CUT_COPPER_STAIRS, () -> Blocks.EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.OXIDIZED_CUT_COPPER_STAIRS),
List.of(() -> Blocks.WAXED_CUT_COPPER_STAIRS, () -> Blocks.WAXED_EXPOSED_CUT_COPPER_STAIRS, () -> Blocks.WAXED_WEATHERED_CUT_COPPER_STAIRS, () -> Blocks.WAXED_OXIDIZED_CUT_COPPER_STAIRS)),
CUT_COPPER_SLAB = oxidizationChain(
List.of(() -> Blocks.CUT_COPPER_SLAB, () -> Blocks.EXPOSED_CUT_COPPER_SLAB, () -> Blocks.WEATHERED_CUT_COPPER_SLAB, () -> Blocks.OXIDIZED_CUT_COPPER_SLAB),
List.of(() -> Blocks.WAXED_CUT_COPPER_SLAB, () -> Blocks.WAXED_EXPOSED_CUT_COPPER_SLAB, () -> Blocks.WAXED_WEATHERED_CUT_COPPER_SLAB, () -> Blocks.WAXED_OXIDIZED_CUT_COPPER_SLAB))
;
public GeneratedRecipe copperChain(CopperBlockSet set) {
for (Variant<?> variant : set.getVariants()) {
List<Supplier<ItemLike>> chain = new ArrayList<>(4);
List<Supplier<ItemLike>> waxedChain = new ArrayList<>(4);
for (WeatherState state : WeatherState.values()) {
addWax(set.get(variant, state, true)::get, set.get(variant, state, false)::get);
waxedChain.add(set.get(variant, state, true)::get);
chain.add(set.get(variant, state, false)::get);
}
oxidizationChain(chain);
oxidizationChain(chain, waxedChain);
}
return null;
}
public GeneratedRecipe oxidizationChain(List<Supplier<ItemLike>> chain, List<Supplier<ItemLike>> waxedChain) {
for (int i = 0; i < chain.size() - 1; i++) {
Supplier<ItemLike> to = chain.get(i);
Supplier<ItemLike> from = chain.get(i + 1);
createWithDeferredId(idWithSuffix(to, "_from_deoxidising"), b -> b.require(from.get())
.require(ItemTags.AXES)
.toolNotConsumed()
.output(to.get()));
}
for (int i = 0; i < chain.size(); i++)
addWax(waxedChain.get(i), chain.get(i));
return null;
}
public GeneratedRecipe addWax(Supplier<ItemLike> waxed, Supplier<ItemLike> nonWaxed) {
createWithDeferredId(idWithSuffix(nonWaxed, "_from_removing_wax"), b -> b.require(waxed.get())
.require(ItemTags.AXES)
@ -88,18 +116,6 @@ public class DeployingRecipeGen extends ProcessingRecipeGen {
.output(waxed.get()));
}
public GeneratedRecipe oxidizationChain(List<Supplier<ItemLike>> chain) {
for (int i = 0; i < chain.size() - 1; i++) {
Supplier<ItemLike> to = chain.get(i);
Supplier<ItemLike> from = chain.get(i + 1);
createWithDeferredId(idWithSuffix(to, "_from_deoxidising"), b -> b.require(from.get())
.require(ItemTags.AXES)
.toolNotConsumed()
.output(to.get()));
}
return null;
}
public DeployingRecipeGen(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
super(output, registries);
}