diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 0935baf..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,21 +0,0 @@ -stages: - - build - -variables: - name: "EpicHeads" - path: "/builds/$CI_PROJECT_PATH" - version: "3.2.5" - -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" diff --git a/pom.xml b/pom.xml index 5db1fb7..ccacb1e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda EpicHeads 4.0.0 - maven-version-number + 3.2.6 clean install EpicHeads-${project.version} @@ -16,6 +16,28 @@ 1.8 + + com.google.code.maven-replacer-plugin + replacer + 1.5.3 + + + prepare-package + + replace + + + + + ${project.build.directory}/classes/plugin.yml + + + maven-version-number + ${project.version} + + + + org.apache.maven.plugins maven-shade-plugin @@ -72,7 +94,7 @@ org.spigotmc spigot - 1.14.4 + 1.15 provided diff --git a/src/main/java/com/songoda/epicheads/gui/GUIHeads.java b/src/main/java/com/songoda/epicheads/gui/GUIHeads.java index 15b2d3e..70cf6a0 100644 --- a/src/main/java/com/songoda/epicheads/gui/GUIHeads.java +++ b/src/main/java/com/songoda/epicheads/gui/GUIHeads.java @@ -189,7 +189,7 @@ public class GUIHeads extends Gui { ePlayer.removeFavorite(head.getURL()); else ePlayer.addFavorite(head.getURL()); - updateItem(event.slot, head.getHeadItemName(!isFav), head.getHeadItemLore(free)); + showPage(); return; } if (!free) {