diff --git a/src/main/resources/assets/spectrum/lang/zh_cn.json b/src/main/resources/assets/spectrum/lang/zh_cn.json index fd461fd7fa..7b9bd8fa4b 100644 --- a/src/main/resources/assets/spectrum/lang/zh_cn.json +++ b/src/main/resources/assets/spectrum/lang/zh_cn.json @@ -485,9 +485,9 @@ "enchantment.spectrum.big_catch": "捕鱼达人", "enchantment.spectrum.big_catch.desc": "有更高几率直接捕获活体生物", "enchantment.spectrum.inexorable": "不可阻挡", - "enchantment.spectrum.inexorable.desc": "无视挖掘疲劳的影响", + "enchantment.spectrum.inexorable.desc": "无视对移动或挖掘的减速", "enchantment.spectrum.razing": "变换自如", - "enchantment.spectrum.razing.desc": "方块越难破坏,挖掘速度就越快", + "enchantment.spectrum.razing.desc": "方块越难破坏,挖掘速度加成越大", "spectrum.subtitles.crystal_aura": "一种深沉的气场产生了共鸣", "spectrum.subtitles.dimension.ambient": "洞穴:呼啸", @@ -1527,7 +1527,7 @@ "block.spectrum.glistering_shooting_star": "闪亮流星", "block.spectrum.fiery_shooting_star": "炽热流星", "block.spectrum.colorful_shooting_star": "七彩流星", - "block.spectrum.pristine_shooting_star": "原始流星", + "block.spectrum.pristine_shooting_star": "海晶流星", "block.spectrum.gemstone_shooting_star": "宝石流星", "item.spectrum.shooting_star.tooltip.hardened": "已硬化 -无法破坏", @@ -2123,7 +2123,7 @@ "block.spectrum.feeding_idol.tooltip": "§7使用地上的食物喂养半径%d§7格内的动物", "block.spectrum.villager_converting_idol.tooltip": "§7将其上的村民转化为僵尸村民", - "block.spectrum.incandescent_amalgam": "白炽汞合金", + "block.spectrum.incandescent_amalgam": "白炽醇合物", "block.spectrum.incandescent_amalgam.tooltip": "§6⚠§r 高威力魔法炸药,小心轻放", "block.spectrum.incandescent_amalgam.tooltip_power": "爆炸威力:%d", "block.spectrum.incandescent_amalgam.tooltip.preview": "随着时间的推移变得更具爆炸性", @@ -2218,9 +2218,9 @@ "item.spectrum.ender_splice.wrong_dimension": "末影连弦的能量不足以支持跨维度传送", "item.spectrum.natures_staff": "自然法杖", "item.spectrum.natures_staff.tooltip": "§7使用§a植本质§7来种植所有类型的植物", - "item.spectrum.natures_staff.tooltip_with_chance": "§7使用§a植本质§7来种植所有类型的植物(%d%%§7)", - "item.spectrum.natures_staff.tooltip_with_ink": "§7使用§a植本质§7或者§a黄绿色墨水§7来种植所有类型的植物", - "item.spectrum.natures_staff.tooltip_with_ink_and_chance": "§7使用§a植本质§7或者§a黄绿色墨水§7来种植所有类型的植物(%d%%§7)", + "item.spectrum.natures_staff.tooltip_with_chance": "§7使用§a植本质§7来种植所有类型的植物(消耗几率:%d%%§7)", + "item.spectrum.natures_staff.tooltip_with_ink": "§7使用%s或§a植本质§7来种植所有类型的植物", + "item.spectrum.natures_staff.tooltip_with_ink_and_chance": "§7使用%s或§a植本质§7来种植所有类型的植物(消耗几率:%d%%§7)", "item.spectrum.natures_staff.tooltip_lure": "§7还会吸引附近的动物", "item.spectrum.staff_of_remembrance": "记忆法杖", "item.spectrum.staff_of_remembrance.tooltip": "点击生物将其收集为 §f记忆§r", @@ -2266,8 +2266,8 @@ "item.spectrum.varia_cookbook": "瓦利安的食谱", "item.spectrum.varia_cookbook.tooltip": "待办", "item.spectrum.aqua_regia": "翡翠莲花酒", - "item.spectrum.aqua_regia.tooltip.preview": "用莲蓬头和花瓣混合酿造", - "item.spectrum.aqua_regia.tooltip.preview2": "用花瓣发酵比莲蓬头慢,但能减少负面效果", + "item.spectrum.aqua_regia.tooltip.preview": "用球茎和花瓣混合酿造", + "item.spectrum.aqua_regia.tooltip.preview2": "加入花瓣发酵比只用球茎慢,但能减少负面效果", "item.spectrum.evernectar": "永恒甘露", "item.spectrum.evernectar.tooltip": "你可能不应该喝这个", "item.spectrum.bagnun": "奶油芝士焗龙虾", @@ -2294,7 +2294,7 @@ "item.spectrum.morchella": "蘑苋焦糖酿", "item.spectrum.nectered_viognier": "蜜桃维欧尼", "item.spectrum.nectered_viognier.tooltip.preview": "用球茎和晶桃混合酿造", - "item.spectrum.nectered_viognier.tooltip.preview2": "用晶桃发酵比球茎慢,但能减少负面效果", + "item.spectrum.nectered_viognier.tooltip.preview2": "加入晶桃发酵比只用球茎慢,但能减少负面效果", "item.spectrum.peaches_flambe": "火焰蜜桃羹", "item.spectrum.peach_cream": "晶桃奶油", "item.spectrum.peach_jam": "晶桃果酱", @@ -3117,8 +3117,8 @@ "item.spectrum.jade_wine": "玉液酒", "item.spectrum.jade_wine.tooltip.bloominess": "%d %% 花香度", "item.spectrum.jade_wine.tooltip.bloominess_sweetened": "%d %% 花香度 -加糖", - "item.spectrum.jade_wine.tooltip.preview": "用玉藤种子和花瓣混合酿造", - "item.spectrum.jade_wine.tooltip.preview2": "花瓣比玉藤种子发酵慢,但减少了负面影响", + "item.spectrum.jade_wine.tooltip.preview": "用玉藤球茎和花瓣混合酿造", + "item.spectrum.jade_wine.tooltip.preview2": "加入花瓣比只用玉藤球茎发酵慢,但减少了负面影响", "item.spectrum.pure_alcohol": "高纯度酒精", "item.spectrum.chrysocolla": "孔雀酒", "item.spectrum.reprise": "凛寒紫颂", @@ -4341,7 +4341,7 @@ "book.spectrum.guidebook.hints.downstone_fragments.page0.text": "你挖得越深,就越会遇到看似坚不可摧的岩石.在这个岩石层中,有一个结构等待你发现.", "book.spectrum.guidebook.hints.downstone_fragments.page1.text": "在渊深之域的最低层附近,你可能会遇到以前的人用来雕刻这种石头的结构.在这个结构中的一个箱子里,你会找到一种新的资源.", "book.spectrum.guidebook.hints.dragonbone.page0.text": "在龙腐沼地中,你可以找到一种巨型生物的遗骸.这些方块似乎无法用传统方式开采,因为它们被魔法光环保护着.那么有没有非常规的方法可以破坏这种光环呢?也许可以使用某些巨大的能量?", - "book.spectrum.guidebook.hints.dragonbone.page1.text": "龙骨方块的魔法光环可以通过强大的爆炸来破坏.你需要一些比TNT更猛的爆炸物,比如白炽汞合金.强大的魔法爆炸也有同样的效果.", + "book.spectrum.guidebook.hints.dragonbone.page1.text": "龙骨方块的魔法光环可以通过强大的爆炸来破坏.你需要一些比TNT更猛的爆炸物,比如白炽醇合物.强大的魔法爆炸也有同样的效果.", "book.spectrum.guidebook.hints.fading.name": "实验#1", "book.spectrum.guidebook.hints.fading.page0.text": "褪解微生物渺小而微弱,以放置在其旁边的有机方块为食.右键将其放置为方块;你可以使用空瓶回收.", "book.spectrum.guidebook.hints.fading.page1.text": "将诸如南瓜,西瓜,树叶这样的有机方块放在褪解微生物旁边稍作等待,这些方块就会被微生物寄生吞噬,外表上产生变化.采集这些方块即可获得新资源.", @@ -4501,7 +4501,7 @@ "book.spectrum.guidebook.incandescent_amalgam.page3.text": "*...如此炽热!*", "book.spectrum.guidebook.incandescent_amalgam.page4.title": "简单合成", "book.spectrum.guidebook.incandescent_amalgam.page5.title": "蒸馏", - "book.spectrum.guidebook.incandescent_amalgam.page5.text": "白炽汞合金造就的原初火焰使其特别适合蒸馏高纯度酒精", + "book.spectrum.guidebook.incandescent_amalgam.page5.text": "白炽醇合物造就的原初火焰使其特别适合蒸馏高纯度酒精", "book.spectrum.guidebook.indestructible.page0.text": "一路走来,许多大大小小的问题或多或少都迎刃而解,我却仍然没法解决诸如打火石用太多次就会坏掉的这种日常琐事——零碎的工具装备实在太多,稍有不慎就会损坏.\\\n\\\n现在,手头有了基岩粉,这下总要硬气起来!", "book.spectrum.guidebook.indestructible.page1.text": "使得物品坚不可摧,不受损坏.\\\n\\\n最大等级:1\\\n适用于所有有耐久的工具,某些单一例外除外.\\\n与耐久、经验修补、效率、无限和保护互斥.", @@ -4770,7 +4770,7 @@ "book.spectrum.guidebook.modular_explosives.page5.title": "通用强化物 (∞)", "book.spectrum.guidebook.modular_explosives.page5.text": "-TNT: 增加爆炸半径\n-紫颂果:星空粒子\n-火花石:放置光源", "book.spectrum.guidebook.modular_explosives.page6.title": "伤害类型强化物 (1)", - "book.spectrum.guidebook.modular_explosives.page6.text": "-火焰弹:着火\n-末日花种子:原初火焰\n-风暴之石:闪电伤害\n-坚新石:魔法伤害\n-白炽汞合金:白炽伤害", + "book.spectrum.guidebook.modular_explosives.page6.text": "-火焰弹:着火\n-末日花种子:原初火焰\n-风暴之石:闪电伤害\n-坚新石:魔法伤害\n-白炽醇合物:白炽伤害", "book.spectrum.guidebook.modular_explosives.page7.title": "伤害强化物 (∞)", "book.spectrum.guidebook.modular_explosives.page7.text": "-末地烛:在爆炸中心附近造成大幅伤害", "book.spectrum.guidebook.modular_explosives.page8.title": "采矿强化物 (∞)", @@ -6325,4 +6325,4 @@ "book.spectrum.guidebook.mysterious_locket.page4.text": "里面还有一张小纸条……它可能属于谁呢?", "book.spectrum.guidebook.mysterious_locket.page5.text": "现在我理解了德雷顿语言,解读背面的铭文对我来说很容易:\\\n\\\n*别傻了, 阿斯特拉斯——月亮不能发光,它只能反射太阳的光芒.*", "book.spectrum.guidebook.mysterious_locket.page5.title": "未识别的纸条" -} \ No newline at end of file +} diff --git a/src/main/resources/data/spectrum/structures/city_below/seed_vault.nbt b/src/main/resources/data/spectrum/structures/city_below/seed_vault.nbt index 781ac25f3e..c9e7dafef8 100644 Binary files a/src/main/resources/data/spectrum/structures/city_below/seed_vault.nbt and b/src/main/resources/data/spectrum/structures/city_below/seed_vault.nbt differ diff --git a/src/main/resources/data/spectrum/worldgen/placed_feature/citrine_geode.json b/src/main/resources/data/spectrum/worldgen/placed_feature/citrine_geode.json index 8b60b0aef3..b89acc6065 100644 --- a/src/main/resources/data/spectrum/worldgen/placed_feature/citrine_geode.json +++ b/src/main/resources/data/spectrum/worldgen/placed_feature/citrine_geode.json @@ -19,6 +19,16 @@ "absolute": 55 } } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:not", + "predicate": { + "type": "exclusions_lib:overlaps_structure", + "range": 4 + } + } }, { "type": "minecraft:biome" diff --git a/src/main/resources/data/spectrum/worldgen/placed_feature/topaz_geode.json b/src/main/resources/data/spectrum/worldgen/placed_feature/topaz_geode.json index 5512cec788..fa03bb5d38 100644 --- a/src/main/resources/data/spectrum/worldgen/placed_feature/topaz_geode.json +++ b/src/main/resources/data/spectrum/worldgen/placed_feature/topaz_geode.json @@ -19,6 +19,16 @@ "below_top": 0 } } + }, + { + "type": "minecraft:block_predicate_filter", + "predicate": { + "type": "minecraft:not", + "predicate": { + "type": "exclusions_lib:overlaps_structure", + "range": 4 + } + } }, { "type": "minecraft:biome"