Add rule blockStateParserFutureVersionInputCompact

Author: Fallen-Breath

patches/net/minecraft/command/arguments/BlockStateParser.java.patch

@@ -1,14 +1,41 @@
 --- a/net/minecraft/command/arguments/BlockStateParser.java
 +++ b/net/minecraft/command/arguments/BlockStateParser.java
-@@ -1,5 +1,7 @@
+@@ -1,5 +1,8 @@
  package net.minecraft.command.arguments;
 
 +import carpet.helpers.DummyPropertyEnum;
 +import carpet.settings.CarpetSettings;
++import com.google.common.collect.ImmutableMap;
  import com.google.common.collect.Maps;
  import com.mojang.brigadier.StringReader;
  import com.mojang.brigadier.exceptions.CommandSyntaxException;
-@@ -448,6 +450,20 @@
+@@ -400,11 +403,25 @@
+         return builder.buildFuture();
+     }
+ 
++    // TISCM blockStateParserFutureVersionInputCompact
++    private static final Map<ResourceLocation, ResourceLocation> TISCM_BLOCK_ID_COMPACT_MAPPING = ImmutableMap.<ResourceLocation, ResourceLocation>builder().
++            put(new ResourceLocation("minecraft:oak_sign"), new ResourceLocation("minecraft:sign")).
++            put(new ResourceLocation("minecraft:smooth_stone_slab"), new ResourceLocation("minecraft:stone_slab")).
++            build();
++    // TISCM blockStateParserFutureVersionInputCompact ends
++
+     public void readBlock() throws CommandSyntaxException
+     {
+         int i = this.reader.getCursor();
+         this.blockID = ResourceLocation.read(this.reader);
+ 
++        // TISCM blockStateParserFutureVersionInputCompact
++        if (CarpetSettings.blockStateParserFutureVersionInputCompact)
++        {
++            this.blockID = TISCM_BLOCK_ID_COMPACT_MAPPING.getOrDefault(this.blockID, this.blockID);
++        }
++        // TISCM blockStateParserFutureVersionInputCompact ends
++
+         if (IRegistry.BLOCK.containsKey(this.blockID))
+         {
+             Block block = IRegistry.BLOCK.getOrDefault(this.blockID);
+@@ -448,6 +465,20 @@
                  String s = this.reader.readString();
                  IProperty<?> iproperty = this.blockStateContainer.getProperty(s);
 
@@ -29,7 +56,7 @@
                  if (iproperty == null)
                  {
                      this.reader.setCursor(i);
-@@ -470,9 +486,10 @@
+@@ -470,9 +501,10 @@
 
                  this.reader.skip();
                  this.reader.skipWhitespace();
@@ -41,7 +68,7 @@
                  };
                  int j = this.reader.getCursor();
                  this.parseValue(iproperty, this.reader.readString(), j);
-@@ -598,6 +615,12 @@
+@@ -598,6 +630,12 @@
          }
          else
          {

src/main/java/carpet/settings/CarpetSettings.java

@@ -26,7 +26,7 @@ public class CarpetSettings
     public static final int SHULKERBOX_MAX_STACK_AMOUNT = 64;
     public static boolean isEpsActive = false;
 
-	private static class ValidateVoxelOpt extends Validator<Boolean>
+    private static class ValidateVoxelOpt extends Validator<Boolean>
     {
         @Override
         public Boolean validate(CommandSource source, ParsedRule<Boolean> currentRule, Boolean newValue, String string)
@@ -950,6 +950,17 @@ public String validate(CommandSource source, ParsedRule<String> currentRule, Str
     )
     public static double spawnJockeyProbably = -1;
 
+    @Rule(
+            desc = "Enable the automatic future MC version compatibility mode on block states for the BlockStateParser which is used in command parsing",
+            extra = {
+                    "Included mappings:",
+                    "- minecraft:oak_sign -> minecraft:sign",
+                    "- minecraft:smooth_stone_slab -> minecraft:stone_slab",
+            },
+            category = {CREATIVE}
+    )
+    public static boolean blockStateParserFutureVersionInputCompact;
+
 
     // /$$$$$$$$ /$$$$$$  /$$$$$$   /$$$$$$  /$$      /$$
     //|__  $$__/|_  $$_/ /$$__  $$ /$$__  $$| $$$    /$$$

src/main/resources/assets/carpet/lang/zh_cn.yml

@@ -12,6 +12,13 @@ rule:
     desc: 方块可放置时无视实体碰撞检测，也就是你可以将方块放在实体内
     extra:
       '0': 仅对创造模式玩家有效
+  blockStateParserFutureVersionInputCompact:
+    name: 方块状态解析器兼容未来版本输入
+    desc: 在命令解析过程中使用的 BlockStateParser 组件里，启用对未来版本方块 ID 的输入兼容
+    extra:
+      '0': 包含的映射：
+      '1': '- minecraft:oak_sign -> minecraft:sign'
+      '2': '- minecraft:smooth_stone_slab -> minecraft:stone_slab'
   cauldronBlockItemInteractFix:
     name: 炼药锅方块类物品交互修复
     desc: 让玩家可以对着填充有水的炼药锅放置方块