Merge branch 'master' into removeDeprecated

# Conflicts:
#	SpigotCore_Main/src/de/steamwar/core/Core.java
#	SpigotCore_Main/src/de/steamwar/sql/SchematicNode.java

SpigotCore_Main/build.gradle

@@ -46,6 +46,11 @@ dependencies {
     compileOnly files("${project.rootDir}/lib/Spigot-1.15.jar")
     compileOnly files("${project.rootDir}/lib/WorldEdit-1.12.jar")
     implementation 'net.wesjd:anvilgui:1.4.0-SNAPSHOT'
+
+    compileOnly 'org.projectlombok:lombok:1.18.6'
+    testCompileOnly 'org.projectlombok:lombok:1.18.6'
+    annotationProcessor 'org.projectlombok:lombok:1.18.6'
+    testAnnotationProcessor 'org.projectlombok:lombok:1.18.6'
 }
 
 processResources {

SpigotCore_Main/src/SpigotCore.properties

@@ -0,0 +1,55 @@
+#
+# This file is a part of the SteamWar software.
+#
+# Copyright (C) 2021  SteamWar.de-Serverteam
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+
+SCHEM_SELECTOR_TITLE={0} auswählen: {1}
+SCHEM_SELECTOR_BACK=§eZurück
+SCHEM_SELECTOR_DIR=§9Ordner
+SCHEM_SELECTOR_RANK=§8Rang {0}
+SCHEM_SELECTOR_OWN=§7Eigene Schematics
+SCHEM_SELECTOR_PUB=§7Public Schematics
+SCHEM_SELECTOR_SEL_DIR=§7Ordner auswählen
+SCHEM_SELECTOR_NEW_DIR=§7Neuer Ordner
+SCHEM_SELECTOR_FILTER=§7Filter
+
+SCHEM_SELECTOR_ITEM_NAME=§e{0}
+SCHEM_SELECTOR_ITEM_NAME_FILTER=§7{0}
+SCHEM_SELECTOR_ITEM_REPLACE=§e{0}§7
+SCHEM_SELECTOR_ITEM_LORE_TYPE=§7{0}
+
+SCHEM_SELECTOR_CREATE_DIR_TITLE=Ordner erstellen
+
+SCHEM_SELECTOR_FILTER_TITLE=Filter
+SCHEM_SELECTOR_FILTER_ENTER_NAME=Name eingeben
+SCHEM_SELECTOR_FILTER_NAME=§7Nach Namen suchen...
+SCHEM_SELECTOR_FILTER_NAME_SEARCH=§7Suchbegriff: §e{0}
+SCHEM_SELECTOR_FILTER_ENTER_OWNER=Besitzer eingeben
+SCHEM_SELECTOR_FILTER_OWNER=§7Nach Besitzer suchen...
+SCHEM_SELECTOR_FILTER_OWNER_SEARCH=§7Besitzer: §e{0}
+SCHEM_SELECTOR_FILTER_SEL_TYPE=Typ wählen...
+SCHEM_SELECTOR_FILTER_TYPE=§7Nach Typ filtern...
+SCHEM_SELECTOR_FILTER_TYPE_SEARCH=§7Typ: §e{0}
+SCHEM_SELECTOR_FILTER_MAT=§7Nach Item filtern...
+SCHEM_SELECTOR_FILTER_MAT_SEARCH=§7Item: §e{0}
+SCHEM_SELECTOR_CANCEL=§eAbbrechen
+SCHEM_SELECTOR_GO=§eSuchen...
+SCHEM_SELECTOR_SCHEMATIC=Schematic
+SCHEM_SELECTOR_DIRECTORY=Ordner
+SCHEM_SELECTOR_SCHEMATIC_NODE=Schematic/Ordner
+
+MATERIAL_SELECTOR_TITLE=Material auswählen

SpigotCore_Main/src/de/steamwar/command/SWCommand.java

@@ -19,14 +19,19 @@
 
 package de.steamwar.command;
 
+import de.steamwar.message.Message;
+import lombok.Setter;
+import net.md_5.bungee.api.chat.ClickEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 
 import java.lang.annotation.*;
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.IntPredicate;
 import java.util.logging.Level;
@@ -41,6 +46,10 @@ public abstract class SWCommand {
     private final Map<String, TypeMapper<?>> localTypeMapper = new HashMap<>();
     private final Map<String, GuardChecker> localGuardChecker = new HashMap<>();
 
+    @Setter
+    private Message message = null;
+    private List<String> defaultHelpMessages = new ArrayList<>();
+
     protected SWCommand(String command) {
         this(command, new String[0]);
     }
@@ -82,7 +91,7 @@ public abstract class SWCommand {
     }
 
     private synchronized void createMapping() {
-        Method[] methods = getClass().getDeclaredMethods();
+        List<Method> methods = methods();
         for (Method method : methods) {
             addMapper(Mapper.class, method, i -> i == 0, false, TypeMapper.class, (anno, typeMapper) -> {
                 (anno.local() ? localTypeMapper : SWCommandUtils.MAPPER_FUNCTIONS).putIfAbsent(anno.value(), typeMapper);
@@ -109,7 +118,7 @@ public abstract class SWCommand {
                     Bukkit.getLogger().log(Level.WARNING, () -> "The method '" + method.toString() + "' is lacking the varArgs parameters of type '" + String.class.getTypeName() + "' as last Argument");
                     return;
                 }
-                commandHelpList.add(new SubCommand(this, method, anno.value(), new HashMap<>(), localGuardChecker, true));
+                commandHelpList.add(new SubCommand(this, method, anno.value(), new HashMap<>(), localGuardChecker, true, null));
             });
         }
         for (Method method : methods) {
@@ -131,7 +140,7 @@ public abstract class SWCommand {
                         return;
                     }
                 }
-                commandList.add(new SubCommand(this, method, anno.value(), localTypeMapper, localGuardChecker, false));
+                commandList.add(new SubCommand(this, method, anno.value(), localTypeMapper, localGuardChecker, false, anno.description()));
             });
 
             this.commandList.sort((o1, o2) -> {
@@ -143,7 +152,15 @@ public abstract class SWCommand {
                             o2.varArgType != null ? Integer.MAX_VALUE : o2.arguments.length);
                 }
             });
