From a793b8021182cc0fdb818b657c0214184abf551a Mon Sep 17 00:00:00 2001 From: Jules Date: Mon, 9 Jan 2023 00:41:34 +0100 Subject: [PATCH] Deployment --- .gitlab-ci.yml | 33 ------------------- .m2/settings.xml | 14 -------- .../mmoitems/listener/PlayerListener.java | 3 ++ pom.xml | 17 +++++++++- 4 files changed, 19 insertions(+), 48 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .m2/settings.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 270f9d0b..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,33 +0,0 @@ -image: maven:3-openjdk-16-slim - -variables: - MAVEN_CLI_OPTS: "-s .m2/settings.xml --batch-mode" - MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository" - -before_script: - - apt-get update -qq - # Setup SSH deploy keys - - 'which ssh-agent || ( apt-get install -qq openssh-client )' - - eval $(ssh-agent -s) - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - -cache: - paths: - - .m2/repository/ - - target/ - -build: - stage: build - script: - - mvn $MAVEN_CLI_OPTS clean package - -deploy: - stage: deploy - script: - - mvn $MAVEN_CLI_OPTS deploy - - ssh builder@proxy.mythiccraft.io -p 2222 "mkdir -p /tmp/builds/$CI_JOB_ID && exit" - - scp -rp -o StrictHostKeyChecking=no -o Port=2222 ./target/ builder@proxy.mythiccraft.io:/tmp/builds/$CI_JOB_ID/ - only: - - master diff --git a/.m2/settings.xml b/.m2/settings.xml deleted file mode 100644 index 84a53514..00000000 --- a/.m2/settings.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - nexus - ${env.M2_REPO_USER} - ${env.M2_REPO_PASS} - - - lumine - ${env.M2_REPO_USER} - ${env.M2_REPO_PASS} - - - diff --git a/MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java b/MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java index 303f6749..1c3ea2a7 100644 --- a/MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java +++ b/MMOItems-Dist/src/main/java/net/Indyuce/mmoitems/listener/PlayerListener.java @@ -30,6 +30,9 @@ import java.util.*; public class PlayerListener implements Listener { private final Map> deathItems = new HashMap<>(); + /** + * Careful, MMOCore and MMOMana runs on LOWEST + */ @EventHandler(priority = EventPriority.LOW) public void loadPlayerData(PlayerJoinEvent event) { MMOItems.plugin.getRecipes().refreshRecipeBook(event.getPlayer()); diff --git a/pom.xml b/pom.xml index 4f894c6d..326ada34 100644 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,22 @@ + + + + phoenixdevt-releases + PhoenixDevt Releases + https://nexus.phoenixdevt.fr/repository/maven-releases/ + + + + phoenixdevt-snapshots + PhoenixDevt Snapshots + https://nexus.phoenixdevt.fr/repository/maven-snapshots/ + + + + @@ -53,7 +69,6 @@ -