From e3547008416de461ec5659083fd39a8ce7fe98fa Mon Sep 17 00:00:00 2001 From: Fallen_Breath Date: Sun, 16 Jul 2023 19:51:19 +0800 Subject: [PATCH] use redstone ore instead of emerald ore for rule `updateSuppressionSimulator` --- patches/net/minecraft/block/BlockRailPowered.java.patch | 2 +- src/main/java/carpet/settings/CarpetSettings.java | 4 ++-- src/main/resources/assets/carpet/lang/zh_cn.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/net/minecraft/block/BlockRailPowered.java.patch b/patches/net/minecraft/block/BlockRailPowered.java.patch index 3358dba0..e03a7dae 100644 --- a/patches/net/minecraft/block/BlockRailPowered.java.patch +++ b/patches/net/minecraft/block/BlockRailPowered.java.patch @@ -44,7 +44,7 @@ + // TISCM updateSuppressionSimulator + if (UpdateSuppressionSimulator.isActivated()) + { -+ if (!flag1 && worldIn.getBlockState(pos.down()).getBlock() == Blocks.EMERALD_ORE) ++ if (!flag1 && worldIn.getBlockState(pos.down()).getBlock() == Blocks.REDSTONE_ORE) + { + UpdateSuppressionSimulator.kaboom(); + } diff --git a/src/main/java/carpet/settings/CarpetSettings.java b/src/main/java/carpet/settings/CarpetSettings.java index ea3212c5..67b25346 100644 --- a/src/main/java/carpet/settings/CarpetSettings.java +++ b/src/main/java/carpet/settings/CarpetSettings.java @@ -896,9 +896,9 @@ public String validate(CommandSource source, ParsedRule currentRule, Str public static boolean undeadDontBurnInSunlight = false; @Rule( - desc = "Activator / Powered rail on an emerald ore simulates a update suppressor", + desc = "Activator / Powered rail on an redstone ore simulates a update suppressor", extra = { - "Right before a powered activator / powered rail on an emerald ore setting its powered state to false, throw the given JVM throwable", + "Right before a powered activator / powered rail on an redstone ore setting its powered state to false, throw the given JVM throwable", "false: rule disabled; true: rule enable and use StackOverflowError; others: feature enable and use given throwable" }, category = CREATIVE, diff --git a/src/main/resources/assets/carpet/lang/zh_cn.yml b/src/main/resources/assets/carpet/lang/zh_cn.yml index 6feb92c2..1441252c 100644 --- a/src/main/resources/assets/carpet/lang/zh_cn.yml +++ b/src/main/resources/assets/carpet/lang/zh_cn.yml @@ -341,9 +341,9 @@ rule: desc: 阻止海龟蛋因实体踩踏而破坏 updateSuppressionSimulator: name: 更新抑制模拟器 - desc: 绿宝石矿石上方的激活/充能铁轨可模拟更新抑制器 + desc: 红石矿石上方的激活/充能铁轨可模拟更新抑制器 extra: - '0': 在绿宝石矿石上已亮起的激活/充能铁轨将要熄灭时，抛出所提供的JVM异常 + '0': 在红石矿石上已亮起的激活/充能铁轨将要熄灭时，抛出所提供的JVM异常 '1': 'false: 关闭规则; true: 启用规则并使用StackOverflowError; 其他: 启用规则并使用所给异常' visualizeProjectileLoggerEnabled: name: 可视化投掷物记录器