diff --git a/build.gradle b/build.gradle index 9ec23c5d9..d15c25300 100644 --- a/build.gradle +++ b/build.gradle @@ -1,38 +1,73 @@ plugins { id 'java' id 'io.freefair.lombok' version '5.2.1' + id "com.github.johnrengelman.shadow" version "7.0.0" } group 'com.volmit.iris' version '1.3.7' +def apiVersion = '1.14' +def name = 'Iris' +def main = 'com.volmit.iris.Iris' + +// ============================================================== +registerCustomOutputTask('Cyberpwn', 'C://Users/cyberpwn/Documents/development/server/plugins'); +// ============================================================== configurations { provided } -sourceSets { - main { compileClasspath += configurations.provided } +processResources { + filesMatching('**/plugin.yml') { + expand( + 'name': name.toString(), + 'version': version.toString(), + 'main': main.toString(), + 'apiversion': apiVersion.toString() + ) + } } repositories { mavenCentral() + gradlePluginPortal() maven { + allowInsecureProtocol true url "http://archive.arcane.art/repository/arcane/" } } +shadowJar { + +} + +def registerCustomOutputTask(name, path) { + tasks.register('build' + name, Copy) { + group('development') + outputs.upToDateWhen{false} + dependsOn ':shadowJar' + from(file('build/libs/Iris-' + version + '-all.jar')) + into(file(path)) + rename { String fileName -> + fileName.replace('Iris-' + version + '-all.jar', "Iris.jar") + } + } +} + + dependencies { compileOnly 'org.projectlombok:lombok:1.18.12' annotationProcessor 'org.projectlombok:lombok:1.18.12' implementation 'io.timeandspace:smoothie-map:2.0.2' implementation 'com.github.ben-manes.caffeine:caffeine:2.8.5' implementation 'org.zeroturnaround:zt-zip:1.14' - provided 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' implementation 'io.papermc:paperlib:1.0.5' - provided 'org.bukkit.craftbukkit:1.16.3:1.16.3' - provided 'org.bukkit.craftbukkit:1.16.4:1.16.4' - provided 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' - provided 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' - provided 'io.lumine.xikage:MythicMobs:4.9.1' - provided 'com.google.code.gson:gson:2.8.5' + compileClasspath 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' + compileClasspath 'org.bukkit.craftbukkit:1.16.3:1.16.3' + compileClasspath 'org.bukkit.craftbukkit:1.16.4:1.16.4' + compileClasspath 'com.bergerkiller.bukkit:BKCommonLib:1.16.4-v2' + compileClasspath 'com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT' + compileClasspath 'io.lumine.xikage:MythicMobs:4.9.1' + compileClasspath 'com.google.code.gson:gson:2.8.5' } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..567bbb916 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.daemon=true +org.gradle.parallel=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f9e..0f80bbf51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java index ad1f7981a..df56dc22a 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java @@ -1,11 +1,12 @@ package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; -import org.bouncycastle.util.Arrays; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Arrays; + @Data @EqualsAndHashCode(callSuper = false) public class ArrayHunk extends StorageHunk implements Hunk diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java index dea79763e..733359d28 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java +++ b/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java @@ -1,11 +1,12 @@ package com.volmit.iris.scaffold.hunk.storage; import com.volmit.iris.scaffold.hunk.Hunk; -import org.bouncycastle.util.Arrays; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Arrays; + @Data @EqualsAndHashCode(callSuper = false) public class SynchronizedArrayHunk extends StorageHunk implements Hunk diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index cc8978c6c..622134345 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ -name: ${project.name} -version: ${project.version} -main: com.volmit.iris.Iris +name: ${name} +version: ${version} +main: ${main} load: STARTUP authors: [cyberpwn, NextdoorPsycho] website: volmit.com @@ -8,5 +8,5 @@ description: More than a Dimenson! commands: iris: aliases: [ir, irs] -api-version: 1.14 +api-version: ${apiversion} hotload-dependencies: false \ No newline at end of file