Merge branch '1.15-ready' of SteamWar/SchematicSystem into master

SchematicSystem_15/src/de/steamwar/schematicsystem/CheckSchemType_15.java

@@ -18,40 +18,41 @@ import java.util.logging.Level;
 
 class CheckSchemType_15 {
     private static final Set<Material> INVENTORY = EnumSet.of(
-            Material.CHEST,
+            Material.BARREL,
-            Material.TRAPPED_CHEST,
+            Material.BLAST_FURNACE,
-            Material.HOPPER,
-            Material.FURNACE,
-            Material.DROPPER,
-            Material.JUKEBOX,
-            Material.DISPENSER,
-            Material.ANVIL,
             Material.BREWING_STAND,
-            Material.BLACK_SHULKER_BOX,
+            Material.CAMPFIRE,
-            Material.RED_SHULKER_BOX,
+            Material.CHEST,
+            Material.DISPENSER,
+            Material.DROPPER,
+            Material.FURNACE,
+            Material.HOPPER,
+            Material.JUKEBOX,
+            Material.SHULKER_BOX,
             Material.WHITE_SHULKER_BOX,
             Material.ORANGE_SHULKER_BOX,
-            Material.BLUE_SHULKER_BOX,
+            Material.MAGENTA_SHULKER_BOX,
             Material.LIGHT_BLUE_SHULKER_BOX,
             Material.YELLOW_SHULKER_BOX,
-            Material.GREEN_SHULKER_BOX,
+            Material.LIME_SHULKER_BOX,
-            Material.BROWN_SHULKER_BOX,
+            Material.PINK_SHULKER_BOX,
-            Material.CYAN_SHULKER_BOX,
             Material.GRAY_SHULKER_BOX,
             Material.LIGHT_GRAY_SHULKER_BOX,
-            Material.LIME_SHULKER_BOX,
+            Material.CYAN_SHULKER_BOX,
-            Material.MAGENTA_SHULKER_BOX,
-            Material.PINK_SHULKER_BOX,
             Material.PURPLE_SHULKER_BOX,
-            Material.LECTERN,
+            Material.BLUE_SHULKER_BOX,
-            Material.BEACON,
+            Material.BROWN_SHULKER_BOX,
-            Material.BARREL);
+            Material.GREEN_SHULKER_BOX,
+            Material.RED_SHULKER_BOX,
+            Material.BLACK_SHULKER_BOX,
+            Material.SMOKER,
+            Material.TRAPPED_CHEST);
 
     private static final Set<Material> FLOWERS = EnumSet.of(
             Material.CORNFLOWER,
+            Material.POPPY,
             Material.FERN,
             Material.DANDELION,
-            Material.POPPY,
             Material.BLUE_ORCHID,
             Material.ALLIUM,
             Material.AZURE_BLUET,
@@ -62,9 +63,7 @@ class CheckSchemType_15 {
             Material.OXEYE_DAISY,
             Material.CORNFLOWER,
             Material.LILY_OF_THE_VALLEY,
-            Material.WITHER_ROSE,
+            Material.WITHER_ROSE);
-            Material.BROWN_MUSHROOM,
-            Material.RED_MUSHROOM);
 
     private CheckSchemType_15(){}
 
@@ -104,7 +103,7 @@ class CheckSchemType_15 {
                     if(blockMaterial == Material.TNT || blockMaterial == Material.OBSIDIAN)
                         tnt++;
 
-                    if(blockMaterial == Material.SLIME_BLOCK || blockMaterial == Material.BEDROCK)
+                    if(blockMaterial == Material.SLIME_BLOCK || blockMaterial == Material.HONEY_BLOCK || blockMaterial == Material.BEDROCK)
                         slime++;
 
                     if(blockMaterial == Material.DISPENSER)

SchematicSystem_API/src/de/steamwar/schematicsystem/AutoCheckResult.java

@@ -61,7 +61,7 @@ public class AutoCheckResult {
         if(type.getMaxTNT() != 0 && tnt > type.getMaxTNT())
             errors.add("Zu viele TNT-Blöcke (" + tnt + " > " + type.getMaxTNT() + ")");
         if(type.getMaxSlime() != 0 && slime > type.getMaxSlime())
-            errors.add("Zu viele Schleim-Blöcke (" + slime + " > " + type.getMaxSlime() + ")");
+            errors.add("Zu viele Schleim/Honig-Blöcke (" + slime + " > " + type.getMaxSlime() + ")");
         if(type.getMaxDispenser() != 0 && dispenser > type.getMaxDispenser())
             errors.add("Zu viele Werfer (" + dispenser + " > " + type.getMaxDispenser() + ")");
         if(type.getMaxTNTSlime() != 0 && errorTNTSlime > type.getMaxTNTSlime())

SchematicSystem_Main/pom.xml

@@ -47,19 +47,13 @@
         <dependency>
             <groupId>steamwar</groupId>
             <artifactId>Spigot</artifactId>
-            <version>1.12</version>
+            <version>1.15</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>steamwar</groupId>
-            <artifactId>FAWE</artifactId>
-            <version>1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>steamwar</groupId>
             <artifactId>WorldEdit</artifactId>
-            <version>1.0</version>
+            <version>1.15</version>
             <scope>provided</scope>
         </dependency>
         <dependency>