-            commandHelpList.sort(Comparator.comparingInt(o -> -o.subCommand.length));
+            commandHelpList.sort((o1, o2) -> {
+                int compare = Integer.compare(-o1.subCommand.length, -o2.subCommand.length);
+                if (compare != 0) {
+                    return compare;
+                } else {
+                    return Integer.compare(o1.method.getDeclaringClass() == SWCommand.class ? 1 : 0,
+                            o2.method.getDeclaringClass() == SWCommand.class ? 1 : 0);
+                }
+            });
         }
         initialized = true;
     }
@@ -190,6 +207,16 @@ public abstract class SWCommand {
         });
     }
 
+    public void addDefaultHelpMessage(String message) {
+        defaultHelpMessages.add(message);
+    }
+
+    private List<Method> methods() {
+        List<Method> methods = new ArrayList<>(Arrays.asList(getClass().getDeclaredMethods()));
+        methods.addAll(Arrays.asList(SWCommand.class.getDeclaredMethods()));
+        return methods;
+    }
+
     public void unregister() {
         SWCommandUtils.knownCommandMap.remove(command.getName());
         command.getAliases().forEach(SWCommandUtils.knownCommandMap::remove);
@@ -200,6 +227,56 @@ public abstract class SWCommand {
         SWCommandUtils.commandMap.register("steamwar", this.command);
     }
 
+    @Register(help = true)
+    private void internalHelp(Player p, String... args) {
+        if (message == null) {
+            return;
+        }
+        try {
+            message.sendPrefixless("COMMAND_HELP_HEAD", p, command.getName());
+            defaultHelpMessages.forEach(s -> message.sendPrefixless(s, p));
+        } catch (Exception e) {
+            Bukkit.getLogger().log(Level.WARNING, "Failed to send help message", e);
+            return;
+        }
+        AtomicInteger atomicInteger = new AtomicInteger();
+        if (args.length != 0) {
+            commandList.forEach(subCommand -> {
+                List<String> tabCompletes = subCommand.tabComplete(p, args);
+                if (tabCompletes == null || tabCompletes.isEmpty()) {
+                    atomicInteger.incrementAndGet();
+                    return;
+                }
+                boolean hasTabCompletes = tabCompletes.stream()
+                        .anyMatch(s -> s.toLowerCase().startsWith(args[args.length - 1].toLowerCase()));
+                if (hasTabCompletes) {
+                    send(p, subCommand);
+                } else {
+                    atomicInteger.incrementAndGet();
+                }
+            });
+        }
+        if (args.length == 0 || atomicInteger.get() == commandList.size()) {
+            commandList.forEach(subCommand -> {
+                if (subCommand.guardChecker == null || subCommand.guardChecker.guard(p, GuardCheckType.TAB_COMPLETE, new String[0], null) == GuardResult.ALLOWED) {
+                    send(p, subCommand);
+                }
+            });
+        }
+    }
+
+    private void send(Player p, SubCommand subCommand) {
+        try {
+            for (String s : subCommand.description) {
+                String hover = "§8/§e" + command.getName() + " " + String.join(" ", subCommand.subCommand);
+                String suggest = "/" + command.getName() + " " + String.join(" ", subCommand.subCommand);
+                message.sendPrefixless(s, p, hover, new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, suggest));
+            }
+        } catch (Exception e) {
+            Bukkit.getLogger().log(Level.WARNING, "Failed to send description of registered method '" + subCommand.method + "' with description '" + subCommand.description + "'", e);
+        }
+    }
+
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.METHOD})
     @Repeatable(Register.Registeres.class)
@@ -208,6 +285,8 @@ public abstract class SWCommand {
 
         boolean help() default false;
 
+        String[] description() default {};
+
         @Retention(RetentionPolicy.RUNTIME)
         @Target({ElementType.METHOD})
         @interface Registeres {

SpigotCore_Main/src/de/steamwar/command/SWCommandUtils.java

@@ -19,6 +19,7 @@
 
 package de.steamwar.command;
 
+import de.steamwar.sql.SchematicNode;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -72,6 +73,17 @@ public class SWCommandUtils {
             return null;
         }, s -> Arrays.asList("s", "survival", "0", "c", "creative", "1", "sp", "spectator", "3", "a", "adventure", "2")));
         MAPPER_FUNCTIONS.put(SteamwarUser.class.getTypeName(), createMapper(SteamwarUser::get, s -> Bukkit.getOnlinePlayers().stream().map(Player::getName).collect(Collectors.toList())));
