mirror of
https://github.com/ColdeZhang/Dominion.git
synced 2024-10-18 16:26:42 +08:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # build.gradle.kts
This commit is contained in:
commit
7046ef0391
@ -25,7 +25,7 @@ publishing {
|
||||
create<MavenPublication>("mavenJava") {
|
||||
groupId = "cn.lunadeer"
|
||||
artifactId = "DominionAPI"
|
||||
version = "1.5-SNAPSHOT"
|
||||
version = "2.0-SNAPSHOT"
|
||||
from(components["java"])
|
||||
}
|
||||
}
|
||||
|
||||
@ -4,9 +4,18 @@ import org.bukkit.Bukkit;
|
||||
|
||||
public class Dominion {
|
||||
|
||||
private final static int[] requiredDominionVersion = new int[]{2, 12, 0};
|
||||
|
||||
public static DominionAPI getInstance() throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
|
||||
if (!isDominionEnabled()) {
|
||||
throw new IllegalStateException("Dominion is not installed.");
|
||||
}
|
||||
if (!isVersionCompatible(requiredDominionVersion)) {
|
||||
throw new IllegalStateException("DominionAPI is not compatible with the current version of Dominion."
|
||||
+ " Required Dominion version: " + requiredDominionVersion[0] + "." + requiredDominionVersion[1] + "." + requiredDominionVersion[2]);
|
||||
}
|
||||
// 通过反射获取 Cache 类中的 instance 字段
|
||||
var instanceField = Class.forName("cn.lunadeer.dominion.Cache").getDeclaredField("instance");
|
||||
var instanceField = Class.forName("cn.lunadeer.dominion.DominionInterface").getDeclaredField("instance");
|
||||
// 设置可访问
|
||||
instanceField.setAccessible(true);
|
||||
// 返回 Cache 的实例
|
||||
@ -16,4 +25,28 @@ public class Dominion {
|
||||
public static boolean isDominionEnabled() {
|
||||
return Bukkit.getPluginManager().isPluginEnabled("Dominion");
|
||||
}
|
||||
|
||||
private static int[] getDominionVersion() {
|
||||
var plugin = Bukkit.getPluginManager().getPlugin("Dominion");
|
||||
if (plugin == null) {
|
||||
return new int[]{0, 0, 0};
|
||||
}
|
||||
var version = plugin.getDescription().getVersion().replaceAll("[^0-9.]", "");
|
||||
var versionSplit = version.split("\\.");
|
||||
var versionInt = new int[versionSplit.length];
|
||||
for (int i = 0; i < versionSplit.length; i++) {
|
||||
versionInt[i] = Integer.parseInt(versionSplit[i]);
|
||||
}
|
||||
return versionInt;
|
||||
}
|
||||
|
||||
private static boolean isVersionCompatible(int[] requiredVersion) {
|
||||
var version = getDominionVersion();
|
||||
for (int i = 0; i < requiredVersion.length; i++) {
|
||||
if (version[i] < requiredVersion[i]) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,14 +14,14 @@ import java.util.UUID;
|
||||
public interface DominionAPI {
|
||||
|
||||
/**
|
||||
* 获取所有领地信息
|
||||
* 从缓存获取所有领地信息
|
||||
*
|
||||
* @return 所有领地信息
|
||||
*/
|
||||
@NotNull List<DominionDTO> getAllDominions();
|
||||
|
||||
/**
|
||||
* 获取玩家当前所在领地
|
||||
* 从缓存获取玩家当前所在领地
|
||||
*
|
||||
* @param player 玩家
|
||||
* @return 玩家当前所在领地 如果玩家不在任何领地内，则返回null
|
||||
@ -29,7 +29,7 @@ public interface DominionAPI {
|
||||
@Nullable DominionDTO getPlayerCurrentDominion(@NotNull Player player);
|
||||
|
||||
/**
|
||||
* 获取指定位置的领地信息
|
||||
* 从缓存获取指定位置的领地信息
|
||||
*
|
||||
* @param loc 位置
|
||||
* @return 领地信息 如果位置不在任何领地内，则返回null
|
||||
@ -37,7 +37,7 @@ public interface DominionAPI {
|
||||
@Nullable DominionDTO getDominionByLoc(@NotNull Location loc);
|
||||
|
||||
/**
|
||||
* 根据 ID 获取权限组对象
|
||||
* 从缓存根据 ID 获取权限组对象
|
||||
*
|
||||
* @param id 权限组 ID
|
||||
* @return 权限组对象 如果权限组不存在，则返回null
|
||||
@ -45,7 +45,7 @@ public interface DominionAPI {
|
||||
@Nullable GroupDTO getGroup(@NotNull Integer id);
|
||||
|
||||
/**
|
||||
* 获取玩家在指定领地的成员信息
|
||||
* 从缓存获取玩家在指定领地的成员信息
|
||||
*
|
||||
* @param player 玩家
|
||||
* @param dominion 领地
|
||||
@ -54,7 +54,7 @@ public interface DominionAPI {
|
||||
@Nullable MemberDTO getMember(@NotNull Player player, @NotNull DominionDTO dominion);
|
||||
|
||||
/**
|
||||
* 获取玩家在指定领地的成员信息
|
||||
* 从缓存获取玩家在指定领地的成员信息
|
||||
*
|
||||
* @param player_uuid 玩家 UUID
|
||||
* @param dominion 领地
|
||||
@ -63,7 +63,7 @@ public interface DominionAPI {
|
||||
@Nullable MemberDTO getMember(@NotNull UUID player_uuid, @NotNull DominionDTO dominion);
|
||||
|
||||
/**
|
||||
* 获取指定 ID 的领地信息
|
||||
* 从缓存获取指定 ID 的领地信息
|
||||
*
|
||||
* @param id 领地 ID
|
||||
* @return 领地信息 如果领地不存在，则返回null
|
||||
@ -71,7 +71,7 @@ public interface DominionAPI {
|
||||
@Nullable DominionDTO getDominion(@NotNull Integer id);
|
||||
|
||||
/**
|
||||
* 获取玩家当前正在使用的权限组称号
|
||||
* 从缓存获取玩家当前正在使用的权限组称号
|
||||
*
|
||||
* @param uuid 玩家 UUID
|
||||
* @return 权限组对象 如果玩家没有使用任何权限组，则返回null
|
||||
|
||||
@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
|
||||
import static cn.lunadeer.dominion.DominionNode.getLocInDominionNode;
|
||||
import static cn.lunadeer.dominion.DominionNode.isInDominion;
|
||||
|
||||
public class Cache implements DominionAPI {
|
||||
public class Cache {
|
||||
|
||||
public Cache() {
|
||||
player_current_dominion_id = new HashMap<>();
|
||||
@ -206,7 +206,6 @@ public class Cache implements DominionAPI {
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public DominionDTO getPlayerCurrentDominion(@NotNull Player player) {
|
||||
try (AutoTimer ignored = new AutoTimer(Dominion.config.TimerEnabled())) {
|
||||
Integer last_in_dom_id = player_current_dominion_id.get(player.getUniqueId());
|
||||
@ -261,7 +260,6 @@ public class Cache implements DominionAPI {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public DominionDTO getDominionByLoc(@NotNull Location loc) {
|
||||
return dominion_trees.getLocInDominionDTO(loc);
|
||||
}
|
||||
@ -345,18 +343,15 @@ public class Cache implements DominionAPI {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public GroupDTO getGroup(@NotNull Integer id) {
|
||||
return id_groups.get(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MemberDTO getMember(@NotNull Player player, cn.lunadeer.dominion.api.dtos.@NotNull DominionDTO dominion) {
|
||||
if (!player_uuid_to_member.containsKey(player.getUniqueId())) return null;
|
||||
return player_uuid_to_member.get(player.getUniqueId()).get(dominion.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public MemberDTO getMember(@NotNull UUID player_uuid, cn.lunadeer.dominion.api.dtos.@NotNull DominionDTO dominion) {
|
||||
if (!player_uuid_to_member.containsKey(player_uuid)) return null;
|
||||
return player_uuid_to_member.get(player_uuid).get(dominion.getId());
|
||||
@ -376,7 +371,6 @@ public class Cache implements DominionAPI {
|
||||
return groups;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DominionDTO getDominion(@NotNull Integer id) {
|
||||
return id_dominions.get(id);
|
||||
}
|
||||
@ -420,7 +414,6 @@ public class Cache implements DominionAPI {
|
||||
return residence_data.get(player_uuid);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull List<cn.lunadeer.dominion.api.dtos.DominionDTO> getAllDominions() {
|
||||
return new ArrayList<>(id_dominions.values());
|
||||
}
|
||||
@ -601,7 +594,6 @@ public class Cache implements DominionAPI {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable GroupDTO getPlayerUsingGroupTitle(@NotNull UUID uuid) {
|
||||
if (!Dominion.config.getGroupTitleEnable()) {
|
||||
return null;
|
||||
|
||||
@ -39,6 +39,7 @@ public final class Dominion extends JavaPlugin {
|
||||
new Scheduler(this);
|
||||
AutoClean.run();
|
||||
Cache.instance = new Cache();
|
||||
DominionInterface.instance = new DominionInterface();
|
||||
|
||||
if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
|
||||
new PlaceHolderApi(this);
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
package cn.lunadeer.dominion;
|
||||
|
||||
import cn.lunadeer.dominion.api.DominionAPI;
|
||||
import cn.lunadeer.dominion.dtos.*;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class DominionInterface implements DominionAPI {
|
||||
|
||||
public static DominionInterface instance;
|
||||
|
||||
@Override
|
||||
public DominionDTO getPlayerCurrentDominion(@NotNull Player player) {
|
||||
return Cache.instance.getPlayerCurrentDominion(player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DominionDTO getDominionByLoc(@NotNull Location loc) {
|
||||
return Cache.instance.getDominionByLoc(loc);
|
||||
}
|
||||
|
||||
@Override
|
||||
public GroupDTO getGroup(@NotNull Integer id) {
|
||||
return Cache.instance.getGroup(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MemberDTO getMember(@NotNull Player player, cn.lunadeer.dominion.api.dtos.@NotNull DominionDTO dominion) {
|
||||
return Cache.instance.getMember(player.getUniqueId(), dominion);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MemberDTO getMember(@NotNull UUID player_uuid, cn.lunadeer.dominion.api.dtos.@NotNull DominionDTO dominion) {
|
||||
return Cache.instance.getMember(player_uuid, dominion);
|
||||
}
|
||||
|
||||
@Override
|
||||
public DominionDTO getDominion(@NotNull Integer id) {
|
||||
return Cache.instance.getDominion(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public @NotNull List<cn.lunadeer.dominion.api.dtos.DominionDTO> getAllDominions() {
|
||||
return Cache.instance.getAllDominions();
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable GroupDTO getPlayerUsingGroupTitle(@NotNull UUID uuid) {
|
||||
return Cache.instance.getPlayerUsingGroupTitle(uuid);
|
||||
}
|
||||
}
|
||||
@ -727,20 +727,28 @@ public class DominionController {
|
||||
int x_length = x2 - x1;
|
||||
int y_length = y2 - y1;
|
||||
int z_length = z2 - z1;
|
||||
if (x_length < 4 || y_length < 4 || z_length < 4) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeShouldBeGreaterThan4));
|
||||
if (x_length < Dominion.config.getLimitSizeMinX(operator.getPlayer())) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeXShouldBeGreaterThan, Dominion.config.getLimitSizeMinX(operator.getPlayer())));
|
||||
return true;
|
||||
}
|
||||
if (x_length > Dominion.config.getLimitSizeX(operator.getPlayer()) && Dominion.config.getLimitSizeX(operator.getPlayer()) > 0) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeXShouldBeLessThan, Dominion.config.getLimitSizeX(operator.getPlayer())));
|
||||
if (y_length < Dominion.config.getLimitSizeMinY(operator.getPlayer())) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeYShouldBeGreaterThan, Dominion.config.getLimitSizeMinY(operator.getPlayer())));
|
||||
return true;
|
||||
}
|
||||
if (y_length > Dominion.config.getLimitSizeY(operator.getPlayer()) && Dominion.config.getLimitSizeY(operator.getPlayer()) > 0) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeYShouldBeLessThan, Dominion.config.getLimitSizeY(operator.getPlayer())));
|
||||
if (z_length < Dominion.config.getLimitSizeMinZ(operator.getPlayer())) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeZShouldBeGreaterThan, Dominion.config.getLimitSizeMinZ(operator.getPlayer())));
|
||||
return true;
|
||||
}
|
||||
if (z_length > Dominion.config.getLimitSizeZ(operator.getPlayer()) && Dominion.config.getLimitSizeZ(operator.getPlayer()) > 0) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeZShouldBeLessThan, Dominion.config.getLimitSizeZ(operator.getPlayer())));
|
||||
if (x_length > Dominion.config.getLimitSizeMaxX(operator.getPlayer()) && Dominion.config.getLimitSizeMaxX(operator.getPlayer()) > 0) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeXShouldBeLessThan, Dominion.config.getLimitSizeMaxX(operator.getPlayer())));
|
||||
return true;
|
||||
}
|
||||
if (y_length > Dominion.config.getLimitSizeMaxY(operator.getPlayer()) && Dominion.config.getLimitSizeMaxY(operator.getPlayer()) > 0) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeYShouldBeLessThan, Dominion.config.getLimitSizeMaxY(operator.getPlayer())));
|
||||
return true;
|
||||
}
|
||||
if (z_length > Dominion.config.getLimitSizeMaxZ(operator.getPlayer()) && Dominion.config.getLimitSizeMaxZ(operator.getPlayer()) > 0) {
|
||||
operator.setResponse(FAIL.addMessage(Translation.Messages_SizeZShouldBeLessThan, Dominion.config.getLimitSizeMaxZ(operator.getPlayer())));
|
||||
return true;
|
||||
}
|
||||
if (y2 > Dominion.config.getLimitMaxY(operator.getPlayer())) {
|
||||
|
||||
@ -69,9 +69,21 @@ public class ConfigManager {
|
||||
_group_title_suffix = _file.getString("GroupTitle.Suffix", "&#ffffff]");
|
||||
|
||||
GroupLimit defaultGroup = new GroupLimit();
|
||||
defaultGroup.setLimitSizeX(_file.getInt("Limit.SizeX", 128), null);
|
||||
defaultGroup.setLimitSizeY(_file.getInt("Limit.SizeY", 64), null);
|
||||
defaultGroup.setLimitSizeZ(_file.getInt("Limit.SizeZ", 128), null);
|
||||
if (_file.contains("Limit.SizeX")) { // todo: should be removed in the future
|
||||
defaultGroup.setLimitSizeMaxX(_file.getInt("Limit.SizeX", 128), null);
|
||||
defaultGroup.setLimitSizeMaxY(_file.getInt("Limit.SizeY", 64), null);
|
||||
defaultGroup.setLimitSizeMaxZ(_file.getInt("Limit.SizeZ", 128), null);
|
||||
defaultGroup.setLimitSizeMinX(4, null);
|
||||
defaultGroup.setLimitSizeMinY(4, null);
|
||||
defaultGroup.setLimitSizeMinZ(4, null);
|
||||
} else {
|
||||
defaultGroup.setLimitSizeMaxX(_file.getInt("Limit.Size.MaxX", 128), null);
|
||||
defaultGroup.setLimitSizeMaxY(_file.getInt("Limit.Size.MaxY", 64), null);
|
||||
defaultGroup.setLimitSizeMaxZ(_file.getInt("Limit.Size.MaxZ", 128), null);
|
||||
defaultGroup.setLimitSizeMinX(_file.getInt("Limit.Size.MinX", 4), null);
|
||||
defaultGroup.setLimitSizeMinY(_file.getInt("Limit.Size.MinY", 4), null);
|
||||
defaultGroup.setLimitSizeMinZ(_file.getInt("Limit.Size.MinZ", 4), null);
|
||||
}
|
||||
defaultGroup.setLimitMinY(_file.getInt("Limit.MinY", -64), null);
|
||||
defaultGroup.setLimitMaxY(_file.getInt("Limit.MaxY", 320), null);
|
||||
defaultGroup.setLimitAmount(_file.getInt("Limit.Amount", 10), null);
|
||||
@ -133,12 +145,18 @@ public class ConfigManager {
|
||||
_file.setInlineComments("Limit.MinY", List.of(Translation.Config_Comment_MinY.trans()));
|
||||
_file.set("Limit.MaxY", groupLimits.get("default").getLimitMaxY(null));
|
||||
_file.setInlineComments("Limit.MaxY", List.of(Translation.Config_Comment_MaxY.trans()));
|
||||
_file.set("Limit.SizeX", groupLimits.get("default").getLimitSizeX(null));
|
||||
_file.setInlineComments("Limit.SizeX", List.of(Translation.Config_Comment_SizeX.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.SizeY", groupLimits.get("default").getLimitSizeY(null));
|
||||
_file.setInlineComments("Limit.SizeY", List.of(Translation.Config_Comment_SizeY.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.SizeZ", groupLimits.get("default").getLimitSizeZ(null));
|
||||
_file.setInlineComments("Limit.SizeZ", List.of(Translation.Config_Comment_SizeZ.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.Size.MaxX", groupLimits.get("default").getLimitSizeMaxX(null));
|
||||
_file.setInlineComments("Limit.Size.MaxX", List.of(Translation.Config_Comment_SizeMaxX.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.Size.MaxY", groupLimits.get("default").getLimitSizeMaxY(null));
|
||||
_file.setInlineComments("Limit.Size.MaxY", List.of(Translation.Config_Comment_SizeMaxY.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.Size.MaxZ", groupLimits.get("default").getLimitSizeMaxZ(null));
|
||||
_file.setInlineComments("Limit.Size.MaxZ", List.of(Translation.Config_Comment_SizeMaxZ.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.Size.MinX", groupLimits.get("default").getLimitSizeMinX(null));
|
||||
_file.setInlineComments("Limit.Size.MinX", List.of(Translation.Config_Comment_SizeMinX.trans()));
|
||||
_file.set("Limit.Size.MinY", groupLimits.get("default").getLimitSizeMinY(null));
|
||||
_file.setInlineComments("Limit.Size.MinY", List.of(Translation.Config_Comment_SizeMinY.trans()));
|
||||
_file.set("Limit.Size.MinZ", groupLimits.get("default").getLimitSizeMinZ(null));
|
||||
_file.setInlineComments("Limit.Size.MinZ", List.of(Translation.Config_Comment_SizeMinZ.trans()));
|
||||
_file.set("Limit.Amount", groupLimits.get("default").getLimitAmount(null));
|
||||
_file.setInlineComments("Limit.Amount", List.of(Translation.Config_Comment_Amount.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
_file.set("Limit.Depth", groupLimits.get("default").getLimitDepth(null));
|
||||
@ -249,16 +267,28 @@ public class ConfigManager {
|
||||
return _db_pass;
|
||||
}
|
||||
|
||||
public Integer getLimitSizeX(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeX(player.getWorld());
|
||||
public Integer getLimitSizeMaxX(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeMaxX(player.getWorld());
|
||||
}
|
||||
|
||||
public Integer getLimitSizeY(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeY(player.getWorld());
|
||||
public Integer getLimitSizeMaxY(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeMaxY(player.getWorld());
|
||||
}
|
||||
|
||||
public Integer getLimitSizeZ(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeZ(player.getWorld());
|
||||
public Integer getLimitSizeMaxZ(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeMaxZ(player.getWorld());
|
||||
}
|
||||
|
||||
public Integer getLimitSizeMinX(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeMinX(player.getWorld());
|
||||
}
|
||||
|
||||
public Integer getLimitSizeMinY(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeMinY(player.getWorld());
|
||||
}
|
||||
|
||||
public Integer getLimitSizeMinZ(Player player) {
|
||||
return groupLimits.get(getPlayerGroup(player)).getLimitSizeMinZ(player.getWorld());
|
||||
}
|
||||
|
||||
public Integer getAutoCreateRadius() {
|
||||
|
||||
@ -34,9 +34,21 @@ public class GroupLimit {
|
||||
WorldSetting defaultSetting = new WorldSetting(filePath.getName());
|
||||
defaultSetting.min_y = config.getInt("MinY", -64);
|
||||
defaultSetting.max_y = config.getInt("MaxY", 320);
|
||||
defaultSetting.size_x = config.getInt("SizeX", 128);
|
||||
defaultSetting.size_y = config.getInt("SizeY", 64);
|
||||
defaultSetting.size_z = config.getInt("SizeZ", 128);
|
||||
if (config.contains("SizeX")) { // todo: should be removed in the future
|
||||
defaultSetting.size_max_x = config.getInt("SizeX", 128);
|
||||
defaultSetting.size_max_y = config.getInt("SizeY", 64);
|
||||
defaultSetting.size_max_z = config.getInt("SizeZ", 128);
|
||||
defaultSetting.size_min_x = 4;
|
||||
defaultSetting.size_min_y = 4;
|
||||
defaultSetting.size_min_z = 4;
|
||||
} else {
|
||||
defaultSetting.size_max_x = config.getInt("Size.MaxX", 128);
|
||||
defaultSetting.size_max_y = config.getInt("Size.MaxY", 64);
|
||||
defaultSetting.size_max_z = config.getInt("Size.MaxZ", 128);
|
||||
defaultSetting.size_min_x = config.getInt("Size.MinX", 4);
|
||||
defaultSetting.size_min_y = config.getInt("Size.MinY", 4);
|
||||
defaultSetting.size_min_z = config.getInt("Size.MinZ", 4);
|
||||
}
|
||||
defaultSetting.amount = config.getInt("Amount", 10);
|
||||
defaultSetting.depth = config.getInt("Depth", 3);
|
||||
defaultSetting.vert = config.getBoolean("Vert", false);
|
||||
@ -68,27 +80,51 @@ public class GroupLimit {
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getLimitSizeX(@Nullable World world) {
|
||||
public Integer getLimitSizeMaxX(@Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
return world_limits.get("default").size_x;
|
||||
return world_limits.get("default").size_max_x;
|
||||
} else {
|
||||
return world_limits.get(world.getName()).size_x;
|
||||
return world_limits.get(world.getName()).size_max_x;
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getLimitSizeY(@Nullable World world) {
|
||||
public Integer getLimitSizeMaxY(@Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
return world_limits.get("default").size_y;
|
||||
return world_limits.get("default").size_max_y;
|
||||
} else {
|
||||
return world_limits.get(world.getName()).size_y;
|
||||
return world_limits.get(world.getName()).size_max_y;
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getLimitSizeZ(@Nullable World world) {
|
||||
public Integer getLimitSizeMaxZ(@Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
return world_limits.get("default").size_z;
|
||||
return world_limits.get("default").size_max_z;
|
||||
} else {
|
||||
return world_limits.get(world.getName()).size_z;
|
||||
return world_limits.get(world.getName()).size_max_z;
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getLimitSizeMinX(@Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
return world_limits.get("default").size_min_x;
|
||||
} else {
|
||||
return world_limits.get(world.getName()).size_min_x;
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getLimitSizeMinY(@Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
return world_limits.get("default").size_min_y;
|
||||
} else {
|
||||
return world_limits.get(world.getName()).size_min_y;
|
||||
}
|
||||
}
|
||||
|
||||
public Integer getLimitSizeMinZ(@Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
return world_limits.get("default").size_min_z;
|
||||
} else {
|
||||
return world_limits.get(world.getName()).size_min_z;
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,27 +181,51 @@ public class GroupLimit {
|
||||
}
|
||||
}
|
||||
|
||||
public void setLimitSizeX(Integer size_x, @Nullable World world) {
|
||||
public void setLimitSizeMaxX(Integer size_x, @Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
world_limits.get("default").size_x = size_x;
|
||||
world_limits.get("default").size_max_x = size_x;
|
||||
} else {
|
||||
world_limits.get(world.getName()).size_x = size_x;
|
||||
world_limits.get(world.getName()).size_max_x = size_x;
|
||||
}
|
||||
}
|
||||
|
||||
public void setLimitSizeY(Integer size_y, @Nullable World world) {
|
||||
public void setLimitSizeMaxY(Integer size_y, @Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
world_limits.get("default").size_y = size_y;
|
||||
world_limits.get("default").size_max_y = size_y;
|
||||
} else {
|
||||
world_limits.get(world.getName()).size_y = size_y;
|
||||
world_limits.get(world.getName()).size_max_y = size_y;
|
||||
}
|
||||
}
|
||||
|
||||
public void setLimitSizeZ(Integer size_z, @Nullable World world) {
|
||||
public void setLimitSizeMaxZ(Integer size_z, @Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
world_limits.get("default").size_z = size_z;
|
||||
world_limits.get("default").size_max_z = size_z;
|
||||
} else {
|
||||
world_limits.get(world.getName()).size_z = size_z;
|
||||
world_limits.get(world.getName()).size_max_z = size_z;
|
||||
}
|
||||
}
|
||||
|
||||
public void setLimitSizeMinX(Integer size_x, @Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
world_limits.get("default").size_min_x = size_x;
|
||||
} else {
|
||||
world_limits.get(world.getName()).size_min_x = size_x;
|
||||
}
|
||||
}
|
||||
|
||||
public void setLimitSizeMinY(Integer size_y, @Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
world_limits.get("default").size_min_y = size_y;
|
||||
} else {
|
||||
world_limits.get(world.getName()).size_min_y = size_y;
|
||||
}
|
||||
}
|
||||
|
||||
public void setLimitSizeMinZ(Integer size_z, @Nullable World world) {
|
||||
if (world == null || !world_limits.containsKey(world.getName())) {
|
||||
world_limits.get("default").size_min_z = size_z;
|
||||
} else {
|
||||
world_limits.get(world.getName()).size_min_z = size_z;
|
||||
}
|
||||
}
|
||||
|
||||
@ -251,12 +311,18 @@ public class GroupLimit {
|
||||
this.config.setInlineComments("MinY", List.of(Translation.Config_Comment_MinY.trans()));
|
||||
this.config.set("MaxY", world_limits.get("default").max_y);
|
||||
this.config.setInlineComments("MaxY", List.of(Translation.Config_Comment_MaxY.trans()));
|
||||
this.config.set("SizeX", world_limits.get("default").size_x);
|
||||
this.config.setInlineComments("SizeX", List.of(Translation.Config_Comment_SizeX.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("SizeY", world_limits.get("default").size_y);
|
||||
this.config.setInlineComments("SizeY", List.of(Translation.Config_Comment_SizeY.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("SizeZ", world_limits.get("default").size_z);
|
||||
this.config.setInlineComments("SizeZ", List.of(Translation.Config_Comment_SizeZ.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("Size.MaxX", world_limits.get("default").size_max_x);
|
||||
this.config.setInlineComments("Size.MaxX", List.of(Translation.Config_Comment_SizeMaxX.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("Size.MaxY", world_limits.get("default").size_max_y);
|
||||
this.config.setInlineComments("Size.MaxY", List.of(Translation.Config_Comment_SizeMaxY.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("Size.MaxZ", world_limits.get("default").size_max_z);
|
||||
this.config.setInlineComments("Size.MaxZ", List.of(Translation.Config_Comment_SizeMaxZ.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("Size.MinX", world_limits.get("default").size_min_x);
|
||||
this.config.setInlineComments("Size.MinX", List.of(Translation.Config_Comment_SizeMinX.trans()));
|
||||
this.config.set("Size.MinY", world_limits.get("default").size_min_y);
|
||||
this.config.setInlineComments("Size.MinY", List.of(Translation.Config_Comment_SizeMinY.trans()));
|
||||
this.config.set("Size.MinZ", world_limits.get("default").size_min_z);
|
||||
this.config.setInlineComments("Size.MinZ", List.of(Translation.Config_Comment_SizeMinZ.trans()));
|
||||
this.config.set("Amount", world_limits.get("default").amount);
|
||||
this.config.setInlineComments("Amount", List.of(Translation.Config_Comment_Amount.trans() + Translation.Config_Comment_NegativeOneUnlimited.trans()));
|
||||
this.config.set("Depth", world_limits.get("default").depth);
|
||||
|
||||
@ -316,14 +316,18 @@ public class Translation extends Localization {
|
||||
public static i18n Messages_SetMapColorSuccess;
|
||||
@i18nField(defaultValue = "尺寸不合法")
|
||||
public static i18n Messages_SizeInvalid;
|
||||
@i18nField(defaultValue = "领地的任意一边长度不得小于4")
|
||||
public static i18n Messages_SizeShouldBeGreaterThan4;
|
||||
@i18nField(defaultValue = "领地X方向(东西)长度不能超过 %d")
|
||||
public static i18n Messages_SizeXShouldBeLessThan;
|
||||
@i18nField(defaultValue = "领地Y方向(上下)高度不能超过 %d")
|
||||
public static i18n Messages_SizeYShouldBeLessThan;
|
||||
@i18nField(defaultValue = "领地Z方向(南北)长度不能超过 %d")
|
||||
public static i18n Messages_SizeZShouldBeLessThan;
|
||||
@i18nField(defaultValue = "领地X方向(东西)长度不能少于 %d")
|
||||
public static i18n Messages_SizeXShouldBeGreaterThan;
|
||||
@i18nField(defaultValue = "领地Y方向(上下)高度不能少于 %d")
|
||||
public static i18n Messages_SizeYShouldBeGreaterThan;
|
||||
@i18nField(defaultValue = "领地Z方向(南北)长度不能少于 %d")
|
||||
public static i18n Messages_SizeZShouldBeGreaterThan;
|
||||
@i18nField(defaultValue = "领地Y坐标上限不能超过 %d")
|
||||
public static i18n Messages_MaxYShouldBeLessThan;
|
||||
@i18nField(defaultValue = "领地Y坐标下限不能超过 %d")
|
||||
@ -824,12 +828,24 @@ public class Translation extends Localization {
|
||||
public static i18n Config_Check_ToolNameError;
|
||||
@i18nField(defaultValue = "%s 的 MinY 不能大于等于 MaxY，已重置为 -64 和 320")
|
||||
public static i18n Config_Check_GroupMinYError;
|
||||
@i18nField(defaultValue = "%s 的 SizeX 设置过小，已重置为 128")
|
||||
public static i18n Config_Check_GroupSizeXError;
|
||||
@i18nField(defaultValue = "%s 的 SizeY 设置过小，已重置为 64")
|
||||
public static i18n Config_Check_GroupSizeYError;
|
||||
@i18nField(defaultValue = "%s 的 SizeZ 设置过小，已重置为 128")
|
||||
public static i18n Config_Check_GroupSizeZError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MaxX 设置过小，已重置为 128")
|
||||
public static i18n Config_Check_GroupSizeMaxXError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MaxY 设置过小，已重置为 64")
|
||||
public static i18n Config_Check_GroupSizeMaxYError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MaxZ 设置过小，已重置为 128")
|
||||
public static i18n Config_Check_GroupSizeMaxZError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MinX 设置过小，已重置为 4")
|
||||
public static i18n Config_Check_GroupSizeMinXError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MinY 设置过小，已重置为 4")
|
||||
public static i18n Config_Check_GroupSizeMinYError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MinZ 设置过小，已重置为 4")
|
||||
public static i18n Config_Check_GroupSizeMinZError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MaxX 不能小于 MinX，已重置为 128 和 4")
|
||||
public static i18n Config_Check_GroupMaxMinXError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MinY 不能小于 MinY，已重置为 64 和 4")
|
||||
public static i18n Config_Check_GroupMaxMinYError;
|
||||
@i18nField(defaultValue = "%s 的 Size.MaxZ 不能小于 MinZ，已重置为 128 和 4")
|
||||
public static i18n Config_Check_GroupMaxMinZError;
|
||||
@i18nField(defaultValue = "%s 的 Amount 设置不合法，已重置为 10")
|
||||
public static i18n Config_Check_GroupAmountError;
|
||||
@i18nField(defaultValue = "%s 的 Depth 设置不合法，已重置为 3")
|
||||
@ -872,11 +888,17 @@ public class Translation extends Localization {
|
||||
@i18nField(defaultValue = "-1表示不限制")
|
||||
public static i18n Config_Comment_NegativeOneUnlimited;
|
||||
@i18nField(defaultValue = "X方向最大长度")
|
||||
public static i18n Config_Comment_SizeX;
|
||||
public static i18n Config_Comment_SizeMaxX;
|
||||
@i18nField(defaultValue = "Y方向最大长度")
|
||||
public static i18n Config_Comment_SizeY;
|
||||
public static i18n Config_Comment_SizeMaxY;
|
||||
@i18nField(defaultValue = "Z方向最大长度")
|
||||
public static i18n Config_Comment_SizeZ;
|
||||
public static i18n Config_Comment_SizeMaxZ;
|
||||
@i18nField(defaultValue = "X方向最小长度")
|
||||
public static i18n Config_Comment_SizeMinX;
|
||||
@i18nField(defaultValue = "Y方向最小长度")
|
||||
public static i18n Config_Comment_SizeMinY;
|
||||
@i18nField(defaultValue = "Z方向最小长度")
|
||||
public static i18n Config_Comment_SizeMinZ;
|
||||
@i18nField(defaultValue = "最大领地数量")
|
||||
public static i18n Config_Comment_Amount;
|
||||
@i18nField(defaultValue = "子领地深度")
|
||||
|
||||
@ -9,9 +9,12 @@ import java.util.Map;
|
||||
public class WorldSetting {
|
||||
public Integer min_y;
|
||||
public Integer max_y;
|
||||
public Integer size_x;
|
||||
public Integer size_y;
|
||||
public Integer size_z;
|
||||
public Integer size_max_x;
|
||||
public Integer size_max_y;
|
||||
public Integer size_max_z;
|
||||
public Integer size_min_x;
|
||||
public Integer size_min_y;
|
||||
public Integer size_min_z;
|
||||
public Integer amount;
|
||||
public Integer depth;
|
||||
public Boolean vert;
|
||||
@ -26,9 +29,12 @@ public class WorldSetting {
|
||||
YamlConfiguration section = new YamlConfiguration();
|
||||
section.set("some_world_name.MinY", -64);
|
||||
section.set("some_world_name.MaxY", 320);
|
||||
section.set("some_world_name.SizeX", 128);
|
||||
section.set("some_world_name.SizeY", 64);
|
||||
section.set("some_world_name.SizeZ", 128);
|
||||
section.set("some_world_name.Size.MaxX", 128);
|
||||
section.set("some_world_name.Size.MaxY", 64);
|
||||
section.set("some_world_name.Size.MaxZ", 128);
|
||||
section.set("some_world_name.Size.MinX", 4);
|
||||
section.set("some_world_name.Size.MinY", 4);
|
||||
section.set("some_world_name.Size.MinZ", 4);
|
||||
section.set("some_world_name.Amount", 10);
|
||||
section.set("some_world_name.Depth", 3);
|
||||
section.set("some_world_name.Vert", false);
|
||||
@ -45,9 +51,21 @@ public class WorldSetting {
|
||||
WorldSetting setting = new WorldSetting(sourceName);
|
||||
setting.min_y = worldSettings.getInt(worldName + ".MinY", -64);
|
||||
setting.max_y = worldSettings.getInt(worldName + ".MaxY", 320);
|
||||
setting.size_x = worldSettings.getInt(worldName + ".SizeX", 128);
|
||||
setting.size_y = worldSettings.getInt(worldName + ".SizeY", 64);
|
||||
setting.size_z = worldSettings.getInt(worldName + ".SizeZ", 128);
|
||||
if (worldSettings.contains(worldName + ".SizeX")) { // todo: should be removed in the future
|
||||
setting.size_max_x = worldSettings.getInt(worldName + ".SizeX", 128);
|
||||
setting.size_max_y = worldSettings.getInt(worldName + ".SizeY", 64);
|
||||
setting.size_max_z = worldSettings.getInt(worldName + ".SizeZ", 128);
|
||||
setting.size_min_x = 4;
|
||||
setting.size_min_y = 4;
|
||||
setting.size_min_z = 4;
|
||||
} else {
|
||||
setting.size_max_x = worldSettings.getInt(worldName + ".Size.MaxX", 128);
|
||||
setting.size_max_y = worldSettings.getInt(worldName + ".Size.MaxY", 64);
|
||||
setting.size_max_z = worldSettings.getInt(worldName + ".Size.MaxZ", 128);
|
||||
setting.size_min_x = worldSettings.getInt(worldName + ".Size.MinX", 4);
|
||||
setting.size_min_y = worldSettings.getInt(worldName + ".Size.MinY", 4);
|
||||
setting.size_min_z = worldSettings.getInt(worldName + ".Size.MinZ", 4);
|
||||
}
|
||||
setting.amount = worldSettings.getInt(worldName + ".Amount", 10);
|
||||
setting.depth = worldSettings.getInt(worldName + ".Depth", 3);
|
||||
setting.vert = worldSettings.getBoolean(worldName + ".Vert", false);
|
||||
@ -63,9 +81,12 @@ public class WorldSetting {
|
||||
YamlConfiguration section = new YamlConfiguration();
|
||||
section.set("MinY", min_y);
|
||||
section.set("MaxY", max_y);
|
||||
section.set("SizeX", size_x);
|
||||
section.set("SizeY", size_y);
|
||||
section.set("SizeZ", size_z);
|
||||
section.set("Size.MaxX", size_max_x);
|
||||
section.set("Size.MaxY", size_max_y);
|
||||
section.set("Size.MaxZ", size_max_z);
|
||||
section.set("Size.MinX", size_min_x);
|
||||
section.set("Size.MinY", size_min_y);
|
||||
section.set("Size.MinZ", size_min_z);
|
||||
section.set("Amount", amount);
|
||||
section.set("Depth", depth);
|
||||
section.set("Vert", vert);
|
||||
@ -78,17 +99,44 @@ public class WorldSetting {
|
||||
min_y = -64;
|
||||
max_y = 320;
|
||||
}
|
||||
if (size_x <= 4 && size_x != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeXError, sourceName);
|
||||
size_x = 128;
|
||||
if (size_max_x <= 4 && size_max_x != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeMaxXError, sourceName);
|
||||
size_max_x = 128;
|
||||
}
|
||||
if (size_y <= 4 && size_y != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeYError, sourceName);
|
||||
size_y = 64;
|
||||
if (size_max_y <= 4 && size_max_y != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeMaxYError, sourceName);
|
||||
size_max_y = 64;
|
||||
}
|
||||
if (size_z <= 4 && size_z != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeZError, sourceName);
|
||||
size_z = 128;
|
||||
if (size_max_z <= 4 && size_max_z != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeMaxZError, sourceName);
|
||||
size_max_z = 128;
|
||||
}
|
||||
if (size_min_x <= 0) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeMinXError, sourceName);
|
||||
size_min_x = 4;
|
||||
}
|
||||
if (size_min_y <= 0) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeMinYError, sourceName);
|
||||
size_min_y = 4;
|
||||
}
|
||||
if (size_min_z <= 0) {
|
||||
XLogger.err(Translation.Config_Check_GroupSizeMinZError, sourceName);
|
||||
size_min_z = 4;
|
||||
}
|
||||
if (size_max_x < size_min_x && size_max_x != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupMaxMinXError, sourceName);
|
||||
size_max_x = 128;
|
||||
size_min_x = 4;
|
||||
}
|
||||
if (size_max_y < size_min_y && size_max_y != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupMaxMinYError, sourceName);
|
||||
size_max_y = 64;
|
||||
size_min_y = 4;
|
||||
}
|
||||
if (size_max_z < size_min_z && size_max_z != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupMaxMinZError, sourceName);
|
||||
size_max_z = 128;
|
||||
size_min_z = 4;
|
||||
}
|
||||
if (amount < 0 && amount != -1) {
|
||||
XLogger.err(Translation.Config_Check_GroupAmountError, sourceName);
|
||||
|
||||
@ -20,9 +20,13 @@ Limit:
|
||||
SpawnProtection: 10
|
||||
MinY: -64
|
||||
MaxY: 320
|
||||
SizeX: 128
|
||||
SizeY: 64
|
||||
SizeZ: 128
|
||||
Size:
|
||||
MaxX: 128
|
||||
MaxY: 64
|
||||
MaxZ: 128
|
||||
MinX: 4
|
||||
MinY: 4
|
||||
MinZ: 4
|
||||
Amount: 10
|
||||
Depth: 3
|
||||
Vert: false
|
||||
@ -31,9 +35,13 @@ Limit:
|
||||
some_world_name:
|
||||
MinY: -64
|
||||
MaxY: 320
|
||||
SizeX: 128
|
||||
SizeY: 64
|
||||
SizeZ: 128
|
||||
Size:
|
||||
MaxX: 128
|
||||
MaxY: 64
|
||||
MaxZ: 128
|
||||
MinX: 4
|
||||
MinY: 4
|
||||
MinZ: 4
|
||||
Amount: 10
|
||||
Depth: 3
|
||||
Vert: false
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
MinY: -64
|
||||
MaxY: 320
|
||||
SizeX: 128
|
||||
SizeY: 64
|
||||
SizeZ: 128
|
||||
Size:
|
||||
MaxX: 128
|
||||
MaxY: 64
|
||||
MaxZ: 128
|
||||
MinX: 4
|
||||
MinY: 4
|
||||
MinZ: 4
|
||||
Amount: 10
|
||||
Depth: 3
|
||||
Vert: false
|
||||
@ -13,9 +17,13 @@ WorldSettings:
|
||||
some_world_name:
|
||||
MinY: -64
|
||||
MaxY: 320
|
||||
SizeX: 128
|
||||
SizeY: 64
|
||||
SizeZ: 128
|
||||
Size:
|
||||
MaxX: 128
|
||||
MaxY: 64
|
||||
MaxZ: 128
|
||||
MinX: 4
|
||||
MinY: 4
|
||||
MinZ: 4
|
||||
Amount: 10
|
||||
Depth: 3
|
||||
Vert: false
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
### 1. 引入依赖
|
||||
|
||||
If you are using gradle, you can add the following code to your `build.gradle` file:
|
||||
如果您使用 gradle，可以在您的 `build.gradle` 文件中添加如下代码：
|
||||
|
||||
```groovy
|
||||
// build.gradle
|
||||
@ -15,11 +15,11 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("cn.lunadeer:DominionAPI:1.4-SNAPSHOT")
|
||||
compileOnly("cn.lunadeer:DominionAPI:2.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
or if you are using gradle kotlin dsl:
|
||||
或者你使用的是 gradle kotlin dsl：
|
||||
|
||||
```kotlin
|
||||
// build.gradle.kts
|
||||
@ -28,11 +28,11 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("cn.lunadeer:DominionAPI:1.4-SNAPSHOT")
|
||||
compileOnly("cn.lunadeer:DominionAPI:2.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
or if you are using maven, you can add the following code to your `pom.xml` file:
|
||||
再或者您使用 maven，可以在您的 `pom.xml` 文件中添加如下代码：
|
||||
|
||||
```xml
|
||||
<!-- pom.xml -->
|
||||
@ -47,7 +47,7 @@ or if you are using maven, you can add the following code to your `pom.xml` file
|
||||
<dependency>
|
||||
<groupId>cn.lunadeer</groupId>
|
||||
<artifactId>DominionAPI</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>2.0-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@ -93,3 +93,5 @@ public void onEnable() {
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
[示例项目地址](https://github.com/ColdeZhang/DominionPluginExample)。
|
||||
|
||||
@ -18,3 +18,6 @@ Dominion 是一个完全开源、免费，专为高版本开发，面向未来
|
||||
1. [安装、必读、常见问题](operator/README.md)
|
||||
2. [配置文件参考](operator/config.md)
|
||||
|
||||
什么，你是新手服主？推荐通读一下[驿站](https://github.com/postyizhan)大佬的 [笨蛋文档｜一群笨蛋们写的 Minecraft 开服教程](https://yizhan.wiki/NitWikit/Java/intro)。
|
||||
希望能对你的开服之路有所帮助！
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("cn.lunadeer:DominionAPI:1.4-SNAPSHOT")
|
||||
compileOnly("cn.lunadeer:DominionAPI:2.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
@ -28,7 +28,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("cn.lunadeer:DominionAPI:1.4-SNAPSHOT")
|
||||
compileOnly("cn.lunadeer:DominionAPI:2.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
@ -44,12 +44,12 @@ dependencies {
|
||||
</repositories>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>cn.lunadeer</groupId>
|
||||
<artifactId>DominionAPI</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.lunadeer</groupId>
|
||||
<artifactId>DominionAPI</artifactId>
|
||||
<version>2.0-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
```
|
||||
|
||||
@ -93,3 +93,5 @@ public void onEnable() {
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
[示例项目地址](https://github.com/ColdeZhang/DominionPluginExample)。
|
||||
|
||||
@ -33,9 +33,13 @@ Limit:
|
||||
SpawnProtection: 10 # 出生点保护半径 出生点此范围内不允许圈地-1表示不开启
|
||||
MinY: -64 # 最小Y坐标
|
||||
MaxY: 320 # 最大Y坐标
|
||||
SizeX: 128 # X方向最大长度-1表示不限制
|
||||
SizeY: 64 # Y方向最大长度-1表示不限制
|
||||
SizeZ: 128 # Z方向最大长度-1表示不限制
|
||||
Size:
|
||||
MaxX: 628 # X方向最大长度-1表示不限制
|
||||
MaxY: 64 # Y方向最大长度-1表示不限制
|
||||
MaxZ: 628 # Z方向最大长度-1表示不限制
|
||||
MinX: 4 # X方向最小长度
|
||||
MinY: 4 # Y方向最小长度
|
||||
MinZ: 4 # Z方向最小长度
|
||||
Amount: 10 # 最大领地数量-1表示不限制
|
||||
Depth: 3 # 子领地深度0表示不开启-1表示不限制
|
||||
Vert: false # 是否自动延伸到 MaxY 和 MinY
|
||||
@ -136,13 +140,18 @@ Timer: false # 性能测试计时器
|
||||
- SpawnProtection：出生点半径保护，此半径范围内普通玩家无法创建领地
|
||||
- MinY：领地的最小Y坐标
|
||||
- MaxY：领地的最大Y坐标
|
||||
- SizeX：X方向最大长度 1表示不限制
|
||||
- SizeY：Y方向最大长度 1表示不限制
|
||||
- SizeZ：Z方向最大长度 1表示不限制
|
||||
- Size：领地的大小限制
|
||||
- MaxX：X方向最大长度 -1表示不限制
|
||||
- MaxY：Y方向最大长度 -1表示不限制
|
||||
- MaxZ：Z方向最大长度 -1表示不限制
|
||||
- MinX：X方向最小长度 不能小于等于0 不能大于MaxX
|
||||
- MinY：Y方向最小长度 不能小于等于0 不能大于MaxY
|
||||
- MinZ：Z方向最小长度 不能小于等于0 不能大于MaxZ
|
||||
- Amount：每个玩家拥有的最大领地数量 1表示不限制
|
||||
- Depth：子领地深度、0表示不允许子领地、 -1表示不限制
|
||||
- Vert：当设置为 `true` 时，玩家选择区域创建或者自动创建领地，会自动将Y向下向上延伸到MinY和MaxY。**同时也会根据 MinY 和 MaxY 的设置自动调整 SizeY 的配置保证数值逻辑一致。**
|
||||
- Vert：当设置为 `true` 时，玩家选择区域创建或者自动创建领地，会自动将Y向下向上延伸到MinY和MaxY
|
||||
- WorldSettings：单独设置某个世界的圈地规则（如不设置则使用上述默认规则）
|
||||
- OpByPass：是否允许OP无视领地限制
|
||||
|
||||
> 您服务器世界的名称应该避免使用 `default` 这样的特殊单词，否则会导致不可预料的意外错误。
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# 跨群组服传送
|
||||
|
||||
**改功能暂未上线**
|
||||
**该功能暂未上线**
|
||||
|
||||
## 新服务器配置
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("cn.lunadeer:DominionAPI:1.4-SNAPSHOT")
|
||||
compileOnly("cn.lunadeer:DominionAPI:2.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
@ -28,7 +28,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly("cn.lunadeer:DominionAPI:1.4-SNAPSHOT")
|
||||
compileOnly("cn.lunadeer:DominionAPI:2.0-SNAPSHOT")
|
||||
}
|
||||
```
|
||||
|
||||
@ -47,7 +47,7 @@ dependencies {
|
||||
<dependency>
|
||||
<groupId>cn.lunadeer</groupId>
|
||||
<artifactId>DominionAPI</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
<version>2.0-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
@ -93,3 +93,4 @@ public void onEnable() {
|
||||
}
|
||||
}
|
||||
```
|
||||
[示例项目地址](https://github.com/ColdeZhang/DominionPluginExample)。
|
||||
|
||||
@ -12,16 +12,15 @@ import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Monster;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import static cn.lunadeer.dominion.utils.EventUtils.checkFlag;
|
||||
|
||||
public class Spigot implements Listener {
|
||||
|
||||
static {
|
||||
Map<UUID, Location> entityMap = new HashMap<>();
|
||||
ConcurrentHashMap<UUID, Location> entityMap = new ConcurrentHashMap<>();
|
||||
Scheduler.runTaskRepeat(() -> {
|
||||
Dominion.instance.getServer().getWorlds().forEach(world -> {
|
||||
world.getEntities().forEach(entity -> {
|
||||
|
||||
@ -12,16 +12,15 @@ import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Monster;
|
||||
import org.bukkit.event.Listener;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import static cn.lunadeer.dominion.utils.EventUtils.checkFlag;
|
||||
|
||||
public class Spigot implements Listener {
|
||||
|
||||
static {
|
||||
Map<UUID, Location> entityMap = new HashMap<>();
|
||||
ConcurrentHashMap<UUID, Location> entityMap = new ConcurrentHashMap<>();
|
||||
Scheduler.runTaskRepeat(() -> {
|
||||
Dominion.instance.getServer().getWorlds().forEach(world -> {
|
||||
world.getEntities().forEach(entity -> {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user