From bed8a808944a67256aaa1598a06d9f541a3363b5 Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 13 Nov 2015 20:17:56 -0500 Subject: [PATCH] Revert to Guava 17's firstNonNull. Deprecated but Spigot doesn't include guava18 yet. --- build.gradle | 2 +- worldedit-core/build.gradle | 2 +- .../com/sk89q/worldedit/command/argument/ReplaceParser.java | 2 +- .../java/com/sk89q/worldedit/function/factory/Apply.java | 4 ++-- .../java/com/sk89q/worldedit/function/factory/Deform.java | 4 ++-- .../java/com/sk89q/worldedit/function/factory/Paint.java | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 59a920987..b797f51f2 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { configurations.all { resolutionStrategy { - force 'com.google.guava:guava:18.0' + force 'com.google.guava:guava:17.0' } } diff --git a/worldedit-core/build.gradle b/worldedit-core/build.gradle index 66ec06d39..079e3c124 100644 --- a/worldedit-core/build.gradle +++ b/worldedit-core/build.gradle @@ -5,7 +5,7 @@ dependencies { compile 'de.schlichtherle:truezip:6.8.3' compile 'rhino:js:1.7R2' compile 'org.yaml:snakeyaml:1.9' - compile 'com.google.guava:guava:18.0' + compile 'com.google.guava:guava:17.0' compile 'com.sk89q:jchronic:0.2.4a' compile 'com.google.code.findbugs:jsr305:1.3.9' compile 'com.thoughtworks.paranamer:paranamer:2.6' diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ReplaceParser.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ReplaceParser.java index b6834945d..6db624149 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ReplaceParser.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/argument/ReplaceParser.java @@ -30,7 +30,7 @@ import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.util.command.argument.CommandArgs; import com.sk89q.worldedit.util.command.composition.SimpleCommand; -import static com.google.common.base.MoreObjects.firstNonNull; +import static com.google.common.base.Objects.firstNonNull; public class ReplaceParser extends SimpleCommand> { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Apply.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Apply.java index 01c26d522..b7695b795 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Apply.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Apply.java @@ -19,7 +19,6 @@ package com.sk89q.worldedit.function.factory; -import com.google.common.base.MoreObjects; import com.sk89q.worldedit.function.Contextual; import com.sk89q.worldedit.function.EditContext; import com.sk89q.worldedit.function.RegionFunction; @@ -28,6 +27,7 @@ import com.sk89q.worldedit.function.visitor.RegionVisitor; import com.sk89q.worldedit.regions.NullRegion; import com.sk89q.worldedit.regions.Region; +import static com.google.common.base.Objects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; public class Apply implements Contextual { @@ -48,7 +48,7 @@ public class Apply implements Contextual { @Override public Operation createFromContext(EditContext context) { - return new RegionVisitor(MoreObjects.firstNonNull(context.getRegion(), region), function.createFromContext(context)); + return new RegionVisitor(firstNonNull(context.getRegion(), region), function.createFromContext(context)); } @Override diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java index 51e840ee5..1c206843c 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Deform.java @@ -19,7 +19,7 @@ package com.sk89q.worldedit.function.factory; -import com.google.common.base.MoreObjects; +import com.google.common.base.Objects; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.WorldEditException; @@ -123,7 +123,7 @@ public class Deform implements Contextual { final Vector zero; Vector unit; - Region region = MoreObjects.firstNonNull(context.getRegion(), this.region); + Region region = Objects.firstNonNull(context.getRegion(), this.region); switch (mode) { case UNIT_CUBE: diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Paint.java b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Paint.java index 77421b56c..fe9c80a83 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Paint.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/function/factory/Paint.java @@ -19,7 +19,6 @@ package com.sk89q.worldedit.function.factory; -import com.google.common.base.MoreObjects; import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.NullExtent; import com.sk89q.worldedit.function.Contextual; @@ -34,6 +33,7 @@ import com.sk89q.worldedit.math.noise.RandomNoise; import com.sk89q.worldedit.regions.NullRegion; import com.sk89q.worldedit.regions.Region; +import static com.google.common.base.Objects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; import static com.sk89q.worldedit.regions.Regions.*; @@ -63,8 +63,8 @@ public class Paint implements Contextual { @Override public Operation createFromContext(EditContext context) { - Extent destination = MoreObjects.firstNonNull(context.getDestination(), this.destination); - Region region = MoreObjects.firstNonNull(context.getRegion(), this.region); + Extent destination = firstNonNull(context.getDestination(), this.destination); + Region region = firstNonNull(context.getRegion(), this.region); GroundFunction ground = new GroundFunction(new ExistingBlockMask(destination), function.createFromContext(context)); LayerVisitor visitor = new LayerVisitor(asFlatRegion(region), minimumBlockY(region), maximumBlockY(region), ground); visitor.setMask(new NoiseFilter2D(new RandomNoise(), density));