Add Veritas, Tyr, also other changes

This commit is contained in:
Paul Reilly
2023-08-26 19:05:45 -05:00
parent 8e2e466864
commit a676207afa
37 changed files with 851 additions and 64 deletions

View File

@ -30,9 +30,9 @@ import fns.patchwork.command.annotation.Completion;
import fns.patchwork.command.annotation.Info;
import fns.patchwork.command.annotation.Permissive;
import fns.patchwork.command.annotation.Subcommand;
import fns.patchwork.security.Node;
import fns.patchwork.security.NodeType;
import fns.patchwork.security.PermissionHolder;
import fns.patchwork.permissible.Node;
import fns.patchwork.permissible.NodeType;
import fns.patchwork.permissible.PermissionHolder;
import fns.patchwork.user.User;
import java.time.Duration;
import org.bukkit.command.CommandSender;

View File

@ -23,8 +23,8 @@
package fns.datura.perms;
import fns.patchwork.security.Node;
import fns.patchwork.security.NodeType;
import fns.patchwork.permissible.Node;
import fns.patchwork.permissible.NodeType;
public class DefaultNodes
{

View File

@ -25,8 +25,8 @@ package fns.datura.perms;
import fns.patchwork.base.Patchwork;
import fns.patchwork.base.Shortcuts;
import fns.patchwork.security.Group;
import fns.patchwork.security.Node;
import fns.patchwork.permissible.Group;
import fns.patchwork.permissible.Node;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;

View File

@ -28,7 +28,7 @@ import fns.datura.user.SimpleUserData;
import fns.patchwork.base.Patchwork;
import fns.patchwork.base.Registration;
import fns.patchwork.base.Shortcuts;
import fns.patchwork.security.Node;
import fns.patchwork.permissible.Node;
import fns.patchwork.user.User;
import fns.patchwork.user.UserData;
import java.util.HashMap;

View File

@ -23,8 +23,8 @@
package fns.datura.perms;
import fns.patchwork.security.Node;
import fns.patchwork.security.NodeType;
import fns.patchwork.permissible.Node;
import fns.patchwork.permissible.NodeType;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionDefault;

View File

@ -23,9 +23,9 @@
package fns.datura.perms;
import fns.patchwork.security.Node;
import fns.patchwork.security.NodeBuilder;
import fns.patchwork.security.NodeType;
import fns.patchwork.permissible.Node;
import fns.patchwork.permissible.NodeBuilder;
import fns.patchwork.permissible.NodeType;
public class PermissionNodeBuilder implements NodeBuilder
{

View File

@ -29,11 +29,11 @@ import fns.patchwork.base.Patchwork;
import fns.patchwork.base.Registration;
import fns.patchwork.base.Shortcuts;
import fns.patchwork.display.adminchat.AdminChatFormat;
import fns.patchwork.security.Group;
import fns.patchwork.permissible.Group;
import fns.patchwork.sql.SQL;
import fns.patchwork.user.User;
import fns.patchwork.user.UserData;
import fns.patchwork.utils.logging.FreedomLogger;
import fns.patchwork.utils.logging.FNS4J;
import java.sql.SQLException;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
@ -132,8 +132,8 @@ public class SimpleUserData implements UserData
"\nStack trace: " +
ExceptionUtils.getStackTrace(ex);
FreedomLogger.getLogger("Datura")
.error(sb);
FNS4J.getLogger("Datura")
.error(sb);
}
final Player player = Bukkit.getPlayer(UUID.fromString(uuid));