diff --git a/common/src/main/java/com/iafenvoy/iceandfire/config/IafCommonConfig.java b/common/src/main/java/com/iafenvoy/iceandfire/config/IafCommonConfig.java index 86e1386..3dd1647 100644 --- a/common/src/main/java/com/iafenvoy/iceandfire/config/IafCommonConfig.java +++ b/common/src/main/java/com/iafenvoy/iceandfire/config/IafCommonConfig.java @@ -43,7 +43,7 @@ public class IafCommonConfig extends AutoInitConfigContainer { public Misc misc = new Misc(); public IafCommonConfig() { - super(Identifier.of(IceAndFire.MOD_ID,"config.iceandfire.common"), "screen.iceandfire.common.title", "./config/iceandfire/iaf-common.json"); + super(Identifier.of(IceAndFire.MOD_ID, "config.iceandfire.common"), "screen.iceandfire.common.title", "./config/iceandfire/iaf-common.json"); } @Override @@ -104,6 +104,7 @@ public static class DragonConfig extends AutoInitConfigCategoryBase { public final IConfigEntry chunkLoadSummonCrystal = new BooleanEntry("iceandfire.dragon.chunkLoadSummonCrystal", true); public final IConfigEntry dragonFlightSpeedMod = new DoubleEntry("iceandfire.dragon.dragonFlightSpeedMod", 1, 0.0001, 50); public final IConfigEntry maxTamedDragonAge = new IntegerEntry("iceandfire.dragon.maxTamedDragonAge", 128, 0, 128); + public final IConfigEntry maxBreathTimeMul = new DoubleEntry("iceandfire.dragon.maxBreathTimeMul", 2, 0, Integer.MAX_VALUE); public final SeparatorEntry s3 = new SeparatorEntry(); public final IConfigEntry lootSkull = new BooleanEntry("iceandfire.dragon.loot.skull", true); public final IConfigEntry lootHeart = new BooleanEntry("iceandfire.dragon.loot.heart", true); diff --git a/common/src/main/java/com/iafenvoy/iceandfire/entity/EntityDragonBase.java b/common/src/main/java/com/iafenvoy/iceandfire/entity/EntityDragonBase.java index 51f1737..9e22151 100644 --- a/common/src/main/java/com/iafenvoy/iceandfire/entity/EntityDragonBase.java +++ b/common/src/main/java/com/iafenvoy/iceandfire/entity/EntityDragonBase.java @@ -1277,9 +1277,8 @@ public ActionResult interactMob(PlayerEntity player, Hand hand) { } } return ActionResult.SUCCESS; - } - return super.interactMob(player, hand); - + } else return super.interactMob(player, hand); + return ActionResult.PASS; } public abstract ItemConvertible getHeartItem(); @@ -1587,7 +1586,6 @@ public int getDragonStage() { else if (age >= 50) return 3; else if (age >= 25) return 2; else return 1; - } public boolean isTeen() { diff --git a/common/src/main/java/com/iafenvoy/iceandfire/entity/util/dragon/IafDragonLogic.java b/common/src/main/java/com/iafenvoy/iceandfire/entity/util/dragon/IafDragonLogic.java index b5282e4..5a14666 100644 --- a/common/src/main/java/com/iafenvoy/iceandfire/entity/util/dragon/IafDragonLogic.java +++ b/common/src/main/java/com/iafenvoy/iceandfire/entity/util/dragon/IafDragonLogic.java @@ -281,6 +281,10 @@ public void updateDragonClient() { logic done on server and client on parallel. */ public void updateDragonCommon() { + if (this.dragon.fireBreathTicks > this.dragon.getAgeInDays() * IafCommonConfig.INSTANCE.dragon.maxBreathTimeMul.getValue()) { + this.dragon.fireBreathTicks = 0; + this.dragon.setBreathingFire(false); + } if (this.dragon.isBreathingFire()) { this.dragon.fireBreathTicks++; if (this.dragon.burnProgress < 40) diff --git a/common/src/main/resources/assets/iceandfire/lang/en_us.json b/common/src/main/resources/assets/iceandfire/lang/en_us.json index b700bb4..a90cb54 100644 --- a/common/src/main/resources/assets/iceandfire/lang/en_us.json +++ b/common/src/main/resources/assets/iceandfire/lang/en_us.json @@ -1501,6 +1501,7 @@ "iceandfire.category.hippocampus": "Hippocampus", "iceandfire.hippocampus.spawnChance": "Hippocampus Spawn Chance", "iceandfire.hippocampus.swimSpeedMod": "Hippocampus Swim Speed Mod", + "iceandfire.dragon.maxBreathTimeMul": "Max Breath Time Mul", "iceandfire.category.misc": "Misc", "iceandfire.misc.allowAttributeOverriding": "Allow Attribute Overriding", "modmenu.nameTranslation.iceandfire": "Ice And Fire", diff --git a/common/src/main/resources/assets/iceandfire/lang/zh_cn.json b/common/src/main/resources/assets/iceandfire/lang/zh_cn.json index 5bd68cb..74216cc 100644 --- a/common/src/main/resources/assets/iceandfire/lang/zh_cn.json +++ b/common/src/main/resources/assets/iceandfire/lang/zh_cn.json @@ -2,7 +2,6 @@ "itemGroup.iceandfire.items": "冰火传说丨物品", "itemGroup.iceandfire.blocks": "冰火传说丨方块", "iceandfire.empty": "空", - "block.iceandfire.lectern": "手稿誊写桌", "block.iceandfire.podium": "展台", "block.iceandfire.podium_oak": "橡木展台", @@ -514,7 +513,6 @@ "item.iceandfire.banner_pattern_troll.desc": "食人妖徽标", "item.iceandfire.banner_pattern_dread": "旗帜图案", "item.iceandfire.banner_pattern_dread.desc": "悚怖髑髅徽标", - "entity.iceandfire.dragon_multipart": "龙体", "entity.iceandfire.multipart": "身躯", "entity.iceandfire.hydra_multipart": "九头蛇颈", @@ -691,7 +689,6 @@ "amphithere.command.0": "这条翼蚺起身活动。", "amphithere.command.1": "这条翼蚺坐下休息。", "amphithere.command.2": "这条翼蚺跟随着你。", - "container.lectern.no_bestiary": "没有可增加的篇目了。", "container.lectern.costs": "消耗:", "container.lectern.manuscript.many": "%s张手稿", @@ -750,7 +747,6 @@ "message.iceandfire.dragonGrown": "这条龙成长到了阶段", "message.iceandfire.dragonGrownEnd": "!", "message.iceandfire.dragonGrownName": "成长到了阶段", - "death.attack.dragon.0": "%s被龙撕成了两半", "death.attack.dragon.1": "%s被龙扯成了碎片", "death.attack.dragon.2": "%s用自己的身体喂饱了龙", @@ -781,15 +777,12 @@ "death.attack.dragon_lightning.attacker_0": "%s承受了%s过分热情的充电", "death.attack.dragon_lightning.attacker_1": "%s遭受了%s的雷霆一击", "death.attack.dragon_lightning.attacker_2": "%s被%s狠狠地电了一下", - "key.dragon_strike": "发动龙袭", "key.dragon_fireAttack": "喷吐龙息", "key.dragon_down": "进行龙降", "key.dragon_change_view": "调整第三人称视角以便骑乘", - "tc.aspect.mythus": "神秘生灵", "tc.aspect.draco": "龙", - "advancements.iceandfire.root.title": "寒冰与烈火", "advancements.iceandfire.root.description": "来到魔法生物栖息的世界", "advancements.iceandfire.bestiary.title": "记载怪兽的书籍", @@ -942,7 +935,6 @@ "block.minecraft.banner.fire.green": "绿色火龙纹章", "block.minecraft.banner.fire.red": "红色火龙纹章", "block.minecraft.banner.fire.black": "黑色火龙纹章", - "block.minecraft.banner.ice.white": "白色冰龙纹章", "block.minecraft.banner.ice.orange": "橙色冰龙纹章", "block.minecraft.banner.ice.magenta": "品红冰龙纹章", @@ -959,7 +951,6 @@ "block.minecraft.banner.ice.green": "绿色冰龙纹章", "block.minecraft.banner.ice.red": "红色冰龙纹章", "block.minecraft.banner.ice.black": "黑色冰龙纹章", - "block.minecraft.banner.lightning.white": "白色电龙纹章", "block.minecraft.banner.lightning.orange": "橙色电龙纹章", "block.minecraft.banner.lightning.magenta": "品红电龙纹章", @@ -976,7 +967,6 @@ "block.minecraft.banner.lightning.green": "绿色电龙纹章", "block.minecraft.banner.lightning.red": "红色电龙纹章", "block.minecraft.banner.lightning.black": "黑色电龙纹章", - "block.minecraft.banner.fire_head.white": "白色火龙首徽标", "block.minecraft.banner.fire_head.orange": "橙色火龙首徽标", "block.minecraft.banner.fire_head.magenta": "品红火龙首徽标", @@ -993,7 +983,6 @@ "block.minecraft.banner.fire_head.green": "绿色火龙首徽标", "block.minecraft.banner.fire_head.red": "红色火龙首徽标", "block.minecraft.banner.fire_head.black": "黑色火龙首徽标", - "block.minecraft.banner.ice_head.white": "白色冰龙首徽标", "block.minecraft.banner.ice_head.orange": "橙色冰龙首徽标", "block.minecraft.banner.ice_head.magenta": "品红冰龙首徽标", @@ -1010,7 +999,6 @@ "block.minecraft.banner.ice_head.green": "绿色冰龙首徽标", "block.minecraft.banner.ice_head.red": "红色冰龙首徽标", "block.minecraft.banner.ice_head.black": "黑色冰龙首徽标", - "block.minecraft.banner.lightning_head.white": "白色电龙首徽标", "block.minecraft.banner.lightning_head.orange": "橙色电龙首徽标", "block.minecraft.banner.lightning_head.magenta": "品红电龙首徽标", @@ -1027,7 +1015,6 @@ "block.minecraft.banner.lightning_head.green": "绿色电龙首徽标", "block.minecraft.banner.lightning_head.red": "红色电龙首徽标", "block.minecraft.banner.lightning_head.black": "黑色电龙首徽标", - "block.minecraft.banner.gorgon.white": "白色蛇发女妖徽标", "block.minecraft.banner.gorgon.orange": "橙色蛇发女妖徽标", "block.minecraft.banner.gorgon.magenta": "品红蛇发女妖徽标", @@ -1044,7 +1031,6 @@ "block.minecraft.banner.gorgon.green": "绿色蛇发女妖徽标", "block.minecraft.banner.gorgon.red": "红色蛇发女妖徽标", "block.minecraft.banner.gorgon.black": "黑色蛇发女妖徽标", - "block.minecraft.banner.fae.white": "白色仙灵纹章", "block.minecraft.banner.fae.orange": "橙色仙灵纹章", "block.minecraft.banner.fae.magenta": "品红仙灵纹章", @@ -1061,7 +1047,6 @@ "block.minecraft.banner.fae.green": "绿色仙灵纹章", "block.minecraft.banner.fae.red": "红色仙灵纹章", "block.minecraft.banner.fae.black": "黑色仙灵纹章", - "block.minecraft.banner.hippogryph_head.white": "白色骏鹰首纹章", "block.minecraft.banner.hippogryph_head.orange": "橙色骏鹰首纹章", "block.minecraft.banner.hippogryph_head.magenta": "品红骏鹰首纹章", @@ -1078,7 +1063,6 @@ "block.minecraft.banner.hippogryph_head.green": "绿色骏鹰首纹章", "block.minecraft.banner.hippogryph_head.red": "红色骏鹰首纹章", "block.minecraft.banner.hippogryph_head.black": "黑色骏鹰首纹章", - "block.minecraft.banner.hippocampus.white": "白色海马纹章", "block.minecraft.banner.hippocampus.orange": "橙色海马纹章", "block.minecraft.banner.hippocampus.magenta": "品红海马纹章", @@ -1095,7 +1079,6 @@ "block.minecraft.banner.hippocampus.green": "绿色海马纹章", "block.minecraft.banner.hippocampus.red": "红色海马纹章", "block.minecraft.banner.hippocampus.black": "黑色海马纹章", - "block.minecraft.banner.mermaid.white": "白色人鱼徽标", "block.minecraft.banner.mermaid.orange": "橙色人鱼徽标", "block.minecraft.banner.mermaid.magenta": "品红人鱼徽标", @@ -1112,7 +1095,6 @@ "block.minecraft.banner.mermaid.green": "绿色人鱼徽标", "block.minecraft.banner.mermaid.red": "红色人鱼徽标", "block.minecraft.banner.mermaid.black": "黑色人鱼徽标", - "block.minecraft.banner.troll.white": "白色食人妖徽标", "block.minecraft.banner.troll.orange": "橙色食人妖徽标", "block.minecraft.banner.troll.magenta": "品红食人妖徽标", @@ -1129,7 +1111,6 @@ "block.minecraft.banner.troll.green": "绿色食人妖徽标", "block.minecraft.banner.troll.red": "红色食人妖徽标", "block.minecraft.banner.troll.black": "黑色食人妖徽标", - "block.minecraft.banner.eye.white": "白色独眼徽标", "block.minecraft.banner.eye.orange": "橙色独眼徽标", "block.minecraft.banner.eye.magenta": "品红独眼徽标", @@ -1146,7 +1127,6 @@ "block.minecraft.banner.eye.green": "绿色独眼徽标", "block.minecraft.banner.eye.red": "红色独眼徽标", "block.minecraft.banner.eye.black": "黑色独眼徽标", - "block.minecraft.banner.feather.white": "白色翎羽纹章", "block.minecraft.banner.feather.orange": "橙色翎羽纹章", "block.minecraft.banner.feather.magenta": "品红翎羽纹章", @@ -1163,7 +1143,6 @@ "block.minecraft.banner.feather.green": "绿色翎羽纹章", "block.minecraft.banner.feather.red": "红色翎羽纹章", "block.minecraft.banner.feather.black": "黑色翎羽纹章", - "block.minecraft.banner.bird.white": "白色泽鹗徽标", "block.minecraft.banner.bird.orange": "橙色泽鹗徽标", "block.minecraft.banner.bird.magenta": "品红泽鹗徽标", @@ -1180,7 +1159,6 @@ "block.minecraft.banner.bird.green": "绿色泽鹗徽标", "block.minecraft.banner.bird.red": "红色泽鹗徽标", "block.minecraft.banner.bird.black": "黑色泽鹗徽标", - "block.minecraft.banner.amphithere.white": "白色翼蚺纹章", "block.minecraft.banner.amphithere.orange": "橙色翼蚺纹章", "block.minecraft.banner.amphithere.magenta": "品红翼蚺纹章", @@ -1197,7 +1175,6 @@ "block.minecraft.banner.amphithere.green": "绿色翼蚺纹章", "block.minecraft.banner.amphithere.red": "红色翼蚺纹章", "block.minecraft.banner.amphithere.black": "黑色翼蚺纹章", - "block.minecraft.banner.sea_serpent.white": "白色海蟒徽标", "block.minecraft.banner.sea_serpent.orange": "橙色海蟒徽标", "block.minecraft.banner.sea_serpent.magenta": "品红海蟒徽标", @@ -1214,7 +1191,6 @@ "block.minecraft.banner.sea_serpent.green": "绿色海蟒徽标", "block.minecraft.banner.sea_serpent.red": "红色海蟒徽标", "block.minecraft.banner.sea_serpent.black": "黑色海蟒徽标", - "block.minecraft.banner.weezer.white": "白色Weezer纹章", "block.minecraft.banner.weezer.orange": "橙色Weezer纹章", "block.minecraft.banner.weezer.magenta": "品红Weezer纹章", @@ -1231,7 +1207,6 @@ "block.minecraft.banner.weezer.green": "绿色Weezer纹章", "block.minecraft.banner.weezer.red": "红色Weezer纹章", "block.minecraft.banner.weezer.black": "黑色Weezer纹章", - "block.minecraft.banner.dread.white": "白色悚怖髑髅徽标", "block.minecraft.banner.dread.orange": "橙色悚怖髑髅徽标", "block.minecraft.banner.dread.magenta": "品红悚怖髑髅徽标", @@ -1248,7 +1223,6 @@ "block.minecraft.banner.dread.green": "绿色悚怖髑髅徽标", "block.minecraft.banner.dread.red": "红色悚怖髑髅徽标", "block.minecraft.banner.dread.black": "黑色悚怖髑髅徽标", - "iceandfire.sound.subtitle.ghost_attack": "幽灵:攻击", "iceandfire.sound.subtitle.ghost_idle": "幽灵:呼气", "iceandfire.sound.subtitle.ghost_hurt": "幽灵:受伤", @@ -1343,10 +1317,8 @@ "iceandfire.sound.subtitle.dragonegg_hatch": "龙蛋:孵化", "iceandfire.sound.subtitle.dragonflute": "龙歌长笛奏响", "item.iceandfire.dragonarmor_netherite": "下界合金龙铠", - "iceandfire.book.name": "异兽手记", "iceandfire.book.landing": "This is a landing text.", - "config.iceandfire.title": "§km§b冰§6火§f传说设置§km", "iceandfire.client": "客户端", "iceandfire.customMainMenu": "重写主界面背景", @@ -1491,6 +1463,7 @@ "iceandfire.worldgen.dangerousSeparationLimit": "危险结构间隔距离", "iceandfire.worldgen.generateMausoleums": "生成悚陵", "iceandfire.worldgen.villagerHouseWeight": "村民房子生成权重", + "iceandfire.dragon.maxBreathTimeMul": "最长喷龙息时间倍数", "iceandfire.category.misc": "杂项", "iceandfire.misc.dreadQueenMaxHealth": "恐蚁女皇最大生命值", "iceandfire.category.hippocampus": "海马", @@ -1505,21 +1478,20 @@ "emi.category.iceandfire.fire_forge": "龙炎锻炉", "emi.category.iceandfire.ice_forge": "龙霜锻炉", "emi.category.iceandfire.lightning_forge": "龙霆锻炉", - "item.iceandfire.dragon_seeker":"寻龙杖", - "item.iceandfire.dragon_seeker.credit":"移植自Syrikal的Mod:Ice and Fire: Dragonseeker", - "item.iceandfire.dragon_seeker.tooltip":"寻找150格以内最近的龙", - "item.iceandfire.epic_dragon_seeker":"史诗级寻龙杖", - "item.iceandfire.epic_dragon_seeker.tooltip":"寻找200格以内活着的龙", - "item.iceandfire.legendary_dragon_seeker":"传说级寻龙杖", - "item.iceandfire.legendary_dragon_seeker.tooltip":"寻找300格以内活着的野生龙", - "item.iceandfire.godly_dragon_seeker":"神话级寻龙杖", - "item.iceandfire.godly_dragon_seeker.tooltip":"直接获取500格以内龙的坐标(创造模式专用)", - "item.iceandfire.dragon_seeker.not_found":"寻龙杖无法找到任何龙", - "item.iceandfire.dragon_seeker.found":"寻龙杖发现了一条龙", - "item.iceandfire.dragon_seeker.found_location":"最近的龙位于", - "text.iceandfire.not_enable":"请先在配置文件中启用此功能!", + "item.iceandfire.dragon_seeker": "寻龙杖", + "item.iceandfire.dragon_seeker.credit": "移植自Syrikal的Mod:Ice and Fire: Dragonseeker", + "item.iceandfire.dragon_seeker.tooltip": "寻找150格以内最近的龙", + "item.iceandfire.epic_dragon_seeker": "史诗级寻龙杖", + "item.iceandfire.epic_dragon_seeker.tooltip": "寻找200格以内活着的龙", + "item.iceandfire.legendary_dragon_seeker": "传说级寻龙杖", + "item.iceandfire.legendary_dragon_seeker.tooltip": "寻找300格以内活着的野生龙", + "item.iceandfire.godly_dragon_seeker": "神话级寻龙杖", + "item.iceandfire.godly_dragon_seeker.tooltip": "直接获取500格以内龙的坐标(创造模式专用)", + "item.iceandfire.dragon_seeker.not_found": "寻龙杖无法找到任何龙", + "item.iceandfire.dragon_seeker.found": "寻龙杖发现了一条龙", + "item.iceandfire.dragon_seeker.found_location": "最近的龙位于", + "text.iceandfire.not_enable": "请先在配置文件中启用此功能!", "iceandfire.misc.enableDragonSeeker": "启用寻龙杖", - "item.iceandfire.cooked_rice_with_fire_dragon_meat": "火龙肉炒饭", "item.iceandfire.cooked_rice_with_ice_dragon_meat": "冰龙肉炒饭", "item.iceandfire.cooked_rice_with_lightning_dragon_meat": "电龙肉炒饭", @@ -1532,12 +1504,10 @@ "bestiary_gui": "异兽手记", "screen.iceandfire.common.title": "冰火传说通用设置", "screen.iceandfire.client.title": "冰火传说客户端设置", - "iceandfire.dragon.movedWronglyFix.comment": "未使用", "iceandfire.bird.dataTagDrops.comment": "未使用", "iceandfire.worldgen.villagerHouseWeight.comment": "未使用", "iceandfire.misc.allowAttributeOverriding.comment": "未使用", - "block.iceandfire.dreadwood_leaves": "悚木树叶", "block.iceandfire.dreadwood_sapling": "悚木树苗", "biome.iceandfire.dread_forest": "悚林", diff --git a/gradle.properties b/gradle.properties index e8ff5e5..a3ad89b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 0.8.5 +mod_version = 1.0-beta.1 maven_group = com.iafenvoy.iceandfire archives_name = IceAndFireCE enabled_platforms = fabric,forge