From 447b4e886854b0488edf756064169661df0f8950 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Fri, 21 Dec 2018 08:03:50 -0800 Subject: [PATCH 1/2] Update gradle settings to new repository URL Signed-off-by: Byron Marohn --- favs/build.gradle | 2 +- worldedit-bukkit/build.gradle | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/favs/build.gradle b/favs/build.gradle index 96173f802..778e6aee2 100644 --- a/favs/build.gradle +++ b/favs/build.gradle @@ -1,5 +1,5 @@ repositories { - maven {url "http://vault.voxelmodpack.com/content/repositories/central/"} + maven {url "https://ci.athion.net/job/FAWE-WorldGuard-1.13/lastSuccessfulBuild/artifact/mvn"} } dependencies { diff --git a/worldedit-bukkit/build.gradle b/worldedit-bukkit/build.gradle index 7e6ffb41a..5e5b3f48b 100644 --- a/worldedit-bukkit/build.gradle +++ b/worldedit-bukkit/build.gradle @@ -4,6 +4,7 @@ apply plugin: 'maven' repositories { maven { url "https://hub.spigotmc.org/nexus/content/groups/public" } + maven { url "https://ci.athion.net/job/FAWE-WorldGuard-1.13/lastSuccessfulBuild/artifact/mvn" } } dependencies { @@ -28,9 +29,6 @@ dependencies { compile 'com.wasteofplastic:askyblock:3.0.8.2' compile 'com.sk89q:worldguard-core:latest' compile 'com.sk89q:worldguard-legacy:latest' - compile('org.inventivetalent:mapmanager:1.7.1-SNAPSHOT') { - transitive = false - } } processResources { From dab9e9a799c4db4041d2b8896dae428051991771 Mon Sep 17 00:00:00 2001 From: Byron Marohn Date: Fri, 21 Dec 2018 08:09:58 -0800 Subject: [PATCH 2/2] Fix imports - build working again Signed-off-by: Byron Marohn --- .../legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java | 1 - .../src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java | 1 - .../src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java | 1 - .../java/com/sk89q/worldedit/extension/factory/BlockFactory.java | 1 - .../com/sk89q/worldedit/world/registry/BundledBlockRegistry.java | 1 + .../java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java | 1 - 6 files changed, 1 insertion(+), 5 deletions(-) diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java index 6bc58a39c..11d157824 100644 --- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java +++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/MobSpawnerBlock.java @@ -25,7 +25,6 @@ import com.sk89q.jnbt.NBTUtils; import com.sk89q.jnbt.ShortTag; import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.Tag; -import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.storage.InvalidFormatException; diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java index fddd784de..028c17014 100644 --- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java +++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SignBlock.java @@ -23,7 +23,6 @@ import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.Tag; import com.sk89q.worldedit.util.gson.GsonUtil; -import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; import java.util.HashMap; diff --git a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java index e65ab3ec1..af33bc8de 100644 --- a/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java +++ b/worldedit-core/src/legacy/java/com/sk89q/worldedit/blocks/SkullBlock.java @@ -22,7 +22,6 @@ package com.sk89q.worldedit.blocks; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.StringTag; import com.sk89q.jnbt.Tag; -import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.world.block.BlockState; import java.util.HashMap; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java index aab3504f4..141124855 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extension/factory/BlockFactory.java @@ -21,7 +21,6 @@ package com.sk89q.worldedit.extension.factory; import com.sk89q.util.StringUtil; import com.sk89q.worldedit.WorldEdit; -import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.extension.input.InputParseException; import com.sk89q.worldedit.extension.input.ParserContext; import com.sk89q.worldedit.internal.registry.AbstractFactory; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java index 40e123959..1f1a2b317 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BundledBlockRegistry.java @@ -19,6 +19,7 @@ package com.sk89q.worldedit.world.registry; +import com.sk89q.worldedit.blocks.BlockMaterial; import com.sk89q.worldedit.registry.state.Property; import com.sk89q.worldedit.world.block.BlockType; diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java index a7ef7ca9d..d812e13e5 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/snapshot/SnapshotRestore.java @@ -24,7 +24,6 @@ import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.MaxChangedBlocksException; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector2D; -import com.sk89q.worldedit.world.block.BaseBlock; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; import com.sk89q.worldedit.world.DataException;