From 0999ec74995688b2068efb36fe0612107e518150 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Wed, 20 Nov 2019 14:12:17 +0100 Subject: [PATCH] Unifying naming, Changing maven build --- .gitignore | 3 ++- ...heckSchemType_v12.java => CheckSchemType_12.java} | 4 ++-- .../{WorldEdit_v12.java => WorldEdit_12.java} | 2 +- ...heckSchemType_v14.java => CheckSchemType_14.java} | 4 ++-- .../{WorldEdit_v14.java => WorldEdit_14.java} | 4 ++-- SchematicSystem_Main/pom.xml | 12 +++++------- .../de/steamwar/schematicsystem/CheckSchemType.java | 4 ++-- .../src/de/steamwar/schematicsystem/WorldEdit.java | 12 ++++++------ 8 files changed, 22 insertions(+), 23 deletions(-) rename SchematicSystem_12/src/de/steamwar/schematicsystem/{CheckSchemType_v12.java => CheckSchemType_12.java} (99%) rename SchematicSystem_12/src/de/steamwar/schematicsystem/{WorldEdit_v12.java => WorldEdit_12.java} (99%) rename SchematicSystem_14/src/de/steamwar/schematicsystem/{CheckSchemType_v14.java => CheckSchemType_14.java} (98%) rename SchematicSystem_14/src/de/steamwar/schematicsystem/{WorldEdit_v14.java => WorldEdit_14.java} (98%) diff --git a/.gitignore b/.gitignore index ec376bb..7eae63f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -target \ No newline at end of file +target +dependency-reduced-pom.xml \ No newline at end of file diff --git a/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_v12.java b/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java similarity index 99% rename from SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_v12.java rename to SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java index dd32e41..62ab362 100644 --- a/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_v12.java +++ b/SchematicSystem_12/src/de/steamwar/schematicsystem/CheckSchemType_12.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; -class CheckSchemType_v12 { +class CheckSchemType_12 { private static final int TNT = Material.TNT.getId(); private static final int SLIME = Material.SLIME_BLOCK.getId(); private static final int DISPENSER = Material.DISPENSER.getId(); @@ -64,7 +64,7 @@ class CheckSchemType_v12 { FLOWERS = flowers; } - private CheckSchemType_v12(){} + private CheckSchemType_12(){} static void autoCheck(Schematic schematic, List errors, List warnings, ICheckSchemType type) { Clipboard clipboard; diff --git a/SchematicSystem_12/src/de/steamwar/schematicsystem/WorldEdit_v12.java b/SchematicSystem_12/src/de/steamwar/schematicsystem/WorldEdit_12.java similarity index 99% rename from SchematicSystem_12/src/de/steamwar/schematicsystem/WorldEdit_v12.java rename to SchematicSystem_12/src/de/steamwar/schematicsystem/WorldEdit_12.java index 3bc53b8..f3e8f1b 100644 --- a/SchematicSystem_12/src/de/steamwar/schematicsystem/WorldEdit_v12.java +++ b/SchematicSystem_12/src/de/steamwar/schematicsystem/WorldEdit_12.java @@ -21,7 +21,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.nio.file.Files; -class WorldEdit_v12 { +class WorldEdit_12 { static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException { ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard(); diff --git a/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_v14.java b/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java similarity index 98% rename from SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_v14.java rename to SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java index c3ddc15..3a8e242 100644 --- a/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_v14.java +++ b/SchematicSystem_14/src/de/steamwar/schematicsystem/CheckSchemType_14.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; -class CheckSchemType_v14 { +class CheckSchemType_14 { private static final Set INVENTORY = EnumSet.of( Material.CHEST, Material.TRAPPED_CHEST, @@ -50,7 +50,7 @@ class CheckSchemType_v14 { private static final Set FLOWERS = EnumSet.of( Material.CORNFLOWER); - private CheckSchemType_v14(){} + private CheckSchemType_14(){} static void autoCheck(Schematic schematic, List errors, List warnings, ICheckSchemType type) { Clipboard clipboard; diff --git a/SchematicSystem_14/src/de/steamwar/schematicsystem/WorldEdit_v14.java b/SchematicSystem_14/src/de/steamwar/schematicsystem/WorldEdit_14.java similarity index 98% rename from SchematicSystem_14/src/de/steamwar/schematicsystem/WorldEdit_v14.java rename to SchematicSystem_14/src/de/steamwar/schematicsystem/WorldEdit_14.java index dad1da1..9bdf5f1 100644 --- a/SchematicSystem_14/src/de/steamwar/schematicsystem/WorldEdit_v14.java +++ b/SchematicSystem_14/src/de/steamwar/schematicsystem/WorldEdit_14.java @@ -21,8 +21,8 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -class WorldEdit_v14 { - private WorldEdit_v14(){} +class WorldEdit_14 { + private WorldEdit_14(){} static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException { ClipboardHolder clipboardHolder = FaweAPI.wrapPlayer(player).getSession().getClipboard(); diff --git a/SchematicSystem_Main/pom.xml b/SchematicSystem_Main/pom.xml index 24d475f..c314f67 100644 --- a/SchematicSystem_Main/pom.xml +++ b/SchematicSystem_Main/pom.xml @@ -27,22 +27,20 @@ - maven-assembly-plugin + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 package - single + shade - - - jar-with-dependencies - - + SchematicSystem diff --git a/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java b/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java index 6b05ad4..de6f1ba 100644 --- a/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java +++ b/SchematicSystem_Main/src/de/steamwar/schematicsystem/CheckSchemType.java @@ -61,10 +61,10 @@ public class CheckSchemType implements ICheckSchemType { public void autoCheck(Schematic schematic, List errors, List warnings) { switch(Core.getVersion()){ case 14: - CheckSchemType_v14.autoCheck(schematic, errors, warnings, this); + CheckSchemType_14.autoCheck(schematic, errors, warnings, this); break; default: - CheckSchemType_v12.autoCheck(schematic, errors, warnings, this); + CheckSchemType_12.autoCheck(schematic, errors, warnings, this); } } diff --git a/SchematicSystem_Main/src/de/steamwar/schematicsystem/WorldEdit.java b/SchematicSystem_Main/src/de/steamwar/schematicsystem/WorldEdit.java index 22825db..1be3006 100644 --- a/SchematicSystem_Main/src/de/steamwar/schematicsystem/WorldEdit.java +++ b/SchematicSystem_Main/src/de/steamwar/schematicsystem/WorldEdit.java @@ -15,29 +15,29 @@ public class WorldEdit { public static void saveSchematic(Player player, String name) throws IOException, EmptyClipboardException { switch(Core.getVersion()){ case 14: - WorldEdit_v14.saveSchematic(player, name); + WorldEdit_14.saveSchematic(player, name); break; default: - WorldEdit_v12.saveSchematic(player, name); + WorldEdit_12.saveSchematic(player, name); } } public static void loadClipboardToPlayer(Player player, Clipboard clipboard){ switch(Core.getVersion()){ case 14: - WorldEdit_v14.loadClipboardToPlayer(player, clipboard); + WorldEdit_14.loadClipboardToPlayer(player, clipboard); break; default: - WorldEdit_v12.loadClipboardToPlayer(player, clipboard); + WorldEdit_12.loadClipboardToPlayer(player, clipboard); } } public static EditSession pasteSchematic(Player player, Schematic schematic){ switch(Core.getVersion()){ case 14: - return WorldEdit_v14.pasteSchematic(player, schematic); + return WorldEdit_14.pasteSchematic(player, schematic); default: - return WorldEdit_v12.pasteSchematic(player, schematic); + return WorldEdit_12.pasteSchematic(player, schematic); } } }