Merge branch 'development'

.gitlab-ci.yml

@@ -1,21 +0,0 @@
-stages:
-  - build
-
-variables:
-  name: "EpicVouchers"
-  path: "/builds/$CI_PROJECT_PATH"
-  version: "2.1.14"
-
-build:
-  stage: build
-  image: maven:3.5.3-jdk-8
-  script:
-    - find $path/ -type f -name "*.xml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g
-    - find $path/ -type f -name "*.yml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g
-    - mvn clean package
-    - find $path/ -depth -path '*original*' -delete
-    - mv $path/target/*.jar $path/
-  artifacts:
-    name: $name-$version
-    paths:
-      - "$path/*.jar"

pom.xml

@@ -2,7 +2,7 @@
     <groupId>com.songoda</groupId>
     <artifactId>EpicVouchers</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>maven-version-number</version>
+    <version>2.1.16</version>
     <build>
         <defaultGoal>clean install</defaultGoal>
         <finalName>EpicVouchers-${project.version}</finalName>
@@ -16,6 +16,28 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>replacer</artifactId>
+                <version>1.5.3</version>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <file>${project.build.directory}/classes/plugin.yml</file>
+                    <replacements>
+                        <replacement>
+                            <token>maven-version-number</token>
+                            <value>${project.version}</value>
+                        </replacement>
+                    </replacements>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -75,7 +97,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.14.4</version>
+            <version>1.15</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java

@@ -162,7 +162,7 @@ public class ItemBuilder {
      * Unbreakability:
      */
     public boolean isUnbreakable() {
-        return meta.spigot().isUnbreakable();
+        return meta.isUnbreakable();
     }
 
     public ItemBuilder unbreakable() {
@@ -171,7 +171,7 @@ public class ItemBuilder {
 
     @SuppressWarnings("deprecation")
     public ItemBuilder unbreakable(boolean unbreakable) {
-        meta.spigot().setUnbreakable(unbreakable);
+        meta.setUnbreakable(unbreakable);
         return this;
     }
 

src/main/java/com/songoda/epicvouchers/voucher/Voucher.java

@@ -95,7 +95,7 @@ public class Voucher {
         }
 
         if (unbreakable) {
-            meta.spigot().setUnbreakable(true);
+            meta.setUnbreakable(true);
         }
 
         if (hideAttributes) {