+        MAPPER_FUNCTIONS.put(SchematicNode.class.getTypeName(), new TypeMapper<SchematicNode>() {
+            @Override
+            public List<String> tabCompletes(CommandSender commandSender, String[] strings, String s) {
+                return SchematicNode.getNodeTabcomplete(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
+            }
+
+            @Override
+            public SchematicNode map(CommandSender commandSender, String[] previousArguments, String s) {
+                return SchematicNode.getNodeFromPath(SteamwarUser.get(((Player) commandSender).getUniqueId()), s);
+            }
+        });
     }
 
     private static void addMapper(Class<?> clazz, Class<?> alternativeClazz, TypeMapper<?> mapper) {

SpigotCore_Main/src/de/steamwar/command/SubCommand.java

@@ -35,20 +35,22 @@ import static de.steamwar.command.SWCommandUtils.*;
 class SubCommand {
 
     private SWCommand swCommand;
-    private Method method;
+    Method method;
+    String[] description;
     String[] subCommand;
     TypeMapper<?>[] arguments;
     GuardChecker[] guards;
     private Predicate<CommandSender> commandSenderPredicate;
     private Function<CommandSender, ?> commandSenderFunction;
-    private GuardChecker guardChecker;
+    GuardChecker guardChecker;
     Class<?> varArgType = null;
     private boolean help;
 
-    SubCommand(SWCommand swCommand, Method method, String[] subCommand, Map<String, TypeMapper<?>> localTypeMapper, Map<String, GuardChecker> localGuardChecker, boolean help) {
+    SubCommand(SWCommand swCommand, Method method, String[] subCommand, Map<String, TypeMapper<?>> localTypeMapper, Map<String, GuardChecker> localGuardChecker, boolean help, String[] description) {
         this.swCommand = swCommand;
         this.method = method;
         this.help = help;
+        this.description = description;
 
         Parameter[] parameters = method.getParameters();
         commandSenderPredicate = sender -> parameters[0].getType().isAssignableFrom(sender.getClass());
@@ -99,7 +101,7 @@ class SubCommand {
                 return localGuardChecker.getOrDefault(s, GUARD_FUNCTIONS.getOrDefault(s, null));
             }
             GuardChecker current = localGuardChecker.getOrDefault(guard.value(), GUARD_FUNCTIONS.getOrDefault(guard.value(), null));
-            if (guardChecker == null) {
+            if (current == null) {
                 Bukkit.getLogger().log(Level.WARNING, () -> "The guard checker with name '" + guard.value() + "' is neither a local guard checker nor a global one");
             }
             return current;

SpigotCore_Main/src/de/steamwar/core/Core.java

@@ -25,6 +25,7 @@ import de.steamwar.core.events.ChattingEvent;
 import de.steamwar.core.events.ChunkListener;
 import de.steamwar.core.events.PlayerJoinedEvent;
 import de.steamwar.core.events.WorldLoadEvent;
+import de.steamwar.message.Message;
 import de.steamwar.sql.Statement;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -37,8 +38,10 @@ import java.util.logging.Level;
 
 public class Core extends JavaPlugin{
 
+
 	private static Core instance;
 	private static final int version;
+	public static Message MESSAGE;
 
 	static{
 		String packageName = Bukkit.getServer().getClass().getPackage().getName();
@@ -79,6 +82,8 @@ public class Core extends JavaPlugin{
 		} catch (IOException e) {
 			throw new SecurityException("Could not load Hostname", e);
 		}
+
+		MESSAGE = new Message("SpigotCore", getClassLoader());
 	}
 
 	@Override

SpigotCore_Main/src/de/steamwar/inventory/SchematicSelector.java

@@ -0,0 +1,429 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2021  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.inventory;
+
+import de.steamwar.core.Core;
+import de.steamwar.sql.SchematicNode;
+import de.steamwar.sql.SchematicType;
+import de.steamwar.sql.SteamwarUser;
+import lombok.*;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class SchematicSelector {
+
+    @Getter
+    private final Player player;
+    @Getter
+    private SteamwarUser user;
+    @Getter
+    private final Consumer<SchematicNode> callback;
+    private final SelectorTarget target;
+    @Getter
+    private final SelectorFilter filter = new SelectorFilter();
+    private SchematicSelectorInjectable injectable = SchematicSelectorInjectable.DEFAULT;
+    @Setter
+    @Getter
+    private PublicMode publicMode = PublicMode.ALL;
+    @Setter
+    @Getter
+    private boolean singleDirOpen;
+    private boolean sdoTrigger = false;
+
+    public SchematicSelector(Player player, SelectorTarget target, Consumer<SchematicNode> callback) {
+        this.player = player;
+        this.user = SteamwarUser.get(player.getUniqueId());
+        this.target = target;
+        this.callback = callback;
+        this.singleDirOpen = !target.target.dirs;
+    }
+
+    public SchematicSelector(Player player, SelectorTarget target, SchematicSelectorInjectable injectable, Consumer<SchematicNode> callback) {
+        this(player, target, callback);
+        this.injectable = injectable;
+    }
+
+    public void open() {
+        injectable.onSelectorCreate(this);
+        if(publicMode == PublicMode.PUBLIC_ONLY) {
+            this.user = SteamwarUser.get(0);
+        }
+        openList(null);
+    }
+
+    private void openList(SchematicNode parent) {
+        List<SchematicNode> nodes = filter.isFilter()?getFilteredSchematics():getSchematicList(parent);
+
+        if(sdoTrigger) {
+            sdoTrigger = false;
+            return;
+        }
+
+        List<SWListInv.SWListEntry<SchematicNode>> list = new ArrayList<>();
+
+        if(parent != null) {
+            list.add(new SWListInv.SWListEntry<>(new SWItem(Material.ARROW, Core.MESSAGE.parse("SCHEM_SELECTOR_BACK", player), clickType -> {}), null));
+        }
+
+        for (SchematicNode node : nodes) {
+            if(node.getName().equals("//copy")) continue;
+            list.add(renderItem(node));
+        }
+
+        SWListInv<SchematicNode> inv = new SWListInv<>(player, MessageFormat.format(injectable.createTitle(player), target.target.getName(player), filter.getName() == null?(parent == null?"/":parent.generateBreadcrumbs(user)):filter.getName()), false, list, (clickType, node) -> handleClick(node, parent));
+        if(publicMode == PublicMode.ALL) {
+            if(user.getId() == 0) {
+                inv.setItem(48, Material.BUCKET, Core.MESSAGE.parse("SCHEM_SELECTOR_OWN", player), clickType -> {
+                    this.user = SteamwarUser.get(player.getUniqueId());
+                    openList(null);
+                });
+            } else {
+                inv.setItem(48, Material.GLASS, Core.MESSAGE.parse("SCHEM_SELECTOR_PUB", player), clickType -> {
+                    this.user = SteamwarUser.get(0);
+                    openList(null);
+                });
+            }
+        }
+        if(target.target.dirs) {
+            inv.setItem(49, SWItem.getDye(10), Core.MESSAGE.parse("SCHEM_SELECTOR_SEL_DIR", player), clickType -> {
+                player.closeInventory();
+                callback.accept(parent);
+            });
+        }
+        if(user.getId() != 0) {
+            inv.setItem(50, Material.CHEST, Core.MESSAGE.parse("SCHEM_SELECTOR_NEW_DIR", player), clickType -> createFolderIn(parent));
+        }
+        inv.setItem(51, Material.NAME_TAG, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER", player), clickType -> openFilter());
+
+        injectable.onListRender(this, inv, parent);
+        inv.open();
+    }
+
+    private void handleClick(SchematicNode node, SchematicNode parent) {
+        if(node == null) {
+            openList(getParent(parent));
+            return;
+        }
+        if(node.isDir()) {
+            if(filter.isFilter() && target.target.dirs) {
+                player.closeInventory();
+                callback.accept(node);
+                return;
+            }
+            filter.reset();
+            openList(node);
+            return;
+        }
+        player.closeInventory();
+        callback.accept(node);
+    }
+
+    private SWListInv.SWListEntry<SchematicNode> renderItem(SchematicNode node) {
+        Material m = SWItem.getMaterial(node.getItem());
+
+        String name = Core.MESSAGE.parse(filter.name == null?"SCHEM_SELECTOR_ITEM_NAME":"SCHEM_SELECTOR_ITEM_NAME_FILTER", player, node.getName());
+
+        if(filter.getName() != null) {
+            name = name.replace(filter.getName(), Core.MESSAGE.parse("SCHEM_SELECTOR_ITEM_REPLACE", player, filter.getName()));
+        }
+
+        SWItem item = new SWItem(m, name, Collections.singletonList(node.isDir() ? (Core.MESSAGE.parse("SCHEM_SELECTOR_DIR", player)) : Core.MESSAGE.parse("SCHEM_SELECTOR_ITEM_LORE_TYPE", player, node.getSchemtype().name())), !node.isDir() && !node.getSchemtype().writeable(), click -> {
+        });
+        if(!node.isDir() && node.getRank() > 0) {
+            item.setLore(Arrays.asList(Core.MESSAGE.parse("SCHEM_SELECTOR_ITEM_LORE_TYPE", player, node.getSchemtype().name()), Core.MESSAGE.parse("SCHEM_SELECTOR_RANK", player)));
+        }
+        return new SWListInv.SWListEntry<>(item, node);
+    }
+
+    private void createFolderIn(SchematicNode parent) {
+        SWAnvilInv inv = new SWAnvilInv(player, Core.MESSAGE.parse("SCHEM_SELECTOR_CREATE_DIR_TITLE", player));
+        inv.setItem(Material.CHEST);
+        inv.setCallback(s -> {
+            if(injectable.onFolderCreate(this, s)) {
+                SchematicNode.createSchematicDirectory(user.getId(), s, parent==null?0:parent.getId());
+                openList(parent);
+            }
+        });
+        inv.open();
+    }
+
+    private void openFilter() {
+        SWInventory inv = new SWInventory(player, 9, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_TITLE", player));
+        InvCallback nameCallback = clickType -> {
+            if(clickType.isRightClick()) {
+                filter.setName(null);
+                openFilter();
+            } else {
+                SWAnvilInv swAnvilInv = new SWAnvilInv(player, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_ENTER_NAME", player));
+                swAnvilInv.setItem(Material.NAME_TAG);
+                swAnvilInv.setCallback(s -> {
+                    filter.setName(s);
+                    openFilter();
+                });
+                swAnvilInv.open();
+            }
+        };
+        if(filter.getName() == null) {
+            inv.setItem(0, Material.NAME_TAG, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_NAME", player), nameCallback);
+        } else {
+            inv.setItem(0, Material.NAME_TAG, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_NAME", player), Collections.singletonList(Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_NAME_SEARCH", player, filter.getName())), true, nameCallback);
+        }
+
+        InvCallback ownerCallback = clickType -> {
+            if(clickType.isRightClick()) {
+                filter.setOwner(null);
+                openFilter();
+            } else {
+                SWAnvilInv swAnvilInv = new SWAnvilInv(player, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_ENTER_OWNER", player));
+                swAnvilInv.setItem(Material.PLAYER_HEAD);
+                swAnvilInv.setCallback(s -> {
+                    filter.setOwner(SteamwarUser.get(s).getId());
+                    openFilter();
+                });
+                swAnvilInv.open();
+            }
+        };
+        if(filter.getOwner() == null) {
+            inv.setItem(1, Material.PLAYER_HEAD, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER", player), ownerCallback);
+        } else {
+            SteamwarUser tUser = SteamwarUser.get(filter.getOwner());
+            SWItem item = SWItem.getPlayerSkull(user.getUserName());
+            item.setName(Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER", player));
+            item.setEnchanted(true);
+            item.setLore(Collections.singletonList(Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_OWNER_SEARCH", player, tUser.getUserName())));
+            item.setCallback(ownerCallback);
+            inv.setItem(1, item);
+        }
+
+        if(target.target != Target.SCHEMATIC_TYPE) {
+            InvCallback schemTypeCallback = clickType -> {
+                if(clickType.isRightClick()) {
+                    filter.setType(null);
+                    openFilter();
+                } else {
+                    List<SWListInv.SWListEntry<SchematicType>> types = new ArrayList<>();
+                    SchematicType.values().forEach(schematicType -> {
+                        types.add(new SWListInv.SWListEntry<>(new SWItem(SWItem.getMaterial("STONE_BUTTON"), "§e" + schematicType.name(), Collections.emptyList(), schematicType.fightType(), n -> {}), schematicType));
+                    });
+                    SWListInv<SchematicType> listInv = new SWListInv<>(player, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_SEL_TYPE", player), types, (clickType1, schematicType) -> {
+                        filter.setType(schematicType);
+                        openFilter();
+                    });
+                    listInv.open();
+                }
+            };
+
+            if(filter.getType() == null) {
+                inv.setItem(2, SWItem.getMaterial("STONE_BUTTON"), Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_TYPE", player), schemTypeCallback);
+            } else {
+                inv.setItem(2, SWItem.getMaterial("STONE_BUTTON"), Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_TYPE", player), Collections.singletonList(Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_TYPE_SEARCH", player, filter.getType().name())), true, schemTypeCallback);
+            }
+        }
+
+        InvCallback materialCallback = clickType -> {
+            if(clickType.isRightClick()) {
+                filter.setItem(null);
+                openFilter();
+            } else {
+                UtilGui.openMaterialSelector(player, material -> {
+                    filter.setItem(material);
+                    openFilter();
+                });
+            }
+        };
+
+        final int iSlot = target.target == Target.SCHEMATIC_TYPE?2:3;
+
+        if(filter.getItem() == null) {
+            inv.setItem(iSlot, Material.STONE, Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_MAT", player), materialCallback);
+        } else {
+            inv.setItem(iSlot, filter.getItem(), Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_MAT", player), Collections.singletonList(Core.MESSAGE.parse("SCHEM_SELECTOR_FILTER_MAT_SEARCH", player, filter.getItem().name())), true, materialCallback);
+        }
+
+        inv.setItem(7, SWItem.getDye(1), Core.MESSAGE.parse("SCHEM_SELECTOR_CANCEL", player), clickType -> {
+            filter.reset();
+            openList(null);
+        });
+        inv.setItem(8, SWItem.getDye(10), Core.MESSAGE.parse("SCHEM_SELECTOR_GO", player), clickType -> {
+            filter.setFilter(true);
+            injectable.onFilterApply(this);
+            openList(null);
+        });
+
+        injectable.onFilterRender(this, inv);
+
+        inv.open();
+    }
+
+    private List<SchematicNode> getFilteredSchematics() {
+        List<SchematicNode> nodes = new ArrayList<>(SchematicNode.getAllSchematicsAccessibleByUser(user.getId()));
+        nodes.removeIf(node -> {
+            injectable.onNodeFilter(this, node);
+            return !filter.matches(node);
+        });
+        if(target.target == Target.DIRECTORY) {
+            nodes.removeIf(node -> !node.isDir());
+        }
+        if(target.target == Target.SCHEMATIC_TYPE) {
+            nodes.removeIf(node -> node.isDir() || !node.getType().equals(target.type.toDB()));
+        }
+        return nodes;
+    }
+
+    private List<SchematicNode> getSchematicList(SchematicNode parent) {
+        List<SchematicNode> nodes = new ArrayList<>();
+        switch (target.target) {
+            case DIRECTORY:
+                if(parent == null) {
+                    nodes.addAll(SchematicNode.getSchematicsAccessibleByUser(user.getId(), null));
+                    nodes.removeIf(node -> !node.isDir());
+                } else {
+                    nodes.addAll(SchematicNode.getSchematicDirectoryInNode(parent.getId()));
+                }
+                break;
+            case SCHEMATIC_TYPE:
+                nodes.addAll(SchematicNode.getAccessibleSchematicsOfTypeInParent(user.getId(), target.type.toDB(), parent==null?0:parent.getId()));
+                if(target.rank >= 0) {
+                    nodes.removeIf(node -> node.getRank() > target.rank);
+                }
+                break;
+            default:
+                nodes.addAll(SchematicNode.getSchematicsAccessibleByUser(user.getId(), parent == null?0:parent.getId()));
+        }
+
+        if(singleDirOpen && nodes.size() == 1 && nodes.get(0).isDir()) {
+            openList(nodes.get(0));
+            sdoTrigger = true;
+        }
+        return nodes;
+    }
+
+    private static SchematicNode getParent(SchematicNode node) {
+        if(node.getParent() == null) {
+            return null;
+        }
+        return node.getParentNode();
+    }
+
+    public static SelectorTarget selectSchematic() {
+        return new SelectorTarget(Target.SCHEMATIC, null, -1);
+    }
+
+    public static SelectorTarget selectDirectory() {
+        return new SelectorTarget(Target.DIRECTORY, null, -1);
+    }
+
+    public static SelectorTarget selectSchematicNode() {
+        return new SelectorTarget(Target.SCHEMATIC_NODE, null, -1);
+    }
+
+    public static SelectorTarget selectSchematicType(SchematicType type) {
+        return new SelectorTarget(Target.SCHEMATIC_TYPE, type, -1);
+    }
+
+    public static SelectorTarget selectSchematicTypeWithRank(SchematicType type, int rank) {
+        return new SelectorTarget(Target.SCHEMATIC_TYPE, type, rank);
+    }
+
+    @AllArgsConstructor
+    static class SelectorTarget {
+
+        private final Target target;
+        private final SchematicType type;
+        private final int rank;
+    }
+
+    @AllArgsConstructor
+    private enum Target {
+        SCHEMATIC("SCHEM_SELECTOR_SCHEMATIC", false),
+        DIRECTORY("SCHEM_SELECTOR_DIRECTORY", true),
+        SCHEMATIC_NODE("SCHEM_SELECTOR_SCHEMATIC_NODE", true),
+        SCHEMATIC_TYPE("SCHEM_SELECTOR_SCHEMATIC", false);
+
+        private String rawName;
+        private boolean dirs;
+
+        private String getName(Player player) {
+            return Core.MESSAGE.parse(rawName, player);
+        }
+    }
+
+    @NoArgsConstructor
+    @Getter
+    @Setter
+    public static class SelectorFilter {
+
+        private boolean filter;
+
+        private String name = null;
+        private Integer owner = null;
+        private SchematicType type = null;
+        private Material item = null;
+
+        public void reset() {
+            name = null;
+            owner = null;
+            type = null;
+            item = null;
+            filter = false;
+        }
+
+        public boolean matches(SchematicNode node) {
+            boolean matches = true;
+            if(name != null && !node.getName().contains(name)) {
+                matches = false;
+            }
+
+            if(owner != null && node.getOwner() != owner) {
+                matches = false;
+            }
+
+            if(type != null && (node.isDir() || !node.getSchemtype().equals(type))) {
+                matches = false;
+            }
+
+            if(item != null) {
+                String i;
+                if(node.getItem().isEmpty()) {
+                    i = node.isDir()?"CHEST":"CAULDRON";
+                } else {
+                    i = node.getItem();
+                }
+                if(!item.name().equals(i)) {
+                    matches = false;
+                }
+            }
+            return matches;
+        }
+    }
+
+    public enum PublicMode {
+        ALL,
+        PRIVATE_ONLY,
+        PUBLIC_ONLY
+    }
+}

SpigotCore_Main/src/de/steamwar/inventory/SchematicSelectorInjectable.java

@@ -0,0 +1,45 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2021  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.inventory;
+
+import de.steamwar.core.Core;
+import de.steamwar.sql.SchematicNode;
+import org.bukkit.entity.Player;
+
+public interface SchematicSelectorInjectable {
+
+    SchematicSelectorInjectable DEFAULT = new SchematicSelectorInjectable() {};
+
+    default String createTitle(Player player) {
+        return Core.MESSAGE.parse("SCHEM_SELECTOR_TITLE", player);
+    }
+
+    default void onSelectorCreate(SchematicSelector selector) {}
+
+    default void onListRender(SchematicSelector selector, SWListInv<SchematicNode> inv, SchematicNode parent) {}
+
+    default void onFilterRender(SchematicSelector selector, SWInventory inventory) {}
+
+    default void onFilterApply(SchematicSelector selector) {}
+
+    default boolean onFolderCreate(SchematicSelector selector, String name) {return true;}
+
+    default void onNodeFilter(SchematicSelector selector, SchematicNode node) {}
+}

SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java

@@ -0,0 +1,54 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2021  SteamWar.de-Serverteam
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.inventory;
+
+import de.steamwar.core.Core;
+import de.steamwar.inventory.SWItem;
+import de.steamwar.inventory.SWListInv;
+import lombok.experimental.UtilityClass;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.Consumer;
+
+@UtilityClass
+public class UtilGui {
+
+    public static void openMaterialSelector(Player player, Consumer<Material> callback) {
+        openMaterialSelector(player, Core.MESSAGE.parse("MATERIAL_SELECTOR_TITLE", player), callback);
+    }
+
+    public static void openMaterialSelector(Player player, String title, Consumer<Material> callback) {
+        List<SWListInv.SWListEntry<Material>> materials = new LinkedList<>();
+        for(Material material : Material.values()){
+            if(material.name().startsWith(Material.LEGACY_PREFIX))
+                continue;
+            SWItem item = new SWItem(material, "§7" + material.name());
+            if(item.getItemMeta() != null && material.isItem()) {
+                materials.add(new SWListInv.SWListEntry<>(item, material));
+            }
+        }
+
+        SWListInv<Material> swListInv = new SWListInv<>(player, title, materials, (clickType3, material) -> callback.accept(material));
+        swListInv.open();
+    }
+}

SpigotCore_Main/src/de/steamwar/sql/Schematic.java

@@ -28,7 +28,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Deprecated
 public class Schematic {
@@ -61,6 +63,11 @@ public class Schematic {
         SchematicNode node = SchematicNode.getSchematicNode(schemOwner, schemName, 0);
         if(node != null) {
             return new Schematic(node);
+        } else {
+            Optional<SchematicNode> n = SchematicNode.getSchematicsAccessibleByUser(schemOwner, 0).stream().filter(node1 -> node1.getName().equals(schemName)).findAny();
+            if(n.isPresent()) {
+                return new Schematic(n.get());
+            }
         }
         return null;
     }

SpigotCore_Main/src/de/steamwar/sql/SchematicNode.java

@@ -41,24 +41,24 @@ public class SchematicNode {
     private static final Statement createNode = new Statement("INSERT INTO SchematicNode (NodeName, NodeOwner, ParentNode, NodeType, NodeItem) VALUES (?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE NodeName = VALUES(NodeName), ParentNode = VALUES(ParentNode), NodeItem = VALUES(NodeItem), NodeType = VALUES(NodeType), NodeItem = VALUES(NodeItem)");
     private static final Statement getSchematicNode_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeOwner = ? AND NodeName = ? AND ParentNode is NULL");
     private static final Statement getSchematicNode = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeOwner = ? AND NodeName = ? AND ParentNode = ?");
-    private static final Statement getSchematicsInNode_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode is NULL");
+    private static final Statement getSchematicsInNode_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode is NULL ORDER BY NodeName");
-    private static final Statement getSchematicsInNode = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode = ?");
+    private static final Statement getSchematicsInNode = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode = ? ORDER BY NodeName");
-    private static final Statement getDirsInNode_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode is NULL AND NodeType is NULL");
+    private static final Statement getDirsInNode_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode is NULL AND NodeType is NULL ORDER BY NodeName");
-    private static final Statement getDirsInNode = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode = ? AND NodeType is NULL");
+    private static final Statement getDirsInNode = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE ParentNode = ? AND NodeType is NULL ORDER BY NodeName");
-    private static final Statement getSchematicDirectory_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode is NULL");
+    private static final Statement getSchematicDirectory_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode is NULL ORDER BY NodeName");
-    private static final Statement getSchematicDirectory = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode = ?");
+    private static final Statement getSchematicDirectory = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode = ? ORDER BY NodeName");
     private static final Statement getSchematicNodeO_Null = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode is NULL ");
-    private static final Statement getSchematicNodeO = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode = ?");
+    private static final Statement getSchematicNodeO = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeName = ? AND ParentNode = ? ORDER BY NodeName");
     private static final Statement getSchematicNodeId = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeId = ?");
-    private static final Statement getAllSchemsOfTypeOwner = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeOwner = ? AND NodeType = ?");
+    private static final Statement getAllSchemsOfTypeOwner = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeOwner = ? AND NodeType = ? ORDER BY NodeName");
-    private static final Statement getAllSchemsOfType = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeType = ?");
+    private static final Statement getAllSchemsOfType = new Statement("SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeType = ? ORDER BY NodeName");
     private static final Statement getAccessibleByUser = new Statement("SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) AND ((s.NodeOwner = ? AND s.ParentNode IS NULL) OR NOT s.NodeOwner = ?) GROUP BY s.NodeId ORDER BY s.NodeName");
-    private static final Statement getAccessibleByUserByTypeInNode = new Statement("WITH RECURSIVE RSNB AS (WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSNB WHERE SN.NodeId = RSNB.ParentNode)SELECT * FROM RSNB WHERE ParentNode = ?");
+    private static final Statement getAccessibleByUserByTypeInNode = new Statement("WITH RECURSIVE RSNB AS (WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSNB WHERE SN.NodeId = RSNB.ParentNode)SELECT * FROM RSNB WHERE ParentNode = ? ORDER BY NodeName");
-    private static final Statement getAccessibleByUserByTypeInNode_Null = new Statement("WITH RECURSIVE RSNB AS (WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSNB WHERE SN.NodeId = RSNB.ParentNode)SELECT * FROM RSNB WHERE ParentNode is null");
+    private static final Statement getAccessibleByUserByTypeInNode_Null = new Statement("WITH RECURSIVE RSNB AS (WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSNB WHERE SN.NodeId = RSNB.ParentNode)SELECT * FROM RSNB WHERE ParentNode is null ORDER BY NodeName");
-    private static final Statement getAccessibleByUserByType = new Statement("WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ?");
+    private static final Statement getAccessibleByUserByType = new Statement("WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN WHERE NodeType = ? ORDER BY NodeName");
-    private static final Statement getAllSchematicsAccessibleByUser = new Statement("WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN");
+    private static final Statement getAllSchematicsAccessibleByUser = new Statement("WITH RECURSIVE RSN as (SELECT s.NodeId, s.NodeName, s.NodeOwner, s.NodeItem, s.NodeType, s.ParentNode, s.NodeRank, s.NodeFormat, s.LastUpdate FROM SchematicNode s LEFT JOIN NodeMember n ON s.NodeId = n.NodeId WHERE (s.NodeOwner = ? OR n.UserId = ?) GROUP BY s.NodeId union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.NodeItem, SN.NodeType, SN.ParentNode, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode AS SN, RSN WHERE SN.ParentNode = RSN.NodeId) SELECT * FROM RSN ORDER BY NodeName");
     private static final Statement isSchematicAccessibleForUser = new Statement("WITH RECURSIVE RSN AS (SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeId = ? union select SN.NodeId, SN.NodeName, SN.NodeOwner, SN.ParentNode, SN.NodeType, SN.NodeItem, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode SN, RSN WHERE RSN.ParentNode = SN.NodeId) SELECT COUNT(RSN.NodeId) AS `Accessible` FROM RSN LEFT Join NodeMember NM On NM.NodeId = RSN.NodeId WHERE NodeOwner = ? OR UserId = ? LIMIT 1");
-    private static final Statement getAllParentsOfNode = new Statement("WITH RECURSIVE RSN AS (SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeId = ? UNION SELECT SN.NodeId, SN.NodeName, SN.NodeOwner, SN.ParentNode, SN.NodeType, SN.NodeItem, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode SN, RSN WHERE RSN.ParentNode = SN.NodeId) SELECT * FROM RSN");
+    private static final Statement getAllParentsOfNode = new Statement("WITH RECURSIVE RSN AS (SELECT NodeId, NodeName, NodeOwner, ParentNode, NodeType, NodeItem, NodeRank, NodeFormat, LastUpdate FROM SchematicNode WHERE NodeId = ? UNION SELECT SN.NodeId, SN.NodeName, SN.NodeOwner, SN.ParentNode, SN.NodeType, SN.NodeItem, SN.NodeRank, SN.NodeFormat, SN.LastUpdate FROM SchematicNode SN, RSN WHERE RSN.ParentNode = SN.NodeId) SELECT * FROM RSN ORDER BY NodeName");
     private static final Statement countNodes = new Statement("SELECT COUNT(NodeId) AS 'count' FROM SchematicNode");
     private static final Statement updateDB = new Statement("UPDATE SchematicNode SET NodeName = ?, NodeOwner = ?, ParentNode = ?, NodeItem = ?, NodeType = ?, NodeRank = ? WHERE NodeId = ?");
     private static final Statement updateDatabase = new Statement("UPDATE SchematicNode SET NodeData = ?, NodeFormat = ? WHERE NodeId = ?");
@@ -80,8 +80,6 @@ public class SchematicNode {
         return getSchematicNode(owner, name, parent);
     }
 
-    private Timestamp lastUpdate;
-
     public static SchematicNode getSchematicNode(int owner, String name, SchematicNode parent) {
         return getSchematicNode(owner, name, parent.getId());
     }
@@ -91,6 +89,9 @@ public class SchematicNode {
         owner = set.getInt("NodeOwner");
         name = set.getString("NodeName");
         parent = set.getInt("ParentNode");
+        if(set.wasNull()) {
+            parent = null;
+        }
         item = set.getString("NodeItem");
         type = set.getString("NodeType");
         lastUpdate = set.getTimestamp("LastUpdate");
@@ -116,9 +117,8 @@ public class SchematicNode {
             parent = null;
         }
         Statement.ResultSetUser<SchematicNode> user = rs -> {
-            while (rs.next()) {
+            if (rs.next()) {
-                SchematicNode node = new SchematicNode(rs);
+                return new SchematicNode(rs);
-                return node;
             }
             return null;
         };
@@ -134,8 +134,9 @@ public class SchematicNode {
             parent = null;
         Statement.ResultSetUser<List<SchematicNode>> user = rs -> {
             List<SchematicNode> nodes = new ArrayList<>();
-            while (rs.next())
+            while (rs.next()) {
                 nodes.add(new SchematicNode(rs));
+            }
             return nodes;
         };
         if(parent == null) {
@@ -263,11 +264,12 @@ public class SchematicNode {
 
     public static List<SchematicNode> getSchematicsAccessibleByUser(int user, Integer parent) {
         if (parent != null && parent != 0) {
-            if(isSchematicAccessibleForUser.select(rs -> {
+            if(Boolean.TRUE.equals(isSchematicAccessibleForUser.select(rs -> {
                 rs.next();
                 return rs.getInt("Accessible") > 0;
-            }, parent, user, user))
+            }, parent, user, user))) {
                 return getSchematicNodeInNode(parent);
+            }
         } else {
             return getAccessibleByUser.select(rs -> {
                 List<SchematicNode> nodes = new ArrayList<>();
@@ -303,6 +305,40 @@ public class SchematicNode {
         }, node);
     }
 
+    public static SchematicNode getNodeFromPath(SteamwarUser user, String s) {
+        if (s.startsWith("/")) {
+            s = s.substring(1);
+        }
+        if (s.isEmpty()) {
+            return null;
+        }
+        if (s.contains("/")) {
+            String[] layers = s.split("/");
+            SchematicNode currentNode = null;
+            for (int i = 0; i < layers.length; i++) {
+                int finalI = i;
+                Optional<SchematicNode> node;
+                if (currentNode == null) {
+                    node = SchematicNode.getSchematicsAccessibleByUser(user.getId(), 0).stream().filter(node1 -> node1.getName().equals(layers[finalI])).findAny();
+                } else {
+                    node = Optional.ofNullable(SchematicNode.getSchematicNode(layers[i], currentNode.getId()));
+                }
+                if (!node.isPresent()) {
+                    return null;
+                } else {
+                    currentNode = node.get();
+                    if (!currentNode.isDir() && i != layers.length - 1) {
+                        return null;
+                    }
+                }
+            }
+            return currentNode;
+        } else {
+            String finalS = s;
+            return SchematicNode.getSchematicsAccessibleByUser(user.getId(), 0).stream().filter(node1 -> node1.getName().equals(finalS)).findAny().orElse(null);
+        }
+    }
+
     private final int id;
     private final int owner;
     private String name;
@@ -311,6 +347,7 @@ public class SchematicNode {
     private String type;
     private boolean schemFormat;
     private int rank;
+    private Timestamp lastUpdate;
     private final boolean isDir;
     private Map<Integer, String> brCache = new HashMap<>();
 
@@ -364,6 +401,9 @@ public class SchematicNode {
     }
 
     public String getItem() {
+        if (item.isEmpty()) {
+            return isDir ? "CHEST" : "CAULDRON_ITEM";
+        }
         return item;
     }
 
@@ -372,12 +412,14 @@ public class SchematicNode {
         updateDB();
     }
 
+    @Deprecated
     public String getType() {
         if(isDir)
             throw new SecurityException("Node is Directory");
         return type;
     }
 
+    @Deprecated
     public void setType(String type) {
         if(isDir)
             throw new SecurityException("Node is Directory");
@@ -413,7 +455,15 @@ public class SchematicNode {
         return SchematicType.fromDB(type);
     }
 
+    public void setSchemtype(SchematicType type) {
+        if(isDir())
+            throw new RuntimeException("Is Directory");
+        this.type = type.toDB();
+        updateDB();
+    }
+
     public SchematicNode getParentNode() {
+        if(parent == null) return null;
         return SchematicNode.getSchematicNode(parent);
     }
 
@@ -515,6 +565,14 @@ public class SchematicNode {
         schemFormat = newFormat;
     }
 
+    public static Clipboard clipboardFromStream(InputStream is, boolean schemFormat) {
+        try {
+            return WorldEditWrapper.impl.getClipboard(is, schemFormat);
+        } catch (IOException e) {
+            throw new SecurityException("Could not read schem", e);
+        }
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof SchematicNode))
@@ -523,4 +581,24 @@ public class SchematicNode {
         SchematicNode node = (SchematicNode) obj;
         return node.getId() == id;
     }
+
+    public static List<String> getNodeTabcomplete(SteamwarUser user, String s) {
+        List<String> list = new ArrayList<>();
+        boolean sws = s.startsWith("/");
+        if (sws) {
+            s = s.substring(1);
+        }
+        if (s.contains("/")) {
+            String preTab = s.substring(0, s.lastIndexOf("/") + 1);
+            SchematicNode pa = SchematicNode.getNodeFromPath(user, preTab);
+            if (pa == null) return Collections.emptyList();
+            List<SchematicNode> nodes = SchematicNode.getSchematicNodeInNode(pa);
+            nodes.forEach(node -> list.add((sws ? "/" : "") + node.generateBreadcrumbs(user)));
+        } else {
+            List<SchematicNode> nodes = SchematicNode.getSchematicsAccessibleByUser(user.getId(), 0);
+            nodes.forEach(node -> list.add((sws ? "/" : "") + node.getName() + (node.isDir() ? "/" : "")));
+        }
+        list.remove("//copy");
+        return list;
+    }
 }

SpigotCore_Main/src/de/steamwar/sql/SchematicType.java

@@ -20,11 +20,11 @@
 package de.steamwar.sql;
 
 import de.steamwar.core.Core;
-import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class SchematicType {
 	public static final SchematicType Normal = new SchematicType("Normal", "", Type.NORMAL, null); //Has to stay publicly availible
@@ -33,12 +33,7 @@ public class SchematicType {
 	private static final List<SchematicType> types;
 
 	static {
-		File file = new File(Core.getInstance().getDataFolder(), "SchematicTypes.yml");
+		File folder = new File(Core.getInstance().getDataFolder().getParentFile(), "FightSystem");
-
-		if(!file.exists())
-			throw new SecurityException("SchematicType-ConfigFile not found!");
-
-		YamlConfiguration config = YamlConfiguration.loadConfiguration(file);
 
 		List<SchematicType> tmpTypes = new LinkedList<>();
 		Map<String, SchematicType> tmpFromDB = new HashMap<>();
@@ -46,14 +41,31 @@ public class SchematicType {
 		tmpTypes.add(Normal);
 		tmpFromDB.put(Normal.name().toLowerCase(), Normal);
 
-		for(String type : config.getKeys(false)){
+		if(folder.exists()) {
-			ConfigurationSection section = config.getConfigurationSection(type);
+			for(File configFile : Arrays.stream(folder.listFiles((file, name) -> name.endsWith(".yml") && !name.endsWith(".kits.yml"))).sorted().collect(Collectors.toList())) {
-			assert section != null;
+				YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-			String checktype = section.getString("checktype");
+				if(!config.isConfigurationSection("Schematic"))
-			SchematicType current = new SchematicType(type, section.getString("kuerzel"), Type.valueOf(section.getString("type")), checktype != null ? tmpFromDB.get(checktype.toLowerCase()) : null);
+					continue;
+
+				String type = config.getString("Schematic.Type");
+				assert type != null;
+				String shortcut = config.getString("Schematic.Shortcut");
+				if(tmpFromDB.containsKey(type.toLowerCase()))
+					continue;
+
+				SchematicType checktype = null;
+
+				if(!config.getStringList("CheckQuestions").isEmpty()) {
+					checktype = new SchematicType("C" + type, "C" + shortcut, Type.CHECK_TYPE, null);
+					tmpTypes.add(checktype);
+					tmpFromDB.put(checktype.toDB(), checktype);
+				}
+
+				SchematicType current = new SchematicType(type, shortcut, config.isConfigurationSection("Server") ? Type.FIGHT_TYPE : Type.NORMAL, checktype);
 				tmpTypes.add(current);
 				tmpFromDB.put(type.toLowerCase(), current);
 			}
+		}
 
 		fromDB = Collections.unmodifiableMap(tmpFromDB);
 		types = Collections.unmodifiableList(tmpTypes);
@@ -62,7 +74,7 @@ public class SchematicType {
 	private final String name;
 	private final String kuerzel;
 	private final Type type;
-	private SchematicType checkType;
+	private final SchematicType checkType;
 
 	private SchematicType(String name, String kuerzel, Type type, SchematicType checkType){
 		this.name = name;

SpigotCore_Main/src/de/steamwar/sql/SteamwarUser.java

@@ -21,6 +21,7 @@ package de.steamwar.sql;
 
 import de.steamwar.core.Core;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -122,4 +123,8 @@ public class SteamwarUser {
 			}, id);
 		return user;
 	}
+
+	public static SteamwarUser get(Player player) {
+		return get(player.getUniqueId());
+	}
 }