Skip to content

Commit 9e37add

Browse files
authored
Merge pull request #11 from jfglzs/dev
Add RuleCategory:"OCA"
2 parents e321ec8 + a3c8f53 commit 9e37add

File tree

1 file changed

+32
-31
lines changed

1 file changed

+32
-31
lines changed

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetSettings.java

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,51 +21,52 @@
2121
//$$ @SuppressWarnings("all")
2222
//#endif
2323
public class OptCarpetSettings {
24+
public static final String OCA = "OCA";
2425
public static final String FALSE = "false";
2526
public static Path configDirectory = FabricLoader.getInstance().getConfigDir().resolve("opt-carpet-addition");
2627

2728
// Tp command rules =======================================================================
2829

2930
@Rule(
3031
desc = "Enables [/player xxx tp] to teleport to fake player",
31-
category = RuleCategory.COMMAND,
32+
category = {RuleCategory.COMMAND,OCA},
3233
options = {"true", "false", "ops"}
3334
)
3435
public static String commandTpToFakePlayer = FALSE;
3536

3637
@Rule(
3738
desc = "Enables [/player xxx tp] to teleport to real player",
38-
category = RuleCategory.COMMAND,
39+
category = {RuleCategory.COMMAND,OCA},
3940
options = {"true", "false", "ops"}
4041
)
4142
public static String allowTpToRealPlayer = FALSE;
4243

4344
@Rule(
4445
desc = "Enables [/player xxx tp] to teleport to fake player",
45-
category = RuleCategory.COMMAND,
46+
category = {RuleCategory.COMMAND,OCA},
4647
options = {"true", "false", "ops"}
4748
)
4849
public static String commandTpHereFakePlayer = FALSE;
4950

5051
@Rule(
5152
desc = "Enables [/player xxx tp] to teleport to real player",
52-
category = RuleCategory.COMMAND,
53+
category = {RuleCategory.COMMAND,OCA},
5354
options = {"true", "false", "ops"}
5455
)
5556
public static String allowTpHereRealPlayer = FALSE;
5657

5758
// Force fake player gamemode rule =========================================================
5859
@Rule(
5960
desc = "Force fake player gamemode",
60-
category = RuleCategory.FEATURE,
61+
category = {RuleCategory.FEATURE,OCA},
6162
options = {"survival", "creative", "adventure", "false"}
6263
)
6364
public static String forceFakePlayerGameMode = FALSE;
6465

6566
// Fix bugs ================================================================================
6667
@Rule(
6768
desc = "Refresh xp level when player change world",
68-
category = RuleCategory.BUGFIX
69+
category = {RuleCategory.BUGFIX,OCA}
6970
)
7071
public static boolean fixXpLevelBug = false;
7172

@@ -77,125 +78,125 @@ public class OptCarpetSettings {
7778

7879
@Rule(
7980
desc = "Enable tp prefix blacklist",
80-
category = RuleCategory.FEATURE
81+
category = {RuleCategory.FEATURE,OCA}
8182
)
8283
public static boolean enableTpPrefixBlacklist = false;
8384

8485
@Rule(
8586
desc = "Enable tp prefix whitelist",
86-
category = RuleCategory.FEATURE
87+
category = {RuleCategory.FEATURE,OCA}
8788
)
8889
public static boolean enableTpPrefixWhitelist = false;
8990

9091
@Rule(
9192
desc = "Enable tp here prefix blacklist",
92-
category = RuleCategory.FEATURE
93+
category = {RuleCategory.FEATURE,OCA}
9394
)
9495
public static boolean enableTpHerePrefixBlacklist = false;
9596

9697
@Rule(
9798
desc = "Enable tp here prefix whitelist",
98-
category = RuleCategory.FEATURE
99+
category = {RuleCategory.FEATURE,OCA}
99100
)
100101
public static boolean enableTpHerePrefixWhitelist = false;
101102

102103
@Rule(
103104
desc = "Disable chicken lays eggs",
104-
category = RuleCategory.FEATURE
105+
category = {RuleCategory.FEATURE,OCA}
105106
)
106107
public static boolean disabledLayEggs = false;
107108

108109
@Rule(
109110
desc = "Disable enderman pickup block goal",
110-
category = RuleCategory.FEATURE
111+
category = {RuleCategory.FEATURE,OCA}
111112
)
112113
public static boolean disabledEnderManPickupGoal = false;
113114

114115
@Rule(
115116
desc = "Disable enderman place block goal",
116-
category = RuleCategory.FEATURE
117+
category = {RuleCategory.FEATURE,OCA}
117118
)
118119
public static boolean disabledEnderManPlaceBlockGoal = false;
119120

120121
@Rule(
121122
desc = "Disable zombified piglin spawn in nether portal",
122-
category = {RuleCategory.OPTIMIZATION, RuleCategory.FEATURE}
123+
category = {RuleCategory.OPTIMIZATION, RuleCategory.FEATURE,OCA}
123124
)
124125
public static boolean disabledNetherPortalSpawn = false;
125126

126127
@Rule(
127128
desc = "Disable entity tick(contains all entity and BlockEntity)",
128-
category = {RuleCategory.EXPERIMENTAL}
129+
category = {RuleCategory.EXPERIMENTAL,OCA}
129130
)
130131
public static boolean disabledEntityTick = false;
131132

132133
//#if MC < 11900
133134
@Rule(
134135
desc = "Disable error stack when update suppression.",
135-
category = {RuleCategory.BUGFIX}
136+
category = {RuleCategory.BUGFIX,OCA}
136137
)
137138
public static boolean disabledUpdateSuppressionErrorStackTrace = false;
138139
//#endif
139140

140141
@Rule(
141142
desc = "Unescape chat message. \\u4e2d -> 中",
142-
category = {RuleCategory.FEATURE, RuleCategory.CLIENT}
143+
category = {RuleCategory.FEATURE, RuleCategory.CLIENT,OCA}
143144
)
144145
public static boolean unescapeChatMessage = false;
145146

146147
//#if MC < 11900
147148
@Rule(
148149
desc = "Handle player connect in a new thread to reduce the lag.",
149-
category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL}
150+
category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL,OCA}
150151
)
151152
public static boolean optimizePlayerConnect = false;
152153
//#endif
153154

