Revert "feat: integrate Sichuan Mahjong core flow"

This reverts commit 043b230.

Author: Arbousier1

src/main/java/top/ellan/mahjong/command/MahjongCommand.java

@@ -526,7 +526,7 @@ private List<String> visibleRootCommands(CommandSender sender) {
             : ROOT_COMMANDS.stream().filter(command -> !this.isAdminRootCommand(command)).collect(java.util.stream.Collectors.toCollection(ArrayList::new));
         if (sender instanceof Player player) {
             MahjongTableSession table = this.tableManager.tableFor(player.getUniqueId());
-            if (table != null && table.currentVariant() != MahjongVariant.RIICHI) {
+            if (table != null && table.currentVariant() == MahjongVariant.GB) {
                 commands.remove("riichi");
                 commands.remove("kyuushu");
             }

src/main/java/top/ellan/mahjong/config/PluginSettings.java

@@ -132,7 +132,7 @@ public String craftEngineGbTileItemIdPrefix() {
     }
 
     public String craftEngineTileItemIdPrefix(MahjongVariant variant) {
-        if (variant != MahjongVariant.RIICHI) {
+        if (variant == MahjongVariant.GB) {
             return this.craftEngineGbTileItemIdPrefix;
         }
         return this.craftEngineRiichiTileItemIdPrefix;

src/main/java/top/ellan/mahjong/table/core/MahjongTableSession.java

@@ -14,7 +14,6 @@
 import top.ellan.mahjong.riichi.model.MahjongSoulScoring;
 import top.ellan.mahjong.riichi.model.ScoringStick;
 import top.ellan.mahjong.table.core.round.GbTableRoundController;
-import top.ellan.mahjong.table.core.round.GbRuleProfile;
 import top.ellan.mahjong.table.core.round.OpeningDiceRoll;
 import top.ellan.mahjong.table.core.round.RiichiTableRoundController;
 import top.ellan.mahjong.table.core.round.TableRoundController;
@@ -913,14 +912,8 @@ private TableRoundController createRoundController() {
             seats.put(wind, playerId);
             displayNames.put(playerId, this.displayName(playerId));
         }
-        if (this.currentVariant() != MahjongVariant.RIICHI) {
-            return new GbTableRoundController(
-                this.copyRule(),
-                seats,
-                displayNames,
-                new GbNativeRulesGateway(),
-                GbRuleProfile.forVariant(this.currentVariant())
-            );
+        if (this.currentVariant() == MahjongVariant.GB) {
+            return new GbTableRoundController(this.copyRule(), seats, displayNames, new GbNativeRulesGateway());
         }
         List<RiichiPlayerState> players = new ArrayList<>(SeatWind.values().length);
         for (SeatWind wind : SeatWind.values()) {

src/main/java/top/ellan/mahjong/table/core/MahjongVariant.java

@@ -4,8 +4,7 @@
 
 public enum MahjongVariant {
     RIICHI,
-    GB,
-    SICHUAN;
+    GB;
 
     public String translationKey() {
         return "rule.variant." + this.name().toLowerCase(Locale.ROOT);

src/main/java/top/ellan/mahjong/table/core/SessionRuleCoordinator.java

@@ -65,8 +65,8 @@ List<String> ruleKeys() {
 
     List<String> ruleValues(String key) {
         return switch (key.toLowerCase(Locale.ROOT)) {
-            case "preset", "mode" -> List.of("MAJSOUL_TONPUU", "MAJSOUL_HANCHAN", "GB", "SICHUAN");
-            case "variant", "ruleset" -> List.of("RIICHI", "GB", "SICHUAN");
+            case "preset", "mode" -> List.of("MAJSOUL_TONPUU", "MAJSOUL_HANCHAN", "GB");
+            case "variant", "ruleset" -> List.of("RIICHI", "GB");
             case "length" -> List.of("ONE_GAME", "EAST", "SOUTH", "TWO_WIND");
             case "thinkingtime", "thinking" -> List.of("VERY_SHORT", "SHORT", "NORMAL", "LONG", "VERY_LONG");
             case "minimumhan", "minhan" -> List.of("ONE", "TWO", "FOUR", "YAKUMAN");

src/main/java/top/ellan/mahjong/table/core/SessionRulePresetResolver.java

@@ -18,14 +18,12 @@ static Preset resolve(String rawValue) {
                 new Preset(MahjongVariant.RIICHI, majsoulRule(MahjongRule.GameLength.TWO_WIND));
             case "GB", "GUOBIAO", "ZHONGGUO", "CHINESE_OFFICIAL" ->
                 new Preset(MahjongVariant.GB, gbRule());
-            case "SICHUAN", "SCMJ", "SICHUAN_MAHJONG", "SICHUAN_TOURNAMENT" ->
-                new Preset(MahjongVariant.SICHUAN, sichuanRule());
             default -> null;
         };
     }
 
     static MahjongRule defaultRuleFor(MahjongVariant variant) {
-        return variant == MahjongVariant.RIICHI ? majsoulRule(MahjongRule.GameLength.TWO_WIND) : gbRule();
+        return variant == MahjongVariant.GB ? gbRule() : majsoulRule(MahjongRule.GameLength.TWO_WIND);
     }
 
     static MahjongRule majsoulRule(MahjongRule.GameLength length) {
@@ -56,10 +54,6 @@ static MahjongRule gbRule() {
         );
     }
 
-    static MahjongRule sichuanRule() {
-        return gbRule();
-    }
-
     record Preset(MahjongVariant variant, MahjongRule rule) {
     }
 }

src/main/java/top/ellan/mahjong/table/core/round/GbRoundSupport.java

@@ -163,23 +163,11 @@ static int rollDicePoints() {
     }
 
     static List<MahjongTile> buildWall() {
-        return buildWall(GbRuleProfile.GB);
-    }
-
-    static List<MahjongTile> buildWall(GbRuleProfile profile) {
-        GbRuleProfile safeProfile = profile == null ? GbRuleProfile.GB : profile;
-        int initialCapacity = safeProfile.includesHonors() && safeProfile.includesFlowers() ? 144 : 108;
-        List<MahjongTile> wall = new ArrayList<>(initialCapacity);
+        List<MahjongTile> wall = new ArrayList<>(144);
         for (MahjongTile tile : MahjongTile.values()) {
             if (tile == MahjongTile.UNKNOWN || tile.isRedFive()) {
                 continue;
             }
-            if (!safeProfile.includesHonors() && isHonor(tile)) {
-                continue;
-            }
-            if (!safeProfile.includesFlowers() && tile.isFlower()) {
-                continue;
-            }
             int copies = tile.isFlower() ? 1 : 4;
             for (int i = 0; i < copies; i++) {
                 wall.add(tile);