mirror of
https://github.com/GoldChick/ExtraBotany.git
synced 2024-10-28 03:40:09 +08:00
v0.1.6
This commit is contained in:
HuTao今天吃什么
parent
90d7eaaafa
commit
7268506f57
@ -20,7 +20,7 @@ apply plugin: 'maven-publish'
|
||||
// apply MixinGradle
|
||||
apply plugin: 'org.spongepowered.mixin'
|
||||
|
||||
version = '1.18.2-0.1.5.1'
|
||||
version = '1.18.2-0.1.6'
|
||||
group = 'extrabotany' //'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||
archivesBaseName = 'extrabotany'
|
||||
|
||||
|
||||
@ -24,8 +24,8 @@ a11e55f651479912f38def68d408d3365bff4e6b assets/extrabotany/blockstates/moonligh
|
||||
5b4b6c301ff57c7d4006e79654cac0e1e68cbe60 assets/extrabotany/blockstates/serenitian.json
|
||||
31853f21bb80a913ba27e5053a843459b3d7d37d assets/extrabotany/blockstates/sunshine_lily.json
|
||||
98ef3075f38b46cec1ea7720d159ad1109096786 assets/extrabotany/blockstates/tinkle_flower.json
|
||||
2ae4c8f80bb543c977038bace4fae725b2a671f2 assets/extrabotany/lang/en_us.json
|
||||
6e03c14b7b639f3c1b76d6dddbb6cd95abbad0a4 assets/extrabotany/lang/zh_cn.json
|
||||
92f11b2aad4cf72721511ea385c0e99682e3111d assets/extrabotany/lang/en_us.json
|
||||
db16352b54c5883071f5ed706f96a82c5b2e0763 assets/extrabotany/lang/zh_cn.json
|
||||
477b72a89fa3546590428dd7d8d4528c711a98dc assets/extrabotany/models/block/annoying_flower.json
|
||||
2f2803ccc1532c712c13241790c9ec65fb61a97d assets/extrabotany/models/block/bell_flower.json
|
||||
a559d107783c691b559872c498455ac4ebebb363 assets/extrabotany/models/block/block_orichalcos.json
|
||||
@ -80,6 +80,7 @@ acd573711cb27cb29310524371b724e6ceb3e26c assets/extrabotany/models/item/death_ri
|
||||
38d4283b1a7e6a89a5df67e113a7b4e635fa50f1 assets/extrabotany/models/item/earth_stone.json
|
||||
04400fe21e57a3ddb7f2d676a88936907a753c21 assets/extrabotany/models/item/edelweiss.json
|
||||
74207035e1e8eeef1204334540ba804a1dbdb223 assets/extrabotany/models/item/element_rune.json
|
||||
f036ad3dee5daf5e46780de619a91df4bbfbd314 assets/extrabotany/models/item/elf_king_ring.json
|
||||
fd4d4d590a1e7a91f441fafa153d4683c1cde5a3 assets/extrabotany/models/item/empty_bottle.json
|
||||
1de90addd84e9b3dfb4e8abb9649f543792ffc1f assets/extrabotany/models/item/excaliber.json
|
||||
9061d18cda64a054fb924283dfd4ac2fd999af28 assets/extrabotany/models/item/first_fractal.json
|
||||
@ -184,7 +185,7 @@ e24955f0e3e0924ca0570a81ee2998680679b5ea data/botania/tags/blocks/special_floati
|
||||
c9ff3b120bf0d1145a5f6e82846b8f449c734da9 data/botania/tags/items/functional_special_flowers.json
|
||||
ddc834a139f949eccb001070727eabd4ff1ee8ce data/botania/tags/items/generating_special_flowers.json
|
||||
fdd7219319bd75a5c113c12c6ca07dace05ce9a4 data/botania/tags/items/lens.json
|
||||
c86e8f05abc5ff0cf0661c602039468343a96c8d data/botania/tags/items/mana_using_items.json
|
||||
64962fd60e3decca2096d4fc4b44de616763bec7 data/botania/tags/items/mana_using_items.json
|
||||
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/mini_flowers.json
|
||||
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/misc_special_flowers.json
|
||||
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/botania/tags/items/mundane_floating_flowers.json
|
||||
@ -215,7 +216,7 @@ e24955f0e3e0924ca0570a81ee2998680679b5ea data/botania/tags/items/special_floatin
|
||||
50651d97aa37260c6cf7bf73372e573f929e6763 data/curios/tags/items/curio.json
|
||||
c05a4941c251c61c47b5f4e9199662d26a766db5 data/curios/tags/items/head.json
|
||||
bd553a13427b90964796ff12fb7e48b1aa109b61 data/curios/tags/items/necklace.json
|
||||
1b5561d70415a7513da0a544188c726a1d967312 data/curios/tags/items/ring.json
|
||||
7c491cf673c47f3854b796ca9cf80eebcf6c7f84 data/curios/tags/items/ring.json
|
||||
0794c9da9f745ef08597b04bf4bd6c44d49cdbeb data/extrabotany/advancements/main/armorset_goblinslayer.json
|
||||
951e87b016b54fe39247a74bba77a5e46935aa5e data/extrabotany/advancements/main/armorset_maid.json
|
||||
926aa994e625bc007a260641a5d2cb02602dc7ee data/extrabotany/advancements/main/armorset_miku.json
|
||||
@ -313,6 +314,7 @@ fbb957e2b2a952edc0a9045a90b3720f510bb334 data/extrabotany/recipes/runic_altar/ae
|
||||
3441482768985f9f00fee37796d6233768d56cd0 data/extrabotany/recipes/runic_altar/aqua_stone.json
|
||||
6a2055a76ebd165d533048b117523f1fa2b8c0b5 data/extrabotany/recipes/runic_altar/deathring.json
|
||||
9417884fcec17c9b7943f9567578f70be5e936ff data/extrabotany/recipes/runic_altar/earth_stone.json
|
||||
7599327a6f27dbd0e72a76bdde93945bfd4beb60 data/extrabotany/recipes/runic_altar/elf_king_ring.json
|
||||
8291e377d3008b5f136d400921b35d1a281e7ca8 data/extrabotany/recipes/runic_altar/frostring.json
|
||||
a32e24a07063ec63079cf50d27cb6f56178264c6 data/extrabotany/recipes/runic_altar/gildedpotato.json
|
||||
c7a38c3b7dfd0c83127fd131e5abc601058fdd25 data/extrabotany/recipes/runic_altar/ignite_stone.json
|
||||
@ -369,6 +371,7 @@ f0bfb0cc8d2af424b4d3e39faf8acdb6ad04b772 data/minecraft/advancements/recipes/ext
|
||||
4f73a251aa74220a38ba6065abf1a76dbd4a894c data/minecraft/advancements/recipes/extrabotany/miku_chest.json
|
||||
fcbeac0a85a7ed615b36af11bf8d1781dff138ec data/minecraft/advancements/recipes/extrabotany/miku_helm.json
|
||||
d68ae94282c5441ce3801bce9142ec916d96ecb1 data/minecraft/advancements/recipes/extrabotany/miku_legs.json
|
||||
22fcf86562ca5cfa10ec21ebfea3c3ce9703503d data/minecraft/advancements/recipes/extrabotany/moon_pendant.json
|
||||
1483a63a1bf1210c0677e6a2441e93dedf4b6027 data/minecraft/advancements/recipes/extrabotany/peace_amulet.json
|
||||
baed377893aa0527a1d4548d86515112d715811f data/minecraft/advancements/recipes/extrabotany/puredaisy_pendant.json
|
||||
33124afa7cec560a86a5d66b42d1157e2e5206dd data/minecraft/advancements/recipes/extrabotany/redscarf.json
|
||||
@ -381,6 +384,7 @@ baed377893aa0527a1d4548d86515112d715811f data/minecraft/advancements/recipes/ext
|
||||
041538beb4d2784a9a4ff2b5694ca8bf4eb86627 data/minecraft/advancements/recipes/extrabotany/shadowwarrior_legs.json
|
||||
d60e9ac040dc6e4e4d531428d4226f7d12e91fc9 data/minecraft/advancements/recipes/extrabotany/sin_rune.json
|
||||
d34ef092a415ccd7a15498b4a2ccd5ecf64fd70c data/minecraft/advancements/recipes/extrabotany/stonemask.json
|
||||
8ff992753dad9686040e77de13da28eadb56a3ca data/minecraft/advancements/recipes/extrabotany/sun_ring.json
|
||||
9dfa7a1b144dc08294e30be558b758ccf376ee45 data/minecraft/advancements/recipes/extrabotany/the_chaos.json
|
||||
7f9f63ec687e0e443faf7f891754cde204ab7e9b data/minecraft/advancements/recipes/extrabotany/the_end.json
|
||||
0cd257ea1b18870fbb46be619c9eee9fa5345407 data/minecraft/advancements/recipes/extrabotany/the_origin.json
|
||||
@ -437,6 +441,7 @@ a8e2860e88e38e1b4a6fe99487ad539c691c1511 data/minecraft/recipes/manareader.json
|
||||
8f4cd1dd88648b89be9a7d86657da308bb5d92be data/minecraft/recipes/miku_chest.json
|
||||
b985f2b9fc14036f65b21bd0dea87fc33387de3a data/minecraft/recipes/miku_helm.json
|
||||
c34f3094093e9982f62527ef235b08af00d108af data/minecraft/recipes/miku_legs.json
|
||||
a9075a0f854ed636256651d1f23a0c1fe9cc39cc data/minecraft/recipes/moon_pendant.json
|
||||
701dea5335b90ca083753fc810678fa398770583 data/minecraft/recipes/peace_amulet.json
|
||||
34c5521d60a8d1cb76eda415e9694e7196c58790 data/minecraft/recipes/puredaisy_pendant.json
|
||||
34c12d5ad6ec95825afc79834150b45ab141b815 data/minecraft/recipes/redscarf.json
|
||||
@ -450,6 +455,7 @@ edb9f326e8ee3166b686baf0a2318653c071ffa5 data/minecraft/recipes/shadowwarrior_ch
|
||||
5e7abd4db2d22446bfb2d8f90c4be24e4783baa7 data/minecraft/recipes/shadowwarrior_legs.json
|
||||
436fca839932bfc1eff6a4426702891b4fa65db6 data/minecraft/recipes/sin_rune.json
|
||||
14a9f3ef1e794236b4e871ef9825b927ece4c05b data/minecraft/recipes/stonemask.json
|
||||
cff10659e511e619a16984fa1061bcceb68fa8b0 data/minecraft/recipes/sun_ring.json
|
||||
6711944389564a9f90b45851a1fa918189c8b7f6 data/minecraft/recipes/the_chaos.json
|
||||
37283a34491251d73307e72f535183f610a091c8 data/minecraft/recipes/the_end.json
|
||||
2ef278ad8f01b0a79117256373e0f10f3db30fe0 data/minecraft/recipes/the_origin.json
|
||||
|
||||
@ -138,6 +138,7 @@
|
||||
"extrabotany.entry.ego": "Ego",
|
||||
"extrabotany.entry.elementium_shield": "\u9AD8\u7EA7\u9B54\u529B\u76FE\u724C",
|
||||
"extrabotany.entry.elementstone": "Stones of Four Element",
|
||||
"extrabotany.entry.elf_king_ring": "Ring of Elven King",
|
||||
"extrabotany.entry.excaliber": "Excaliber",
|
||||
"extrabotany.entry.failnaught": "Failnaught",
|
||||
"extrabotany.entry.forest_book": "Aranyaka",
|
||||
@ -155,6 +156,7 @@
|
||||
"extrabotany.entry.manasteel_shield": "Mana Shield",
|
||||
"extrabotany.entry.miku": "Starry Idol Armor Set",
|
||||
"extrabotany.entry.mini_item": "\u7F29\u5C0F\u5DE5\u5177",
|
||||
"extrabotany.entry.moon_pendant": "Heart of Corrupted Moon",
|
||||
"extrabotany.entry.moonlight_lily": "Moonlight Lily",
|
||||
"extrabotany.entry.nightmarefuel": "Nightmare Fuel",
|
||||
"extrabotany.entry.omni_violet": "Omniviolet",
|
||||
@ -169,6 +171,7 @@
|
||||
"extrabotany.entry.serenitian": "Serenitian",
|
||||
"extrabotany.entry.shadowium": "Shadowium",
|
||||
"extrabotany.entry.spiritfuel": "Spirit Fuel",
|
||||
"extrabotany.entry.sun_ring": "Ring of Sacred Sun",
|
||||
"extrabotany.entry.sunshine_lily": "Sunshine Lily",
|
||||
"extrabotany.entry.supreme_elementstone": "Supreme Stones",
|
||||
"extrabotany.entry.tinkle_flower": "Tinkle Flower",
|
||||
@ -234,6 +237,8 @@
|
||||
"extrabotany.page.elementstone2": "Earth Stone",
|
||||
"extrabotany.page.elementstone3": "Aqua Stone",
|
||||
"extrabotany.page.elementstone4": "Ignis Stone",
|
||||
"extrabotany.page.elf_king_ring0": "$(item)Ring of Elven King$(0) is a special ring. When crafted with another ring, it will probably obtain their ability. However, several abilities like $(thing)storing mana$(0) will not work on $(item)Ring of Elven King$(0). $(item)Ring of Elven King$(0) could obtain at most 2 abilities from other rings. The same abilities might stack. $(br)Do not work on $(thing)Relic$(0). $(br)Crafting $(item)Ring of Elven King$(0) with $(item)Das Rheingold$(0) could remove one of the abilities.",
|
||||
"extrabotany.page.elf_king_ring1": "",
|
||||
"extrabotany.page.excaliber0": "$(item)Excaliber$(0) could shoot golden mana beam that will automatically trace enemies in a large area.",
|
||||
"extrabotany.page.excaliber1": "",
|
||||
"extrabotany.page.failnaught0": "The $(item)Failnaught$(0) uses $(thing)Mana$(0) to shoot magic arrows which pierce through enemies and deal damage to the creatures in the area. The longer you draw the bow, the more damage it will deal.",
|
||||
@ -300,6 +305,8 @@
|
||||
"extrabotany.page.mini_item3": "",
|
||||
"extrabotany.page.mini_item4": "$(item)\u5929\u7A7A\u6CD5\u6756$(0)\u98DE\u8DC3\u7684\u9AD8\u5EA6\u6709\u65F6\u5019\u5927\u5927\u8D85\u8FC7\u4E86\u6211\u4EEC\u6240\u9700\uFF0C$(item)\u5929\u7A7A\u77ED\u6756$(0)\u5C31\u89E3\u51B3\u4E86\u8FD9\u4E2A\u95EE\u9898\u3002\u5728\u8FD9\u4E2A\u8FC7\u7A0B\u4E2D\u704C\u6CE8\u7684\u9B54\u529B\u4E5F\u8BA9$(item)\u5929\u7A7A\u77ED\u6756$(0)\u80FD\u591F\u5B89\u88C5\u4E00\u4E9B\u914D\u4EF6\u3002",
|
||||
"extrabotany.page.mini_item5": "",
|
||||
"extrabotany.page.moon_pendant0": "$(item)Heart of Corrupted Moon$(0) is similar to $(item)Ring of Sacred Sun$(0). The only difference is that $(item)Heart of Corrupted Moon$(0) is a kind of necklace and could only receive 6 abilities from other necklaces.",
|
||||
"extrabotany.page.moon_pendant1": "Broken Rime's Echo",
|
||||
"extrabotany.page.moonlight_lily0": "Moonlight Lily generates $(thing)Mana$(0) at night, but it is not very efficient. Please note that it will decay after working for 3 days in minecraft.",
|
||||
"extrabotany.page.moonlight_lily1": "Sowing of the fool.",
|
||||
"extrabotany.page.nightmarefuel0": "$(item)Nightmare Fuel$(0) is the aggregation of the nightmare, you will suffer after eating it, but it may be the beginning of a sweet dream. Elves may be interested in this. (Warning: instant damage III will cause 24 damage to player!)",
|
||||
@ -342,6 +349,8 @@
|
||||
"extrabotany.page.spiritfuel0": "$(item)Spirit Fuel$(0) is an important material which could be obtained by two ways. The first way is to eat $(item)Nightmare Fuel$(0). The second is by Elven Trade through Alfheim Portal. Spirit Fuel can be refined into $(item)Spirit Fragment$(0) through Alfheim Portal.",
|
||||
"extrabotany.page.spiritfuel1": "Spirit Fuel",
|
||||
"extrabotany.page.spiritfuel2": "Spirit Fragment",
|
||||
"extrabotany.page.sun_ring0": "$(item)Ring of Sacred Sun$(0) is the upgraded version of $(item)Ring of Elven King$(0), with the power of obtain 8 additional abilities from other rings, even including $(thing)Relic$(0). However,$(item)Ring of Sacred Sun$(0) can not get some abilities like $(thing)storing mana$(0), either.",
|
||||
"extrabotany.page.sun_ring1": "Lavawalker's Epiphany",
|
||||
"extrabotany.page.sunshine_lily0": "Sunshine Lily produces $(thing)Mana$(0) from sunlight, but it is not very efficient. Please note that it will decay after working for 3 days in minecraft.",
|
||||
"extrabotany.page.sunshine_lily1": "Heal and heat.",
|
||||
"extrabotany.page.supreme_elementstone0": "Element Stones are so powerful. But there is one way to get even stronger power from element. However, this results in some disadvantages. And this also exacerbates the conflict between the different elements. For example, $(item)Aero Stone$(0) and $(item)Earth Stone$(0) can not work together if one of them is $(item)Supreme$(0) version. So will $(item)Aqua Stone$(0) and $(item)Ignis Stone$(0) do.",
|
||||
@ -375,6 +384,7 @@
|
||||
"item.extrabotany.earth_stone": "Earth Stone",
|
||||
"item.extrabotany.element_rune": "Rune of Element",
|
||||
"item.extrabotany.elementium_shield": "Elementium Shield",
|
||||
"item.extrabotany.elf_king_ring": "Ring of Elven King",
|
||||
"item.extrabotany.empty_bottle": "Empty Mana Glass Bottle",
|
||||
"item.extrabotany.excaliber": "Excaliber",
|
||||
"item.extrabotany.failnaught": "Failnaught",
|
||||
|
||||
@ -137,6 +137,7 @@
|
||||
"extrabotany.entry.ego": "\u672C\u6211 (\u76D6\u4E9A\u5B88\u62A4\u8005III)",
|
||||
"extrabotany.entry.elementium_shield": "\u9AD8\u7EA7\u9B54\u529B\u76FE\u724C",
|
||||
"extrabotany.entry.elementstone": "\u5143\u7D20\u7B26\u77F3",
|
||||
"extrabotany.entry.elf_king_ring": "\u7CBE\u7075\u738B\u6307\u73AF",
|
||||
"extrabotany.entry.excaliber": "\u738B\u8005\u5723\u5251",
|
||||
"extrabotany.entry.failnaught": "\u767E\u4E2D\u5F13",
|
||||
"extrabotany.entry.forest_book": "\u68EE\u6797\u4E66",
|
||||
@ -236,6 +237,8 @@
|
||||
"extrabotany.page.elementstone2": "\u5730\u4E4B\u7B26\u77F3",
|
||||
"extrabotany.page.elementstone3": "\u6C34\u4E4B\u7B26\u77F3",
|
||||
"extrabotany.page.elementstone4": "\u706B\u4E4B\u7B26\u77F3",
|
||||
"extrabotany.page.elf_king_ring0": "$(item)\u7CBE\u7075\u738B\u6307\u73AF$(0)\u662F\u4E00\u79CD\u5947\u7279\u7684\u6212\u6307\uFF0C\u53EA\u8981\u5C06\u5B83\u4E0E\u522B\u7684\u6212\u6307\u5408\u6210\uFF0C\u5C31\u53EF\u80FD\u83B7\u5F97\u8FD9\u79CD\u6212\u6307\u7684\u7279\u6B8A\u80FD\u529B\u3002$(thing)\u50A8\u5B58\u9B54\u529B$(0)\u7B49\u80FD\u529B\u4E0D\u80FD\u6B63\u5E38\u4F5C\u7528\u4E8E$(item)\u7CBE\u7075\u738B\u6307\u73AF$(0)\u3002$(item)\u7CBE\u7075\u738B\u6307\u73AF$(0)\u53EF\u4EE5\u989D\u5916\u83B7\u53D6\u603B\u5171\u4E24\u4E2A\u6212\u6307\u7684\u80FD\u529B\uFF0C\u6709\u4E9B\u80FD\u529B\u53EF\u4EE5\u53E0\u52A0\u4F5C\u7528\u3002$(br)\u5BF9$(thing)\u9057\u7269$(0)\u4E0D\u751F\u6548\u3002$(br)\u53E6\u5916\uFF0C\u5728\u5DE5\u4F5C\u53F0\u4E2D\u5C06$(item)\u7CBE\u7075\u738B\u6307\u73AF$(0)\u4E0E$(item)\u83B1\u8335\u6CB3\u7684\u9EC4\u91D1$(0)\u5408\u6210\u53EF\u4EE5\u6D88\u53BB\u4E00\u79CD\u80FD\u529B\u3002",
|
||||
"extrabotany.page.elf_king_ring1": "",
|
||||
"extrabotany.page.excaliber0": "$(item)\u738B\u8005\u5723\u5251$(0)\u53EF\u4EE5\u6D88\u8017\u9B54\u529B\u53D1\u5C04\u91D1\u8272\u7684\u9B54\u529B\u5149\u675F\uFF0C\u9B54\u529B\u5149\u675F\u53EF\u4EE5\u8FFD\u8E2A\u654C\u4EBA\u5E76\u9020\u6210\u7269\u7406\u7A7F\u7532\u4F24\u5BB3\u3002",
|
||||
"extrabotany.page.excaliber1": "",
|
||||
"extrabotany.page.failnaught0": "$(item)\u767E\u4E2D\u5F13$(0)\u53EF\u4EE5\u6D88\u8017\u9B54\u529B\u53D1\u5C04\u51FA\u4E00\u652F\u80FD\u591F\u8D2F\u7A7F\u654C\u4EBA\u7684\u7BAD\u77E2\uFF0C\u8FD9\u652F\u7BAD\u80FD\u5BF9\u5468\u56F4\u8F83\u5927\u8303\u56F4\u654C\u4EBA\u9020\u6210\u4F24\u5BB3\u3002\u84C4\u529B\u65F6\u95F4\u8D8A\u4E45\uFF0C\u7BAD\u77E2\u7684\u4F24\u5BB3\u5C31\u8D8A\u9AD8\uFF0C\u98DE\u884C\u8DDD\u79BB\u4E5F\u8D8A\u957F\u3002",
|
||||
@ -304,8 +307,8 @@
|
||||
"extrabotany.page.mini_item3": "",
|
||||
"extrabotany.page.mini_item4": "$(item)\u5929\u7A7A\u6CD5\u6756$(0)\u98DE\u8DC3\u7684\u9AD8\u5EA6\u6709\u65F6\u5019\u5927\u5927\u8D85\u8FC7\u4E86\u6211\u4EEC\u6240\u9700\uFF0C$(item)\u5929\u7A7A\u77ED\u6756$(0)\u5C31\u89E3\u51B3\u4E86\u8FD9\u4E2A\u95EE\u9898\u3002\u5728\u8FD9\u4E2A\u8FC7\u7A0B\u4E2D\u704C\u6CE8\u7684\u9B54\u529B\u4E5F\u8BA9$(item)\u5929\u7A7A\u77ED\u6756$(0)\u80FD\u591F\u5B89\u88C5\u4E00\u4E9B\u914D\u4EF6\u3002",
|
||||
"extrabotany.page.mini_item5": "",
|
||||
"extrabotany.page.moon_pendant0": "$(item)\u8680\u6708\u4E4B\u5FC3$(0)\u548C$(item)\u5723\u9633\u5C0A\u6212$(0)\u5177\u6709\u7C7B\u4F3C\u7684\u529B\u91CF\uFF0C\u4E0D\u540C\u4E4B\u5904\u53EA\u662F\u5728\u4E8E$(item)\u8680\u6708\u4E4B\u5FC3$(0)\u662F\u4E00\u79CD\u9879\u94FE\u3002",
|
||||
"extrabotany.page.moon_pendant1": "",
|
||||
"extrabotany.page.moon_pendant0": "$(item)\u8680\u6708\u4E4B\u5FC3$(0)\u548C$(item)\u5723\u9633\u5C0A\u6212$(0)\u5177\u6709\u7C7B\u4F3C\u7684\u529B\u91CF\uFF0C\u4E0D\u540C\u4E4B\u5904\u53EA\u662F\u5728\u4E8E$(item)\u8680\u6708\u4E4B\u5FC3$(0)\u662F\u4E00\u79CD\u9879\u94FE\uFF0C\u5E76\u4E14\u53EA\u80FD\u83B7\u53D6\u516D\u4E2A\u9879\u94FE\u7684\u80FD\u529B\u3002",
|
||||
"extrabotany.page.moon_pendant1": "\u7834\u51B0\u8E0F\u96EA\u7684\u56DE\u97F3",
|
||||
"extrabotany.page.moonlight_lily0": "\u62E5\u6709\u80FD\u5728\u591C\u665A\u4EA7\u751F$(thing)\u9B54\u529B$(0)\u7684\u80FD\u529B\uFF0C\u4F46\u4EA7\u80FD\u6548\u7387\u5E76\u4E0D\u53EF\u89C2\u3002\u4F1A\u57283\u4E2Aminecraft\u65E5\u540E\u67AF\u840E\u3002",
|
||||
"extrabotany.page.moonlight_lily1": "\u611A\u8005\u7684\u64AD\u79CD\u3002",
|
||||
"extrabotany.page.nightmarefuel0": "$(item)\u68A6\u9B47\u71C3\u6599$(0)\u662F\u5669\u68A6\u7684\u96C6\u5408\u4F53\uFF0C\u98DF\u7528\u540E\u4F1A\u906D\u9047\u4E0D\u5E78\uFF0C\u4F46\u4E5F\u53EF\u80FD\u662F\u7F8E\u68A6\u7684\u5F00\u59CB\u3002\u7CBE\u7075\u4EEC\u53EF\u80FD\u4E5F\u4F1A\u5BF9\u8FD9\u79CD\u4E1C\u897F\u611F\u5174\u8DA3\u3002\uFF08\u8B66\u544A\uFF1A\u77AC\u95F4\u4F24\u5BB3III\u4F1A\u9020\u621024\u70B9\u4F24\u5BB3\uFF01\uFF09",
|
||||
@ -348,8 +351,8 @@
|
||||
"extrabotany.page.spiritfuel0": "$(item)\u7CBE\u795E\u71C3\u6599$(0)\u662F\u4E00\u79CD\u975E\u5E38\u91CD\u8981\u7684\u6750\u6599\u3002\u5B83\u6709\u4E24\u79CD\u83B7\u53D6\u65B9\u5F0F\uFF0C\u4E00\u79CD\u662F\u98DF\u7528$(item)\u68A6\u9B47\u71C3\u6599$(0)\uFF0C\u53E6\u4E00\u79CD\u662F\u901A\u8FC7\u7CBE\u7075\u4EA4\u6613\u3002\u7CBE\u7075\u95E8\u53EF\u4EE5\u5C06\u7CBE\u795E\u71C3\u6599\u7CBE\u70BC\u4E3A$(item)\u7CBE\u795E\u788E\u7247$(0)\u3002",
|
||||
"extrabotany.page.spiritfuel1": "\u7CBE\u795E\u71C3\u6599",
|
||||
"extrabotany.page.spiritfuel2": "\u7CBE\u795E\u788E\u7247",
|
||||
"extrabotany.page.sun_ring0": "$(item)\u5723\u9633\u5C0A\u6212$(0)\u662F\u4E00\u79CD\u5947\u7279\u7684\u6212\u6307\u3002\u53EA\u8981\u5C06\u5B83\u4E0E\u522B\u7684\u6212\u6307\u5408\u6210\uFF0C\u5C31\u53EF\u80FD\u83B7\u5F97\u8FD9\u79CD\u6212\u6307\u7684\u7279\u6B8A\u80FD\u529B\u3002\u6709\u4E9B\u80FD\u529B\u662F\u53EF\u4EE5\u53E0\u52A0\u7684\u3002\u5F53\u7136\uFF0C$(item)\u5723\u9633\u5C0A\u6212$(0)\u7684\u529B\u91CF\u4E5F\u662F\u6709\u9650\u5EA6\u7684\uFF0C\u6BD4\u5982\u4E0D\u80FD\u83B7\u5F97$(thing)\u50A8\u5B58\u9B54\u529B$(0)\u8FD9\u79CD\u80FD\u529B\u3002$(br)\u53E6\u5916\uFF0C\u5728\u5DE5\u4F5C\u53F0\u4E2D\u5C06$(item)\u5723\u9633\u5C0A\u6212$(0)\u4E0E$(item)\u83B1\u8335\u6CB3\u7684\u9EC4\u91D1$(0)\u5408\u6210\u53EF\u4EE5\u6D88\u53BB\u4E00\u79CD\u80FD\u529B\u3002",
|
||||
"extrabotany.page.sun_ring1": "",
|
||||
"extrabotany.page.sun_ring0": "$(item)\u5723\u9633\u5C0A\u6212$(0)\u662F$(item)\u7CBE\u7075\u738B\u6307\u73AF$(0)\u7684\u5347\u7EA7\u7248\uFF0C\u80FD\u591F\u83B7\u53D6\u516B\u4E2A\u6212\u6307\u7684\u80FD\u529B\uFF0C\u5305\u62EC\u9057\u7269\u3002\u7136\u800C\uFF0C$(item)\u5723\u9633\u5C0A\u6212$(0)\u4ECD\u7136\u4E0D\u80FD\u83B7\u5F97$(thing)\u50A8\u5B58\u9B54\u529B$(0)\u7B49\u80FD\u529B\u3002",
|
||||
"extrabotany.page.sun_ring1": "\u6E21\u706B\u8005\u7684\u9192\u609F",
|
||||
"extrabotany.page.sunshine_lily0": "\u62E5\u6709\u80FD\u5C06\u9633\u5149\u8F6C\u5316\u4E3A$(thing)\u9B54\u529B$(0)\u7684\u80FD\u529B\uFF0C\u4F46\u4EA7\u80FD\u6548\u7387\u5E76\u4E0D\u53EF\u89C2\u3002\u4F1A\u57283\u4E2Aminecraft\u65E5\u540E\u67AF\u840E\u3002",
|
||||
"extrabotany.page.sunshine_lily1": "\u5149\u4E0E\u70ED\u3002",
|
||||
"extrabotany.page.supreme_elementstone0": "\u5143\u7D20\u7B26\u77F3\u5DF2\u7ECF\u5341\u5206\u5F3A\u5927\u4E86\u3002\u4F46\u662F\u8FD8\u6709\u4E00\u79CD\u65B9\u6CD5\u80FD\u4ECE\u5143\u7D20\u4E2D\u53D6\u5F97\u66F4\u5F3A\u5927\u7684\u529B\u91CF\u3002\u4E0D\u8FC7\uFF0C\u8FD9\u4E5F\u5BFC\u81F4\u4E86\u4E00\u4E9B\u7F3A\u70B9\uFF0C\u540C\u65F6\u4E5F\u52A0\u5267\u4E86\u4E0D\u540C\u5143\u7D20\u4E4B\u95F4\u7684\u51B2\u7A81\u3002\u6BD4\u5982\u8BF4\uFF0C\u5982\u679C\u5176\u4E2D\u4E00\u4E2A\u662F\u81F3\u9AD8\u7EA7\u522B\u7684\u7B26\u77F3\uFF0C\u90A3\u4E48\u4F60\u5C06\u65E0\u6CD5\u540C\u65F6\u4F7F\u7528$(item)\u98CE\u4E4B\u7B26\u77F3$(0)\u548C$(item)\u5730\u4E4B\u7B26\u77F3$(0)\uFF0C\u6216\u8005$(item)\u706B\u4E4B\u7B26\u77F3$(0)\u548C$(item)\u6C34\u4E4B\u7B26\u77F3$(0)\u3002",
|
||||
@ -383,6 +386,7 @@
|
||||
"item.extrabotany.earth_stone": "\u5730\u4E4B\u7B26\u77F3",
|
||||
"item.extrabotany.element_rune": "\u5143\u7075\u7B26\u6587",
|
||||
"item.extrabotany.elementium_shield": "\u6E90\u8D28\u94A2\u76FE\u724C",
|
||||
"item.extrabotany.elf_king_ring": "\u7CBE\u7075\u738B\u6307\u73AF",
|
||||
"item.extrabotany.empty_bottle": "\u9B54\u6CD5\u73BB\u7483\u7A7A\u74F6",
|
||||
"item.extrabotany.excaliber": "\u738B\u8005\u5723\u5251",
|
||||
"item.extrabotany.failnaught": "\u767E\u4E2D\u5F13",
|
||||
|
||||
@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "minecraft:item/generated",
|
||||
"textures": {
|
||||
"layer0": "extrabotany:item/elf_king_ring"
|
||||
}
|
||||
}
|
||||
@ -24,6 +24,10 @@
|
||||
"extrabotany:maid_helm",
|
||||
"extrabotany:maid_chest",
|
||||
"extrabotany:maid_legs",
|
||||
"extrabotany:maid_boots"
|
||||
"extrabotany:maid_boots",
|
||||
"extrabotany:puredaisy_pendant",
|
||||
"extrabotany:sun_ring",
|
||||
"extrabotany:moon_pendant",
|
||||
"extrabotany:elf_king_ring"
|
||||
]
|
||||
}
|
||||
@ -4,6 +4,7 @@
|
||||
"extrabotany:death_ring",
|
||||
"extrabotany:frost_ring",
|
||||
"extrabotany:sages_mana_ring",
|
||||
"extrabotany:sun_ring"
|
||||
"extrabotany:sun_ring",
|
||||
"extrabotany:elf_king_ring"
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
{
|
||||
"type": "botania:runic_altar",
|
||||
"output": {
|
||||
"item": "extrabotany:elf_king_ring"
|
||||
},
|
||||
"mana": 100000,
|
||||
"ingredients": [
|
||||
{
|
||||
"item": "botania:pixie_ring"
|
||||
},
|
||||
{
|
||||
"item": "botania:rune_spring"
|
||||
},
|
||||
{
|
||||
"item": "botania:elementium_ingot"
|
||||
},
|
||||
{
|
||||
"item": "botania:elementium_ingot"
|
||||
},
|
||||
{
|
||||
"item": "botania:quartz_elven"
|
||||
},
|
||||
{
|
||||
"item": "botania:quartz_elven"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:bamboo"
|
||||
},
|
||||
{
|
||||
"item": "minecraft:bamboo"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"minecraft:moon_pendant"
|
||||
]
|
||||
},
|
||||
"criteria": {
|
||||
"hero_medal": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"items": [
|
||||
"extrabotany:hero_medal"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"has_the_recipe": {
|
||||
"trigger": "minecraft:recipe_unlocked",
|
||||
"conditions": {
|
||||
"recipe": "minecraft:moon_pendant"
|
||||
}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"hero_medal",
|
||||
"has_the_recipe"
|
||||
]
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
{
|
||||
"parent": "minecraft:recipes/root",
|
||||
"rewards": {
|
||||
"recipes": [
|
||||
"minecraft:sun_ring"
|
||||
]
|
||||
},
|
||||
"criteria": {
|
||||
"hero_medal": {
|
||||
"trigger": "minecraft:inventory_changed",
|
||||
"conditions": {
|
||||
"items": [
|
||||
{
|
||||
"items": [
|
||||
"extrabotany:hero_medal"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"has_the_recipe": {
|
||||
"trigger": "minecraft:recipe_unlocked",
|
||||
"conditions": {
|
||||
"recipe": "minecraft:sun_ring"
|
||||
}
|
||||
}
|
||||
},
|
||||
"requirements": [
|
||||
[
|
||||
"hero_medal",
|
||||
"has_the_recipe"
|
||||
]
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "extrabotany",
|
||||
"pattern": [
|
||||
"edc",
|
||||
"fmb",
|
||||
"gza"
|
||||
],
|
||||
"key": {
|
||||
"m": {
|
||||
"item": "extrabotany:hero_medal"
|
||||
},
|
||||
"z": {
|
||||
"item": "extrabotany:moon_pendant"
|
||||
},
|
||||
"a": {
|
||||
"item": "botania:rune_envy"
|
||||
},
|
||||
"b": {
|
||||
"item": "botania:rune_sloth"
|
||||
},
|
||||
"c": {
|
||||
"item": "botania:rune_pride"
|
||||
},
|
||||
"d": {
|
||||
"item": "botania:rune_lust"
|
||||
},
|
||||
"e": {
|
||||
"item": "botania:rune_greed"
|
||||
},
|
||||
"f": {
|
||||
"item": "botania:rune_wrath"
|
||||
},
|
||||
"g": {
|
||||
"item": "botania:rune_gluttony"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "extrabotany:moon_pendant"
|
||||
}
|
||||
}
|
||||
41
src/generated/resources/data/minecraft/recipes/sun_ring.json
Normal file
41
src/generated/resources/data/minecraft/recipes/sun_ring.json
Normal file
@ -0,0 +1,41 @@
|
||||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"group": "extrabotany",
|
||||
"pattern": [
|
||||
"edc",
|
||||
"fmb",
|
||||
"gza"
|
||||
],
|
||||
"key": {
|
||||
"m": {
|
||||
"item": "extrabotany:hero_medal"
|
||||
},
|
||||
"z": {
|
||||
"item": "extrabotany:elf_king_ring"
|
||||
},
|
||||
"a": {
|
||||
"item": "botania:rune_envy"
|
||||
},
|
||||
"b": {
|
||||
"item": "botania:rune_sloth"
|
||||
},
|
||||
"c": {
|
||||
"item": "botania:rune_pride"
|
||||
},
|
||||
"d": {
|
||||
"item": "botania:rune_lust"
|
||||
},
|
||||
"e": {
|
||||
"item": "botania:rune_greed"
|
||||
},
|
||||
"f": {
|
||||
"item": "botania:rune_wrath"
|
||||
},
|
||||
"g": {
|
||||
"item": "botania:rune_gluttony"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "extrabotany:sun_ring"
|
||||
}
|
||||
}
|
||||
@ -130,6 +130,7 @@ public class ModItems
|
||||
public static final RegistryObject<Item> SUPREME_AQUA_STONE = register(LibItemNames.SUPREME_AQUA_STONE, () -> new SupremeAquaStone(stackTo1()));
|
||||
public static final RegistryObject<Item> SUPREME_EARTH_STONE = register(LibItemNames.SUPREME_EARTH_STONE, () -> new SupremeEarthStone(stackTo1()));
|
||||
public static final RegistryObject<Item> SUPREME_IGNITE_STONE = register(LibItemNames.SUPREME_IGNITE_STONE, () -> new SupremeIgniteStone(stackTo1()));
|
||||
public static final RegistryObject<Item> ELF_KING_RING = register(LibItemNames.ELF_KING_RING, () -> new ElfKingRing(stackTo1()));
|
||||
public static final RegistryObject<Item> SAGES_MANA_RING = register(LibItemNames.SAGES_MANA_RING, () -> new SagesManaRing(stackTo1()));
|
||||
public static final RegistryObject<Item> POTATO_CHIP = register(LibItemNames.POTATO_CHIP, () -> new PotatoChips(stackTo1()));
|
||||
public static final RegistryObject<Item> SUN_RING = register(LibItemNames.SUN_RING, () -> new SunRing(stackTo1()));
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
package chick.extrabotany.common.baubles;
|
||||
|
||||
import chick.extrabotany.common.baubles.relic.AbstractMultiUpgradedBauble;
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import vazkii.botania.common.handler.PixieHandler;
|
||||
import vazkii.botania.xplat.IXplatAbstractions;
|
||||
|
||||
|
||||
public class ElfKingRing extends AbstractMultiUpgradedBauble
|
||||
{
|
||||
public ElfKingRing(Properties props)
|
||||
{
|
||||
super(props);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxAmount()
|
||||
{
|
||||
return 2;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getEquippedAttributeModifiers(ItemStack stack)
|
||||
{
|
||||
Multimap<Attribute, AttributeModifier> ret = HashMultimap.create(super.getEquippedAttributeModifiers(stack));
|
||||
ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, new AttributeModifier(getBaubleUUID(stack), "Ring modifier", 0.25, AttributeModifier.Operation.ADDITION));
|
||||
return ret;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int canAddBauble(ItemStack base, ItemStack bauble)
|
||||
{
|
||||
if (IXplatAbstractions.INSTANCE.findRelic(bauble) != null)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
return super.canAddBauble(base, bauble);
|
||||
}
|
||||
}
|
||||
@ -11,6 +11,8 @@ import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.network.chat.MutableComponent;
|
||||
import net.minecraft.network.chat.TextComponent;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
@ -25,29 +27,30 @@ import vazkii.botania.common.item.equipment.bauble.ItemBauble;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public abstract class AbstractMultiUpgradedRelic extends ItemBauble implements IAdvancementRequirement
|
||||
/**
|
||||
* abstract class for baubles that can be crafted with others to obtain their abilities<p>
|
||||
* note that the base bauble will only be able to get the <b style=color:rgb(0,255,255)>onWornTick()</b> of others
|
||||
*/
|
||||
public abstract class AbstractMultiUpgradedBauble extends ItemBauble implements IAdvancementRequirement
|
||||
{
|
||||
private static final String TAG_BAUBLE_NBT = "tag_bauble_nbt_";
|
||||
|
||||
private static final int MAX_AMOUNT = 6;
|
||||
|
||||
public AbstractMultiUpgradedRelic(Properties props)
|
||||
public AbstractMultiUpgradedBauble(Properties props)
|
||||
{
|
||||
super(props);
|
||||
}
|
||||
|
||||
public int getMaxAmount()
|
||||
{
|
||||
return 8;
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull Rarity getRarity(@NotNull ItemStack stack)
|
||||
{
|
||||
return Rarity.EPIC;
|
||||
}
|
||||
|
||||
public boolean addBauble(ItemStack base, Item bauble)
|
||||
{
|
||||
return addBauble(base, new ItemStack(bauble));
|
||||
}
|
||||
|
||||
public boolean addBauble(ItemStack base, ItemStack bauble)
|
||||
{
|
||||
int check = canAddBauble(base, bauble);
|
||||
@ -65,7 +68,7 @@ public abstract class AbstractMultiUpgradedRelic extends ItemBauble implements I
|
||||
}
|
||||
|
||||
/**
|
||||
* @return 0 - <b style="color:rgb(0,255,255)">(MAX_AMOUNT-1)</b>(default 6-1=5) represents SUCCESS<p>
|
||||
* @return 0 - <b style="color:rgb(0,255,255)">(MAX_AMOUNT-1)</b> represents SUCCESS<p>
|
||||
* -1 represents FAILED
|
||||
*/
|
||||
public int canAddBauble(ItemStack base, ItemStack bauble)
|
||||
@ -74,9 +77,9 @@ public abstract class AbstractMultiUpgradedRelic extends ItemBauble implements I
|
||||
{
|
||||
var base_cmp = ItemNBTHelper.getCompound(base, TAG_BAUBLE_NBT, false);
|
||||
|
||||
if (base_cmp.size() < MAX_AMOUNT)
|
||||
if (base_cmp.size() < getMaxAmount())
|
||||
{
|
||||
for (int i = 0; i < MAX_AMOUNT; i++)
|
||||
for (int i = 0; i < getMaxAmount(); i++)
|
||||
{
|
||||
if (base_cmp.getCompound(TAG_BAUBLE_NBT + i).isEmpty())
|
||||
{
|
||||
@ -113,28 +116,48 @@ public abstract class AbstractMultiUpgradedRelic extends ItemBauble implements I
|
||||
return rings;
|
||||
}
|
||||
|
||||
public void removeLastBauble(ItemStack stack)
|
||||
/**
|
||||
* remove the last bauble
|
||||
*/
|
||||
public void removeLastBauble(ItemStack base)
|
||||
{
|
||||
removeBauble(stack, getBaublesAmount(stack) - 1);
|
||||
removeBauble(base, getBaublesAmount(base) - 1);
|
||||
}
|
||||
|
||||
public void removeBauble(ItemStack stack, int index)
|
||||
/**
|
||||
* remove bauble from index
|
||||
* @param index start from ZERO to MAX_AMOUNT-1
|
||||
*/
|
||||
public void removeBauble(ItemStack base, int index)
|
||||
{
|
||||
var base_cmp = ItemNBTHelper.getCompound(stack, TAG_BAUBLE_NBT, false);
|
||||
base_cmp.remove(TAG_BAUBLE_NBT + index);
|
||||
var base_cmp = ItemNBTHelper.getCompound(base, TAG_BAUBLE_NBT, false);
|
||||
int j = 0;
|
||||
for (int i = 0; i < getMaxAmount(); i++)
|
||||
{
|
||||
var cmp = base_cmp.getCompound(TAG_BAUBLE_NBT + i);
|
||||
if (!cmp.isEmpty())
|
||||
{
|
||||
if (j == index)
|
||||
{
|
||||
base_cmp.remove(TAG_BAUBLE_NBT + i);
|
||||
break;
|
||||
}
|
||||
j++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* just return amount<p>
|
||||
* do not generate ItemStack
|
||||
*
|
||||
* @param stack base_bauble
|
||||
* @param base base_bauble
|
||||
*/
|
||||
public int getBaublesAmount(ItemStack stack)
|
||||
public int getBaublesAmount(ItemStack base)
|
||||
{
|
||||
int amount = 0;
|
||||
var base_cmp = ItemNBTHelper.getCompound(stack, TAG_BAUBLE_NBT, false);
|
||||
for (int i = 0; i < MAX_AMOUNT; i++)
|
||||
var base_cmp = ItemNBTHelper.getCompound(base, TAG_BAUBLE_NBT, false);
|
||||
for (int i = 0; i < getMaxAmount(); i++)
|
||||
{
|
||||
if (!base_cmp.getCompound(TAG_BAUBLE_NBT + i).isEmpty())
|
||||
{
|
||||
@ -187,9 +210,13 @@ public abstract class AbstractMultiUpgradedRelic extends ItemBauble implements I
|
||||
return super.getEquippedAttributeModifiers(stack);
|
||||
}
|
||||
|
||||
/**
|
||||
* default is <b style=color:rgb(0,255,255)>curios:ring</b><p>
|
||||
* you can override it if you want to add or change
|
||||
*/
|
||||
public List<TagKey<Item>> getTagKeys()
|
||||
{
|
||||
return new ArrayList<>();
|
||||
return List.of(ItemTags.create(new ResourceLocation("curios", "ring")));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -1,82 +1,41 @@
|
||||
package chick.extrabotany.common.baubles.relic;
|
||||
|
||||
import chick.extrabotany.api.advancement.IAdvancementRequirement;
|
||||
import chick.extrabotany.ExtraBotany;
|
||||
import chick.extrabotany.common.libs.LibAdvancementNames;
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import net.minecraft.core.particles.BlockParticleOption;
|
||||
import net.minecraft.core.particles.ParticleTypes;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
|
||||
import net.minecraft.world.entity.ai.attributes.Attributes;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.enchantment.FrostWalkerEnchantment;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingAttackEvent;
|
||||
import vazkii.botania.common.handler.EquipmentHandler;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemItemFinder;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemSuperLavaPendant;
|
||||
import vazkii.botania.common.item.relic.ItemRelicBauble;
|
||||
import net.minecraft.world.item.TooltipFlag;
|
||||
import net.minecraft.world.level.Level;
|
||||
import vazkii.botania.api.item.IRelic;
|
||||
import vazkii.botania.common.item.relic.RelicImpl;
|
||||
import vazkii.botania.xplat.IXplatAbstractions;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class MoonPendant extends ItemRelicBauble implements IAdvancementRequirement
|
||||
public class MoonPendant extends AbstractMultiUpgradedBauble
|
||||
{
|
||||
public MoonPendant(Item.Properties props)
|
||||
{
|
||||
super(props);
|
||||
MinecraftForge.EVENT_BUS.addListener(this::onDamage);
|
||||
}
|
||||
|
||||
private void onDamage(LivingAttackEvent evt)
|
||||
{
|
||||
if (evt.getSource().isFire() && !EquipmentHandler.findOrEmpty(this, evt.getEntityLiving()).isEmpty())
|
||||
{
|
||||
evt.setCanceled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWornTick(ItemStack stack, LivingEntity player)
|
||||
public int getMaxAmount()
|
||||
{
|
||||
super.onWornTick(stack, player);
|
||||
((ItemSuperLavaPendant) ModItems.superLavaPendant).onWornTick(stack, player);
|
||||
((ItemItemFinder) ModItems.itemFinder).onWornTick(stack, player);
|
||||
|
||||
if (!player.level.isClientSide && !player.isShiftKeyDown())
|
||||
{
|
||||
boolean lastOnGround = player.isOnGround();
|
||||
player.setOnGround(true);
|
||||
FrostWalkerEnchantment.onEntityMoved(player, player.level, player.blockPosition(), 8);
|
||||
player.setOnGround(lastOnGround);
|
||||
} else if (player.level.isClientSide && !player.isShiftKeyDown())
|
||||
{
|
||||
if (player.level.random.nextFloat() >= 0.25F)
|
||||
{
|
||||
player.level.addParticle(new BlockParticleOption(ParticleTypes.FALLING_DUST, Blocks.SNOW_BLOCK.defaultBlockState()),
|
||||
player.getX() + player.level.random.nextFloat() * 0.6 - 0.3, player.getY() + 1.1, player.getZ() + player.level.random.nextFloat() * 0.6 - 0.3,
|
||||
0, -0.15, 0);
|
||||
}
|
||||
}
|
||||
return 6;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(EquipmentSlot slot, ItemStack stack)
|
||||
public List<TagKey<Item>> getTagKeys()
|
||||
{
|
||||
Multimap<Attribute, AttributeModifier> attributes = HashMultimap.create(super.getAttributeModifiers(slot, stack));
|
||||
attributes.put(Attributes.KNOCKBACK_RESISTANCE, new AttributeModifier(getBaubleUUID(stack), "Moon Pendant", 1, AttributeModifier.Operation.ADDITION));
|
||||
return attributes;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean canEquip(ItemStack stack, LivingEntity entity)
|
||||
{
|
||||
return EquipmentHandler.findOrEmpty(this, entity).isEmpty();
|
||||
return List.of(ItemTags.create(new ResourceLocation("curios", "necklace")));
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -84,4 +43,35 @@ public class MoonPendant extends ItemRelicBauble implements IAdvancementRequirem
|
||||
{
|
||||
return LibAdvancementNames.EGO_DEFEAT;
|
||||
}
|
||||
|
||||
public static IRelic makeRelic(ItemStack stack)
|
||||
{
|
||||
return new RelicImpl(stack, new ResourceLocation(ExtraBotany.MODID, "main/" + LibAdvancementNames.MOON_PENDANT_CRAFT));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected)
|
||||
{
|
||||
if (!world.isClientSide && entity instanceof Player player)
|
||||
{
|
||||
var relic = IXplatAbstractions.INSTANCE.findRelic(stack);
|
||||
if (relic != null)
|
||||
{
|
||||
relic.tickBinding(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEntityLifespan(ItemStack itemStack, Level level)
|
||||
{
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendHoverText(ItemStack stack, Level world, List<Component> tooltip, TooltipFlag flags)
|
||||
{
|
||||
super.appendHoverText(stack, world, tooltip, flags);
|
||||
RelicImpl.addDefaultTooltip(stack, tooltip);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
package chick.extrabotany.common.baubles.relic;
|
||||
|
||||
import chick.extrabotany.ExtraBotany;
|
||||
import chick.extrabotany.common.libs.LibAdvancementNames;
|
||||
import net.minecraft.core.NonNullList;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import vazkii.botania.api.item.IRelic;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemManaRing;
|
||||
import vazkii.botania.common.item.relic.RelicImpl;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@ -56,4 +61,9 @@ public class SagesManaRing extends ItemManaRing
|
||||
return MAX_MANA * stack.getCount();
|
||||
}
|
||||
}
|
||||
|
||||
public static IRelic makeRelic(ItemStack stack)
|
||||
{
|
||||
return new RelicImpl(stack, new ResourceLocation(ExtraBotany.MODID, "main/" + LibAdvancementNames.SAGES_MANA_RING_CRAFT));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,48 +1,56 @@
|
||||
package chick.extrabotany.common.baubles.relic;
|
||||
|
||||
import chick.extrabotany.ExtraBotany;
|
||||
import chick.extrabotany.common.libs.LibAdvancementNames;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.item.*;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.TooltipFlag;
|
||||
import net.minecraft.world.level.Level;
|
||||
import vazkii.botania.api.item.IRelic;
|
||||
import vazkii.botania.api.mana.ManaItemHandler;
|
||||
import vazkii.botania.common.item.relic.RelicImpl;
|
||||
import vazkii.botania.xplat.IXplatAbstractions;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class SunRing extends AbstractMultiUpgradedRelic
|
||||
public class SunRing extends AbstractMultiUpgradedBauble
|
||||
{
|
||||
public SunRing(Properties props)
|
||||
{
|
||||
super(props);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onWornTick(ItemStack stack, LivingEntity player)
|
||||
public static IRelic makeRelic(ItemStack stack)
|
||||
{
|
||||
super.onWornTick(stack, player);
|
||||
|
||||
/*
|
||||
//ModItems.bloodPendant;
|
||||
this.addBauble(stack, ModItems.waterRing);
|
||||
this.addBauble(stack, ModItems.miningRing);
|
||||
this.addBauble(stack, ModItems.auraRingGreater);
|
||||
this.addBauble(stack, ModItems.swapRing);
|
||||
this.addBauble(stack, chick.extrabotany.common.ModItems.DEATH_RING.get());
|
||||
this.addBauble(stack, chick.extrabotany.common.ModItems.FROST_RING.get());
|
||||
// ((ItemManaDriveRing) manadrivering).onWornTick(stack, player);
|
||||
|
||||
*/
|
||||
return new RelicImpl(stack, new ResourceLocation(ExtraBotany.MODID, "main/" + LibAdvancementNames.SUN_RING_CRAFT));
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<TagKey<Item>> getTagKeys()
|
||||
public void inventoryTick(ItemStack stack, Level world, Entity entity, int slot, boolean selected)
|
||||
{
|
||||
//return List.of(ItemTags.create(new ResourceLocation("curios", "ring")));
|
||||
return Arrays.asList(
|
||||
ItemTags.create(new ResourceLocation("curios", "ring")),
|
||||
ItemTags.create(new ResourceLocation("curios", "necklace"))
|
||||
);
|
||||
if (!world.isClientSide && entity instanceof Player player)
|
||||
{
|
||||
var relic = IXplatAbstractions.INSTANCE.findRelic(stack);
|
||||
if (relic != null)
|
||||
{
|
||||
relic.tickBinding(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getEntityLifespan(ItemStack itemStack, Level level)
|
||||
{
|
||||
return Integer.MAX_VALUE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendHoverText(ItemStack stack, Level world, List<Component> tooltip, TooltipFlag flags)
|
||||
{
|
||||
super.appendHoverText(stack, world, tooltip, flags);
|
||||
RelicImpl.addDefaultTooltip(stack, tooltip);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
package chick.extrabotany.common.crafting;
|
||||
|
||||
import chick.extrabotany.ExtraBotany;
|
||||
import chick.extrabotany.common.baubles.relic.AbstractMultiUpgradedRelic;
|
||||
import chick.extrabotany.common.baubles.relic.AbstractMultiUpgradedBauble;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.inventory.CraftingContainer;
|
||||
@ -33,7 +32,7 @@ public class BaublesMultiUpgradeRecipe extends CustomRecipe
|
||||
ItemStack stack = inv.getItem(i);
|
||||
if (!stack.isEmpty())
|
||||
{
|
||||
if (stack.getItem() instanceof AbstractMultiUpgradedRelic)
|
||||
if (stack.getItem() instanceof AbstractMultiUpgradedBauble)
|
||||
{
|
||||
|
||||
if (base != null)
|
||||
@ -52,13 +51,13 @@ public class BaublesMultiUpgradeRecipe extends CustomRecipe
|
||||
if (!stack.isEmpty())
|
||||
{
|
||||
var item = stack.getItem();
|
||||
if (!(item instanceof AbstractMultiUpgradedRelic) && item instanceof ItemBauble)
|
||||
if (!(item instanceof AbstractMultiUpgradedBauble) && item instanceof ItemBauble)
|
||||
{
|
||||
if (findBauble)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
findBauble = ((AbstractMultiUpgradedRelic) base.getItem()).canAddBauble(base, stack) >= 0;
|
||||
findBauble = ((AbstractMultiUpgradedBauble) base.getItem()).canAddBauble(base, stack) >= 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -74,7 +73,7 @@ public class BaublesMultiUpgradeRecipe extends CustomRecipe
|
||||
for (int i = 0; i < inv.getContainerSize(); i++)
|
||||
{
|
||||
ItemStack stack = inv.getItem(i);
|
||||
if (!stack.isEmpty() && stack.getItem() instanceof AbstractMultiUpgradedRelic)
|
||||
if (!stack.isEmpty() && stack.getItem() instanceof AbstractMultiUpgradedBauble)
|
||||
{
|
||||
out = ItemStack.of(stack.save(new CompoundTag()));
|
||||
break;
|
||||
@ -83,9 +82,9 @@ public class BaublesMultiUpgradeRecipe extends CustomRecipe
|
||||
for (int i = 0; i < inv.getContainerSize(); i++)
|
||||
{
|
||||
ItemStack stack = inv.getItem(i);
|
||||
if (!stack.isEmpty() && !(stack.getItem() instanceof AbstractMultiUpgradedRelic))
|
||||
if (!stack.isEmpty() && !(stack.getItem() instanceof AbstractMultiUpgradedBauble))
|
||||
{
|
||||
((AbstractMultiUpgradedRelic) out.getItem()).addBauble(out, stack);
|
||||
((AbstractMultiUpgradedBauble) out.getItem()).addBauble(out, stack);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -69,6 +69,7 @@ public class LibItemNames
|
||||
public static String SUPREME_AQUA_STONE = "supreme_aqua_stone";
|
||||
public static String SUPREME_IGNITE_STONE = "supreme_ignite_stone";
|
||||
public static String SUPREME_EARTH_STONE = "supreme_earth_stone";
|
||||
public static String ELF_KING_RING = "elf_king_ring";
|
||||
public static String SAGES_MANA_RING = "sages_mana_ring";
|
||||
public static String POTATO_CHIP = "potato_chip";
|
||||
public static String SUN_RING = "sun_ring";
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
package chick.extrabotany.common.tools.weapons;
|
||||
|
||||
import chick.extrabotany.ExtraBotany;
|
||||
import chick.extrabotany.api.advancement.IAdvancementRequirement;
|
||||
import chick.extrabotany.common.entities.projectile.relic_projectile.EntityPhantomSword;
|
||||
import chick.extrabotany.common.libs.LibAdvancementNames;
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
@ -17,6 +19,8 @@ import net.minecraft.world.item.Rarity;
|
||||
import net.minecraft.world.item.Tiers;
|
||||
import net.minecraft.world.phys.AABB;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import vazkii.botania.api.item.IRelic;
|
||||
import vazkii.botania.common.item.relic.RelicImpl;
|
||||
|
||||
import static vazkii.botania.common.item.equipment.bauble.ItemBauble.getBaubleUUID;
|
||||
|
||||
@ -115,4 +119,9 @@ public class FirstFractal extends SwordRelicBase implements IAdvancementRequirem
|
||||
{
|
||||
return LibAdvancementNames.EGO_DEFEAT;
|
||||
}
|
||||
|
||||
public static IRelic makeRelic(ItemStack stack)
|
||||
{
|
||||
return new RelicImpl(stack, new ResourceLocation(ExtraBotany.MODID, "main/" + LibAdvancementNames.FIRST_FRACTAL_CRAFT));
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,6 +80,8 @@ public class ModItemTags extends ItemTagsProvider
|
||||
.add(ModItems.GOBLINSLAYER_HELM.get(), ModItems.GOBLINSLAYER_CHEST.get(), ModItems.GOBLINSLAYER_LEGS.get(), ModItems.GOBLINSLAYER_BOOTS.get())
|
||||
.add(ModItems.MIKU_HELM.get(), ModItems.MIKU_CHEST.get(), ModItems.MIKU_LEGS.get(), ModItems.MIKU_BOOTS.get())
|
||||
.add(ModItems.MAID_HELM.get(), ModItems.MAID_CHEST.get(), ModItems.MAID_LEGS.get(), ModItems.MAID_BOOTS.get())
|
||||
|
||||
.add(ModItems.PURE_DAISY_PENDANT.get(), ModItems.SUN_RING.get(), ModItems.MOON_PENDANT.get(), ModItems.ELF_KING_RING.get())
|
||||
;
|
||||
baublesTags();
|
||||
}
|
||||
@ -106,6 +108,7 @@ public class ModItemTags extends ItemTagsProvider
|
||||
.add(ModItems.FROST_RING.get())
|
||||
.add(ModItems.SAGES_MANA_RING.get())
|
||||
.add(ModItems.SUN_RING.get())
|
||||
.add(ModItems.ELF_KING_RING.get())
|
||||
;
|
||||
|
||||
tag(accessory("belt"));
|
||||
|
||||
@ -98,6 +98,7 @@ public class EN_USLanguageProvider extends LanguageProvider
|
||||
add(ModItems.SUPREME_AQUA_STONE.get(), "Supreme Aqua Stone");
|
||||
add(ModItems.SUPREME_EARTH_STONE.get(), "Supreme Earth Stone");
|
||||
add(ModItems.SUPREME_IGNITE_STONE.get(), "Supreme Ignis Stone");
|
||||
add(ModItems.ELF_KING_RING.get(), "Ring of Elven King");
|
||||
add(ModItems.SAGES_MANA_RING.get(), "Sages Mana Ring");
|
||||
add(ModItems.POTATO_CHIP.get(), "Potato Chip");
|
||||
add(ModItems.SUN_RING.get(), "Ring of Sacred Sun");
|
||||
@ -456,7 +457,16 @@ public class EN_USLanguageProvider extends LanguageProvider
|
||||
add("extrabotany.entry.potato_chip", "Potato Chip");
|
||||
add("extrabotany.page.potato_chip0", "$(item)Potato Chip$(0) functions almost the same as Totem of Undying. When you are taking deadly damage, it will trigger, consume mana to recover you. It has 60s cool down and will cost a great amount of $(thing)mana$(0).");
|
||||
add("extrabotany.page.potato_chip1", "");
|
||||
add("extrabotany.entry.elf_king_ring", "Ring of Elven King");
|
||||
add("extrabotany.page.elf_king_ring0", "$(item)Ring of Elven King$(0) is a special ring. When crafted with another ring, it will probably obtain their ability. However, several abilities like $(thing)storing mana$(0) will not work on $(item)Ring of Elven King$(0). $(item)Ring of Elven King$(0) could obtain at most 2 abilities from other rings. The same abilities might stack. $(br)Do not work on $(thing)Relic$(0). $(br)Crafting $(item)Ring of Elven King$(0) with $(item)Das Rheingold$(0) could remove one of the abilities.");
|
||||
add("extrabotany.page.elf_king_ring1", "");
|
||||
|
||||
add("extrabotany.entry.sun_ring", "Ring of Sacred Sun");
|
||||
add("extrabotany.page.sun_ring0", "$(item)Ring of Sacred Sun$(0) is the upgraded version of $(item)Ring of Elven King$(0), with the power of obtain 8 additional abilities from other rings, even including $(thing)Relic$(0). However,$(item)Ring of Sacred Sun$(0) can not get some abilities like $(thing)storing mana$(0), either.");
|
||||
add("extrabotany.page.sun_ring1", "Lavawalker's Epiphany");
|
||||
add("extrabotany.entry.moon_pendant", "Heart of Corrupted Moon");
|
||||
add("extrabotany.page.moon_pendant0", "$(item)Heart of Corrupted Moon$(0) is similar to $(item)Ring of Sacred Sun$(0). The only difference is that $(item)Heart of Corrupted Moon$(0) is a kind of necklace and could only receive 6 abilities from other necklaces.");
|
||||
add("extrabotany.page.moon_pendant1", "Broken Rime's Echo");
|
||||
|
||||
add("extrabotany.entry.mini_item", "缩小工具");
|
||||
add("extrabotany.page.mini_item0", "像$(thing)缩小花$(0)那样，可以使用$(thing)魔力$(0)缩小一些工具，从而达到不可思议的效果。$(br)$(br)比如$(item)活木短弓$(0)无需拉弓，左键即可射出箭矢。然而，这仍然会消耗箭矢，并且会造成低一些的伤害和高一点的击退。或许应该考虑更好一点的弓材料才对。");
|
||||
@ -501,12 +511,12 @@ public class EN_USLanguageProvider extends LanguageProvider
|
||||
add("extrabotany.page.bloodyenchantress0", "The $(item)Bloody Enchantress$(0) creates $(thing)Mana$(0) by consuming nearby creatures' life. Creatures sacrificed to the Bloody Enchantress will not produce any drops or experience.");
|
||||
add("extrabotany.page.bloodyenchantress1", "Every bite will add a effect called Blood Temptation and overlay with higher amplifier one, the mana production will decrease according to the level of Blood Temptation, and the flower will stop working if the total level of Blood Temptation of all the creatures nearby is over a threshold.");
|
||||
add("extrabotany.page.bloodyenchantress2", "The only cure is death.");
|
||||
add("extrabotany.entry.tinkle_flower","Tinkle Flower");
|
||||
add("extrabotany.page.tinkle_flower0","The $(item)Tinkle flower converts kinetic energy of nearby moving players into $(thing)Mana$(0). It will also increase players' energy consumption.");
|
||||
add("extrabotany.page.tinkle_flower1","Ding dong, here I come to find you.");
|
||||
add("extrabotany.entry.edelweiss","Edelweiss");
|
||||
add("extrabotany.page.edelweiss0","$(item)Edelweiss$(0) will swallow the snow golem to produce mana. The mana production is done instantly, but there are still intervals.");
|
||||
add("extrabotany.page.edelweiss1","If you are reading this, you can read.");
|
||||
add("extrabotany.entry.tinkle_flower", "Tinkle Flower");
|
||||
add("extrabotany.page.tinkle_flower0", "The $(item)Tinkle flower converts kinetic energy of nearby moving players into $(thing)Mana$(0). It will also increase players' energy consumption.");
|
||||
add("extrabotany.page.tinkle_flower1", "Ding dong, here I come to find you.");
|
||||
add("extrabotany.entry.edelweiss", "Edelweiss");
|
||||
add("extrabotany.page.edelweiss0", "$(item)Edelweiss$(0) will swallow the snow golem to produce mana. The mana production is done instantly, but there are still intervals.");
|
||||
add("extrabotany.page.edelweiss1", "If you are reading this, you can read.");
|
||||
|
||||
add("extrabotany.entry.serenitian", "Serenitian");
|
||||
add("extrabotany.page.serenitian0", "$(item)Serenitian$(0) could prevent passive flowers nearby at the same floor from fading away, and set the fading progress to zero.");
|
||||
|
||||
@ -99,6 +99,7 @@ public class ZH_CNLanguageProvider extends LanguageProvider
|
||||
add(ModItems.SUPREME_AQUA_STONE.get(), "至高水之符石");
|
||||
add(ModItems.SUPREME_EARTH_STONE.get(), "至高地之符石");
|
||||
add(ModItems.SUPREME_IGNITE_STONE.get(), "至高火之符石");
|
||||
add(ModItems.ELF_KING_RING.get(), "精灵王指环");
|
||||
add(ModItems.SAGES_MANA_RING.get(), "贤者魔力指环");
|
||||
add(ModItems.POTATO_CHIP.get(), "薯片");
|
||||
add(ModItems.SUN_RING.get(), "圣阳尊戒");
|
||||
@ -457,14 +458,16 @@ public class ZH_CNLanguageProvider extends LanguageProvider
|
||||
add("extrabotany.entry.potato_chip", "薯片");
|
||||
add("extrabotany.page.potato_chip0", "$(item)薯片$(0)拥有着和不死图腾类似的效果。装备后，在受到致死伤害时会激活，消耗魔力获得多种增益并回复生命至5点。这一效果有一定的冷却时间，并且会消耗大量的魔力。");
|
||||
add("extrabotany.page.potato_chip1", "");
|
||||
|
||||
add("extrabotany.entry.elf_king_ring", "精灵王指环");
|
||||
add("extrabotany.page.elf_king_ring0", "$(item)精灵王指环$(0)是一种奇特的戒指，只要将它与别的戒指合成，就可能获得这种戒指的特殊能力。$(thing)储存魔力$(0)等能力不能正常作用于$(item)精灵王指环$(0)。$(item)精灵王指环$(0)可以额外获取总共两个戒指的能力，有些能力可以叠加作用。$(br)对$(thing)遗物$(0)不生效。$(br)另外，在工作台中将$(item)精灵王指环$(0)与$(item)莱茵河的黄金$(0)合成可以消去一种能力。");
|
||||
add("extrabotany.page.elf_king_ring1", "");
|
||||
|
||||
add("extrabotany.entry.sun_ring", "圣阳尊戒");
|
||||
add("extrabotany.page.sun_ring0", "$(item)圣阳尊戒$(0)是一种奇特的戒指。只要将它与别的戒指合成，就可能获得这种戒指的特殊能力。有些能力是可以叠加的。当然，$(item)圣阳尊戒$(0)的力量也是有限度的，比如不能获得$(thing)储存魔力$(0)这种能力。$(br)另外，在工作台中将$(item)圣阳尊戒$(0)与$(item)莱茵河的黄金$(0)合成可以消去一种能力。");
|
||||
add("extrabotany.page.sun_ring1", "");
|
||||
add("extrabotany.page.sun_ring0", "$(item)圣阳尊戒$(0)是$(item)精灵王指环$(0)的升级版，能够获取八个戒指的能力，包括遗物。然而，$(item)圣阳尊戒$(0)仍然不能获得$(thing)储存魔力$(0)等能力。");
|
||||
add("extrabotany.page.sun_ring1", "渡火者的醒悟");
|
||||
add("extrabotany.entry.moon_pendant", "蚀月之心");
|
||||
add("extrabotany.page.moon_pendant0", "$(item)蚀月之心$(0)和$(item)圣阳尊戒$(0)具有类似的力量，不同之处只是在于$(item)蚀月之心$(0)是一种项链。");
|
||||
add("extrabotany.page.moon_pendant1", "");
|
||||
add("extrabotany.page.moon_pendant0", "$(item)蚀月之心$(0)和$(item)圣阳尊戒$(0)具有类似的力量，不同之处只是在于$(item)蚀月之心$(0)是一种项链，并且只能获取六个项链的能力。");
|
||||
add("extrabotany.page.moon_pendant1", "破冰踏雪的回音");
|
||||
|
||||
|
||||
add("extrabotany.entry.mini_item", "缩小工具");
|
||||
@ -510,12 +513,12 @@ public class ZH_CNLanguageProvider extends LanguageProvider
|
||||
add("extrabotany.page.bloodyenchantress0", "$(item)鲜血妖姬$(0)能够将生物的生命值转化为$(thing)魔力$(0)，一旦有生物在其附近就会开始$(thing)魔力$(0)的转化，效率较为可观。需要注意的是通过这种方式献祭的生物不会有任何掉落。");
|
||||
add("extrabotany.page.bloodyenchantress1", "每次噬咬都会给对方添加血之诱惑效果并不断叠加，每层效果都会降低花的产魔，并且周围生物血之诱惑效果等级总和超过一定值时会停止工作。");
|
||||
add("extrabotany.page.bloodyenchantress2", "死亡是唯一的解药。");
|
||||
add("extrabotany.entry.tinkle_flower","叮当舞花");
|
||||
add("extrabotany.page.tinkle_flower0","$(item)叮当舞花$(0)可以将玩家的动能变为魔力。玩家在其附近移动时会产出$(thing)魔力$(0)，但也会加速玩家的饱食度消耗。");
|
||||
add("extrabotany.page.tinkle_flower1","叮咚，我来找你了哦");
|
||||
add("extrabotany.entry.edelweiss","雪绒花");
|
||||
add("extrabotany.page.edelweiss0","$(item)雪绒花$(0)可以通过吞噬雪傀儡来产出$(thing)魔力$(0)。虽然$(thing)魔力$(0)产出是瞬时的，但也需要一小会的冷却。");
|
||||
add("extrabotany.page.edelweiss1","If you are reading this, you can read.");
|
||||
add("extrabotany.entry.tinkle_flower", "叮当舞花");
|
||||
add("extrabotany.page.tinkle_flower0", "$(item)叮当舞花$(0)可以将玩家的动能变为魔力。玩家在其附近移动时会产出$(thing)魔力$(0)，但也会加速玩家的饱食度消耗。");
|
||||
add("extrabotany.page.tinkle_flower1", "叮咚，我来找你了哦");
|
||||
add("extrabotany.entry.edelweiss", "雪绒花");
|
||||
add("extrabotany.page.edelweiss0", "$(item)雪绒花$(0)可以通过吞噬雪傀儡来产出$(thing)魔力$(0)。虽然$(thing)魔力$(0)产出是瞬时的，但也需要一小会的冷却。");
|
||||
add("extrabotany.page.edelweiss1", "If you are reading this, you can read.");
|
||||
|
||||
|
||||
add("extrabotany.entry.serenitian", "永寂龙胆");
|
||||
|
||||
@ -321,6 +321,38 @@ public class ModCraftingTableRecipes extends RecipeProvider
|
||||
.group(MODID)
|
||||
.unlockedBy("pure_daisy", InventoryChangeTrigger.TriggerInstance.hasItems(vazkii.botania.common.block.ModSubtiles.pureDaisy))
|
||||
.save(consumer, LibItemNames.PURE_DAISY_PENDANT);
|
||||
ShapedRecipeBuilder.shaped(ModItems.SUN_RING.get())
|
||||
.pattern("edc")
|
||||
.pattern("fmb")
|
||||
.pattern("gza")
|
||||
.define('m', ModItems.HERO_MEDAL.get())
|
||||
.define('z', ModItems.ELF_KING_RING.get())
|
||||
.define('a', vazkii.botania.common.item.ModItems.runeEnvy)
|
||||
.define('b', vazkii.botania.common.item.ModItems.runeSloth)
|
||||
.define('c', vazkii.botania.common.item.ModItems.runePride)
|
||||
.define('d', vazkii.botania.common.item.ModItems.runeLust)
|
||||
.define('e', vazkii.botania.common.item.ModItems.runeGreed)
|
||||
.define('f', vazkii.botania.common.item.ModItems.runeWrath)
|
||||
.define('g', vazkii.botania.common.item.ModItems.runeGluttony)
|
||||
.group(MODID)
|
||||
.unlockedBy(LibItemNames.HERO_MEDAL, InventoryChangeTrigger.TriggerInstance.hasItems(ModItems.HERO_MEDAL.get()))
|
||||
.save(consumer, LibItemNames.SUN_RING);
|
||||
ShapedRecipeBuilder.shaped(ModItems.MOON_PENDANT.get())
|
||||
.pattern("edc")
|
||||
.pattern("fmb")
|
||||
.pattern("gza")
|
||||
.define('m', ModItems.HERO_MEDAL.get())
|
||||
.define('z', ModItems.MOON_PENDANT.get())
|
||||
.define('a', vazkii.botania.common.item.ModItems.runeEnvy)
|
||||
.define('b', vazkii.botania.common.item.ModItems.runeSloth)
|
||||
.define('c', vazkii.botania.common.item.ModItems.runePride)
|
||||
.define('d', vazkii.botania.common.item.ModItems.runeLust)
|
||||
.define('e', vazkii.botania.common.item.ModItems.runeGreed)
|
||||
.define('f', vazkii.botania.common.item.ModItems.runeWrath)
|
||||
.define('g', vazkii.botania.common.item.ModItems.runeGluttony)
|
||||
.group(MODID)
|
||||
.unlockedBy(LibItemNames.HERO_MEDAL, InventoryChangeTrigger.TriggerInstance.hasItems(ModItems.HERO_MEDAL.get()))
|
||||
.save(consumer, LibItemNames.MOON_PENDANT);
|
||||
|
||||
shapelessRecipes(consumer);
|
||||
weaponRecipes(consumer);
|
||||
|
||||
@ -39,6 +39,7 @@ public class ModRunicAltarRecipes extends RecipeProvider
|
||||
Ingredient element_steel = Ingredient.of(vazkii.botania.common.item.ModItems.elementium);
|
||||
Ingredient mana_diamond = Ingredient.of(vazkii.botania.common.item.ModItems.manaDiamond);
|
||||
Ingredient mana_steel = Ingredient.of(vazkii.botania.common.item.ModItems.manaSteel);
|
||||
Ingredient elf_quartz = Ingredient.of(vazkii.botania.common.item.ModItems.elfQuartz);
|
||||
Ingredient nightmare = Ingredient.of(ModItems.NIGHTMARE_FUEL.get());
|
||||
Ingredient spirit = Ingredient.of(ModItems.SPIRIT_FUEL.get());
|
||||
Ingredient spirit_frag = Ingredient.of(ModItems.SPIRIT_FRAG.get());
|
||||
@ -49,6 +50,8 @@ public class ModRunicAltarRecipes extends RecipeProvider
|
||||
Ingredient water = Ingredient.of(vazkii.botania.common.item.ModItems.runeWater);
|
||||
Ingredient fire = Ingredient.of(vazkii.botania.common.item.ModItems.runeFire);
|
||||
Ingredient mana = Ingredient.of(vazkii.botania.common.item.ModItems.runeMana);
|
||||
|
||||
Ingredient spring = Ingredient.of(vazkii.botania.common.item.ModItems.runeSpring);
|
||||
Ingredient envy = Ingredient.of(vazkii.botania.common.item.ModItems.runeEnvy);
|
||||
Ingredient wrath = Ingredient.of(vazkii.botania.common.item.ModItems.runeWrath);
|
||||
Ingredient gaiaIngot = Ingredient.of(vazkii.botania.common.item.ModItems.gaiaIngot);
|
||||
@ -68,8 +71,8 @@ public class ModRunicAltarRecipes extends RecipeProvider
|
||||
|
||||
//mana clear ↓
|
||||
consumer.accept(new RunicAltar(idFor("powerglove"), new ItemStack(ModItems.POWER_GLOVE.get()), 3200, cloth, cloth, cloth, mana_diamond, wrath));
|
||||
consumer.accept(new RunicAltar(idFor("orichalcos"), new ItemStack(ModItems.ORICHALCOS.get()), 1000000, gaiaIngot, gaiaIngot, gaiaSoul, gaiaSoul, gaiaSoul, gaiaSoul, medal, mashed_potato,Ingredient.of(Items.AMETHYST_BLOCK),Ingredient.of(Items.AMETHYST_BLOCK)));
|
||||
|
||||
consumer.accept(new RunicAltar(idFor(LibItemNames.ORICHALCOS), new ItemStack(ModItems.ORICHALCOS.get()), 1000000, gaiaIngot, gaiaIngot, gaiaSoul, gaiaSoul, gaiaSoul, gaiaSoul, medal, mashed_potato, Ingredient.of(Items.AMETHYST_BLOCK), Ingredient.of(Items.AMETHYST_BLOCK)));
|
||||
consumer.accept(new RunicAltar(idFor(LibItemNames.ELF_KING_RING), new ItemStack(ModItems.ELF_KING_RING.get()), 100000, Ingredient.of(vazkii.botania.common.item.ModItems.pixieRing), spring, element_steel, element_steel, elf_quartz, elf_quartz, Ingredient.of(Items.BAMBOO), Ingredient.of(Items.BAMBOO)));
|
||||
}
|
||||
|
||||
private static ResourceLocation idFor(String s)
|
||||
|
||||
@ -4,7 +4,9 @@ import chick.extrabotany.ExtraBotany;
|
||||
import chick.extrabotany.api.cap.ExtraBotanyCapabilities;
|
||||
import chick.extrabotany.api.cap.IPassiveFlowerCap;
|
||||
import chick.extrabotany.common.ModItems;
|
||||
import chick.extrabotany.common.baubles.relic.MoonPendant;
|
||||
import chick.extrabotany.common.baubles.relic.SagesManaRing;
|
||||
import chick.extrabotany.common.baubles.relic.SunRing;
|
||||
import chick.extrabotany.common.blocks.ModSubtiles;
|
||||
import chick.extrabotany.common.tools.weapons.*;
|
||||
import chick.extrabotany.common.tools.weapons.ranged.Failnaught;
|
||||
@ -43,7 +45,12 @@ public class CapabilityInit
|
||||
ModItems.TRUE_THUNSTAR_CALLER.get(), TrueThunStarCaller::makeRelic,
|
||||
ModItems.INFLUX_WAVER.get(), InfluxWaver::makeRelic,
|
||||
ModItems.FAILNAUGHT.get(), Failnaught::makeRelic,
|
||||
ModItems.EXCALIBER.get(), Excaliber::makeRelic
|
||||
ModItems.EXCALIBER.get(), Excaliber::makeRelic,
|
||||
ModItems.FIRST_FRACTAL.get(), FirstFractal::makeRelic,
|
||||
|
||||
ModItems.SAGES_MANA_RING.get(), SagesManaRing::makeRelic,
|
||||
ModItems.SUN_RING.get(), SunRing::makeRelic,
|
||||
ModItems.MOON_PENDANT.get(), MoonPendant::makeRelic
|
||||
));
|
||||
|
||||
/**
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.0 KiB |
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "extrabotany.entry.deathring",
|
||||
"category": "botania:baubles",
|
||||
"icon": "extrabotany:deathring",
|
||||
"icon": "extrabotany:death_ring",
|
||||
"entry_color": "4169E1",
|
||||
"advancement": "botania:main/runic_altar_pickup",
|
||||
"pages": [
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "extrabotany.entry.elf_king_ring",
|
||||
"category": "extrabotany:extrabotany",
|
||||
"icon": "extrabotany:elf_king_ring",
|
||||
"entry_color": "4169E1",
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "extrabotany.page.elf_king_ring0"
|
||||
},
|
||||
{
|
||||
"type": "botania:runic_altar",
|
||||
"text": "extrabotany.page.elf_king_ring1",
|
||||
"recipe": "extrabotany:runic_altar/elf_king_ring"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "extrabotany.entry.frostring",
|
||||
"category": "botania:baubles",
|
||||
"icon": "extrabotany:frostring",
|
||||
"icon": "extrabotany:frost_ring",
|
||||
"entry_color": "4169E1",
|
||||
"advancement": "botania:main/runic_altar_pickup",
|
||||
"pages": [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "extrabotany.entry.jingweifeather",
|
||||
"category": "botania:baubles",
|
||||
"icon": "extrabotany:jingweifeather",
|
||||
"icon": "extrabotany:jingwei_feather",
|
||||
"entry_color": "4169E1",
|
||||
"advancement": "botania:main/elf_lexicon_pickup",
|
||||
"pages": [
|
||||
|
||||
@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "extrabotany.entry.moon_pendant",
|
||||
"category": "extrabotany:extrabotany",
|
||||
"icon": "extrabotany:moon_pendant",
|
||||
"entry_color": "ffaa00",
|
||||
"advancement": "extrabotany:main/ego_defeat",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "extrabotany.page.moon_pendant0"
|
||||
},
|
||||
{
|
||||
"type": "crafting",
|
||||
"text": "extrabotany.page.moon_pendant1",
|
||||
"recipe": "minecraft/moon_pendant"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "extrabotany.entry.sun_ring",
|
||||
"category": "extrabotany:extrabotany",
|
||||
"icon": "extrabotany:sun_ring",
|
||||
"entry_color": "ffaa00",
|
||||
"advancement": "extrabotany:main/ego_defeat",
|
||||
"pages": [
|
||||
{
|
||||
"type": "text",
|
||||
"text": "extrabotany.page.sun_ring0"
|
||||
},
|
||||
{
|
||||
"type": "crafting",
|
||||
"text": "extrabotany.page.sun_ring1",
|
||||
"recipe": "minecraft:sun_ring"
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user