From 3754ec7e091fbd6779fad5004b75d9e2313c04d9 Mon Sep 17 00:00:00 2001 From: Patryk Bernacki Date: Wed, 13 Nov 2019 02:52:46 +0100 Subject: [PATCH 1/4] Better .gitignore --- .gitignore | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 203 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c4d8e8e..02d235d2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,177 @@ +### Eclipse ### +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +### Eclipse Patch ### +# Eclipse Core +.project + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# Annotation Processing +.apt_generated + +.sts4-cache/ + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +auto-import. +.idea/modules.xml +.idea/*.iml +.idea/modules +*.iml +*.ipr + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### Intellij Patch ### +# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721 + +*.iml +modules.xml +.idea/misc.xml +*.ipr +.idea/compiler.xml + +# Sonarlint plugin +.idea/**/sonarlint/ + +# SonarQube Plugin +.idea/**/sonarIssues.xml + +# Markdown Navigator plugin +.idea/**/markdown-navigator.xml +.idea/**/markdown-navigator/ + +### Java ### +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +### Maven ### target/ -.idea/ -songodaUpdater.iml pom.xml.tag pom.xml.releaseBackup pom.xml.versionsBackup @@ -9,5 +180,33 @@ release.properties dependency-reduced-pom.xml buildNumber.properties .mvn/timing.properties -nbactions.xml -nb-configuration.xml +.mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml + +### NetBeans ### +**/nbproject/private/ +**/nbproject/Makefile-*.mk +**/nbproject/Package-*.bash +build/ +nbbuild/ +dist/ +nbdist/ +.nb-gradle/ + +### Gradle ### +.gradle + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +# Cache of project +.gradletasknamecache + +# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 +# gradle/wrapper/gradle-wrapper.properties + +### Gradle Patch ### +**/build/ From 954adf93768f83b8f90bbe0ee972c394f5f9311b Mon Sep 17 00:00:00 2001 From: Patryk Bernacki Date: Wed, 13 Nov 2019 02:53:27 +0100 Subject: [PATCH 2/4] Fix player head api --- .idea/codeStyles/codeStyleConfig.xml | 5 +++ .idea/vcs.xml | 6 +++ .../com/songoda/core/utils/ItemUtils.java | 1 + SongodaCore.iml | 44 ------------------- 4 files changed, 12 insertions(+), 44 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/vcs.xml delete mode 100644 SongodaCore.iml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..b9d18bf5 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java index 512ad573..e32b9de0 100644 --- a/Core/src/main/java/com/songoda/core/utils/ItemUtils.java +++ b/Core/src/main/java/com/songoda/core/utils/ItemUtils.java @@ -257,6 +257,7 @@ public class ItemUtils { } else { meta.setOwner(player.getName()); } + head.setItemMeta(meta); return head; } diff --git a/SongodaCore.iml b/SongodaCore.iml deleted file mode 100644 index 000b875c..00000000 --- a/SongodaCore.iml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 1beb3848f8b869412d4254815580922bdcfdb5aa Mon Sep 17 00:00:00 2001 From: Patryk Bernacki Date: Wed, 13 Nov 2019 02:57:35 +0100 Subject: [PATCH 3/4] Fix dependency issue (WildStacker) --- Core/pom.xml | 34 +++++++++++++++++++++++++++++++--- pom.xml | 4 ++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Core/pom.xml b/Core/pom.xml index 04b9827b..ef0967ea 100644 --- a/Core/pom.xml +++ b/Core/pom.xml @@ -27,6 +27,34 @@ 1.8 + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + none + + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-shade-plugin @@ -251,9 +279,9 @@ provided - com.bgsoftware - WildStacker - 2-9-0 + com.github.OmerBenGera + WildStackerAPI + b16 provided diff --git a/pom.xml b/pom.xml index b42ccf44..96a9a46f 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,10 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + jitpack.io + https://jitpack.io + From 443e3b01364a1f950d6cf47ff4d654161c561495 Mon Sep 17 00:00:00 2001 From: Patryk Bernacki Date: Wed, 13 Nov 2019 03:03:14 +0100 Subject: [PATCH 4/4] version 2.2.11 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02f40b26..96fa6672 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "SongodaCore" path: "/builds/$CI_PROJECT_PATH" - version: "2.2.10" + version: "2.2.11" build: stage: build