Skip to content

Commit 1dd8a4e

Browse files
committed
Move ModuleType to common
1 parent 4aa4968 commit 1dd8a4e

26 files changed

Lines changed: 79 additions & 67 deletions
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
package io.wdsj.asw.common.type;
2+
3+
import java.util.Arrays;
4+
import java.util.List;
5+
6+
/**
7+
* Types for different detection modules.
8+
*/
9+
public enum ModuleType {
10+
CHAT(true),
11+
AI(true),
12+
SIGN(true),
13+
ANVIL(true),
14+
BOOK(true),
15+
NAME(false),
16+
ITEM(true),
17+
BROADCAST(false);
18+
19+
private final boolean violationTracked;
20+
21+
ModuleType(boolean violationTracked) {
22+
this.violationTracked = violationTracked;
23+
}
24+
25+
public boolean isViolationTracked() {
26+
return violationTracked;
27+
}
28+
29+
public static List<ModuleType> violationModules() {
30+
return Arrays.stream(values())
31+
.filter(ModuleType::isViolationTracked)
32+
.toList();
33+
}
34+
35+
public static ModuleType parseViolationModule(String value) {
36+
if (value == null) {
37+
return null;
38+
}
39+
return Arrays.stream(values())
40+
.filter(ModuleType::isViolationTracked)
41+
.filter(moduleType -> moduleType.name().equalsIgnoreCase(value))
42+
.findFirst()
43+
.orElse(null);
44+
}
45+
}

paper/src/main/java/io/wdsj/asw/bukkit/ai/LlmChatDetectionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import io.wdsj.asw.bukkit.setting.PaperConfigurationService;
1010
import io.wdsj.asw.bukkit.setting.PluginSettings;
1111
import io.wdsj.asw.bukkit.setting.SettingKey;
12-
import io.wdsj.asw.bukkit.type.ModuleType;
12+
import io.wdsj.asw.common.type.ModuleType;
1313
import io.wdsj.asw.bukkit.util.SchedulingUtils;
1414
import io.wdsj.asw.bukkit.util.ViolationReporter;
1515
import io.wdsj.asw.common.utils.MessageEntropy;

paper/src/main/java/io/wdsj/asw/bukkit/api/event/AsyncModerationResponseEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.wdsj.asw.bukkit.api.event;
22

33
import io.wdsj.asw.bukkit.api.moderation.LlmChatModerationResult;
4-
import io.wdsj.asw.bukkit.type.ModuleType;
4+
import io.wdsj.asw.common.type.ModuleType;
55
import org.bukkit.event.Cancellable;
66
import org.bukkit.event.Event;
77
import org.bukkit.event.HandlerList;

paper/src/main/java/io/wdsj/asw/bukkit/api/event/SensitiveFilterPostProcessEvent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.wdsj.asw.bukkit.api.event;
22

3-
import io.wdsj.asw.bukkit.type.ModuleType;
3+
import io.wdsj.asw.common.type.ModuleType;
44
import org.bukkit.event.Event;
55
import org.bukkit.event.HandlerList;
66
import org.jetbrains.annotations.ApiStatus;

paper/src/main/java/io/wdsj/asw/bukkit/command/AswCommandRegistrar.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import io.wdsj.asw.bukkit.AdvancedSensitiveWords;
44
import io.wdsj.asw.bukkit.setting.PluginMessages;
5-
import io.wdsj.asw.bukkit.type.ModuleType;
5+
import io.wdsj.asw.common.type.ModuleType;
66
import io.wdsj.asw.bukkit.util.message.MessageUtils;
77
import io.wdsj.asw.bukkit.permission.PermissionsEnum;
88
import org.bukkit.command.CommandSender;

paper/src/main/java/io/wdsj/asw/bukkit/command/AswCommandService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.wdsj.asw.bukkit.setting.PluginMessages;
1111
import io.wdsj.asw.bukkit.setting.PluginSettings;
1212
import io.wdsj.asw.bukkit.setting.PaperConfigurationService;
13-
import io.wdsj.asw.bukkit.type.ModuleType;
13+
import io.wdsj.asw.common.type.ModuleType;
1414
import io.wdsj.asw.bukkit.util.TimingUtils;
1515
import io.wdsj.asw.bukkit.util.Utils;
1616
import io.wdsj.asw.bukkit.util.cache.BookCache;

paper/src/main/java/io/wdsj/asw/bukkit/manage/notice/Notifier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.wdsj.asw.bukkit.permission.PermissionsEnum;
66
import io.wdsj.asw.bukkit.permission.cache.CachingPermTool;
77
import io.wdsj.asw.bukkit.setting.PluginMessages;
8-
import io.wdsj.asw.bukkit.type.ModuleType;
8+
import io.wdsj.asw.common.type.ModuleType;
99
import io.wdsj.asw.bukkit.util.message.MessageUtils;
1010
import net.kyori.adventure.text.Component;
1111
import org.bukkit.Bukkit;

paper/src/main/java/io/wdsj/asw/bukkit/manage/punish/PunishmentService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.wdsj.asw.bukkit.proxy.velocity.VelocitySender;
44
import io.wdsj.asw.bukkit.setting.PaperConfigurationService;
55
import io.wdsj.asw.bukkit.setting.PluginSettings;
6-
import io.wdsj.asw.bukkit.type.ModuleType;
6+
import io.wdsj.asw.common.type.ModuleType;
77
import io.wdsj.asw.bukkit.util.SchedulingUtils;
88
import org.bukkit.Bukkit;
99
import org.bukkit.NamespacedKey;

paper/src/main/java/io/wdsj/asw/bukkit/manage/punish/ViolationCounter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.wdsj.asw.bukkit.manage.punish;
22

3-
import io.wdsj.asw.bukkit.type.ModuleType;
3+
import io.wdsj.asw.common.type.ModuleType;
44
import org.bukkit.entity.Player;
55

66
import java.util.Map;

paper/src/main/java/io/wdsj/asw/bukkit/proxy/velocity/VelocitySender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.wdsj.asw.bukkit.AdvancedSensitiveWords;
66
import io.wdsj.asw.bukkit.api.moderation.LlmChatModerationResult;
77
import io.wdsj.asw.bukkit.manage.punish.ViolationCounter;
8-
import io.wdsj.asw.bukkit.type.ModuleType;
8+
import io.wdsj.asw.common.type.ModuleType;
99
import io.wdsj.asw.common.constant.networking.ChannelDataConstant;
1010
import io.wdsj.asw.common.datatype.io.LimitedByteArrayDataOutput;
1111
import org.bukkit.entity.Player;

0 commit comments

Comments
 (0)