154155
//#if MC < 11900
155156
@Rule(
156157
desc = "Handle player teleport in a new thread to reduce the lag.",
157-
category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL}
158+
category = {RuleCategory.OPTIMIZATION, RuleCategory.EXPERIMENTAL,OCA}
158159
)
159160
public static boolean optimizeTeleport = false;
160161
//#endif
161162

162163
@Rule(
163164
desc = "Print info log when players submit command",
164-
category = {RuleCategory.COMMAND, RuleCategory.FEATURE}
165+
category = {RuleCategory.COMMAND, RuleCategory.FEATURE,OCA}
165166
)
166167
public static boolean commandLogger = false;
167168

168169
//#if MC < 11900
169170
@Rule(
170171
desc = "Dropper crash fix",
171-
category = RuleCategory.BUGFIX
172+
category = {RuleCategory.BUGFIX,OCA}
172173
)
173174
public static boolean dropperCrashFix = false;
174175
//#endif
175176

176177
@Rule(
177178
desc = "Always spawn offline fake player to reduce lagging",
178-
category = RuleCategory.OPTIMIZATION
179+
category = {RuleCategory.OPTIMIZATION,OCA}
179180
)
180181
public static boolean optimizeFakePlayerSpawn = false;
181182

182183
//#if MC < 12100
183184
@Rule(
184185
desc = "Fix CCE Suppression crashes",
185-
category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL}
186+
category = {RuleCategory.BUGFIX, RuleCategory.EXPERIMENTAL,OCA}
186187
)
187188
public static boolean cceSuppressionCrashFix = false;
188189
//#endif
189190

190191
@Rule(
191192
desc = "Remove every armour which has `curse of binding` enchantment when player dead in wall (keepInventory must be true).",
192-
category = RuleCategory.FEATURE
193+
category = {RuleCategory.FEATURE,OCA}
193194
)
194195
public static boolean removeAllCurseOfBindingArmorWhenPlayerDeadInWall = false;
195196

196197
@Rule(
197198
desc = "Modify item disappeared time, default value -1 (unit: tick)",
198-
category = RuleCategory.FEATURE,
199+
category = {RuleCategory.FEATURE,OCA},
199200
options = {"-1", "6000"},
200201
strict = false,
201202
validate = CustomItemDiscardTimeValidator.class
@@ -205,26 +206,26 @@ public class OptCarpetSettings {
205206
//#if MC >= 12000
206207
//$$ @Rule(
207208
//$$ desc = "Disallow redstone wire connects to open trapdoor(in version >= 1.20)",
208-
//$$ category = RuleCategory.FEATURE
209+
//$$ category = {RuleCategory.FEATURE,OCA}
209210
//$$ )
210211
//$$ public static boolean disallowRedstoneWireConnectsToOpenTrapdoor = false;
211212
//#endif
212213

213214
@Rule(
214215
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.",
215-
category = {RuleCategory.FEATURE, RuleCategory.OPTIMIZATION}
216+
category = {RuleCategory.FEATURE, RuleCategory.OPTIMIZATION,OCA}
216217
)
217218
public static boolean allowBlockUpdateLogger = false;
218219

219220
@Rule(
220221
desc = "Don't spawn bats!",
221-
category = RuleCategory.FEATURE
222+
category = {RuleCategory.FEATURE,OCA}
222223
)
223224
public static boolean removeBats = false;
224225

225226
@Rule(
226227
desc = "The rate limit of `/player xxx tp` command. Default: permit 1 request per 2 seconds per player.",
227-
category = {RuleCategory.FEATURE, RuleCategory.COMMAND},
228+
category = {RuleCategory.FEATURE, RuleCategory.COMMAND,OCA},
228229
validate = PlayerTpRateLimitTimeValidator.class,
229230
strict = false,
230231
options = {"2"}
@@ -233,14 +234,14 @@ public class OptCarpetSettings {
233234

234235
@Rule(
235236
desc = "If enabled, command logger will broadcast commands to those players.",
236-
category = {RuleCategory.COMMAND, RuleCategory.FEATURE},
237+
category = {RuleCategory.COMMAND, RuleCategory.FEATURE,OCA},
237238
options = {"true", "false", "ops"}
238239
)
239240
public static String commandLoggerBroadcastToPlayer = FALSE;
240241

241242
@Rule(
242243
desc = "allow spectator tp to any player!",
243-
category = {RuleCategory.FEATURE, RuleCategory.COMMAND},
244+
category = {RuleCategory.FEATURE, RuleCategory.COMMAND,OCA},
244245
options = {"true", "false"}
245246
)
246247
public static boolean allowSpectatorTpToAnyPlayer = false;

0 commit comments

Comments
 (0)