From 05b632e8d52e8c4e5708c62aceb940f5f1002710 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Sun, 17 Dec 2017 14:22:00 +0100
Subject: [PATCH] Reflection actually demanded ImmutableList so revert to that

---
 .../item/ConverterListImmutable.java          | 58 +++++++++++++++++++
 .../massivecore/item/ConverterToColors.java   |  2 +-
 .../item/WriterFireworkEffectColors.java      |  7 ++-
 .../item/WriterFireworkEffectFadeColors.java  |  7 ++-
 4 files changed, 67 insertions(+), 7 deletions(-)
 create 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
new file mode 100644
index 00000000..a88cf4c1
--- /dev/null
+++ b/src/com/massivecraft/massivecore/item/ConverterListImmutable.java
@@ -0,0 +1,58 @@
+package com.massivecraft.massivecore.item;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
+
+public class ConverterListImmutable<EX, EY> extends Converter<Iterable<EX>, ImmutableList<EY>>
+{
+	// -------------------------------------------- //
+	// FIELD
+	// -------------------------------------------- //
+	
+	private final Converter<EX, EY> converterElement;
+	public Converter<EX, EY> getConverterElement() { return this.converterElement; }
+	
+	// -------------------------------------------- //
+	// CREATE
+	// -------------------------------------------- //
+	
+	public ConverterListImmutable(Converter<EX, EY> converterElement)
+	{
+		this.converterElement = converterElement;
+	}
+	
+	// -------------------------------------------- //
+	// OVERRIDE
+	// -------------------------------------------- //
+	
+	@Override
+	public ImmutableList<EY> convert(Iterable<EX> exs)
+	{
+		// Null
+		if (exs == null) return null;
+		
+		// Create
+		Builder<EY> 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 5eecaad7..d5de6c54 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 ConverterList<Integer, Color>
+public class ConverterToColors extends ConverterListImmutable<Integer, Color>
 {
 	// -------------------------------------------- //
 	// INSTANCE & CONSTRUCT
diff --git a/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java b/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java
index 5099c94f..bc6dbd79 100644
--- a/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java
+++ b/src/com/massivecraft/massivecore/item/WriterFireworkEffectColors.java
@@ -1,11 +1,12 @@
 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<List<Integer>, List<Color>>
+public class WriterFireworkEffectColors extends WriterAbstractFireworkEffect<List<Integer>, ImmutableList<Color>>
 {
 	// -------------------------------------------- //
 	// INSTANCE & CONSTRUCT
@@ -37,9 +38,9 @@ public class WriterFireworkEffectColors extends WriterAbstractFireworkEffect<Lis
 	}
 	
 	@Override
-	public List<Color> getB(FireworkEffect cb, Object d)
+	public ImmutableList<Color> getB(FireworkEffect cb, Object d)
 	{
-		return cb.getColors();
+		return (ImmutableList<Color>) cb.getColors();
 	}
 	
 }
diff --git a/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java b/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java
index 22e853f7..cd33a7b9 100644
--- a/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java
+++ b/src/com/massivecraft/massivecore/item/WriterFireworkEffectFadeColors.java
@@ -1,11 +1,12 @@
 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<List<Integer>, List<Color>>
+public class WriterFireworkEffectFadeColors extends WriterAbstractFireworkEffect<List<Integer>, ImmutableList<Color>>
 {
 	// -------------------------------------------- //
 	// INSTANCE & CONSTRUCT
@@ -37,9 +38,9 @@ public class WriterFireworkEffectFadeColors extends WriterAbstractFireworkEffect
 	}
 	
 	@Override
-	public List<Color> getB(FireworkEffect cb, Object d)
+	public ImmutableList<Color> getB(FireworkEffect cb, Object d)
 	{
-		return cb.getFadeColors();
+		return (ImmutableList<Color>) cb.getFadeColors();
 	}
 	
 }