From d4e6860fb0f0c3687e2a33e413fe04c2a14f45ec Mon Sep 17 00:00:00 2001 From: cnr Date: Fri, 1 Sep 2017 00:10:51 -0500 Subject: [PATCH] Accommodate relocatin of guava in spigot --- .../src/mineplex/core/common/util/SpigotUtil.java | 3 ++- .../core/disguise/disguises/DisguiseEnderman.java | 5 ++--- .../mineplex/core/disguise/disguises/DisguiseHorse.java | 7 ++----- .../core/disguise/disguises/DisguiseTameableAnimal.java | 9 +++------ .../src/mineplex/core/imagemap/CustomItemFrames.java | 3 +-- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/SpigotUtil.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/SpigotUtil.java index e04688375..91394f16b 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/SpigotUtil.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/SpigotUtil.java @@ -1,7 +1,8 @@ package mineplex.core.common.util; -import com.google.common.base.Optional; import net.minecraft.server.v1_8_R3.EntityTameableAnimal; + +import org.bukkit.craftbukkit.libs.com.google.common.base.Optional; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftTameableAnimal; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.Tameable; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseEnderman.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseEnderman.java index d8d9703c4..3869699c0 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseEnderman.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseEnderman.java @@ -11,9 +11,8 @@ import net.minecraft.server.v1_8_R3.MobEffect; import net.minecraft.server.v1_8_R3.MobEffectList; import net.minecraft.server.v1_8_R3.PotionBrewer; -import org.bukkit.entity.*; - -import com.google.common.base.Optional; +import org.bukkit.craftbukkit.libs.com.google.common.base.Optional; +import org.bukkit.entity.EntityType; public class DisguiseEnderman extends DisguiseMonster { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseHorse.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseHorse.java index b306a76b6..51681b2b2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseHorse.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseHorse.java @@ -1,12 +1,9 @@ package mineplex.core.disguise.disguises; -import java.util.UUID; - -import com.google.common.base.Optional; - import net.minecraft.server.v1_8_R3.EntityAgeable; import net.minecraft.server.v1_8_R3.EntityHorse; +import org.bukkit.craftbukkit.libs.com.google.common.base.Optional; import org.bukkit.entity.EntityType; import org.bukkit.entity.Horse; @@ -27,7 +24,7 @@ public class DisguiseHorse extends DisguiseMutable DataWatcher.a(16, Integer.valueOf(0), EntityHorse.META_HORSE_STATE, (byte) 0); DataWatcher.a(19, Byte.valueOf((byte) 0), EntityHorse.META_TYPE, 0); DataWatcher.a(20, Integer.valueOf(0), EntityHorse.META_VARIANT, 0); - DataWatcher.a(21, String.valueOf(""), EntityHorse.META_OWNER, Optional. absent()); + DataWatcher.a(21, String.valueOf(""), EntityHorse.META_OWNER, Optional.absent()); DataWatcher.a(22, Integer.valueOf(0), EntityHorse.META_ARMOR, 0); DataWatcher.a(12, new Byte((byte)0), EntityAgeable.META_BABY, false); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseTameableAnimal.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseTameableAnimal.java index 8309387c9..b7e0e8569 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseTameableAnimal.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseTameableAnimal.java @@ -1,12 +1,9 @@ package mineplex.core.disguise.disguises; -import java.util.UUID; - import net.minecraft.server.v1_8_R3.EntityTameableAnimal; -import org.bukkit.entity.*; - -import com.google.common.base.Optional; +import org.bukkit.craftbukkit.libs.com.google.common.base.Optional; +import org.bukkit.entity.EntityType; public abstract class DisguiseTameableAnimal extends DisguiseAnimal { @@ -15,7 +12,7 @@ public abstract class DisguiseTameableAnimal extends DisguiseAnimal super(disguiseType, entity); DataWatcher.a(16, Byte.valueOf((byte) 0), EntityTameableAnimal.META_SITTING_TAMED, (byte) 0); - DataWatcher.a(17, "", EntityTameableAnimal.META_OWNER, Optional. absent()); + DataWatcher.a(17, "", EntityTameableAnimal.META_OWNER, Optional.absent()); } public boolean isTamed() diff --git a/Plugins/Mineplex.Core/src/mineplex/core/imagemap/CustomItemFrames.java b/Plugins/Mineplex.Core/src/mineplex/core/imagemap/CustomItemFrames.java index 9bd70c7db..b3c5744ba 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/imagemap/CustomItemFrames.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/imagemap/CustomItemFrames.java @@ -15,13 +15,12 @@ import net.minecraft.server.v1_8_R3.Packet; import net.minecraft.server.v1_8_R3.PacketPlayInUseEntity; import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata; +import org.bukkit.craftbukkit.libs.com.google.common.base.Optional; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftItemFrame; import org.bukkit.craftbukkit.v1_8_R3.inventory.CraftItemStack; import org.bukkit.entity.ItemFrame; import org.bukkit.entity.Player; -import com.google.common.base.Optional; - import mineplex.core.MiniPlugin; import mineplex.core.ReflectivelyCreateMiniPlugin; import mineplex.core.common.util.UtilPlayer;