Skip to content

Commit

Permalink
添加盲盒机制作为宝库替代;
Browse files Browse the repository at this point in the history
平衡钢质材质与伪钻材质物品的合成物;
修复耐久返还合成的机制bug;
锻造台支持耐久返还合成;
修复牧师村民试图出售6级不祥之瓶导致崩溃的问题。
修复一些其他小问题,重构了部分代码。
  • Loading branch information
YipKei committed Aug 6, 2024
1 parent 6a607a3 commit e74843a
Show file tree
Hide file tree
Showing 249 changed files with 6,556 additions and 205 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.21 2024-08-06T22:34:08.95373 Vanilla Addition/Tags for minecraft:point_of_interest_type
30f8b2269d4695566673eee81ee8654b4f1310a5 data\minecraft\tags\point_of_interest_type\acquirable_job_site.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-23T09:27:36.7147883 Vanilla Addition/Language (zh_hk)
fadb9867b579577d1d1660426a889b194718deca assets\vanilla-addition\lang\zh_hk.json
// 1.21 2024-08-06T22:34:08.95373 Vanilla Addition/Language (zh_hk)
49786a72c8cfb33aff28aaae125d19f9b0a5b149 assets\vanilla-addition\lang\zh_hk.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-23T09:27:36.7261216 Vanilla Addition/Language (zh_cn)
0915e5f5ba0783fcd6793c1db169186d104779b7 assets\vanilla-addition\lang\zh_cn.json
// 1.21 2024-08-06T22:34:08.9634632 Vanilla Addition/Language (zh_cn)
0d7cce030b2d130ddf1a551a4c72a7d8e354343b assets\vanilla-addition\lang\zh_cn.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 1.21 2024-07-23T09:27:36.7137879 Vanilla Addition/Tags for minecraft:block
f8c69575215863c835f560299feeb75712ce6683 data\vanilla-addition\tags\block\bone_meal_drops_extra.json
// 1.21 2024-08-06T22:34:08.9517832 Vanilla Addition/Tags for minecraft:block
0355cc8858fc27a8875758452d79699715194641 data\vanilla-addition\tags\block\nether_bricks.json
f8c69575215863c835f560299feeb75712ce6683 data\vanilla-addition\tags\block\bone_meal_drops_extra.json
34969052b498f41eaf578b7489231a8dd5ec55a2 data\minecraft\tags\block\beacon_base_blocks.json
44a672eabd767bd6d85652525a56a451ed71aa6d data\vanilla-addition\tags\block\obsidian.json
714c14c7070725695cd2e6bb37596f00cedb300d data\vanilla-addition\tags\block\magical_girls_affectable.json
Expand Down
81 changes: 81 additions & 0 deletions src/main/generated/.cache/4992255b8e976b74c77db2c0f150b3e0b9eb2ef3
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
// 1.21 2024-08-06T22:34:08.9527565 Vanilla Addition/Chest Loot Tables
a72c684355e36f0aca7e8a51f3ccbe0a6256272f data\vanilla-addition\loot_table\blind_box\ominous_golden_unique.json
5c9d6a2e369b6ec2c24d6c39d985c9a14cf072fb data\vanilla-addition\loot_table\blind_box\ominous_stone_common.json
ccc3341e62af82e2259f83d993003b5bfa182802 data\vanilla-addition\loot_table\blind_box\ominous_diamond_rare.json
a6ef3c80c8ab4e84f82f4565186c9413d564be91 data\vanilla-addition\loot_table\blind_box\ominous_iron.json
ade12699ae9371c047bff064dd713307c847701b data\vanilla-addition\loot_table\blind_box\diamond_common.json
a7afe0caed8f893b3217314e614cf1a3f665eb6f data\vanilla-addition\loot_table\blind_box\ominous_emerald_unique.json
f825780315b2954552235e4af559952d6a9e9096 data\vanilla-addition\loot_table\blind_box\ominous_iron_rare.json
f844b8422585b09bc6a1aeb9e6a1520878b1579c data\vanilla-addition\loot_table\blind_box\ominous_netherite_uncommon.json
b6aa3b1a14fb2d195f4ed2c5cfcb3a1320c87d4a data\vanilla-addition\loot_table\blind_box\coal.json
a383dcf2bfd07c306a2e651d4cc558cd965393ed data\vanilla-addition\loot_table\blind_box\ominous_stone.json
860da7f3fac041c29ff9b1e3e5374c7578cfbf35 data\vanilla-addition\loot_table\blind_box\golden_common.json
bc2f9c7f209ebdd30a5e616e209a93745a11ee30 data\vanilla-addition\loot_table\blind_box\ominous_iron_unique.json
587b8aa5e15c17f232091402ac756f0ed54f560a data\vanilla-addition\loot_table\blind_box\iron_uncommon.json
9ae17a3983f3a0e4485111128c75a511abd25401 data\vanilla-addition\loot_table\blind_box\netherite_rare.json
f200cfb0426021bf7c46d7fd625e68ec93a19ece data\vanilla-addition\loot_table\blind_box\ominous_netherite.json
1b3056c20190dd6cf09cf41f06e5de53e553ad60 data\vanilla-addition\loot_table\blind_box\ominous_coal_rare.json
f574ae003d0f35ebf31ccb2d40374cd5322ed7c9 data\vanilla-addition\loot_table\blind_box\diamond.json
9b52979e3bc7e772061a3eabae45f85d45399794 data\vanilla-addition\loot_table\blind_box\iron_common.json
478f14478aabc5625735a2b0b63fdaf070207acc data\vanilla-addition\loot_table\blind_box\ominous_stone_rare.json
86bf3cc0f58dddec3ff949ce949f54e1677a0336 data\vanilla-addition\loot_table\blind_box\ominous_diamond.json
c688075177c8152d7fea1bc4d5ea20403924f2a5 data\vanilla-addition\loot_table\blind_box\ominous_coal_uncommon.json
41e0786648c88ec1a81f8044ea42688d42837f1d data\vanilla-addition\loot_table\blind_box\netherite_common.json
82776e574597e3502eb4ec6ef0e0bb6df24b42aa data\vanilla-addition\loot_table\blind_box\coal_common.json
aa60592731508c6dbc552cdace70e8388a97be06 data\vanilla-addition\loot_table\blind_box\copper.json
8a8e5087ce05b144c87ad6a535d2bf157883aec1 data\vanilla-addition\loot_table\blind_box\ominous_copper_rare.json
113b5b4c13511e27a116e38866e3b40e16b6ee06 data\vanilla-addition\loot_table\blind_box\ominous_stone_uncommon.json
544d598824bd4c8cf18a5438496c33fdfab0fb57 data\vanilla-addition\loot_table\blind_box\iron_unique.json
85119c9d37decc762b62df9064592a73e63a6286 data\vanilla-addition\loot_table\blind_box\netherite_uncommon.json
44ba2c55176edeea59fd3fcdf63c97b8e845f793 data\vanilla-addition\loot_table\blind_box\golden_uncommon.json
f14b63dfd48ee2c2c83472e0b38cc9abcf134ee8 data\vanilla-addition\loot_table\blind_box\netherite_unique.json
2e6feab1c305e7bc6640524277d0d8f478ae59d0 data\vanilla-addition\loot_table\blind_box\ominous_golden_rare.json
f65512d31eb3b21de05aa02d6b37c1fd4aac808c data\vanilla-addition\loot_table\blind_box\golden_unique.json
d8069cad0b9e0ab298cae34716a0cb507848560a data\vanilla-addition\loot_table\blind_box\ominous_stone_unique.json
6fa8f6a88ab0127dd71aa01864abd3a35e7880e6 data\vanilla-addition\loot_table\blind_box\ominous_emerald_common.json
2dd1a1d970d461e08998d550a1c4a19e8ddec00f data\vanilla-addition\loot_table\blind_box\ominous_golden_common.json
7d0cd6932abbe88ab8701dceeade2638d984b53f data\vanilla-addition\loot_table\blind_box\ominous_iron_common.json
02ea12a82f09bfe2393c36416ed0b0f9b8414441 data\vanilla-addition\loot_table\blind_box\ominous_emerald_rare.json
2df11ed9c9c28fa257e6f1f992ff929ce58f1f56 data\vanilla-addition\loot_table\blind_box\iron_rare.json
e14fefbaa4a8e759b8584c0a2d9ae85f669b77d5 data\vanilla-addition\loot_table\blind_box\ominous_iron_uncommon.json
adca6bd36979f20168bb0ca930e0078b4fdbd36f data\vanilla-addition\loot_table\blind_box\ominous_netherite_unique.json
1d78638833168928477b37688f0fdaa633c894ed data\vanilla-addition\loot_table\blind_box\ominous_copper.json
1e37c114cb7e912fc0c343100f6221da51dec735 data\vanilla-addition\loot_table\blind_box\ominous_diamond_common.json
65cd9a8da9a5fbcbbf3b0de419118a8d974e581d data\vanilla-addition\loot_table\blind_box\stone.json
b12037f0b61f05f62c10cd7b181a5633514516ab data\vanilla-addition\loot_table\blind_box\iron.json
197b99b318e80ef5bf54595d198d86b3a5019291 data\vanilla-addition\loot_table\blind_box\stone_uncommon.json
afaa3f0dcdb21c2ba8f20e415b65af54eb836c4c data\vanilla-addition\loot_table\blind_box\copper_uncommon.json
fe7fb5eb765882ecc0beb142bf54152051e9d0df data\vanilla-addition\loot_table\blind_box\ominous_copper_unique.json
bbb2ae9fc45c9efe23353c9827e0bb8dd6ee66ca data\vanilla-addition\loot_table\blind_box\emerald_rare.json
afec91a6465d3d0eecbebe886ab790021d4600a2 data\vanilla-addition\loot_table\blind_box\ominous_netherite_common.json
78594ddb6caea02dacf926ae20f421eef174fdca data\vanilla-addition\loot_table\blind_box\ominous_golden_uncommon.json
bda3011d815be0b711e4eed3e8021d7a3a13e0f5 data\vanilla-addition\loot_table\blind_box\ominous_golden.json
e14149696c1274afbf69126e61e2a165ac2a85f6 data\vanilla-addition\loot_table\blind_box\copper_unique.json
115f57eee950fbc669dc23a350314e8dcf06a945 data\vanilla-addition\loot_table\blind_box\ominous_copper_common.json
2652d02d94502953f4972f533effe66da1d00781 data\vanilla-addition\loot_table\blind_box\ominous_diamond_unique.json
b67d25244a40de2b7949e5ebf2dc19a5a20bb4b2 data\vanilla-addition\loot_table\blind_box\emerald_common.json
23f7c41ae17cc65bb997e73e17b1f6f7975f0370 data\vanilla-addition\loot_table\blind_box\ominous_copper_uncommon.json
35b89c596b7a0903ca4aa2440c78f46e11f9def4 data\vanilla-addition\loot_table\blind_box\ominous_coal.json
67f08887d57d31d221acacc8cd87e8cf464ce7af data\vanilla-addition\loot_table\blind_box\netherite.json
120f02c3aba0e4fcb2186a32f82fd632a1df5472 data\vanilla-addition\loot_table\blind_box\golden_rare.json
58059d0358e72f082c9cd685f03cc8fa53b5b4dc data\vanilla-addition\loot_table\blind_box\copper_rare.json
e4785c821aa11a7d197703a1dc1e6a11546e6bf4 data\vanilla-addition\loot_table\blind_box\coal_rare.json
24bd8137485a23cefc061b08057f8d7882785ac2 data\vanilla-addition\loot_table\blind_box\copper_common.json
ac33498a910d57a02fe0f44b0b253668214b5248 data\vanilla-addition\loot_table\blind_box\diamond_rare.json
53b479745478f4b915aae08394aad240c9e5b26f data\vanilla-addition\loot_table\blind_box\stone_common.json
8e9e17e0ba373ab08c624b995fcea8cc346f7f7d data\vanilla-addition\loot_table\blind_box\diamond_unique.json
e693fef0633fee865d4d628cca0508a14388eb51 data\vanilla-addition\loot_table\blind_box\ominous_coal_common.json
8d9edbc2e6c547004646be2e87f79251a8f2be5f data\vanilla-addition\loot_table\blind_box\ominous_emerald_uncommon.json
676520d03b2b18669cb297be1252d0c9b9609982 data\vanilla-addition\loot_table\blind_box\coal_uncommon.json
ded5f4659e50e0550d79f834b4259efff07336a6 data\vanilla-addition\loot_table\blind_box\coal_unique.json
176ab58966715d443f19199417e920a9afe4c59d data\vanilla-addition\loot_table\blind_box\emerald.json
5406d7648854114d3d3b50544ee06384979ffc69 data\vanilla-addition\loot_table\blind_box\stone_unique.json
aca21af2d4badaf673e4703182d4d76930b18942 data\vanilla-addition\loot_table\blind_box\ominous_coal_unique.json
7b195f76c3e865dce7d0703f3eb0fd6c1c895f1c data\vanilla-addition\loot_table\blind_box\stone_rare.json
c5321d48377a22de0a63492abfe8695912932410 data\vanilla-addition\loot_table\blind_box\emerald_uncommon.json
f6f132e19d7f972dd3430f3665c08a688a049a31 data\vanilla-addition\loot_table\blind_box\ominous_emerald.json
b0f687d39f64f3f66b42db847150e61fe8847d08 data\vanilla-addition\loot_table\blind_box\ominous_diamond_uncommon.json
22afec587e34af235bc264838089c35d0b8fbfd4 data\vanilla-addition\loot_table\blind_box\ominous_netherite_rare.json
d2643734cf94d1ac05deb94382084bfadfddcacb data\vanilla-addition\loot_table\blind_box\diamond_uncommon.json
1cf432a26569424177c184b76b1ae321760267be data\vanilla-addition\loot_table\blind_box\golden.json
3ee1dc94fc5bcc5d9bf977419b676c27db2893e0 data\vanilla-addition\loot_table\blind_box\emerald_unique.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21 2024-07-23T09:27:36.710788 Vanilla Addition/Block Loot Tables
// 1.21 2024-08-06T22:34:08.948863 Vanilla Addition/Block Loot Tables
a1a0b43c828acd9cb76d61e60a8bee4029a2fa9c data\vanilla-addition\loot_table\blocks\ice_stairs.json
1a98f88a25643465c0404911c7ed52ac7b4c2d05 data\vanilla-addition\loot_table\blocks\magenta_concrete_stairs.json
cc7524231583823b741d5b402e1c658eef713283 data\vanilla-addition\loot_table\blocks\obsidian_slab.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21 2024-07-23T09:27:36.7147883 Vanilla Addition/Language (en_us)
2165252eb5d0c4eb651d9189ae23259306e2e21e assets\vanilla-addition\lang\en_us.json
// 1.21 2024-08-06T22:34:08.9547031 Vanilla Addition/Language (en_us)
1faf8a5d6b512b4d1c010ba7d9c671d3df55a05e assets\vanilla-addition\lang\en_us.json
Loading

0 comments on commit e74843a

Please sign in to comment.