diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java index 95e2e72..d097509 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/SafeSchematicNode.java @@ -19,7 +19,6 @@ package de.steamwar.schematicsystem; -import de.steamwar.sql.EffectiveSchematicNode; import de.steamwar.sql.SchematicNode; import de.steamwar.sql.SteamwarUser; import lombok.AllArgsConstructor; @@ -33,8 +32,8 @@ public class SafeSchematicNode { return Result.NOT_OWNER; } if(newParent == null) { - if(EffectiveSchematicNode.list(user, 0) - .stream().map(EffectiveSchematicNode::getNodeName).anyMatch(s -> s.equalsIgnoreCase(node.getName()))) { + if(SchematicNode.list(user, 0) + .stream().map(SchematicNode::getName).anyMatch(s -> s.equalsIgnoreCase(node.getName()))) { return Result.ALREADY_IN_DIRECTORY; } @@ -44,8 +43,8 @@ public class SafeSchematicNode { return Result.NOT_A_DIR; } - if(EffectiveSchematicNode.list(user, newParent.getId()) - .stream().map(EffectiveSchematicNode::getNodeName).anyMatch(s -> s.equalsIgnoreCase(node.getName()))) { + if(SchematicNode.list(user, newParent.getId()) + .stream().map(SchematicNode::getName).anyMatch(s -> s.equalsIgnoreCase(node.getName()))) { return Result.ALREADY_IN_DIRECTORY; } @@ -63,7 +62,7 @@ public class SafeSchematicNode { return Result.INVALID_NAME; } - if(EffectiveSchematicNode.list(user, node.getParent()).stream().map(EffectiveSchematicNode::getNodeName).anyMatch(s -> s.equalsIgnoreCase(name))) { + if(SchematicNode.list(user, node.getParent()).stream().map(SchematicNode::getName).anyMatch(s -> s.equalsIgnoreCase(name))) { return Result.ALREADY_IN_DIRECTORY; } diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java index 22f583f..aced87a 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java @@ -50,7 +50,7 @@ public class GUI { } @Override - public void onListRender(SchematicSelector selector, SWListInv inv, EffectiveSchematicNode parent) { + public void onListRender(SchematicSelector selector, SWListInv inv, SchematicNode parent) { inv.setCallback(-999, (ClickType click) -> { if(parent == null) { player.closeInventory(); @@ -62,7 +62,7 @@ public class GUI { inv.setItem(49, Material.AIR, "", clickType -> {}); } else { inv.setItem(49, Material.ANVIL, SchematicSystem.MESSAGE.parse("GUI_FOLDER_PROPERTIES", player), clickType -> { - info(selector.getPlayer(), parent.toSchematicNode(), selector); + info(selector.getPlayer(), parent, selector); }); } } @@ -72,7 +72,7 @@ public class GUI { return AnvilInvCloseAction.REOPEN; } }, node -> {}); - selector.setCallback(node -> info(player, node.toSchematicNode(), selector)); + selector.setCallback(node -> info(player, node, selector)); selector.setSingleDirOpen(false); selector.open(); } @@ -191,19 +191,19 @@ public class GUI { if(node.getOwner() == user.getId() || NodeMember.getNodeMember(node.getId(), user.getId()) != null) { inv.setItem(15, Material.ARROW, SchematicSystem.MESSAGE.parse("GUI_INFO_MOVE", player), clickType -> { SchematicSelector selector = new SchematicSelector(player, SchematicSelector.selectDirectory(), npar -> { - if(npar != null && EffectiveSchematicNode.parentsOfNode(user, npar.getNodeId()).stream().anyMatch(n -> n.getNodeId() == node.getId())) { + if(npar != null && SchematicNode.parentsOfNode(user, npar.getId()).stream().anyMatch(n -> n.getId() == node.getId())) { SchematicSystem.MESSAGE.send("COMMAND_MOVE_RECURSIVE", player); return; } if(node.getOwner() == user.getId()) { - SafeSchematicNode.Result result = SafeSchematicNode.setParent(user, node, Optional.ofNullable(npar).map(EffectiveSchematicNode::toSchematicNode).orElse(null)); + SafeSchematicNode.Result result = SafeSchematicNode.setParent(user, node, npar); if(result.isSuccessful()) { info(player, SchematicNode.getSchematicNode(node.getId()), back); } else { result.sendError(player); } } else { - NodeMember.getNodeMember(node.getId(), user.getId()).setParentId(Optional.ofNullable(npar).map(EffectiveSchematicNode::getNodeId).orElse(null)); + NodeMember.getNodeMember(node.getId(), user.getId()).setParentId(Optional.ofNullable(npar).map(SchematicNode::getId).orElse(null)); } }); selector.open(); diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java index dbd3403..21f9e6e 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java @@ -99,7 +99,7 @@ public class SchematicCommand extends SWCommand { @Register("list") @Register({"list", "/"}) public void schemList(Player player, @OptionalValue(value = "1", onlyUINIG = true) int page) { - createCachedSchemList(player, EffectiveSchematicNode.list(getUser(player), 0), Math.max(page - 1, 0), null, SchematicListBehavior.DEFAULT); + createCachedSchemList(player, SchematicNode.list(getUser(player), 0), Math.max(page - 1, 0), null, SchematicListBehavior.DEFAULT); } @Register({"list", "public"}) @@ -110,13 +110,13 @@ public class SchematicCommand extends SWCommand { @Register({"list", "public"}) @Register({"list", "public", "/"}) public void schemListPublic(Player player, @OptionalValue(value = "1", onlyUINIG = true) int page) { - createCachedSchemList(player, EffectiveSchematicNode.list(SteamwarUser.get(0), 0), Math.max(page - 1, 0), null, SchematicListBehavior.builder().setPublics(true).setPageCommandGen(integer -> "/schem list public " + integer).build()); + createCachedSchemList(player, SchematicNode.list(SteamwarUser.get(0), 0), Math.max(page - 1, 0), null, SchematicListBehavior.builder().setPublics(true).setPageCommandGen(integer -> "/schem list public " + integer).build()); } @Register("list") public void schemList(Player player, @Validator("isDirValidator") @Mapper("dirMapper") SchematicNode node, @OptionalValue("1") int page) { SteamwarUser user = getUser(player); - createCachedSchemList(player, EffectiveSchematicNode.list(user, node.getId()), Math.max(page - 1, 0), EffectiveSchematicNode.byIdAndUser(user, node.getId()).orElse(null), SchematicListBehavior.builder().setPublics(node.getOwner() == 0).setPageCommandGen(value -> "/schem list " + (node.getOwner()==0?"public ":"") + node.generateBreadcrumbs(user) + " " + value).build()); + createCachedSchemList(player, SchematicNode.list(user, node.getId()), Math.max(page - 1, 0), SchematicNode.byIdAndUser(user, node.getId()), SchematicListBehavior.builder().setPublics(node.getOwner() == 0).setPageCommandGen(value -> "/schem list " + (node.getOwner()==0?"public ":"") + node.generateBreadcrumbs(user) + " " + value).build()); } @Register({"info", "public"}) @@ -289,7 +289,7 @@ public class SchematicCommand extends SWCommand { public void schemSearch(Player player, @OptionalValue("1") int page, @Mapper("searchMapper") String... query) { SteamwarUser user = getUser(player); int userId = user.getId(); - List> predicates = new ArrayList<>(); + List> predicates = new ArrayList<>(); List nameList = new ArrayList<>(); int i = 0; while (i < query.length) { @@ -303,10 +303,10 @@ public class SchematicCommand extends SWCommand { int finalI = i; switch (current) { case "-type": - predicates.add(node -> node.getNodeType().name().equalsIgnoreCase(query[finalI + 1])); + predicates.add(node -> node.getSchemtype().name().equalsIgnoreCase(query[finalI + 1])); break; case "-item": - predicates.add(node -> node.getNodeItem().equalsIgnoreCase(query[finalI + 1])); + predicates.add(node -> node.getItem().equalsIgnoreCase(query[finalI + 1])); break; case "-owner": SteamwarUser steamwarUser = SteamwarUser.get(query[finalI + 1]); @@ -314,13 +314,13 @@ public class SchematicCommand extends SWCommand { SchematicSystem.MESSAGE.send("COMMAND_SEARCH_NOT_A_PLAYER", player, query[finalI + 1]); return; } - predicates.add(node -> node.getNodeOwner() == steamwarUser.getId()); + predicates.add(node -> node.getOwner() == steamwarUser.getId()); break; case "-exclude": - predicates.add(node -> !node.getNodeName().contains(query[finalI + 1])); + predicates.add(node -> !node.getName().contains(query[finalI + 1])); break; case "-excludeType": - predicates.add(node -> !node.getNodeType().name().equalsIgnoreCase(query[finalI + 1])); + predicates.add(node -> !node.getSchemtype().name().equalsIgnoreCase(query[finalI + 1])); break; case "-excludeOwner": SteamwarUser steamwarUser1 = SteamwarUser.get(query[finalI + 1]); @@ -328,20 +328,20 @@ public class SchematicCommand extends SWCommand { SchematicSystem.MESSAGE.send("COMMAND_SEARCH_NOT_A_PLAYER", player, query[finalI + 1]); return; } - predicates.add(node -> node.getNodeOwner() != steamwarUser1.getId()); + predicates.add(node -> node.getOwner() != steamwarUser1.getId()); break; } i++; } } else { - predicates.add(node -> node.getNodeName().contains(current)); + predicates.add(node -> node.getName().contains(current)); nameList.add(current); } i++; } - List nodes = EffectiveSchematicNode.getAll(user).stream().filter(node -> { - for (Predicate predicate : predicates) { + List nodes = SchematicNode.getAll(user).stream().filter(node -> { + for (Predicate predicate : predicates) { if (!predicate.test(node)) { return false; } @@ -451,7 +451,7 @@ public class SchematicCommand extends SWCommand { String[] layers = name.split("/"); if (invalidSchemName(player, layers)) return; SchematicNode newNode = mkdirs(layers, user, 0); - if(EffectiveSchematicNode.parentsOfNode(user, newNode.getId()).stream().anyMatch(n -> n.getNodeId() == node.getId())) { + if(SchematicNode.parentsOfNode(user, newNode.getId()).stream().anyMatch(n -> n.getId() == node.getId())) { SchematicSystem.MESSAGE.send("COMMAND_MOVE_RECURSIVE", player); return; } @@ -668,12 +668,12 @@ public class SchematicCommand extends SWCommand { return new TypeMapper() { @Override public List tabCompletes(CommandSender commandSender, String[] strings, String s) { - return EffectiveSchematicNode.getNodeTabcomplete(SteamwarUser.get(0), s); + return SchematicNode.getNodeTabcomplete(SteamwarUser.get(0), s); } @Override public SchematicNode map(CommandSender commandSender, String[] previousArguments, String s) { - return EffectiveSchematicNode.getNodeFromPath(SteamwarUser.get(0), s).map(EffectiveSchematicNode::toSchematicNode).orElse(null); + return SchematicNode.getNodeFromPath(SteamwarUser.get(0), s); } }; } @@ -690,8 +690,7 @@ public class SchematicCommand extends SWCommand { @Override public List tabCompletes(CommandSender commandSender, String[] strings, String s) { - return EffectiveSchematicNode.getNodeFromPath(getUser((Player) commandSender), strings[strings.length - 1]) - .map(EffectiveSchematicNode::toSchematicNode) + return Optional.ofNullable(SchematicNode.getNodeFromPath(getUser((Player) commandSender), strings[strings.length - 1])) .map(SchematicNode::getMembers) .map(nodeMembers -> nodeMembers.stream().map(NodeMember::getMember).map(SteamwarUser::get).map(SteamwarUser::getUserName).collect(Collectors.toList())) .orElse(Collections.emptyList()); @@ -704,14 +703,19 @@ public class SchematicCommand extends SWCommand { return new TypeMapper() { @Override public List tabCompletes(CommandSender commandSender, String[] strings, String s) { - List list = EffectiveSchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s); + List list = SchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s); list.removeIf(s1 -> !s1.endsWith("/")); return list; } @Override public SchematicNode map(CommandSender commandSender, String[] previousArguments, String s) { - return EffectiveSchematicNode.getNodeFromPath(getUser((Player) commandSender), s).map(EffectiveSchematicNode::toSchematicNode).orElse(null); + SchematicNode node = SchematicNode.getNodeFromPath(getUser((Player) commandSender), s); + if(node.isDir()) { + return node; + } else { + return null; + } } }; } @@ -728,7 +732,12 @@ public class SchematicCommand extends SWCommand { @Override public SchematicNode map(CommandSender commandSender, String[] previousArguments, String s) { - return publicCommandTypeMapper.map(commandSender, previousArguments, s); + SchematicNode node = publicCommandTypeMapper.map(commandSender, previousArguments, s); + if(node.isDir()) { + return node; + } else { + return null; + } } }; } @@ -738,7 +747,7 @@ public class SchematicCommand extends SWCommand { return new TypeMapper() { @Override public List tabCompletes(CommandSender commandSender, String[] strings, String s) { - List list = EffectiveSchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s); + List list = SchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s); list.removeIf(s1 -> !s1.endsWith("/")); return list; } @@ -770,12 +779,12 @@ public class SchematicCommand extends SWCommand { return new TypeMapper() { @Override public List tabCompletes(CommandSender commandSender, String[] strings, String s) { - return EffectiveSchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s); + return SchematicNode.getNodeTabcomplete(getUser((Player) commandSender), s); } @Override public SchematicNode map(CommandSender commandSender, String[] previousArguments, String s) { - return EffectiveSchematicNode.getNodeFromPath(getUser((Player) commandSender), s).map(EffectiveSchematicNode::toSchematicNode).orElse(null); + return SchematicNode.getNodeFromPath(getUser((Player) commandSender), s); } }; } diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java index 1f756f3..7fde1f6 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java @@ -90,7 +90,7 @@ public class SchematicCommandUtils { return false; } - public static void createCachedSchemList(Player player, List nodes, int chunk, EffectiveSchematicNode parent, SchematicListBehavior behavior) { + public static void createCachedSchemList(Player player, List nodes, int chunk, SchematicNode parent, SchematicListBehavior behavior) { CachedSchematicList cachedSchematicList = new CachedSchematicList(nodes, chunk, (int) Math.ceil(nodes.size() / (double) CHUNK_SIZE), parent, behavior.withPageCommandGen((page) -> "/schematic page " + (page - 1))); CACHED_LISTS.put(player, cachedSchematicList); renderSchemlist(player, cachedSchematicList.nodes, chunk, parent, cachedSchematicList.behavior); @@ -104,9 +104,9 @@ public class SchematicCommandUtils { } public static void renderSchemlist(Player player, - List nodes, + List nodes, int chunk, - EffectiveSchematicNode parent, + SchematicNode parent, SchematicListBehavior behavior) { SteamwarUser user = getUser(player); int pageCount = (int) Math.ceil(nodes.size() / (double) CHUNK_SIZE); @@ -119,43 +119,43 @@ public class SchematicCommandUtils { SchematicSystem.MESSAGE.sendPrefixless("UTIL_LIST_BACK", player, SchematicSystem.MESSAGE.parse("UTIL_LIST_BACK_HOVER", player, str), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem list " + (behavior.isPublics() ? "public" : "") + " " + str)); } for (int i = chunk * CHUNK_SIZE; i < nodes.size() && i < (chunk + 1) * CHUNK_SIZE; i++) { - EffectiveSchematicNode node = nodes.get(i); + SchematicNode node = nodes.get(i); StringBuilder nodeString = new StringBuilder(); if (node.isDir()) { nodeString.append(SchematicSystem.MESSAGE.parse("UTIL_LIST_DIR", player)).append(" "); } else { - SchematicType type = node.getNodeType(); + SchematicType type = node.getSchemtype(); if (type != SchematicType.Normal) { nodeString.append(SchematicSystem.MESSAGE.parse("UTIL_LIST_TYPE", player, type.getKuerzel())).append(" "); } } nodeString.append(SchematicSystem.MESSAGE.parse("UTIL_LIST_BASE", player)); - nodeString.append(behavior.getRenderHook().apply(node.getNodeName())); + nodeString.append(behavior.getRenderHook().apply(node.getName())); if (node.isDir()) { nodeString.append("/"); } - if (node.getNodeOwner() != user.getId()) { - nodeString.append(" ").append(SchematicSystem.MESSAGE.parse("UTIL_LIST_FROM", player, SteamwarUser.get(node.getNodeOwner()).getUserName())); + if (node.getOwner() != user.getId()) { + nodeString.append(" ").append(SchematicSystem.MESSAGE.parse("UTIL_LIST_FROM", player, SteamwarUser.get(node.getOwner()).getUserName())); } TextComponent schematics = new TextComponent(nodeString.toString()); if (node.isDir()) { schematics.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(SchematicSystem.MESSAGE.parse("UTIL_LIST_OPEN_DIR", player)).create())); - schematics.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem list " + (behavior.isPublics() ? "public " : "") + breadcrumbs + node.getNodeName() + "/")); + schematics.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem list " + (behavior.isPublics() ? "public " : "") + breadcrumbs + node.getName() + "/")); } else { schematics.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(SchematicSystem.MESSAGE.parse("UTIL_LIST_OPEN_SCHEM", player)).create())); - schematics.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem info " + (behavior.isPublics() ? "public " : "") + breadcrumbs + node.getNodeName())); + schematics.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/schem info " + (behavior.isPublics() ? "public " : "") + breadcrumbs + node.getName())); } player.spigot().sendMessage(schematics); } - if (parent != null && parent.getNodeOwner() != user.getId() && NodeMember.getNodeMember(parent.getNodeId(), user.getId()) != null) { + if (parent != null && parent.getOwner() != user.getId() && NodeMember.getNodeMember(parent.getId(), user.getId()) != null) { TextComponent deadd = SchematicSystem.MESSAGE.parseToComponent("UTIL_LIST_REMOVE", false, player); deadd.setColor(ChatColor.RED); deadd.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[] {SchematicSystem.MESSAGE.parseToComponent("UTIL_LIST_REMOVE_HOVER", false, player)})); @@ -315,23 +315,23 @@ public class SchematicCommandUtils { } public static SchematicNode mkdirs(String[] layers, SteamwarUser user, int minus) { - Optional currentNode = Optional.empty(); + Optional currentNode = Optional.empty(); for (int i = 0; i < layers.length - minus; i++) { int finalI = i; - List nodes = EffectiveSchematicNode.list(user, currentNode.map(EffectiveSchematicNode::getNodeId).orElse(0)).stream() - .filter(effectiveSchematicNode -> effectiveSchematicNode.getNodeName().equalsIgnoreCase(layers[finalI])) + List nodes = SchematicNode.list(user, currentNode.map(SchematicNode::getId).orElse(0)).stream() + .filter(node -> node.getName().equalsIgnoreCase(layers[finalI])) .collect(Collectors.toList()); if (nodes.isEmpty()) { - currentNode = EffectiveSchematicNode.byIdAndUser(user, SchematicNode.createSchematicDirectory(user.getId(), layers[i], currentNode.map(EffectiveSchematicNode::getNodeId).orElse(0)).getId()); + currentNode = Optional.ofNullable(SchematicNode.byIdAndUser(user, SchematicNode.createSchematicDirectory(user.getId(), layers[i], currentNode.map(SchematicNode::getId).orElse(0)).getId())); } else { - if(nodes.stream().anyMatch(EffectiveSchematicNode::isDir)) { - currentNode = nodes.stream().filter(EffectiveSchematicNode::isDir).findFirst(); + if(nodes.stream().anyMatch(SchematicNode::isDir)) { + currentNode = nodes.stream().filter(SchematicNode::isDir).findFirst(); } else { - currentNode = EffectiveSchematicNode.byIdAndUser(user, SchematicNode.createSchematicDirectory(user.getId(), layers[i] + "-dir-" + System.currentTimeMillis() % 100, currentNode.map(EffectiveSchematicNode::getNodeId).orElse(0)).getId()); + currentNode = Optional.ofNullable(SchematicNode.byIdAndUser(user, SchematicNode.createSchematicDirectory(user.getId(), layers[i] + "-dir-" + System.currentTimeMillis() % 100, currentNode.map(SchematicNode::getId).orElse(0)).getId())); } } } - return currentNode.map(EffectiveSchematicNode::toSchematicNode).orElseThrow(() -> new IllegalStateException("Could not create schematic directory")); + return currentNode.orElse(null); } public static SteamwarUser getUser(Player player) { @@ -495,10 +495,10 @@ public class SchematicCommandUtils { @AllArgsConstructor @With static class CachedSchematicList { - private List nodes; + private List nodes; private int page; private int maxPage; - private EffectiveSchematicNode parent; + private SchematicNode parent; private SchematicListBehavior behavior; } }