boba/LoMines
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: restore full WorldGuard flags support, default only block-break=allow

Browse source
This commit is contained in:
loki5512344 2026-06-01 11:52:19 +02:00
parent b80fefa6a4
commit bfdf197de4
5 changed files with 42 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/dev/loki/lomines/data/config/loader/region/WorldGuardConfigLoader.java
View file

@ -23,7 +23,7 @@ public final class WorldGuardConfigLoader {
/**
* Parses WorldGuard configuration from YAML.
* Simplified: only block-break flag.
* Supports any WorldGuard flags. Default: block-break=allow.
*/
public WorldGuardConfig parse(YamlConfiguration yaml) {
ConfigurationSection wgSection = yaml.getConfigurationSection("worldguard");
@ -55,10 +55,14 @@ public final class WorldGuardConfigLoader {
members = defaults.getStringList("worldguard.members");
}
// Simplified: only block-break flag
// allow = все могут ломать, deny = никто не может, -g non_members = только владельцы
String blockBreak = yaml.getString("worldguard.block-break",
defaults.getString("worldguard.block-break", "allow"));
// Support any WorldGuard flags. Default: only block-break=allow
List<String> flags = yaml.getStringList("worldguard.flags");
if (flags.isEmpty()) {
flags = defaults.getStringList("worldguard.flags");
}
if (flags.isEmpty()) {
flags = List.of("block-break=allow");
}
boolean protect = yaml.getBoolean("worldguard.protect-on-create",
defaults.getBoolean("worldguard.protect-on-create", true));
@ -68,7 +72,7 @@ public final class WorldGuardConfigLoader {
.template(template)
.owners(owners)
.members(members)
.blockBreak(blockBreak)
.flags(flags)
.protectOnCreate(protect)
.build();
}
@ -83,21 +87,21 @@ public final class WorldGuardConfigLoader {
yaml.set("worldguard.region-template", config.regionNameTemplate());
yaml.set("worldguard.owners", config.owners());
yaml.set("worldguard.members", config.members());
yaml.set("worldguard.block-break", config.blockBreak());
yaml.set("worldguard.flags", config.flags());
yaml.set("worldguard.protect-on-create", config.protectOnCreate());
}
}
/**
* Sets default values for WorldGuard configuration.
* Simplified: only block-break flag.
* Default: only block-break=allow. User can add any flags.
*/
public void setDefaults(YamlConfiguration yaml) {
yaml.set("worldguard.enabled", false);
yaml.set("worldguard.region-template", "{mine_name}_{random_4}");
yaml.set("worldguard.owners", List.of());
yaml.set("worldguard.members", List.of());
yaml.set("worldguard.block-break", "allow"); // allow = все могут ломать
yaml.set("worldguard.flags", List.of("block-break=allow"));
yaml.set("worldguard.protect-on-create", true);
}
}

23
src/main/java/dev/loki/lomines/integration/worldguard/WorldGuardConfig.java
View file

@ -6,14 +6,14 @@ import java.util.Random;
/**
* Configuration for WorldGuard auto-region creation.
* Simplified: only controls who can break blocks in the mine.
* Supports any WorldGuard flags, default is only block-break=allow.
*/
public record WorldGuardConfig(
boolean enabled,
String regionNameTemplate,
List<String> owners,
List<String> members,
String blockBreak,
List<String> flags,
boolean protectOnCreate
) {
@ -27,8 +27,8 @@ public record WorldGuardConfig(
: DEFAULT_TEMPLATE;
owners = owners != null ? List.copyOf(owners) : List.of();
members = members != null ? List.copyOf(members) : List.of();
// block-break: allow = все могут ломать, deny = никто не может, -g non_members = только владельцы
blockBreak = blockBreak != null && !blockBreak.isBlank() ? blockBreak : "allow";
// Default: only block-break=allow. User can add any flags they want.
flags = flags != null && !flags.isEmpty() ? List.copyOf(flags) : List.of("block-break=allow");
protectOnCreate = protectOnCreate;
}
@ -76,7 +76,8 @@ public record WorldGuardConfig(
/**
* Default configuration with auto-region enabled.
* Everyone can break blocks (allow).
* Default flag: block-break=allow (everyone can mine).
* User can add any other flags.
*/
public static WorldGuardConfig defaults() {
return new WorldGuardConfig(
@ -84,7 +85,7 @@ public record WorldGuardConfig(
DEFAULT_TEMPLATE,
List.of(),
List.of(),
"allow", // allow = все могут ломать
List.of("block-break=allow"),
true
);
}
@ -98,7 +99,7 @@ public record WorldGuardConfig(
DEFAULT_TEMPLATE,
List.of(),
List.of(),
"allow",
List.of(),
false
);
}
@ -115,7 +116,7 @@ public record WorldGuardConfig(
private String template = DEFAULT_TEMPLATE;
private List<String> owners = List.of();
private List<String> members = List.of();
private String blockBreak = "allow";
private List<String> flags = List.of("block-break=allow");
private boolean protectOnCreate = true;
public Builder enabled(boolean enabled) {
@ -138,8 +139,8 @@ public record WorldGuardConfig(
return this;
}
public Builder blockBreak(String blockBreak) {
this.blockBreak = blockBreak;
public Builder flags(List<String> flags) {
this.flags = flags;
return this;
}
@ -149,6 +150,6 @@ public record WorldGuardConfig(
}
public WorldGuardConfig build() {
return new WorldGuardConfig(enabled, template, owners, members, blockBreak, protectOnCreate);
return new WorldGuardConfig(enabled, template, owners, members, flags, protectOnCreate);
}
}