From 9c5f6a06a448b4a8e676dfbcca467e9d82c226aa Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 17 Dec 2017 13:25:59 +0100 Subject: [PATCH] Use Xlib guava some more --- .../item/ConverterListImmutable.java | 58 ------------------- .../massivecore/item/ConverterToColors.java | 2 +- .../massivecore/item/PotionUtil.java | 4 +- .../item/WriterFireworkEffectColors.java | 7 +-- .../item/WriterFireworkEffectFadeColors.java | 7 +-- .../massivecraft/massivecore/mson/Mson.java | 2 +- .../massivecore/nms/NmsBoard17R4.java | 2 +- .../massivecore/predicate/PredicateAnd.java | 2 +- .../massivecore/store/SenderEntity.java | 2 +- .../massivecore/util/SenderMap.java | 2 +- 10 files changed, 14 insertions(+), 74 deletions(-) delete mode 100644 src/com/massivecraft/massivecore/item/ConverterListImmutable.java diff --git a/src/com/massivecraft/massivecore/item/ConverterListImmutable.java b/src/com/massivecraft/massivecore/item/ConverterListImmutable.java deleted file mode 100644 index ded20eeb..00000000 --- a/src/com/massivecraft/massivecore/item/ConverterListImmutable.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.massivecraft.massivecore.item; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableList.Builder; - -public class ConverterListImmutable extends Converter, ImmutableList> -{ - // -------------------------------------------- // - // FIELD - // -------------------------------------------- // - - private final Converter converterElement; - public Converter getConverterElement() { return this.converterElement; } - - // -------------------------------------------- // - // CREATE - // -------------------------------------------- // - - public ConverterListImmutable(Converter converterElement) - { - this.converterElement = converterElement; - } - - // -------------------------------------------- // - // OVERRIDE - // -------------------------------------------- // - - @Override - public ImmutableList convert(Iterable exs) - { - // Null - if (exs == null) return null; - - // Create - Builder eys = ImmutableList.builder(); - - // Fill - for (EX ex : exs) - { - EY ey = null; - try - { - ey = this.getConverterElement().convert(ex); - } - catch (Throwable t) - { - t.printStackTrace(); - continue; - } - - eys.add(ey); - } - - // Return - return eys.build(); - } - -} diff --git a/src/com/massivecraft/massivecore/item/ConverterToColors.java b/src/com/massivecraft/massivecore/item/ConverterToColors.java index d5de6c54..5eecaad7 100644 --- a/src/com/massivecraft/massivecore/item/ConverterToColors.java +++ b/src/com/massivecraft/massivecore/item/ConverterToColors.java @@ -2,7 +2,7 @@ package com.massivecraft.massivecore.item; import org.bukkit.Color; -public class ConverterToColors extends ConverterListImmutable +public class ConverterToColors extends ConverterList { // -------------------------------------------- // // INSTANCE & CONSTRUCT diff --git a/src/com/massivecraft/massivecore/item/PotionUtil.java b/src/com/massivecraft/massivecore/item/PotionUtil.java index 4f788c71..90c215bb 100644 --- a/src/com/massivecraft/massivecore/item/PotionUtil.java +++ b/src/com/massivecraft/massivecore/item/PotionUtil.java @@ -1,7 +1,7 @@ package com.massivecraft.massivecore.item; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; +import com.massivecraft.massivecore.xlib.guava.collect.BiMap; +import com.massivecraft.massivecore.xlib.guava.collect.ImmutableBiMap; import org.bukkit.potion.Potion; import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionType; diff --git a/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java b/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java index bc6dbd79..5099c94f 100644 --- a/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java +++ b/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.item; -import com.google.common.collect.ImmutableList; import org.bukkit.Color; import org.bukkit.FireworkEffect; import java.util.List; -public class WriterFireworkEffectColors extends WriterAbstractFireworkEffect, ImmutableList> +public class WriterFireworkEffectColors extends WriterAbstractFireworkEffect, List> { // -------------------------------------------- // // INSTANCE & CONSTRUCT @@ -38,9 +37,9 @@ public class WriterFireworkEffectColors extends WriterAbstractFireworkEffect getB(FireworkEffect cb, Object d) + public List getB(FireworkEffect cb, Object d) { - return (ImmutableList) cb.getColors(); + return cb.getColors(); } } diff --git a/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java b/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java index cd33a7b9..22e853f7 100644 --- a/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java +++ b/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java @@ -1,12 +1,11 @@ package com.massivecraft.massivecore.item; -import com.google.common.collect.ImmutableList; import org.bukkit.Color; import org.bukkit.FireworkEffect; import java.util.List; -public class WriterFireworkEffectFadeColors extends WriterAbstractFireworkEffect, ImmutableList> +public class WriterFireworkEffectFadeColors extends WriterAbstractFireworkEffect, List> { // -------------------------------------------- // // INSTANCE & CONSTRUCT @@ -38,9 +37,9 @@ public class WriterFireworkEffectFadeColors extends WriterAbstractFireworkEffect } @Override - public ImmutableList getB(FireworkEffect cb, Object d) + public List getB(FireworkEffect cb, Object d) { - return (ImmutableList) cb.getFadeColors(); + return cb.getFadeColors(); } } diff --git a/src/com/massivecraft/massivecore/mson/Mson.java b/src/com/massivecraft/massivecore/mson/Mson.java index 37bfd242..9f534e29 100644 --- a/src/com/massivecraft/massivecore/mson/Mson.java +++ b/src/com/massivecraft/massivecore/mson/Mson.java @@ -1,6 +1,5 @@ package com.massivecraft.massivecore.mson; -import com.google.common.collect.ImmutableList; import com.massivecraft.massivecore.adapter.AdapterLowercaseEnum; import com.massivecraft.massivecore.adapter.AdapterMsonEventFix; import com.massivecraft.massivecore.collections.MassiveList; @@ -14,6 +13,7 @@ import com.massivecraft.massivecore.xlib.gson.GsonBuilder; import com.massivecraft.massivecore.xlib.gson.JsonElement; import com.massivecraft.massivecore.xlib.gson.JsonNull; import com.massivecraft.massivecore.xlib.gson.JsonPrimitive; +import com.massivecraft.massivecore.xlib.guava.collect.ImmutableList; import org.apache.commons.lang.mutable.MutableInt; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java b/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java index 00c0a722..2907b453 100644 --- a/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java +++ b/src/com/massivecraft/massivecore/nms/NmsBoard17R4.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.nms; -import com.google.common.collect.ImmutableSet; import com.massivecraft.massivecore.particleeffect.ReflectionUtils.PackageType; import com.massivecraft.massivecore.util.ReflectionUtil; +import com.massivecraft.massivecore.xlib.guava.collect.ImmutableSet; import org.bukkit.scoreboard.Scoreboard; import org.bukkit.scoreboard.Team; diff --git a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java index 4f71d7fc..9c12ef69 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateAnd.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateAnd.java @@ -1,6 +1,6 @@ package com.massivecraft.massivecore.predicate; -import com.google.common.collect.ImmutableList; +import com.massivecraft.massivecore.xlib.guava.collect.ImmutableList; import java.util.Collection; import java.util.List; diff --git a/src/com/massivecraft/massivecore/store/SenderEntity.java b/src/com/massivecraft/massivecore/store/SenderEntity.java index 43249a5e..e6eb19b4 100644 --- a/src/com/massivecraft/massivecore/store/SenderEntity.java +++ b/src/com/massivecraft/massivecore/store/SenderEntity.java @@ -1,6 +1,5 @@ package com.massivecraft.massivecore.store; -import com.google.common.base.Objects; import com.massivecraft.massivecore.Named; import com.massivecraft.massivecore.PlayerState; import com.massivecraft.massivecore.event.EventMassiveCoreAknowledge; @@ -13,6 +12,7 @@ import com.massivecraft.massivecore.mson.Mson; import com.massivecraft.massivecore.store.cleanable.Cleanable; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.PermissionUtil; +import com.massivecraft.massivecore.xlib.guava.base.Objects; import org.bukkit.GameMode; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/com/massivecraft/massivecore/util/SenderMap.java b/src/com/massivecraft/massivecore/util/SenderMap.java index 9fe3a208..1912d663 100644 --- a/src/com/massivecraft/massivecore/util/SenderMap.java +++ b/src/com/massivecraft/massivecore/util/SenderMap.java @@ -1,8 +1,8 @@ package com.massivecraft.massivecore.util; -import com.google.common.collect.ImmutableList; import com.massivecraft.massivecore.SenderPresence; import com.massivecraft.massivecore.SenderType; +import com.massivecraft.massivecore.xlib.guava.collect.ImmutableList; import java.util.Collections; import java.util.EnumMap;