update to 1.14.1

Author: RecursiveG

.travis.yml

@@ -1,67 +1,31 @@
 plugins {
-    id 'java'
     id 'java-library'
     id 'maven-publish'
 }
 
-configurations.all {
-    //resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-}
-
-// Version strings used for CI
-// Note the spaces before and after the equals sign
 ext.majorVersion = 6
-ext.minorVersion = 2
-ext.minecraftVersion = "1.13.2"
-
+ext.minorVersion = 4
+ext.minecraftVersion = "1.14.1"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-repositories {
-    jcenter()
-    // mavenLocal()
-    maven {
-        name 'spigot-repo'
-        url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-    }
+// Suppiled by Jenkins
+ext.buildNumber = System.env.BUILD_NUMBER == null ? "x"                : "$System.env.BUILD_NUMBER"
+ext.mavenDirectory = System.env.MAVEN_DIR == null ? "$projectDir/repo" : "$System.env.MAVEN_DIR"
 
-    maven {
-        name 'NyaaCentral'
-        url 'https://raw.githubusercontent.com/NyaaCat/NyaaCentral/maven-repo'
-    }
-
-    maven {
-        name 'sonatype'
-        url 'https://oss.sonatype.org/content/groups/public'
-    }
-
-    maven {
-        name 'EssentialsX'
-        url 'https://ci.ender.zone/plugin/repository/everything'
-    }
-
-    maven {
-        name 'vault-repo'
-        url 'http://nexus.hc.to/content/repositories/pub_releases'
-    }
-}
+// Version used for distribution. Different from maven repo
+group = "cat.nyaa"
+archivesBaseName = "HamsterEcoHelper-mc$minecraftVersion"
+version = "$majorVersion.$minorVersion.$buildNumber"
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact sourcesJar
-            artifact javadocJar
-            groupId "cat.nyaa"
-            artifactId "hamsterecohelper"
-            version "$majorVersion.$minorVersion-SNAPSHOT"
-            from components.java
-        }
-    }
-    repositories {
-        maven {
-            url "$buildDir/repo"
-        }
-    }
+repositories {
+    jcenter()
+    maven { name 'Spigot';      url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
+    maven { name 'Sonatype';    url 'https://oss.sonatype.org/content/groups/public' }
+    maven { name 'sk89q';       url 'http://maven.sk89q.com/artifactory/repo/' }
+    maven { name 'vault-repo';  url 'http://nexus.hc.to/content/repositories/pub_releases' }
+    maven { name 'NyaaCat';     url 'https://ci.nyaacat.com/maven/' }
+    maven { name 'EssentialsX'; url 'https://ci.ender.zone/plugin/repository/everything' }
 }
 
 dependencies {
@@ -72,41 +36,67 @@ dependencies {
     if (gradle.hasProperty("useLocalDependencies") && gradle.useLocalDependencies) {
         compileOnly project(":NyaaCore")
         compileOnly project(":LanguageUtils")
+        compileOnly project(":LockettePro")
     } else {
-        compileOnly('cat.nyaa:nyaacore:6.3-SNAPSHOT') { transitive = false }
-        compileOnly('cat.nyaa:LangUtils:2.1-SNAPSHOT') { transitive = false }
+        compileOnly('cat.nyaa:nyaacore:6.4-SNAPSHOT') { transitive = false }
+        compileOnly('com.meowj:LangUtils:2.2-SNAPSHOT') { transitive = false }
+        compileOnly('me.crafter.mc:lockettepro:2.9-SNAPSHOT') { transitive = false }
     }
 
     // 3rd party plugins
     compileOnly ('net.milkbowl.vault:VaultAPI:1.7') { transitive = false }
     compileOnly ('net.ess3:EssentialsX:2.16.0') { transitive = false }
-    compileOnly files('lib/LocketteProAPI.jar')
+    compileOnly 'javax.persistence:javax.persistence-api:2.2' // NyaaCore shadows this
 
     // annotation processor
     compileOnly 'org.librazy:NyaaUtilsLangChecker:2.0-SNAPSHOT'
     annotationProcessor 'org.librazy:NyaaUtilsLangChecker:2.0-SNAPSHOT'
     annotationProcessor "org.spigotmc:spigot-api:$minecraftVersion-R0.1-SNAPSHOT"
-    api 'javax.persistence:javax.persistence-api:2.2'
 }
 
-compileJava {
-    // extra config for NyaaCore Language string
-    String nyaaCoreLangDir = gradle.hasProperty("NyaaCoreLangDirs") ? gradle.NyaaCoreLangDirs : null
-    if (nyaaCoreLangDir == null) { nyaaCoreLangDir = System.getenv("NYAACORE_LANG_DIR") }
-    options.compilerArgs += ["-Xplugin:NyaaUtilsLangAnnotationProcessor", "-Xlint:deprecation", "-Xlint:unchecked"]
-    if (nyaaCoreLangDir != null) {
-        options.compilerArgs += ["-ALANG_DIR_ADDITIONAL_PATH=" + nyaaCoreLangDir]
-    }
-}
+// TODO: langcheck temporarily disabled
+// compileJava {
+//     // extra config for NyaaCore Language string
+//     String nyaaCoreLangDir = gradle.hasProperty("NyaaCoreLangDirs") ? gradle.NyaaCoreLangDirs : null
+//     if (nyaaCoreLangDir == null) { nyaaCoreLangDir = System.getenv("NYAACORE_LANG_DIR") }
+//     options.compilerArgs += ["-Xplugin:NyaaUtilsLangAnnotationProcessor", "-Xlint:deprecation", "-Xlint:unchecked"]
+//     if (nyaaCoreLangDir != null) {
+//         options.compilerArgs += ["-ALANG_DIR_ADDITIONAL_PATH=" + nyaaCoreLangDir]
+//     }
+// }
 
+
+// publications
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from sourceSets.main.java.srcDirs
+    from sourceSets.main.allJava
+    archiveClassifier = 'sources'
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
+task javadocJar(type: Jar) {
+    from javadoc
+    archiveClassifier = 'javadoc'
+}
+processResources { // modify version string
+    filesMatching("**/plugin.yml") {
+        expand 'version': project.version
+    }
+}
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            artifact sourcesJar
+            artifact javadocJar
+            groupId "cat.nyaa"
+            artifactId "hamsterecohelper"
+            version "$majorVersion.$minorVersion-SNAPSHOT"
+            from components.java
+        }
+    }
+    repositories {
+        maven {
+            url "${mavenDirectory}"
+        }
+    }
 }
 
 javadoc {

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -52,11 +52,8 @@ public static boolean isChest(Block block) {
     }
 
     public static boolean isSign(Block block) {
-        if (block != null &&
-                    (block.getType().equals(Material.WALL_SIGN) || block.getType().equals(Material.SIGN))) {
-            return true;
-        }
-        return false;
+        if (block == null) return false;
+        return block.getType().name().endsWith("_SIGN"); // FIXME: suspicious comparison
     }
 
     public static Block getAttachedBlock(Block block) {

lib/LocketteProAPI.jar

@@ -1,7 +1,7 @@
 name: HamsterEcoHelper
 main: cat.nyaa.HamsterEcoHelper.HamsterEcoHelper
 description: "Provides a offer/buy system and global market."
-version: 6.2-dev
+version: ${version}
 depend: [Vault,NyaaCore,LangUtils]
 softdepend: [Essentials,LockettePro]
 authors: [cyilin, RecursiveG]