diff --git a/changelog.md b/changelog.md index 1edbc12e7..94becadcb 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ -- changed required Majrusz Library from 7.0.0+ to 7.0.1+ -- fixed game crash `java.lang.ClassNotFoundException` (reported by @NanoAi) -- fixed Soul Jar color issue caused by incompatibility with Sodium (reported by @LonelyFear) -- fixed bug with being unable to disable natural Undead Army spawns (reported by @NeuTraLZero) -- fixed bug with Undead Army not changing weather properly \ No newline at end of file +- changed required Majrusz Library version from 7.0.1+ to 7.0.2+ +- readded missing Bleeding advancements +- updated Chinese translation (thanks to @UDTakerBean) +- fixed bug with blood particles not being visible on server +- fixed bug with some expert mode and master mode mechanics working on earlier game stages +- fixed bug with Cursed Armor spawns not working properly \ No newline at end of file diff --git a/common/libs/majrusz-library-common-1.20.1-7.0.1.jar b/common/libs/majrusz-library-common-1.20.1-7.0.2.jar similarity index 96% rename from common/libs/majrusz-library-common-1.20.1-7.0.1.jar rename to common/libs/majrusz-library-common-1.20.1-7.0.2.jar index 70ce9e776..03beede82 100644 Binary files a/common/libs/majrusz-library-common-1.20.1-7.0.1.jar and b/common/libs/majrusz-library-common-1.20.1-7.0.2.jar differ diff --git a/common/src/main/java/com/majruszsdifficulty/MajruszsDifficulty.java b/common/src/main/java/com/majruszsdifficulty/MajruszsDifficulty.java index f6cf0bbc6..16fc0c8ec 100644 --- a/common/src/main/java/com/majruszsdifficulty/MajruszsDifficulty.java +++ b/common/src/main/java/com/majruszsdifficulty/MajruszsDifficulty.java @@ -17,6 +17,7 @@ import com.majruszsdifficulty.effects.Bleeding; import com.majruszsdifficulty.effects.BleedingImmunity; import com.majruszsdifficulty.effects.GlassRegeneration; +import com.majruszsdifficulty.effects.bleeding.BleedingParticles; import com.majruszsdifficulty.entity.*; import com.majruszsdifficulty.gamestage.GameStageAdvancement; import com.majruszsdifficulty.items.*; @@ -73,6 +74,7 @@ public class MajruszsDifficulty { public static final RegistryGroup< SoundEvent > SOUND_EVENTS = HELPER.create( BuiltInRegistries.SOUND_EVENT ); // Network + public static final NetworkObject< BleedingParticles.Message > BLEEDING_GUI = HELPER.create( "bleeding_gui", BleedingParticles.Message.class ); public static final NetworkObject< TreasureBag.RightClickAction > TREASURE_BAG_RIGHT_CLICK_NETWORK = HELPER.create( "treasure_bag_right_click", TreasureBag.RightClickAction.class ); public static final NetworkObject< TreasureBagHelper.Progress > TREASURE_BAG_PROGRESS_NETWORK = HELPER.create( "treasure_bag_progress", TreasureBagHelper.Progress.class ); diff --git a/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingDamage.java b/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingDamage.java index a55ef655f..dcf0d14db 100644 --- a/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingDamage.java +++ b/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingDamage.java @@ -12,8 +12,10 @@ import com.majruszsdifficulty.effects.Bleeding; import com.majruszsdifficulty.events.OnBleedingCheck; import net.minecraft.core.Holder; +import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageType; +import net.minecraft.world.damagesource.DamageTypes; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.phys.Vec3; @@ -38,6 +40,7 @@ public class BleedingDamage { private static void tryToApply( OnEntityDamaged data ) { if( Events.dispatch( new OnBleedingCheck( data ) ).isBleedingTriggered() && Bleeding.apply( data.target, data.attacker ) ) { BleedingDamage.dealDamage( data.target ); + BleedingDamage.giveAdvancements( data ); } } @@ -67,4 +70,17 @@ private static void dealDamage( LivingEntity entity ) { entity.hurt( new DamageSource( damageType ), 1.0f ); } } + + private static void giveAdvancements( OnEntityDamaged data ) { + if( data.target instanceof ServerPlayer player ) { + MajruszsDifficulty.HELPER.triggerAchievement( player, "bleeding_received" ); + if( data.source.is( DamageTypes.CACTUS ) ) { + MajruszsDifficulty.HELPER.triggerAchievement( player, "cactus_bleeding" ); + } + } + + if( data.attacker instanceof ServerPlayer player ) { + MajruszsDifficulty.HELPER.triggerAchievement( player, "bleeding_inflicted" ); + } + } } diff --git a/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingParticles.java b/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingParticles.java index 7be264b31..5dadd33f7 100644 --- a/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingParticles.java +++ b/common/src/main/java/com/majruszsdifficulty/effects/bleeding/BleedingParticles.java @@ -1,5 +1,9 @@ package com.majruszsdifficulty.effects.bleeding; +import com.majruszlibrary.annotation.Dist; +import com.majruszlibrary.annotation.OnlyIn; +import com.majruszlibrary.data.Reader; +import com.majruszlibrary.data.Serializables; import com.majruszlibrary.emitter.ParticleEmitter; import com.majruszlibrary.entity.EffectHelper; import com.majruszlibrary.entity.EntityHelper; @@ -10,8 +14,8 @@ import com.majruszlibrary.events.base.Priority; import com.majruszlibrary.math.AnyPos; import com.majruszlibrary.math.Random; -import com.majruszlibrary.platform.Side; import com.majruszsdifficulty.MajruszsDifficulty; +import net.minecraft.server.level.ServerPlayer; public class BleedingParticles { static { @@ -26,7 +30,8 @@ public class BleedingParticles { OnEntityPreDamaged.listen( BleedingParticles::addGuiOverlay ) .priority( Priority.LOWEST ) - .addCondition( data->data.source.is( MajruszsDifficulty.BLEEDING_DAMAGE_SOURCE ) ); + .addCondition( data->data.source.is( MajruszsDifficulty.BLEEDING_DAMAGE_SOURCE ) ) + .addCondition( data->data.target instanceof ServerPlayer ); } private static void emit( OnEntityTicked data ) { @@ -49,10 +54,32 @@ private static void emit( OnEntityDied data ) { } private static void addGuiOverlay( OnEntityPreDamaged data ) { - Side.runOnClient( ()->()->{ - if( data.target.equals( Side.getLocalPlayer() ) ) { - BleedingGui.addBloodOnScreen( 3 ); - } - } ); + MajruszsDifficulty.BLEEDING_GUI.sendToClient( ( ServerPlayer )data.target, new Message( 3 ) ); + } + + public static class Message { + int count; + + static { + Serializables.get( Message.class ) + .define( "count", Reader.integer(), s->s.count, ( s, v )->s.count = v ); + } + + public Message( int count ) { + this.count = count; + } + + public Message() {} + } + + @OnlyIn( Dist.CLIENT ) + public static class Client { + static { + MajruszsDifficulty.BLEEDING_GUI.addClientCallback( Client::onMessageReceived ); + } + + private static void onMessageReceived( Message message ) { + BleedingGui.addBloodOnScreen( message.count ); + } } } diff --git a/common/src/main/java/com/majruszsdifficulty/gamestage/GameStage.java b/common/src/main/java/com/majruszsdifficulty/gamestage/GameStage.java index 072bcc122..e67bb2ac5 100644 --- a/common/src/main/java/com/majruszsdifficulty/gamestage/GameStage.java +++ b/common/src/main/java/com/majruszsdifficulty/gamestage/GameStage.java @@ -18,7 +18,7 @@ public class GameStage { private List< ChatFormatting > format = new ArrayList<>(); private Trigger trigger = new Trigger(); private List< Message > messages = new ArrayList<>(); - private int ordinal = 0; + int ordinal = 0; static { Serializables.get( GameStage.class ) @@ -46,10 +46,6 @@ public boolean equals( Object object ) { && this.id.equals( gameStage.id ); } - public void setOrdinal( int ordinal ) { - this.ordinal = ordinal; - } - public boolean checkDimension( String dimensionId ) { return this.trigger.dimensions.stream().anyMatch( string->string.matches( dimensionId ) ); } diff --git a/common/src/main/java/com/majruszsdifficulty/gamestage/GameStageConfig.java b/common/src/main/java/com/majruszsdifficulty/gamestage/GameStageConfig.java index c7cec7255..2708fee79 100644 --- a/common/src/main/java/com/majruszsdifficulty/gamestage/GameStageConfig.java +++ b/common/src/main/java/com/majruszsdifficulty/gamestage/GameStageConfig.java @@ -2,14 +2,13 @@ import com.majruszlibrary.data.Reader; import com.majruszlibrary.data.Serializables; -import com.majruszlibrary.events.OnLevelsLoaded; import net.minecraft.ChatFormatting; import java.util.List; public class GameStageConfig { public static boolean IS_PER_PLAYER_DIFFICULTY_ENABLED = false; - public static List< GameStage > GAME_STAGES = List.of( + public static List< GameStage > GAME_STAGES = GameStageConfig.updateOrdinals( List.of( GameStage.named( GameStage.NORMAL_ID ) .format( ChatFormatting.WHITE ) .create(), @@ -25,22 +24,14 @@ public class GameStageConfig { .message( "majruszsdifficulty.stages.master.started", ChatFormatting.DARK_PURPLE, ChatFormatting.BOLD ) .message( "majruszsdifficulty.undead_army.on_master", ChatFormatting.DARK_PURPLE ) .create() - ); + ) ); static { - OnLevelsLoaded.listen( GameStageConfig::updateOrdinals ); - Serializables.getStatic( GameStageConfig.class ) .define( "is_per_player_difficulty_enabled", Reader.bool(), ()->IS_PER_PLAYER_DIFFICULTY_ENABLED, v->IS_PER_PLAYER_DIFFICULTY_ENABLED = v ) .define( "list", Reader.list( Reader.custom( GameStage::new ) ), ()->GAME_STAGES, v->GAME_STAGES = GameStageConfig.validate( v ) ); } - private static void updateOrdinals( OnLevelsLoaded data ) { - for( int idx = 0; idx < GAME_STAGES.size(); ++idx ) { - GAME_STAGES.get( idx ).setOrdinal( idx ); - } - } - private static List< GameStage > validate( List< GameStage > gameStages ) { boolean hasDefaultGameStages = gameStages.stream() .filter( gameStage->gameStage.is( GameStage.NORMAL_ID ) || gameStage.is( GameStage.EXPERT_ID ) || gameStage.is( GameStage.MASTER_ID ) ) @@ -49,15 +40,39 @@ private static List< GameStage > validate( List< GameStage > gameStages ) { throw new IllegalArgumentException( "Default game stages cannot be removed" ); } - int idx = 0; for( GameStage gameStage : gameStages ) { - gameStage.setOrdinal( idx++ ); long count = gameStages.stream().filter( stage->stage.equals( gameStage ) ).count(); if( count > 1 ) { throw new IllegalArgumentException( "Found %d game stages with identical id (%s)".formatted( count, gameStage.getId() ) ); } } + GameStageConfig.keepOldReferencesValid( gameStages, GAME_STAGES ); + GameStageConfig.updateOrdinals( gameStages ); + + return gameStages; + } + + private static List< GameStage > keepOldReferencesValid( List< GameStage > newGameStages, List< GameStage > oldGameStages ) { + for( int idx = 0; idx < newGameStages.size(); ++idx ) { + GameStage newGameStage = newGameStages.get( idx ); + for( GameStage oldGameStage : oldGameStages ) { + if( oldGameStage.is( newGameStage.getId() ) ) { + newGameStage = oldGameStage; // to keep references valid + break; + } + } + newGameStages.set( idx, newGameStage ); + } + + return newGameStages; + } + + private static List< GameStage > updateOrdinals( List< GameStage > gameStages ) { + for( int idx = 0; idx < gameStages.size(); ++idx ) { + gameStages.get( idx ).ordinal = idx; + } + return gameStages; } } diff --git a/common/src/main/resources/assets/majruszsdifficulty/lang/zh_cn.json b/common/src/main/resources/assets/majruszsdifficulty/lang/zh_cn.json index 9e7b5cf0e..448190d3f 100644 --- a/common/src/main/resources/assets/majruszsdifficulty/lang/zh_cn.json +++ b/common/src/main/resources/assets/majruszsdifficulty/lang/zh_cn.json @@ -1,176 +1,193 @@ -{ - "entity.majruszsdifficulty.creeperling": "小苦力怕", - "entity.majruszsdifficulty.tank": "坦克", - "entity.majruszsdifficulty.cursed_armor": "被诅咒的盔甲", - "entity.majruszsdifficulty.cerberus": "地狱犬", - "effect.majruszsdifficulty.bleeding": "流血", - "effect.majruszsdifficulty.bleeding.description": "感染后造成可以致死的伤害,主要由锋利的工具、僵尸和蜘蛛造成,对亡灵无效。", - "effect.majruszsdifficulty.bleeding.item_tooltip": " %1$s 概率造成 %2$s", - "effect.majruszsdifficulty.bleeding.armor_tooltip": "x%1$s 概率流血", - "effect.majruszsdifficulty.bleeding_immunity": "流血抗性", - "effect.majruszsdifficulty.bleeding_immunity.description": "使玩家免疫流血", - "itemGroup.majruszsdifficulty.primary": "Majrusz的渐进式难度", - "itemGroup.majruszsdifficulty.treasure_bags": "宝藏包", - "item.majruszsdifficulty.illusioner_spawn_egg": "幻术师刷怪蛋", - "item.majruszsdifficulty.creeperling_spawn_egg": "小苦力怕刷怪蛋", - "item.majruszsdifficulty.tank_spawn_egg": "坦克刷怪蛋", - "item.majruszsdifficulty.cursed_armor_spawn_egg": "诅咒盔甲刷怪蛋", - "item.majruszsdifficulty.cursed_armor_spawn_egg.locations": "诅咒盔甲可以在以下箱子中找到:", - "item.majruszsdifficulty.cerberus_spawn_egg": "地狱犬刷怪蛋", - "item.majruszsdifficulty.undead_battle_standard": "亡灵宣战旗", - "item.majruszsdifficulty.undead_battle_standard.item_tooltip1": "招引亡灵军团", - "item.majruszsdifficulty.undead_battle_standard.item_tooltip2": "亡灵军团仅能在主世界", - "item.majruszsdifficulty.undead_battle_standard.item_tooltip3": "被招引而来!", - "item.majruszsdifficulty.undead_army_treasure_bag": "亡灵军团宝藏袋", - "item.majruszsdifficulty.elder_guardian_treasure_bag": "远古守卫者宝藏袋", - "item.majruszsdifficulty.wither_treasure_bag": "凋灵宝藏袋", - "item.majruszsdifficulty.ender_dragon_treasure_bag": "末影龙宝藏袋", - "item.majruszsdifficulty.angler_treasure_bag": "渔夫宝藏袋", - "item.majruszsdifficulty.pillager_treasure_bag": "袭击宝藏袋", - "item.majruszsdifficulty.warden_treasure_bag": "监守者宝藏袋", - "item.majruszsdifficulty.bandage": "绷带", - "item.majruszsdifficulty.bandage.effect": "停止流血", - "item.majruszsdifficulty.enderium_shard": "末地碎片", - "item.majruszsdifficulty.enderium_ingot": "末地锭", - "item.majruszsdifficulty.enderium_sword": "末地剑", - "item.majruszsdifficulty.enderium_shovel": "末地锹", - "item.majruszsdifficulty.enderium_pickaxe": "末地镐", - "item.majruszsdifficulty.enderium_axe": "末地斧", - "item.majruszsdifficulty.enderium_hoe": "末地锄", - "item.majruszsdifficulty.enderium_hoe.effect": "增加耕种面积", - "item.majruszsdifficulty.enderium_helmet": "末地头盔", - "item.majruszsdifficulty.enderium_chestplate": "末地胸甲", - "item.majruszsdifficulty.enderium_leggings": "末地护腿", - "item.majruszsdifficulty.enderium_boots": "末地靴子", - "item.majruszsdifficulty.cloth": "布料", - "item.majruszsdifficulty.tattered_helmet": "破旧的头盔", - "item.majruszsdifficulty.tattered_chestplate": "破旧的胸甲", - "item.majruszsdifficulty.tattered_leggings": "破旧的护腿", - "item.majruszsdifficulty.tattered_boots": "破旧的靴子", - "item.majruszsdifficulty.wither_sword": "凋零剑", - "item.majruszsdifficulty.wither_sword.effect": "%1$s 几率造成凋零 %2$s", - "item.majruszsdifficulty.enderium_shard_locator": "末地碎片定位仪", - "item.majruszsdifficulty.ender_pouch": "末影袋", - "item.majruszsdifficulty.golden_bandage": "金绷带", - "item.majruszsdifficulty.recall_potion": "回忆药水", - "item.majruszsdifficulty.recall_potion.effect": "传送回家", - "item.majruszsdifficulty.cerberus_fang": "地狱犬牙", - "item.majruszsdifficulty.soul_jar": "灵魂罐", - "item.majruszsdifficulty.soul_jar.item_tooltip1": "含有 %1$s 种随机灵魂在内", - "item.majruszsdifficulty.soul_jar.item_tooltip2": "右键揭示灵魂…", - "item.majruszsdifficulty.soul_jar.item_tooltip3": "包含的灵魂:", - "item.majruszsdifficulty.soul_jar.smite": "%1$s 对亡灵攻击伤害", - "item.majruszsdifficulty.soul_jar.move": "%1$s 移动速度", - "item.majruszsdifficulty.soul_jar.range": "%1$s 范围", - "item.majruszsdifficulty.soul_jar.armor": "%1$s 护甲", - "item.majruszsdifficulty.soul_jar.mine": "%1$s 挖掘速度", - "item.majruszsdifficulty.soul_jar.luck": "%1$s 幸运", - "item.majruszsdifficulty.soul_jar.swim": "%1$s 游泳速度", - "block.majruszsdifficulty.enderium_shard_ore": "末地碎片矿石", - "block.majruszsdifficulty.enderium_block": "末地块", - "block.majruszsdifficulty.infested_end_stone": "被虫蚀的末地石", - "commands.gamestage.global.changed": "游戏阶段已变更为:%s", - "commands.gamestage.global.cannot_change": "当前的游戏阶段已经是 %s 了!", - "commands.gamestage.global.current": "当前游戏阶段为 %s", - "commands.undeadarmy.finished": "亡灵军团已经被停止在:%s", - "commands.undeadarmy.missing": "这里没有亡灵军团: %s", - "commands.undeadarmy.started": "一支亡灵军团已经在这个位置生成:%s", - "commands.undeadarmy.cannot_start": "一支亡灵军团无法在这个位置生成:%s", - "commands.undeadarmy.killed": "此位置的所有亡灵军团生物已被杀死:%s", - "commands.undeadarmy.highlighted": "此位置的所有亡灵军团生物已高亮:%s", - "commands.treasurebag.reset": "宝藏袋掉落进度已被重置为 %s", - "commands.treasurebag.unlockall": "所有宝物袋的进度都已达到最大值 %1$s.", - "commands.clampedregionaldifficulty": "在 %1$s 的副区域难度为 %2$s.%3$s", - "commands.clampedregionaldifficulty.formula": "\n - 基础:%1$s\n - 阶段加成:%2$s", - "majruszsdifficulty.states.normal": "普通模式", - "majruszsdifficulty.states.expert": "专家模式", - "majruszsdifficulty.states.master": "大师模式", - "majruszsdifficulty.stages.expert.started": "古老的光明与黑暗之魂已经释放!", - "majruszsdifficulty.stages.master.started": "劫难即将来临……", - "majruszsdifficulty.treasure_bag.item_tooltip": "在手持时右击以打开这个袋子。", - "majruszsdifficulty.treasure_bag.hint_tooltip": "按下Shift键来查看可能的掉落物……", - "majruszsdifficulty.treasure_bag.list_tooltip": "可能的掉落物 (%d/%d)", - "majruszsdifficulty.treasure_bag.new_items": "你在 %1$s 里找到了新的物品!", - "majruszsdifficulty.undead_army.title": "亡灵军团", - "majruszsdifficulty.undead_army.wave": "(波次:%1$s)", - "majruszsdifficulty.undead_army.victory": "胜利!", - "majruszsdifficulty.undead_army.failed": "亡灵军团获胜!", - "majruszsdifficulty.undead_army.between_waves": "进攻已被压制,准备迎击援军", - "majruszsdifficulty.undead_army.approaching": "一支亡灵军团正在从%1$s来袭!", - "majruszsdifficulty.undead_army.approached": "一支亡灵军团已经到达!", - "majruszsdifficulty.undead_army.warning": "鼓声在远方回荡…", - "majruszsdifficulty.undead_army.on_expert": "亡灵军团已经被下界赋予了力量", - "majruszsdifficulty.undead_army.west": "西方", - "majruszsdifficulty.undead_army.east": "东方", - "majruszsdifficulty.undead_army.north": "北方", - "majruszsdifficulty.undead_army.south": "南方", - "majruszsdifficulty.subtitle.undead_army.approaching": "亡灵军团正在来袭", - "majruszsdifficulty.subtitle.undead_army.wave_started": "新一波敌军已开始进攻", - "majruszsdifficulty.sets.enderium.name": "末影套装", - "majruszsdifficulty.sets.enderium.bonus_1": "末影头盔可使所有末影人减少对穿戴者的敌意。", - "majruszsdifficulty.sets.enderium.bonus_2": "在末地时获得额外抢夺等级", - "majruszsdifficulty.sets.enderium.bonus_3": "在穿戴者受到攻击时给予穿戴者速度效果。", - "majruszsdifficulty.sets.enderium.bonus_4": "增加穿戴者2颗心(4点生命值)的最大生命值。", - "majruszsdifficulty.items.advanced_tooltip": "按下Shift键以查看更多细节信息……", - "majruszsdifficulty.sets.undead.name": "亡灵套装", - "majruszsdifficulty.sets.undead.bonus_1": "移除%2$s的%1$s效果", - "majruszsdifficulty.sets.undead.bonus_2": "%1$s恢复双倍饱食度", - "majruszsdifficulty.sets.undead.bonus_3": "增加%1$s点护甲", - "majruszsdifficulty.sets.undead.bonus_4": "%1$s的提升翻倍", - "death.attack.bleeding": "%1$s流血致死", - "death.attack.bleeding.player": "%1$s遭受%2$s重创,流血致死", - "advancements.progressive_difficulty.normal_mode.title": "普通模式", - "majruszsdifficulty.stages.normal.started": "所有事物看上去都十分平静", - "advancements.progressive_difficulty.expert_mode.title": "专家模式", - "advancements.progressive_difficulty.master_mode.title": "大师模式", - "advancements.progressive_difficulty.bleeding.title": "我流血了吗?", - "advancements.progressive_difficulty.bleeding.description": "第一次流血", - "advancements.progressive_difficulty.bleeding_inflicted.title": "让他们流血", - "advancements.progressive_difficulty.bleeding_inflicted.description": "使任意生物流血", - "advancements.progressive_difficulty.bleeding_cactus.title": "哎哟!", - "advancements.progressive_difficulty.bleeding_cactus.description": "碰到仙人掌后流血", - "advancements.progressive_difficulty.bleeding_healed.title": "这只是一道划痕!", - "advancements.progressive_difficulty.bleeding_healed.description": "使用一片绷带来止血", - "advancements.progressive_difficulty.bleeding_healed_other.title": "送给朋友的最好礼物", - "advancements.progressive_difficulty.bleeding_healed_other.description": "对他人使用金绷带", - "advancements.progressive_difficulty.kill_yourself.title": "“杀掉你自己”有了新的含义", - "advancements.progressive_difficulty.kill_yourself.description": "打败你自己的亡灵", - "advancements.progressive_difficulty.undead_army.title": "幽灵般的可怕军队", - "advancements.progressive_difficulty.undead_army.description": "击溃亡灵军团", - "advancements.progressive_difficulty.kill_a_creeperling.title": "这是什么?!", - "advancements.progressive_difficulty.kill_a_creeperling.description": "杀死一只小苦力怕", - "advancements.progressive_difficulty.enderman_teleport_attack.title": "我感觉很乱", - "advancements.progressive_difficulty.enderman_teleport_attack.description": "被一只末影人传送", - "advancements.progressive_difficulty.enderium_shard.title": "奇异的碎片", - "advancements.progressive_difficulty.enderium_shard.description": "获得末地碎片", - "advancements.progressive_difficulty.enderium_ingot.title": "神秘金属锭", - "advancements.progressive_difficulty.enderium_ingot.description": "获得末地锭", - "advancements.progressive_difficulty.angler_treasure_bag.title": "水下宝藏", - "advancements.progressive_difficulty.angler_treasure_bag.description": "打开你的第一个渔夫宝藏袋", - "advancements.progressive_difficulty.angler_treasure_bag_16.title": "钓鱼狂", - "advancements.progressive_difficulty.angler_treasure_bag_16.description": "打开你的第十六个渔夫宝藏袋", - "advancements.progressive_difficulty.undead_army_treasure_bag.title": "亡灵宝藏", - "advancements.progressive_difficulty.undead_army_treasure_bag.description": "打开你的第一个亡灵军团宝藏袋", - "advancements.progressive_difficulty.undead_army_treasure_bag_16.title": "一堆骨头", - "advancements.progressive_difficulty.undead_army_treasure_bag_16.description": "打开你的第十六个亡灵军团宝藏袋", - "advancements.progressive_difficulty.pillager_treasure_bag.title": "掠夺者宝藏", - "advancements.progressive_difficulty.pillager_treasure_bag.description": "打开你的第一个袭击宝藏袋", - "advancements.progressive_difficulty.pillager_treasure_bag_16.title": "村庄守卫", - "advancements.progressive_difficulty.pillager_treasure_bag_16.description": "打开你的第十六个袭击宝藏袋", - "advancements.progressive_difficulty.elder_guardian_treasure_bag.title": "海洋宝藏", - "advancements.progressive_difficulty.elder_guardian_treasure_bag.description": "打开你的第一个远古守卫者宝藏袋", - "advancements.progressive_difficulty.elder_guardian_treasure_bag_16.title": "海洋劫掠者", - "advancements.progressive_difficulty.elder_guardian_treasure_bag_16.description": "打开你的第十六个远古守卫者宝藏袋", - "advancements.progressive_difficulty.wither_treasure_bag.title": "下界宝藏", - "advancements.progressive_difficulty.wither_treasure_bag.description": "打开你的第一个凋灵宝藏袋", - "advancements.progressive_difficulty.wither_treasure_bag_16.title": "下界之主", - "advancements.progressive_difficulty.wither_treasure_bag_16.description": "打开你的第十六个凋灵宝藏袋", - "advancements.progressive_difficulty.ender_dragon_treasure_bag.title": "末地宝藏", - "advancements.progressive_difficulty.ender_dragon_treasure_bag.description": "打开你的第一个末影龙宝藏袋", - "advancements.progressive_difficulty.ender_dragon_treasure_bag_16.title": "结束了的……结束?", - "advancements.progressive_difficulty.ender_dragon_treasure_bag_16.description": "打开你的第十六个末影龙宝藏袋", - "advancements.progressive_difficulty.warden_treasure_bag.title": "禁忌之袋", - "advancements.progressive_difficulty.warden_treasure_bag.description": "打开第一个监守者宝藏袋", - "advancements.progressive_difficulty.warden_treasure_bag_16.title": "沉默的主宰", - "advancements.progressive_difficulty.warden_treasure_bag_16.description": "打开 16 个监守者宝藏袋" -} +{ + "entity.majruszsdifficulty.creeperling": "小苦力怕", + "entity.majruszsdifficulty.tank": "坦克", + "entity.majruszsdifficulty.cursed_armor": "诅咒盔甲", + "entity.majruszsdifficulty.cerberus": "地狱犬", + "entity.majruszsdifficulty.illusioner": "幻术师", + "entity.majruszsdifficulty.giant": "巨人", + "effect.majruszsdifficulty.bleeding.item_consumed": "消耗时:", + "effect.majruszsdifficulty.bleeding": "流血", + "effect.majruszsdifficulty.bleeding.description": "随时间造成可致命的伤害。该效果主要由锋利的工具、僵尸与蜘蛛导致,且对亡灵无效。", + "effect.majruszsdifficulty.bleeding.item_tooltip": " %1$s 造成流血 %2$s", + "effect.majruszsdifficulty.bleeding.armor_tooltip": "x%1$s 出血倍率", + "effect.majruszsdifficulty.bleeding_immunity": "流血抗性", + "effect.majruszsdifficulty.bleeding_immunity.description": "使玩家免疫流血", + "effect.majruszsdifficulty.glass_regeneration": "弱恢复", + "effect.majruszsdifficulty.glass_regeneration.description": "较弱版本的生命恢复,受伤会打断该效果", + "itemGroup.majruszsdifficulty.primary": "Majrusz的渐进难度", + "item.majruszsdifficulty.illusioner_spawn_egg": "幻术师刷怪蛋", + "item.majruszsdifficulty.creeperling_spawn_egg": "小苦力怕刷怪蛋", + "item.majruszsdifficulty.tank_spawn_egg": "坦克刷怪蛋", + "item.majruszsdifficulty.cursed_armor_spawn_egg": "诅咒盔甲刷怪蛋", + "item.majruszsdifficulty.cursed_armor_spawn_egg.locations": "诅咒盔甲能在以下箱子中发现:", + "item.majruszsdifficulty.cerberus_spawn_egg": "地狱犬刷怪蛋", + "item.majruszsdifficulty.giant_spawn_egg": "巨人刷怪蛋", + "item.majruszsdifficulty.undead_battle_standard": "亡灵军旗", + "item.majruszsdifficulty.undead_battle_standard.item_tooltip1": "召唤亡灵军队", + "item.majruszsdifficulty.undead_battle_standard.item_tooltip2": "军队只能在", + "item.majruszsdifficulty.undead_battle_standard.item_tooltip3": "主世界召唤!", + "item.majruszsdifficulty.angler_treasure_bag": "渔夫宝藏袋", + "item.majruszsdifficulty.elder_guardian_treasure_bag": "远古守卫者宝藏袋", + "item.majruszsdifficulty.ender_dragon_treasure_bag": "末影龙宝藏袋", + "item.majruszsdifficulty.pillager_treasure_bag": "袭击宝藏袋", + "item.majruszsdifficulty.undead_army_treasure_bag": "亡灵军队宝藏袋", + "item.majruszsdifficulty.warden_treasure_bag": "监守者宝藏袋", + "item.majruszsdifficulty.wither_treasure_bag": "凋灵宝藏袋", + "item.majruszsdifficulty.bandage": "绷带", + "item.majruszsdifficulty.bandage.effect": "止血", + "item.majruszsdifficulty.enderium_shard": "末影碎片", + "item.majruszsdifficulty.enderium_ingot": "末影晶锭", + "item.majruszsdifficulty.enderium_sword": "末影晶剑", + "item.majruszsdifficulty.enderium_shovel": "末影晶锹", + "item.majruszsdifficulty.enderium_pickaxe": "末影晶镐", + "item.majruszsdifficulty.enderium_axe": "末影晶斧", + "item.majruszsdifficulty.enderium_hoe": "末影晶锄", + "item.majruszsdifficulty.enderium_hoe.effect": "增加犁地范围", + "item.majruszsdifficulty.enderium_helmet": "末影晶头盔", + "item.majruszsdifficulty.enderium_chestplate": "末影晶胸甲", + "item.majruszsdifficulty.enderium_leggings": "末影晶护腿", + "item.majruszsdifficulty.enderium_boots": "末影晶靴子", + "item.majruszsdifficulty.cloth": "布料", + "item.majruszsdifficulty.tattered_helmet": "破旧帽子", + "item.majruszsdifficulty.tattered_chestplate": "破旧上衣", + "item.majruszsdifficulty.tattered_leggings": "破旧裤子", + "item.majruszsdifficulty.tattered_boots": "破旧靴子", + "item.majruszsdifficulty.wither_sword": "凋灵剑", + "item.majruszsdifficulty.wither_sword.effect": "%1$s 造成凋零 %2$s", + "item.majruszsdifficulty.enderium_shard_locator": "末影碎片定位仪", + "item.majruszsdifficulty.ender_pouch": "末影袋", + "item.majruszsdifficulty.golden_bandage": "金绷带", + "item.majruszsdifficulty.recall_potion": "回忆药水", + "item.majruszsdifficulty.recall_potion.effect": "传送回家", + "item.majruszsdifficulty.evoker_fang_scroll": "唤魔尖牙卷轴", + "item.majruszsdifficulty.cerberus_fang": "地狱犬牙", + "item.majruszsdifficulty.soul_jar": "灵魂罐", + "item.majruszsdifficulty.soul_jar.item_tooltip1": "包含%1$s种随机灵魂", + "item.majruszsdifficulty.soul_jar.item_tooltip2": "右键揭示灵魂…", + "item.majruszsdifficulty.soul_jar.item_tooltip3": "包含灵魂:", + "item.majruszsdifficulty.soul_jar.smite": "%1$s 亡灵特攻", + "item.majruszsdifficulty.soul_jar.move": "%1$s 移动速度", + "item.majruszsdifficulty.soul_jar.range": "%1$s 范围", + "item.majruszsdifficulty.soul_jar.armor": "%1$s 护甲", + "item.majruszsdifficulty.soul_jar.mine": "%1$s 挖掘速度", + "item.majruszsdifficulty.soul_jar.luck": "%1$s 幸运", + "item.majruszsdifficulty.soul_jar.swim": "%1$s 游泳速度", + "item.majruszsdifficulty.sonic_boom_scroll": "音波尖啸卷轴", + "item.minecraft.tipped_arrow.effect.wither": "凋零之箭", + "item.minecraft.potion.effect.wither": "凋零药水", + "item.minecraft.splash_potion.effect.wither": "喷溅型凋零药水", + "item.minecraft.lingering_potion.effect.wither": "滞留型凋零药水", + "block.majruszsdifficulty.enderium_block": "末影晶块", + "block.majruszsdifficulty.enderium_shard_ore": "末影碎片矿石", + "block.majruszsdifficulty.fragile_end_stone": "脆弱末地石", + "block.majruszsdifficulty.infested_end_stone": "被虫蚀的末地石", + "block.majruszsdifficulty.infernal_sponge": "炼狱海绵", + "block.majruszsdifficulty.soaked_infernal_sponge": "湿炼狱海绵", + "commands.gamestage.global.changed": "全局游戏阶段已变更至%1$s。", + "commands.gamestage.global.cannot_change": "全局游戏阶段已经是%1$s了!", + "commands.gamestage.global.current": "当前游戏阶段为%1$s。", + "commands.gamestage.player.changed": "已将%2$s的游戏阶段变更至%1$s。", + "commands.gamestage.player.cannot_change": "%2$s的游戏阶段已经是%1$s了!", + "commands.gamestage.player.current": "%2$s的当前游戏阶段为%1$s。", + "commands.gamestage.player.disabled": "按每个玩家区分难度的设置在配置文件中被禁用!", + "commands.undeadarmy.finished": "亡灵军队已经被停止在:%s", + "commands.undeadarmy.missing": "这里没有亡灵军队: %s", + "commands.undeadarmy.started": "一支亡灵军队已经在这个位置生成:%s", + "commands.undeadarmy.cannot_start": "一支亡灵军队无法在这个位置生成:%s", + "commands.undeadarmy.killed": "此位置的所有亡灵军队生物已被杀死:%s", + "commands.undeadarmy.highlighted": "此位置的所有亡灵军队生物已高亮:%s", + "commands.undeadarmy.list": "所有进行中的亡灵军队事件列表:", + "commands.undeadarmy.list_empty": "没有进行中的亡灵军队事件!", + "commands.undeadarmy.progress": "%1$s必须再击杀%2$s个亡灵生物才能触发亡灵军队。", + "commands.blood_moon.cannot_start": "现在无法触发血月!", + "commands.blood_moon.not_started": "没有进行中的血月事件!", + "commands.treasurebag.reset": "宝藏袋掉落进度已重置为%s", + "commands.treasurebag.unlockall": "所有宝藏袋的进度都已达到最大值%1$s.", + "commands.clampedregionaldifficulty": "%1$s的副区域难度为%2$s.%3$s", + "majruszsdifficulty.stages.normal": "普通模式", + "majruszsdifficulty.stages.normal.started": "一切看起来如此平静", + "majruszsdifficulty.stages.expert": "专家模式", + "majruszsdifficulty.stages.expert.started": "古老的光明与黑暗之魂已经释放!", + "majruszsdifficulty.stages.master": "大师模式", + "majruszsdifficulty.stages.master.started": "劫难即将来临……", + "majruszsdifficulty.treasure_bag.item_tooltip": "手持时右击以打开这个袋子。", + "majruszsdifficulty.treasure_bag.hint_tooltip": "按住Shift查看可能的战利品……", + "majruszsdifficulty.treasure_bag.list_tooltip": "可能的战利品(%d/%d)", + "majruszsdifficulty.treasure_bag.new_items": "你在%1$s中找到了新物品!", + "majruszsdifficulty.undead_army.title": "亡灵军队", + "majruszsdifficulty.undead_army.wave": "(波次 %1$s)", + "majruszsdifficulty.undead_army.victory": "胜利!", + "majruszsdifficulty.undead_army.failed": "亡灵军队获胜", + "majruszsdifficulty.undead_army.between_waves": "已击溃该波次", + "majruszsdifficulty.undead_army.approaching": "一支亡灵军队正从%1$s边逼近!", + "majruszsdifficulty.undead_army.approached": "亡灵军队来了!", + "majruszsdifficulty.undead_army.warning": "鼓声在远方回荡…", + "majruszsdifficulty.undead_army.on_expert": "亡灵军队已被下界势力增强", + "majruszsdifficulty.undead_army.on_master": "亡灵军队已被巨型势力增强", + "majruszsdifficulty.undead_army.west": "西", + "majruszsdifficulty.undead_army.east": "东", + "majruszsdifficulty.undead_army.north": "北", + "majruszsdifficulty.undead_army.south": "南", + "majruszsdifficulty.subtitle.undead_army.approaching": "亡灵军队正在来袭", + "majruszsdifficulty.subtitle.undead_army.wave_started": "新波次已开始", + "majruszsdifficulty.blood_moon.started": "血月正在升起…", + "majruszsdifficulty.blood_moon.finished": "血月落入地平线之下…", + "majruszsdifficulty.item_sets.hint": "按住Shift查看更多信息…", + "majruszsdifficulty.item_sets.item_title": "%1$s(%2$d/%3$d)", + "majruszsdifficulty.item_sets.item": "%1$s", + "majruszsdifficulty.item_sets.bonus_title": "%1$s套装效果:", + "majruszsdifficulty.item_sets.bonus": "[%1$s] %2$s", + "majruszsdifficulty.sets.enderium.name": "末影套装", + "majruszsdifficulty.sets.enderium.bonus_1": "使所有末影人降低敌意", + "majruszsdifficulty.sets.enderium.bonus_2": "在末地获得额外抢夺等级", + "majruszsdifficulty.sets.enderium.bonus_3": "以随机药水效果替换%1$s的随机传送", + "majruszsdifficulty.sets.enderium.bonus_4": "阻止死于虚空", + "majruszsdifficulty.sets.undead.name": "亡灵套装", + "majruszsdifficulty.sets.undead.bonus_1": "击杀怪物时恢复%1$s盔甲耐久", + "majruszsdifficulty.sets.undead.bonus_2": "双倍%1$s效果加成", + "majruszsdifficulty.scrolls.attack_damage": " %1$s 攻击伤害", + "majruszsdifficulty.scrolls.attack_range": " %1$s 攻击范围", + "majruszsdifficulty.smithing.enderium.upgrade": "末影晶升级", + "majruszsdifficulty.smithing.enderium.applies_to": "下界合金装备", + "majruszsdifficulty.smithing.enderium.ingredients": "末影晶锭", + "majruszsdifficulty.smithing.enderium.base_slot": "放入下界合金盔甲、武器或工具", + "majruszsdifficulty.smithing.enderium.additions_slot": "放入末影晶锭", + "death.attack.bleeding": "%1$s流血致死", + "death.attack.bleeding.player": "%1$s因%2$s造成的流血而死", + "advancements.progressive_difficulty.bleeding.title": "这是…血?", + "advancements.progressive_difficulty.bleeding.description": "第一次流血", + "advancements.progressive_difficulty.bleeding_inflicted.title": "嗜血成性", + "advancements.progressive_difficulty.bleeding_inflicted.description": "使任意生物流血", + "advancements.progressive_difficulty.bleeding_cactus.title": "哎哟!", + "advancements.progressive_difficulty.bleeding_cactus.description": "碰到仙人掌后流血", + "advancements.progressive_difficulty.bleeding_healed.title": "只是道划痕!", + "advancements.progressive_difficulty.bleeding_healed.description": "使用绷带止血", + "advancements.progressive_difficulty.bleeding_healed_other.title": "患难之交", + "advancements.progressive_difficulty.bleeding_healed_other.description": "对其他人使用金绷带", + "advancements.progressive_difficulty.kill_yourself.title": "“杀死你自己”有了新的含义", + "advancements.progressive_difficulty.kill_yourself.description": "击败亡灵版的自己", + "advancements.progressive_difficulty.undead_army.title": "惊悚恐怖亡军队", + "advancements.progressive_difficulty.undead_army.description": "击溃亡灵军队", + "advancements.progressive_difficulty.creeperling.title": "那是什么!?", + "advancements.progressive_difficulty.creeperling.description": "遭遇小苦力怕", + "advancements.progressive_difficulty.enderman_teleport_attack.title": "我感到迷惑", + "advancements.progressive_difficulty.enderman_teleport_attack.description": "被末影人传送", + "advancements.progressive_difficulty.enderium_shard.title": "奇异碎片", + "advancements.progressive_difficulty.enderium_shard.description": "获得末影碎片", + "advancements.progressive_difficulty.enderium_ingot.title": "玄妙之锭", + "advancements.progressive_difficulty.enderium_ingot.description": "获得末影晶锭", + "advancements.progressive_difficulty.angler_treasure_bag.title": "钓鱼发烧友", + "advancements.progressive_difficulty.angler_treasure_bag.description": "打开渔夫宝藏袋", + "advancements.progressive_difficulty.undead_army_treasure_bag.title": "埋骨地", + "advancements.progressive_difficulty.undead_army_treasure_bag.description": "打开亡灵军队宝藏袋", + "advancements.progressive_difficulty.pillager_treasure_bag.title": "村庄护卫", + "advancements.progressive_difficulty.pillager_treasure_bag.description": "打开袭击宝藏袋", + "advancements.progressive_difficulty.elder_guardian_treasure_bag.title": "海洋掠夺者", + "advancements.progressive_difficulty.elder_guardian_treasure_bag.description": "打开远古守卫者宝藏袋", + "advancements.progressive_difficulty.wither_treasure_bag.title": "凋零财宝", + "advancements.progressive_difficulty.wither_treasure_bag.description": "打开凋灵宝藏袋", + "advancements.progressive_difficulty.ender_dragon_treasure_bag.title": "末地之终末?", + "advancements.progressive_difficulty.ender_dragon_treasure_bag.description": "打开末影龙宝藏袋", + "advancements.progressive_difficulty.warden_treasure_bag.title": "缄默大师", + "advancements.progressive_difficulty.warden_treasure_bag.description": "打开监守者宝藏袋" +} \ No newline at end of file diff --git a/fabric/libs/majrusz-library-fabric-1.20.1-7.0.1.jar b/fabric/libs/majrusz-library-fabric-1.20.1-7.0.2.jar similarity index 93% rename from fabric/libs/majrusz-library-fabric-1.20.1-7.0.1.jar rename to fabric/libs/majrusz-library-fabric-1.20.1-7.0.2.jar index f218c05b0..9166f8031 100644 Binary files a/fabric/libs/majrusz-library-fabric-1.20.1-7.0.1.jar and b/fabric/libs/majrusz-library-fabric-1.20.1-7.0.2.jar differ diff --git a/forge/libs/majrusz-library-forge-1.20.1-7.0.1.jar b/forge/libs/majrusz-library-forge-1.20.1-7.0.2.jar similarity index 86% rename from forge/libs/majrusz-library-forge-1.20.1-7.0.1.jar rename to forge/libs/majrusz-library-forge-1.20.1-7.0.2.jar index f5302b8c0..172a08603 100644 Binary files a/forge/libs/majrusz-library-forge-1.20.1-7.0.1.jar and b/forge/libs/majrusz-library-forge-1.20.1-7.0.2.jar differ diff --git a/gradle.properties b/gradle.properties index 6bf3b6b8d..8f86a8c8b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ minecraft_version=1.20.1 # Mod mod_id=majruszsdifficulty mod_archives_name=majruszs-difficulty -mod_version=1.9.2 +mod_version=1.9.3 mod_display_name=Majrusz's Progressive Difficulty mod_description=Mod that progressively increases the game difficulty over time. mod_authors=Majrusz @@ -24,23 +24,23 @@ forge_version=1.20.1-47.1.0 forge_version_loader=[47,) forge_version_range=[47.1,) forge_minecraft_version_range=[1.20.1,) -forge_majruszlibrary_version_range=[7.0.1,8.0.0) +forge_majruszlibrary_version_range=[7.0.2,8.0.0) # NeoForge neoforge_version=1.20.1-47.1.76 neoforge_version_loader=[47,) neoforge_version_range=1.20.1-47.1.76 neoforge_minecraft_version_range=[1.20.1,) -neoforge_majruszlibrary_version_range=[7.0.1,8.0.0) +neoforge_majruszlibrary_version_range=[7.0.2,8.0.0) # Fabric fabric_loader_version=0.14.22 fabric_api_version=0.89.0+1.20.1 fabric_minecraft_version_range=>=1.20.1 -fabric_majruszlibrary_version_range=>=7.0.1 +fabric_majruszlibrary_version_range=>=7.0.2 # Majrusz Library -majruszlibrary_version=1.20.1-7.0.1 +majruszlibrary_version=1.20.1-7.0.2 # Publishing modrinth_project_id=GGDBwjOg diff --git a/neoforge/libs/majrusz-library-neoforge-1.20.1-7.0.1.jar b/neoforge/libs/majrusz-library-neoforge-1.20.1-7.0.2.jar similarity index 86% rename from neoforge/libs/majrusz-library-neoforge-1.20.1-7.0.1.jar rename to neoforge/libs/majrusz-library-neoforge-1.20.1-7.0.2.jar index 6e1d093ab..7b1d398d6 100644 Binary files a/neoforge/libs/majrusz-library-neoforge-1.20.1-7.0.1.jar and b/neoforge/libs/majrusz-library-neoforge-1.20.1-7.0.2.jar differ