From 90c48774b3825a673b99cbaac06268a1d361fa1f Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:05:31 +0800 Subject: [PATCH 1/8] Update OptCarpetSettings.java --- .../OptCarpetSettings.java | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java index 27c4e8f..375ccbb 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java @@ -21,6 +21,7 @@ //$$ @SuppressWarnings("all") //#endif public class OptCarpetSettings { + public static final String OCA = "OCA"; public static final String FALSE = "false"; public static Path configDirectory = FabricLoader.getInstance().getConfigDir().resolve("opt-carpet-addition"); @@ -28,28 +29,28 @@ public class OptCarpetSettings { @Rule( desc = "Enables [/player xxx tp] to teleport to fake player", - category = RuleCategory.COMMAND, + category = {RuleCategory.COMMAND,OCA} options = {"true", "false", "ops"} ) public static String commandTpToFakePlayer = FALSE; @Rule( desc = "Enables [/player xxx tp] to teleport to real player", - category = RuleCategory.COMMAND, + category = {RuleCategory.COMMAND,OCA} options = {"true", "false", "ops"} ) public static String allowTpToRealPlayer = FALSE; @Rule( desc = "Enables [/player xxx tp] to teleport to fake player", - category = RuleCategory.COMMAND, + category = {RuleCategory.COMMAND,OCA} options = {"true", "false", "ops"} ) public static String commandTpHereFakePlayer = FALSE; @Rule( desc = "Enables [/player xxx tp] to teleport to real player", - category = RuleCategory.COMMAND, + category = {RuleCategory.COMMAND,OCA} options = {"true", "false", "ops"} ) public static String allowTpHereRealPlayer = FALSE; @@ -57,7 +58,7 @@ public class OptCarpetSettings { // Force fake player gamemode rule ========================================================= @Rule( desc = "Force fake player gamemode", - category = RuleCategory.FEATURE, + category = {RuleCategory.FEATURE,OCA} options = {"survival", "creative", "adventure", "false"} ) public static String forceFakePlayerGameMode = FALSE; @@ -65,7 +66,7 @@ public class OptCarpetSettings { // Fix bugs ================================================================================ @Rule( desc = "Refresh xp level when player change world", - category = RuleCategory.BUGFIX + category = {RuleCategory.BUGFIX,OCA} ) public static boolean fixXpLevelBug = false; @@ -77,76 +78,76 @@ public class OptCarpetSettings { @Rule( desc = "Enable tp prefix blacklist", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean enableTpPrefixBlacklist = false; @Rule( desc = "Enable tp prefix whitelist", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean enableTpPrefixWhitelist = false; @Rule( desc = "Enable tp here prefix blacklist", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean enableTpHerePrefixBlacklist = false; @Rule( desc = "Enable tp here prefix whitelist", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean enableTpHerePrefixWhitelist = false; @Rule( desc = "Disable chicken lays eggs", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean disabledLayEggs = false; @Rule( desc = "Disable enderman pickup block goal", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean disabledEnderManPickupGoal = false; @Rule( desc = "Disable enderman place block goal", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean disabledEnderManPlaceBlockGoal = false; @Rule( desc = "Disable zombified piglin spawn in nether portal", - category = {RuleCategory.OPTIMIZATION, RuleCategory.FEATURE} + category = {RuleCategory.OPTIMIZATION, RuleCategory.FEATURE,OCA} ) public static boolean disabledNetherPortalSpawn = false; @Rule( desc = "Disable entity tick(contains all entity and BlockEntity)", - category = {RuleCategory.EXPERIMENTAL} + category = {RuleCategory.EXPERIMENTAL,OCA} ) public static boolean disabledEntityTick = false; //#if MC < 11900 @Rule( desc = "Disable error stack when update suppression.", - category = {RuleCategory.BUGFIX} + category = {RuleCategory.BUGFIX,OCA} ) public static boolean disabledUpdateSuppressionErrorStackTrace = false; //#endif @Rule( desc = "Unescape chat message. \\u4e2d -> δΈ­", - category = {RuleCategory.FEATURE, RuleCategory.CLIENT} + category = {RuleCategory.FEATURE, RuleCategory.CLIENT,OCA} ) public static boolean unescapeChatMessage = false; //#if MC < 11900 @Rule( desc = "Handle player connect in a new thread to reduce the lag.", - category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL} + category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL,OCA} ) public static boolean optimizePlayerConnect = false; //#endif @@ -154,48 +155,48 @@ public class OptCarpetSettings { //#if MC < 11900 @Rule( desc = "Handle player teleport in a new thread to reduce the lag.", - category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL} + category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL,OCA} ) public static boolean optimizeTeleport = false; //#endif @Rule( desc = "Print info log when players submit command", - category = {RuleCategory.COMMAND, RuleCategory.FEATURE} + category = {RuleCategory.COMMAND, RuleCategory.FEATURE,OCA} ) public static boolean commandLogger = false; //#if MC < 11900 @Rule( desc = "Dropper crash fix", - category = RuleCategory.BUGFIX + category = {RuleCategory.BUGFIX,OCA} ) public static boolean dropperCrashFix = false; //#endif @Rule( desc = "Always spawn offline fake player to reduce lagging", - category = RuleCategory.OPTIMIZATION + category = {RuleCategory.OPTIMIZATION,OCA} ) public static boolean optimizeFakePlayerSpawn = false; //#if MC < 12100 @Rule( desc = "Fix CCE Suppression crashes", - category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL} + category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL,OCA} ) public static boolean cceSuppressionCrashFix = false; //#endif @Rule( desc = "Remove every armour which has `curse of binding` enchantment when player dead in wall (keepInventory must be true).", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean removeAllCurseOfBindingArmorWhenPlayerDeadInWall = false; @Rule( desc = "Modify item disappeared time, default value -1 (unit: tick)", - category = RuleCategory.FEATURE, + category = {RuleCategory.FEATURE,OCA} options = {"-1", "6000"}, strict = false, validate = CustomItemDiscardTimeValidator.class @@ -205,7 +206,7 @@ public class OptCarpetSettings { //#if MC >= 12000 //$$ @Rule( //$$ desc = "Disallow redstone wire connects to open trapdoor(in version >= 1.20)", - //$$ category = RuleCategory.FEATURE + //$$ category = {RuleCategory.FEATURE,OCA} //$$ ) //$$ public static boolean disallowRedstoneWireConnectsToOpenTrapdoor = false; //#endif @@ -218,13 +219,13 @@ public class OptCarpetSettings { @Rule( desc = "Don't spawn bats!", - category = RuleCategory.FEATURE + category = {RuleCategory.FEATURE,OCA} ) public static boolean removeBats = false; @Rule( desc = "The rate limit of `/player xxx tp` command. Default: permit 1 request per 2 seconds per player.", - category = {RuleCategory.FEATURE, RuleCategory.COMMAND}, + category = {RuleCategory.FEATURE, RuleCategory.COMMAND,OCA}, validate = PlayerTpRateLimitTimeValidator.class, strict = false, options = {"2"} @@ -233,14 +234,14 @@ public class OptCarpetSettings { @Rule( desc = "If enabled, command logger will broadcast commands to those players.", - category = {RuleCategory.COMMAND, RuleCategory.FEATURE}, + category = {RuleCategory.COMMAND, RuleCategory.FEATURE,OCA}, options = {"true", "false", "ops"} ) public static String commandLoggerBroadcastToPlayer = FALSE; @Rule( desc = "allow spectator tp to any player!", - category = {RuleCategory.FEATURE, RuleCategory.COMMAND}, + category = {RuleCategory.FEATURE, RuleCategory.COMMAND,OCA}, options = {"true", "false"} ) public static boolean allowSpectatorTpToAnyPlayer = false; From bf5b2041270e52ebc3b79d8f188b95472cc529d5 Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:12:37 +0800 Subject: [PATCH 2/8] Update build.yml From 49579b14c923e688d30e0d92da96050f38daca94 Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:18:23 +0800 Subject: [PATCH 3/8] Update OptCarpetSettings.java --- .../github/optijava/opt_carpet_addition/OptCarpetSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java index 375ccbb..bf260d8 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java @@ -213,7 +213,7 @@ public class OptCarpetSettings { @Rule( desc = "Don't enable this rule unless you need blockUpdate logger! Enabling this rule may cause performance issues, so this rule was false by default. Before you set this rule to true, everyone can not use blockUpdate logger.", - category = {RuleCategory.FEATURE, RuleCategory.OPTIMIZATION} + category = {RuleCategory.FEATURE, RuleCategory.OPTIMIZATION,OCA} ) public static boolean allowBlockUpdateLogger = false; From d8d0917f10e36cd211da9adfac6de18bdf22caca Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:24:38 +0800 Subject: [PATCH 4/8] Update OptCarpetSettings.java --- .../opt_carpet_addition/OptCarpetSettings.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java index bf260d8..698a83a 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java @@ -29,28 +29,28 @@ public class OptCarpetSettings { @Rule( desc = "Enables [/player xxx tp] to teleport to fake player", - category = {RuleCategory.COMMAND,OCA} + category = {RuleCategory.COMMAND,OCA}, options = {"true", "false", "ops"} ) public static String commandTpToFakePlayer = FALSE; @Rule( desc = "Enables [/player xxx tp] to teleport to real player", - category = {RuleCategory.COMMAND,OCA} + category = {RuleCategory.COMMAND,OCA}, options = {"true", "false", "ops"} ) public static String allowTpToRealPlayer = FALSE; @Rule( desc = "Enables [/player xxx tp] to teleport to fake player", - category = {RuleCategory.COMMAND,OCA} + category = {RuleCategory.COMMAND,OCA}, options = {"true", "false", "ops"} ) public static String commandTpHereFakePlayer = FALSE; @Rule( desc = "Enables [/player xxx tp] to teleport to real player", - category = {RuleCategory.COMMAND,OCA} + category = {RuleCategory.COMMAND,OCA}, options = {"true", "false", "ops"} ) public static String allowTpHereRealPlayer = FALSE; @@ -58,7 +58,7 @@ public class OptCarpetSettings { // Force fake player gamemode rule ========================================================= @Rule( desc = "Force fake player gamemode", - category = {RuleCategory.FEATURE,OCA} + category = {RuleCategory.FEATURE,OCA}, options = {"survival", "creative", "adventure", "false"} ) public static String forceFakePlayerGameMode = FALSE; @@ -66,7 +66,7 @@ public class OptCarpetSettings { // Fix bugs ================================================================================ @Rule( desc = "Refresh xp level when player change world", - category = {RuleCategory.BUGFIX,OCA} + category = {RuleCategory.BUGFIX,OCA}, ) public static boolean fixXpLevelBug = false; @@ -196,7 +196,7 @@ public class OptCarpetSettings { @Rule( desc = "Modify item disappeared time, default value -1 (unit: tick)", - category = {RuleCategory.FEATURE,OCA} + category = {RuleCategory.FEATURE,OCA}, options = {"-1", "6000"}, strict = false, validate = CustomItemDiscardTimeValidator.class From 50581d9c794a391c3127c554907b356d25871be6 Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:29:25 +0800 Subject: [PATCH 5/8] Update OptCarpetAddition.java --- .../github/optijava/opt_carpet_addition/OptCarpetAddition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java index 05c1f48..70a0fe5 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java @@ -56,7 +56,7 @@ public void onGameStarted() { //#endif GameMode gameMode = GameMode.SURVIVAL; - if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) { + if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative") { gameMode = GameMode.CREATIVE; } else if (OptCarpetSettings.forceFakePlayerGameMode.equals("adventure")) { gameMode = GameMode.ADVENTURE; From d21ad4baef68dd9304567a408a79552e6b03e359 Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:46:30 +0800 Subject: [PATCH 6/8] Update OptCarpetSettings.java --- .../github/optijava/opt_carpet_addition/OptCarpetSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java index 698a83a..88cabd7 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java @@ -66,7 +66,7 @@ public class OptCarpetSettings { // Fix bugs ================================================================================ @Rule( desc = "Refresh xp level when player change world", - category = {RuleCategory.BUGFIX,OCA}, + category = {RuleCategory.BUGFIX,OCA} ) public static boolean fixXpLevelBug = false; From 96cbfa9c22f775138e3b2c365f48a71ccdd479e3 Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:50:06 +0800 Subject: [PATCH 7/8] Update OptCarpetAddition.java --- .../github/optijava/opt_carpet_addition/OptCarpetAddition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java index 70a0fe5..05c1f48 100644 --- a/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java +++ b/src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java @@ -56,7 +56,7 @@ public void onGameStarted() { //#endif GameMode gameMode = GameMode.SURVIVAL; - if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative") { + if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) { gameMode = GameMode.CREATIVE; } else if (OptCarpetSettings.forceFakePlayerGameMode.equals("adventure")) { gameMode = GameMode.ADVENTURE; From a3c8f531c0e03518fe35f82dba38e40cc23d780e Mon Sep 17 00:00:00 2001 From: antideath <127277607+jfglzs@users.noreply.github.com> Date: Wed, 27 Aug 2025 21:52:45 +0800 Subject: [PATCH 8/8] Update build.yml