From 3e8fd842d8f1feb3ec29ad0f4d4048737bbcd1c8 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 11 Jul 2019 08:42:44 +1000 Subject: [PATCH] use ivy repo --- build.gradle | 6 ++++++ worldedit-bukkit/build.gradle | 13 +------------ .../boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java | 1 - 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 87d679fe9..d4e35635b 100644 --- a/build.gradle +++ b/build.gradle @@ -84,6 +84,12 @@ subprojects { maven { url "http://repo.spongepowered.org/maven" } maven { url "http://dl.bintray.com/tastybento/maven-repo" } maven { url "http://ci.emc.gs/nexus/content/groups/aikar/" } + ivy { + url 'https://ci.athion.net/job' + layout 'pattern', { + artifact '/[organisation]/[module]/artifact/[revision].[ext]' + } + } } configurations.all { resolutionStrategy { diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle index b915d4e92..fd0bfff5a 100644 --- a/worldedit-bukkit/build.gradle +++ b/worldedit-bukkit/build.gradle @@ -7,9 +7,6 @@ repositories { maven { url "https://hub.spigotmc.org/nexus/content/groups/public" } maven { url "https://repo.codemc.org/repository/maven-public" } maven { url "https://papermc.io/repo/repository/maven-public/" } - flatDir { - dirs "$rootProject.projectDir/lib" - } } configurations.all { Configuration it -> @@ -18,13 +15,6 @@ configurations.all { Configuration it -> } } -task downloadJarsToLibs(){ - def f = new File('lib/spigot-1.14.jar') - if (!f.exists()) { - new URL('https://ci.athion.net/job/BuildTools/lastSuccessfulBuild/artifact/spigot-1.14.jar').withInputStream{ i -> f.withOutputStream{ it << i }} - } -} - dependencies { compile ('net.milkbowl.vault:VaultAPI:1.7') api project(':worldedit-core') @@ -35,8 +25,7 @@ dependencies { compile 'com.destroystokyo.paper:paper-api:1.14.3-R0.1-SNAPSHOT' implementation('io.papermc:paperlib:1.0.2'){transitive = false} compile 'org.spigotmc:spigot:1.13.2-R0.1-SNAPSHOT' - compile name: 'spigot-1.14.3' -// compile([fileTree(dir: 'lib', include: ['*.jar']),'commons-validator:commons-validator:1.4.1']) + compile 'BuildTools:lastSuccessfulBuild:spigot-1.14@jar' implementation('com.sk89q.worldguard:worldguard-core:7.0.0-20190215.210421-39'){transitive = false} implementation('com.sk89q.worldguard:worldguard-legacy:7.0.0-20190215.210421-39'){transitive = false} implementation('com.massivecraft:factions:2.8.0'){transitive = false} diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java index 78efa8dad..ed2041bec 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java @@ -41,7 +41,6 @@ import net.minecraft.server.v1_14_R1.IBlockData; import net.minecraft.server.v1_14_R1.MinecraftKey; import net.minecraft.server.v1_14_R1.NBTTagCompound; import net.minecraft.server.v1_14_R1.NBTTagInt; -import net.minecraft.server.v1_14_R1.NibbleArray; import net.minecraft.server.v1_14_R1.RegistryID; import net.minecraft.server.v1_14_R1.TileEntity; import org.bukkit.Chunk;