build: bump ClopLib to 2.0

Author: WiIIiam278

bukkit/build.gradle

@@ -4,14 +4,14 @@ dependencies {
     implementation 'net.kyori:adventure-platform-bukkit:4.3.4'
     implementation 'io.papermc:paperlib:1.0.8'
     implementation 'space.arim.morepaperlib:morepaperlib:0.4.4'
-    implementation 'net.william278.cloplib:cloplib-bukkit:1.0.15'
+    implementation 'net.william278.cloplib:cloplib-bukkit:2.0'
     implementation 'me.lucko:commodore:2.2'
     implementation 'net.william278:AdvancementAPI:master-SNAPSHOT'
     implementation 'org.bstats:bstats-bukkit:3.1.0'
 
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'org.projectlombok:lombok:1.18.36'
-    compileOnly 'org.jetbrains:annotations:26.0.1'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     compileOnly 'com.google.guava:guava:33.4.0-jre'
     compileOnly 'net.william278:minedown:1.8.2'
     compileOnly 'commons-io:commons-io:2.18.0'

common/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     api 'net.william278:minedown:1.8.2'
     api 'net.william278:paginedown:1.1.2'
     api 'net.william278:DesertWell:2.0.4'
-    api 'net.william278.cloplib:cloplib-common:1.0.15'
+    api 'net.william278.cloplib:cloplib-common:2.0'
     api 'com.google.code.gson:gson:2.11.0'
     api 'com.github.Exlll.ConfigLib:configlib-yaml:v4.5.0'
     api('com.zaxxer:HikariCP:6.2.1') {
@@ -17,7 +17,7 @@ dependencies {
 
     compileOnly 'net.kyori:adventure-api:4.18.0'
     compileOnly 'net.kyori:adventure-platform-api:4.3.4'
-    compileOnly 'org.jetbrains:annotations:26.0.1'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     compileOnly 'com.google.guava:guava:33.4.0-jre'
     compileOnly 'org.projectlombok:lombok:1.18.36'
 
@@ -33,7 +33,7 @@ dependencies {
 
     testImplementation 'com.github.plan-player-analytics:Plan:5.5.2150'
     testImplementation 'com.google.guava:guava:33.4.0-jre'
-    testCompileOnly 'org.jetbrains:annotations:26.0.1'
+    testCompileOnly 'org.jetbrains:annotations:26.0.2'
 
     annotationProcessor 'org.projectlombok:lombok:1.18.36'
 }

common/src/main/java/net/william278/husktowns/config/Flags.java

@@ -35,24 +35,24 @@
 public class Flags {
 
     protected static final String CONFIG_HEADER = """
-        ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-        ┃    HuskTowns Flags Config    ┃
-        ┃    Developed by William278   ┃
-        ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-        ┣╸ This file is for configuring flags. Flag IDs map to a list of permitted operations.
-        ┗╸ Config Help: https://william278.net/docs/husktowns/config-files""";
+            ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
+            ┃    HuskTowns Flags Config    ┃
+            ┃    Developed by William278   ┃
+            ┣━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
+            ┣╸ This file is for configuring flags. Flag IDs map to a list of permitted operations.
+            ┗╸ Config Help: https://william278.net/docs/husktowns/config-files""";
 
     @Comment("A map of flag IDs to operations that flag permits." +
-        "Display names of flags correspond to a \"town_rule_name_\" locale in your messages file.")
+            "Display names of flags correspond to a \"town_rule_name_\" locale in your messages file.")
     public Map<String, List<String>> flags = Flag.getDefaults().stream().collect(
-        Collectors.toMap(
-            Flag::getName,
-            flag -> flag.getAllowedOperations().stream()
-                .map(OperationType::name)
-                .collect(Collectors.toList()),
-            (a, b) -> a,
-            LinkedHashMap::new
-        )
+            Collectors.toMap(
+                    Flag::getName,
+                    flag -> flag.getAllowedOperations().stream()
+                            .map(OperationType::asMinimalString)
+                            .collect(Collectors.toList()),
+                    (a, b) -> a,
+                    LinkedHashMap::new
+            )
     );
 
     /**
@@ -65,11 +65,8 @@ public Set<Flag> getFlagSet() {
         final Set<Flag> flagSet = new LinkedHashSet<>();
         for (Map.Entry<String, List<String>> entry : flags.entrySet()) {
             flagSet.add(Flag.of(
-                entry.getKey(),
-                entry.getValue().stream()
-                    .map(a -> OperationType.fromId(a).orElseThrow(
-                        () -> new IllegalArgumentException("Invalid operation type in flags config: " + a)))
-                    .collect(Collectors.toUnmodifiableSet())
+                    entry.getKey(),
+                    entry.getValue().stream().map(OperationType::getOrCreate).collect(Collectors.toUnmodifiableSet())
             ));
         }
         return flagSet;
@@ -82,8 +79,8 @@ public Set<Flag> getFlagSet() {
      */
     public void setFlags(@NotNull Set<Flag> flags) {
         this.flags = flags.stream().collect(Collectors.toMap(
-            Flag::getName,
-            flag -> flag.getAllowedOperations().stream().map(Enum::name).collect(Collectors.toList())
+                Flag::getName,
+                f -> f.getAllowedOperations().stream().map(OperationType::asMinimalString).toList()
         ));
     }
 

docs/Config-Files.md

@@ -192,55 +192,55 @@ towns:
 # A map of flag IDs to operations that flag permits.Display names of flags correspond to a "town_rule_name_" locale in your messages file.
 flags:
   public_container_access:
-    - CONTAINER_OPEN
+    - container_open
   fire_damage:
-    - FIRE_SPREAD
-    - FIRE_BURN
+    - fire_spread
+    - fire_burn
   public_farm_access:
-    - BLOCK_INTERACT
-    - FARM_BLOCK_PLACE
-    - FARM_BLOCK_BREAK
-    - FARM_BLOCK_INTERACT
-    - PLAYER_DAMAGE_ENTITY
-    - PLACE_VEHICLE
-    - BREAK_VEHICLE
+    - block_interact
+    - farm_block_place
+    - farm_block_break
+    - farm_block_interact
+    - player_damage_entity
+    - place_vehicle
+    - break_vehicle
   public_build_access:
-    - CONTAINER_OPEN
-    - BLOCK_PLACE
-    - FARM_BLOCK_PLACE
-    - PLAYER_DAMAGE_MONSTER
-    - ENDER_PEARL_TELEPORT
-    - BLOCK_INTERACT
-    - USE_SPAWN_EGG
-    - BREAK_HANGING_ENTITY
-    - PLACE_HANGING_ENTITY
-    - FARM_BLOCK_INTERACT
-    - EMPTY_BUCKET
-    - REDSTONE_INTERACT
-    - PLAYER_DAMAGE_PERSISTENT_ENTITY
-    - BLOCK_BREAK
-    - FILL_BUCKET
-    - ENTITY_INTERACT
-    - PLAYER_DAMAGE_ENTITY
-    - START_RAID
-    - PLACE_VEHICLE
-    - BREAK_VEHICLE
+    - container_open
+    - block_place
+    - farm_block_place
+    - player_damage_monster
+    - ender_pearl_teleport
+    - block_interact
+    - use_spawn_egg
+    - break_hanging_entity
+    - place_hanging_entity
+    - farm_block_interact
+    - empty_bucket
+    - redstone_interact
+    - player_damage_persistent_entity
+    - block_break
+    - fill_bucket
+    - entity_interact
+    - player_damage_entity
+    - start_raid
+    - place_vehicle
+    - break_vehicle
   mob_griefing:
-    - MONSTER_DAMAGE_TERRAIN
+    - monster_damage_terrain
   explosion_damage:
-    - EXPLOSION_DAMAGE_TERRAIN
-    - EXPLOSION_DAMAGE_ENTITY
+    - explosion_damage_terrain
+    - explosion_damage_entity
   pvp:
     - PLAYER_DAMAGE_PLAYER
   monster_spawning:
-    - MONSTER_SPAWN
-    - PASSIVE_MOB_SPAWN
-    - PLAYER_DAMAGE_MONSTER
+    - monster_spawn
+    - passive_mob_spawn
+    - player_damage_monster
   public_interact_access:
-    - ENTITY_INTERACT
-    - REDSTONE_INTERACT
-    - ENDER_PEARL_TELEPORT
-    - BLOCK_INTERACT
+    - entity_interact
+    - redstone_interact
+    - ender_pearl_teleport
+    - block_interact
 ```
 </details>
 

paper/build.gradle

@@ -8,9 +8,9 @@ dependencies {
 
     compileOnly 'io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT'
 
-    compileOnly 'org.jetbrains:annotations:26.0.1'
+    compileOnly 'org.jetbrains:annotations:26.0.2'
     compileOnly 'org.projectlombok:lombok:1.18.36'
-    compileOnly 'net.william278.cloplib:cloplib-bukkit:1.0.15'
+    compileOnly 'net.william278.cloplib:cloplib-bukkit:2.0'
 }
 
 shadowJar {