From cfacfce82ea552aa33a89c137cef2a9c7cf2a985 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Fri, 3 Dec 2021 15:55:39 +0100 Subject: [PATCH] Merge Master ._. Signed-off-by: Chaoscaot --- .../schematicsystem/CheckSchemType.java | 4 +- .../schematicsystem/commands/GUI.java | 6 +- .../commands/SchematicCommand.java | 2 +- .../commands/SchematicCommandHelp.java | 0 .../commands/SchematicCommandUtils.java | 0 SchematicSystem_Main/pom.xml | 60 ------------------- pom.xml | 1 - 7 files changed, 6 insertions(+), 67 deletions(-) rename {SchematicSystem_Main => SchematicSystem_Core}/src/de/steamwar/schematicsystem/commands/SchematicCommandHelp.java (100%) rename {SchematicSystem_Main => SchematicSystem_Core}/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java (100%) delete mode 100644 SchematicSystem_Main/pom.xml diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java index f3c3a01..6a929a3 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/CheckSchemType.java @@ -23,7 +23,7 @@ import com.sk89q.worldedit.extent.clipboard.Clipboard; import de.steamwar.core.Core; import de.steamwar.core.VersionDependent; import de.steamwar.sql.NoClipboardException; -import de.steamwar.sql.Schematic; +import de.steamwar.sql.SchematicNode; import de.steamwar.sql.SchematicType; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; @@ -88,7 +88,7 @@ public class CheckSchemType { return types.get(type); } - public AutoCheckResult autoCheck(Schematic schematic) { + public AutoCheckResult autoCheck(SchematicNode schematic) { AutoCheckResult result = new AutoCheckResult(this); Clipboard clipboard; try { diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java index 0d7a153..514e4b9 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/GUI.java @@ -64,7 +64,7 @@ public class GUI { if(!node.isDir()) { inv.setItem(0, SWItem.getMaterial("WOOD_AXE"), "§eLaden", click -> { player.closeInventory(); - SchematicSystem.SCHEMATIC_COMMAND.loadSchem(player, node); + SchematicSystem.getInstance().SCHEMATIC_COMMAND.loadSchem(player, node); }); } @@ -95,7 +95,7 @@ public class GUI { }); inv.setItem(4, SWItem.getMaterial("MAGENTA_GLAZED_TERRACOTTA"), "§eDownload", click -> { player.closeInventory(); - SchematicSystem.SCHEMATIC_COMMAND.download(player, node); + SchematicSystem.getInstance().SCHEMATIC_COMMAND.download(player, node); }); } SWItem skull = SWItem.getPlayerSkull("MHF_STEVE"); @@ -163,7 +163,7 @@ public class GUI { SWListInv inv = new SWListInv<>(p, "Typ ändern", types, (clickType, schematicType) -> { p.closeInventory(); - SchematicSystem.SCHEMATIC_COMMAND.changeType(p, schem, schematicType); + SchematicSystem.getInstance().SCHEMATIC_COMMAND.changeType(p, schem, schematicType); }); inv.setCallback(-999, (ClickType click) -> p.closeInventory()); inv.open(); diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java index ab58ddb..847f1fa 100644 --- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java +++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommand.java @@ -124,7 +124,7 @@ public class SchematicCommand extends SWCommand { player.sendMessage("§7--==( §eSteam§8War §eSchematic-System §7)==--"); player.sendMessage("§7Anzahl an Schematics: §e" + SchematicNode.countNodes()); player.sendMessage("§7Von dir einsehbar: §e" + SchematicNode.getAllSchematicsAccessibleByUser(getUser(player).getId()).size()); - player.sendMessage("§7Autoren: §e" + Arrays.toString(SchematicSystem.INSTANCE.getDescription().getAuthors().toArray())); + player.sendMessage("§7Autoren: §e" + Arrays.toString(SchematicSystem.getInstance().getDescription().getAuthors().toArray())); } @Register("list") diff --git a/SchematicSystem_Main/src/de/steamwar/schematicsystem/commands/SchematicCommandHelp.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandHelp.java similarity index 100% rename from SchematicSystem_Main/src/de/steamwar/schematicsystem/commands/SchematicCommandHelp.java rename to SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandHelp.java diff --git a/SchematicSystem_Main/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java similarity index 100% rename from SchematicSystem_Main/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java rename to SchematicSystem_Core/src/de/steamwar/schematicsystem/commands/SchematicCommandUtils.java diff --git a/SchematicSystem_Main/pom.xml b/SchematicSystem_Main/pom.xml deleted file mode 100644 index fef4162..0000000 --- a/SchematicSystem_Main/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - 4.0.0 - - - steamwar - SchematicSystem - 1.0 - - - - ${project.basedir}/.. - - - SchematicSystem_Main - 1.0 - - - clean verify -U - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - package - - shade - - - - - - schematicsystem - - - - - steamwar - SchematicSystem_15 - 1.0 - compile - - - steamwar - SchematicSystem_8 - 1.0 - compile - - - steamwar - SchematicSystem_Core - 1.0 - compile - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8973ac5..60ec21a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,6 @@ SchematicSystem_8 SchematicSystem_15 - SchematicSystem_Main SchematicSystem_Core