gradle.properties

@@ -32,7 +32,7 @@ mod_name=NaturesAura
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=40.1
+mod_version=40.0
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/java/de/ellpeck/naturesaura/packet/PacketClient.java

@@ -42,11 +42,8 @@ public class PacketClient implements CustomPacketPayload {
         return PacketClient.ID;
     }
 
-    @SuppressWarnings("Convert2Lambda")
     public static void onMessage(PacketClient message, PlayPayloadContext ctx) {
-        ctx.workHandler().execute(new Runnable() {
+        ctx.workHandler().execute(() -> {
-            @Override
-            public void run() {
             var mc = Minecraft.getInstance();
             if (mc.level != null) {
                 switch (message.type) {
@@ -63,7 +60,6 @@ public class PacketClient implements CustomPacketPayload {
                         }
                 }
             }
-            }
         });
     }
 

src/main/java/de/ellpeck/naturesaura/packet/PacketParticles.java

@@ -67,7 +67,7 @@ public class PacketParticles implements CustomPacketPayload {
 
     public static void onMessage(PacketParticles message, PlayPayloadContext ctx) {
         ctx.workHandler().execute(() -> {
-            var level = ctx.level().orElseThrow();
+            Level level = Minecraft.getInstance().level;
             if (level != null)
                 message.type.action.accept(message, level);
         });

src/main/resources/assets/naturesaura/lang/zh_cn.json

@@ -1,5 +1,5 @@
 {
-  "item_group.naturesaura.tab": "自然灵气",
+    "itemGroup.naturesaura": "自然灵气",
     "block.naturesaura.ancient_log": "远古原木",
     "block.naturesaura.ancient_bark": "远古树皮",
     "block.naturesaura.ancient_leaves": "远古树叶",
@@ -66,11 +66,6 @@
     "block.naturesaura.aura_mushroom": "灵气蘑菇",
     "block.naturesaura.warped_aura_mushroom": "诡异灵气菌",
     "block.naturesaura.crimson_aura_mushroom": "绯红灵气菌",
-  "block.naturesaura.potted_aura_bloom": "灵气花盆栽",
-  "block.naturesaura.potted_aura_cactus": "灵气仙人掌盆栽",
-  "block.naturesaura.potted_aura_mushroom": "灵气蘑菇盆栽",
-  "block.naturesaura.potted_warped_aura_mushroom": "诡异灵气菌盆栽",
-  "block.naturesaura.potted_crimson_aura_mushroom": "绯红灵气菌盆栽",
     "block.naturesaura.tainted_gold_block": "污染黄金块",
     "block.naturesaura.nether_grass": "多草下界岩",
     "block.naturesaura.chorus_generator": "末影高花收割机",
@@ -78,9 +73,6 @@
     "block.naturesaura.slime_split_generator": "分裂观测仪",
     "block.naturesaura.spring": "永恒之泉",
     "block.naturesaura.weather_changer": "移云器",
-  "block.naturesaura.lower_limiter": "灵气失衡区",
-  "block.naturesaura.sky_ingot_block": "苍穹块",
-  "block.naturesaura.depth_ingot_block": "深渊块",
     "item.naturesaura.eye": "环境之眼",
     "item.naturesaura.eye_improved": "环境目镜",
     "item.naturesaura.gold_fiber": "闪耀纤维",
@@ -88,7 +80,7 @@
     "item.naturesaura.infused_iron": "灌注铁锭",
     "item.naturesaura.infused_iron_pickaxe": "植物学家之镐",
     "item.naturesaura.infused_iron_axe": "植物学家之斧",
-  "item.naturesaura.infused_iron_shovel": "植物学家之锹",
+    "item.naturesaura.infused_iron_shovel": "植物学家之铲",
     "item.naturesaura.infused_iron_sword": "植物学家之剑",
     "item.naturesaura.infused_iron_hoe": "植物学家之锄",
     "item.naturesaura.ancient_stick": "远古木棍",
@@ -97,7 +89,6 @@
     "item.naturesaura.book.name": "自然灵气之书",
     "item.naturesaura.shockwave_creator": "狂怒护身符",
     "item.naturesaura.multiblock_maker": "多方块建造器",
-  "item.naturesaura.vacuum_bottle": "瓶装真空",
     "item.naturesaura.aura_bottle.naturesaura:overworld": "瓶装阳光",
     "item.naturesaura.aura_bottle.naturesaura:nether": "瓶装鬼魂",
     "item.naturesaura.aura_bottle.naturesaura:end": "瓶装黑暗",
@@ -105,10 +96,9 @@
     "item.naturesaura.farming_stencil": "耕作模板",
     "item.naturesaura.bottle_two_the_rebottling": "瓶与塞",
     "item.naturesaura.sky_ingot": "苍穹锭",
-  "item.naturesaura.depth_ingot": "深渊锭",
     "item.naturesaura.sky_pickaxe": "探天者之镐",
     "item.naturesaura.sky_axe": "探天者之斧",
-  "item.naturesaura.sky_shovel": "探天者之锹",
+    "item.naturesaura.sky_shovel": "探天者之铲",
     "item.naturesaura.sky_sword": "探天者之剑",
     "item.naturesaura.sky_hoe": "探天者之锄",
     "item.naturesaura.sky_helmet": "探天者帽子",
@@ -151,15 +141,6 @@
     "item.naturesaura.break_prevention": "埃尔的标记",
     "item.naturesaura.pet_reviver": "不朽友情之证明",
     "item.naturesaura.netherite_finder": "远古知识之杖",
-  "item.naturesaura.depth_pickaxe": "灵魂行者之镐",
-  "item.naturesaura.depth_axe": "灵魂行者之斧",
-  "item.naturesaura.depth_shovel": "灵魂行者之锹",
-  "item.naturesaura.depth_sword": "灵魂行者之剑",
-  "item.naturesaura.depth_hoe": "灵魂行者之锄",
-  "item.naturesaura.depth_helmet": "灵魂行者帽子",
-  "item.naturesaura.depth_chest": "灵魂行者胸甲",
-  "item.naturesaura.depth_pants": "灵魂行者护腿",
-  "item.naturesaura.depth_shoes": "灵魂行者靴子",
     "container.naturesaura:tree_ritual.name": "森林仪式",
     "container.naturesaura:altar.name": "自然祭坛灌注",
     "container.naturesaura:offering.name": "祭祀诸神",
@@ -183,6 +164,8 @@
     "info.naturesaura.remaining": "还剩 %s",
     "info.naturesaura.break_prevention": "带有埃尔的标记",
     "info.naturesaura.broken": "（已损坏）",
+    "info.naturesaura.required_aura_type.naturesaura:overworld": "需要自然祭坛",
+    "info.naturesaura.required_aura_type.naturesaura:nether": "需要猩红祭坛",
     "info.naturesaura.pet_reviver": "你的宠物%s一度处于危难之中，已经被送回家了。",
     "advancement.naturesaura.root": "自然灵气",
     "advancement.naturesaura.root.desc": "当一个魔法植物学家",
@@ -196,6 +179,8 @@
     "advancement.naturesaura.altar.desc": "使用森林仪式创建一个自然祭坛",
     "advancement.naturesaura.infused_materials": "铁之工厂",
     "advancement.naturesaura.infused_materials.desc": "使用自然祭坛制作灌注铁锭",
+    "advancement.naturesaura.tainted_gold": "金之工厂",
+    "advancement.naturesaura.tainted_gold.desc": "使用猩红祭坛制造污染黄金",
     "advancement.naturesaura.furnace_heater": "舒适的温暖",
     "advancement.naturesaura.furnace_heater.desc": "制作一个外置燃火器加热你的熔炉",
     "advancement.naturesaura.placer": "咚咚放置",
@@ -228,12 +213,6 @@
     "advancement.naturesaura.eye_improved.desc": "创造一个环境目镜，观测灵气不平衡的影响",
     "advancement.naturesaura.range_visualizer": "小小的眼睛大大的疑惑",
     "advancement.naturesaura.range_visualizer.desc": "创造一个奥秘放大镜，观测你的设备范围",
-  "advancement.naturesaura.vacuum_bottle": "深呼吸",
-  "advancement.naturesaura.vacuum_bottle.desc": "收集一瓶真空",
-  "advancement.naturesaura.depth_ingot": "搁浅深渊",
-  "advancement.naturesaura.depth_ingot.desc": "合成深渊锭",
-  "advancement.naturesaura.depth_tools": "轻快疾行",
-  "advancement.naturesaura.depth_tools.desc": "合成一整套灵魂行者工具和盔甲",
     "command.naturesaura.aura.usage": "/naaura store|drain <数量> [范围] 或者 /naaura reset <范围>",
     "effect.naturesaura.breathless": "窒息",
     "entity.naturesaura.effect_inhibitor": "效应粉",