change: use lapis ore instead of redstone ore for rule `updateSuppres…

…sionSimulator` redstone ore might have random update in random tick phase, which is bad sync from Carpet TIS Addition
TISUnion · Nov 2, 2023 · 9b332f9 · 9b332f9
1 parent e354700
commit 9b332f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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.REDSTONE_ORE)
++                if (!flag1 && worldIn.getBlockState(pos.down()).getBlock() == Blocks.LAPIS_ORE)
 +                {
 +                    UpdateSuppressionSimulator.kaboom();
 +                }

diff --git 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<String> currentRule, Str
     public static boolean undeadDontBurnInSunlight = false;
 
     @Rule(
-            desc = "Activator / Powered rail on an redstone ore simulates a update suppressor",
+            desc = "Activator / Powered rail on an lapis ore simulates a update suppressor",
             extra = {
-                    "Right before a powered activator / powered rail on an redstone ore setting its powered state to false, throw the given JVM throwable",
+                    "Right before a powered activator / powered rail on an lapis 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
@@ -341,9 +341,9 @@ rule:
     desc: 阻止海龟蛋因实体踩踏而破坏
   updateSuppressionSimulator:
     name: 更新抑制模拟器
-    desc: 红石矿石上方的激活/充能铁轨可模拟更新抑制器
+    desc: 青金石矿石上方的激活/充能铁轨可模拟更新抑制器
     extra:
-      '0': 在红石矿石上已亮起的激活/充能铁轨将要熄灭时，抛出所提供的JVM异常
+      '0': 在青金石矿石上已亮起的激活/充能铁轨将要熄灭时，抛出所提供的JVM异常
       '1': 'false: 关闭规则; true: 启用规则并使用StackOverflowError; 其他: 启用规则并使用所给异常'
   visualizeProjectileLoggerEnabled:
     name: 可视化投掷物记录器