From a970681c2e2df07961a9490c9af319f13068d6c3 Mon Sep 17 00:00:00 2001 From: Ivan1F Date: Thu, 9 Jun 2022 23:36:59 +0800 Subject: [PATCH] `endermitesAlwaysHostile` -> `endermitesInconsistencyFix` and better description for it --- docs/readme-zh_cn.md | 2 +- docs/readme.md | 2 +- docs/rules-zh_cn.md | 12 +++++++----- docs/rules.md | 12 +++++++----- .../IvanCarpetAdditionSettings.java | 9 ++++++--- .../EndermiteEntityMixin.java | 2 +- .../assets/ivancarpetaddition/lang/zh_cn.yml | 8 +++++--- 7 files changed, 28 insertions(+), 19 deletions(-) diff --git a/docs/readme-zh_cn.md b/docs/readme-zh_cn.md index 8b99c47..8eeae0a 100644 --- a/docs/readme-zh_cn.md +++ b/docs/readme-zh_cn.md @@ -14,7 +14,7 @@ - [发射器不会影响玩家](rules-zh_cn.md#发射器不会影响玩家-dispensersNotAffectPlayers) - [可编辑告示牌](rules-zh_cn.md#可编辑告示牌-editableSign) - [末地烛避雷针](rules-zh_cn.md#末地烛避雷针-endLightningRod) - - [末影螨总是拥有仇恨](rules-zh_cn.md#末影螨总是拥有仇恨-endermitesAlwaysHostile) + - [末影螨不一致性修复](rules-zh_cn.md#末影螨不一致性修复-endermitesInconsistencyFix) - [假人名称补全预设](rules-zh_cn.md#假人名称补全预设-fakePlayerNameSuggestions) - [假人名称前缀限制](rules-zh_cn.md#假人名称前缀限制-fakePlayerPrefixRestriction) - [假人名称后缀限制](rules-zh_cn.md#假人名称后缀限制-fakePlayerSuffixRestriction) diff --git a/docs/readme.md b/docs/readme.md index 8eb3532..3833d5d 100644 --- a/docs/readme.md +++ b/docs/readme.md @@ -14,7 +14,7 @@ - [dispensersNotAffectPlayers](rules.md#dispensersNotAffectPlayers) - [editableSign](rules.md#editableSign) - [endLightningRod](rules.md#endLightningRod) - - [endermitesAlwaysHostile](rules.md#endermitesAlwaysHostile) + - [endermitesInconsistencyFix](rules.md#endermitesInconsistencyFix) - [fakePlayerNameSuggestions](rules.md#fakePlayerNameSuggestions) - [fakePlayerPrefixRestriction](rules.md#fakePlayerPrefixRestriction) - [fakePlayerSuffixRestriction](rules.md#fakePlayerSuffixRestriction) diff --git a/docs/rules-zh_cn.md b/docs/rules-zh_cn.md index 1b391fa..afa8118 100644 --- a/docs/rules-zh_cn.md +++ b/docs/rules-zh_cn.md @@ -96,14 +96,16 @@ - 参考选项: `true`, `false` - 分类: `ICA`, `FEATURE` -### 末影螨总是拥有仇恨 (endermitesAlwaysHostile) +### 末影螨不一致性修复 (endermitesInconsistencyFix) -通过刷怪蛋和 /summon 指令生成的末影螨将激怒末影人 +通过刷怪蛋和 /summon 指令生成的末影螨将激怒末影人（修复MC-53518） + +由于MC-53518于20w46a修复，该规则仅于1.17前的版本有效 - 类型: `boolean` - 默认值: `false` - 参考选项: `true`, `false` - - 分类: `ICA`, `CREATIVE` + - 分类: `ICA`, `CREATIVE`, `BUGFIX` ### 假人名称补全预设 (fakePlayerNameSuggestions) @@ -339,9 +341,9 @@ blacklist: 规则 生物黑名单(mobBlackList) 中声明的生物无法在世 启用 '/xpcounter' 指令 -使用 '/xpcounter reset' 重置计数器 +使用 '/xpcounter reset' 重置一个玩家的计数器 -使用 '/xpcounter ' 查询计数器 +使用 '/xpcounter ' 查询一个玩家的计数器 使用 '/log xpcounter ' 订阅计数器 diff --git a/docs/rules.md b/docs/rules.md index 1ec5f88..0e988ae 100644 --- a/docs/rules.md +++ b/docs/rules.md @@ -96,14 +96,16 @@ Lightning will NOT naturally spawn on end rods, but it will when end rods are hi - Suggested options: `true`, `false` - Categories: `ICA`, `FEATURE` -### endermitesAlwaysHostile +### endermitesInconsistencyFix -Endermen will be hostile to endermites spawned by spawn eggs or /summon command +Endermen will be hostile to endermites spawned by spawn eggs or /summon command (fixes MC-53518) + +This rule is only available in <1.17 since MC-53518 got fixed in 20w46a - Type: `boolean` - Default value: `false` - Suggested options: `true`, `false` - - Categories: `ICA`, `CREATIVE` + - Categories: `ICA`, `CREATIVE`, `BUGFIX` ### fakePlayerNameSuggestions @@ -339,9 +341,9 @@ A tool like 'hopperCounter' to use players as xp counters Enables '/xpcounter' command -Use '/xpcounter reset' to reset the counter +Use '/xpcounter reset' to reset a player's counter -Use '/xpcounter ' to query the counter +Use '/xpcounter ' to query a player's counter Use '/log xpcounter ' to subscribe xp counters diff --git a/src/main/java/me/ivan/ivancarpetaddition/IvanCarpetAdditionSettings.java b/src/main/java/me/ivan/ivancarpetaddition/IvanCarpetAdditionSettings.java index 976c662..21bee60 100644 --- a/src/main/java/me/ivan/ivancarpetaddition/IvanCarpetAdditionSettings.java +++ b/src/main/java/me/ivan/ivancarpetaddition/IvanCarpetAdditionSettings.java @@ -260,10 +260,13 @@ public void onValueChanged(Boolean oldValue, Boolean newValue) { public static boolean strictBlockPlacement = false; @Rule( - desc = "Endermen will be hostile to endermites spawned by spawn eggs or /summon command", - category = {ICA, CREATIVE} + desc = "Endermen will be hostile to endermites spawned by spawn eggs or /summon command (fixes MC-53518)", + extra = { + "This rule is only available in <1.17 since MC-53518 got fixed in 20w46a" + }, + category = {ICA, CREATIVE, BUGFIX} ) - public static boolean endermitesAlwaysHostile = false; + public static boolean endermitesInconsistencyFix = false; @Rule( desc = "Enables /replaceproperties command for easily replacing properties of all blocks in a range", diff --git a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/endermitesAlwaysHostile/EndermiteEntityMixin.java b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/endermitesAlwaysHostile/EndermiteEntityMixin.java index 4f5759c..dedf400 100644 --- a/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/endermitesAlwaysHostile/EndermiteEntityMixin.java +++ b/src/main/java/me/ivan/ivancarpetaddition/mixins/rule/endermitesAlwaysHostile/EndermiteEntityMixin.java @@ -11,7 +11,7 @@ public class EndermiteEntityMixin { @Inject(method = "isPlayerSpawned", at = @At("HEAD"), cancellable = true) private void playerSpawnedAlwaysToBeTrue(CallbackInfoReturnable cir) { - if (IvanCarpetAdditionSettings.endermitesAlwaysHostile) { + if (IvanCarpetAdditionSettings.endermitesInconsistencyFix) { cir.setReturnValue(true); } } diff --git a/src/main/resources/assets/ivancarpetaddition/lang/zh_cn.yml b/src/main/resources/assets/ivancarpetaddition/lang/zh_cn.yml index 21ee1ce..2193cd1 100644 --- a/src/main/resources/assets/ivancarpetaddition/lang/zh_cn.yml +++ b/src/main/resources/assets/ivancarpetaddition/lang/zh_cn.yml @@ -188,9 +188,11 @@ ivancarpetaddition: strictBlockPlacement: name: 严格方块防止 desc: 玩家无法在空气上防止方块（阻止 litematica 轻松放置） - endermitesAlwaysHostile: - name: 末影螨总是拥有仇恨 - desc: 通过刷怪蛋和 /summon 指令生成的末影螨将激怒末影人 + endermitesInconsistencyFix: + name: 末影螨不一致性修复 + desc: 通过刷怪蛋和 /summon 指令生成的末影螨将激怒末影人（修复MC-53518） + extra: + '0': 由于MC-53518于20w46a修复，该规则仅于1.17前的版本有效 commandReplaceProperties: name: 替换属性命令开关 desc: 启用 /replaceproperties 来方便地替换一定范围内所有方块的属性