add

Author: ROMVoid95

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ version = "1.0"
 
 [versions]
 
-jda = "5.0.0-beta.3"
+jda = "5.0.0-beta.4"
 json = "20220320"
 lang3 = "3.12.0"
 jackson = "2.14.1"

src/main/java/io/github/readonly/common/util/Embed.java

@@ -1,31 +1,34 @@
 package io.github.readonly.common.util;
 
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
 import io.github.readonly.command.event.Event;
+import lombok.NonNull;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.MessageEmbed;
+import net.dv8tion.jda.api.entities.MessageEmbed.Field;
 import net.dv8tion.jda.api.entities.User;
 import okhttp3.HttpUrl;
 
 public class Embed
 {
-	private final String NEWLINE = "\n";
-	private final EmbedBuilder builder;
-	private Event<?> event;
+	private final String		NEWLINE	= "\n";
+	private final EmbedBuilder	builder;
 
-	public static <T extends Event<T>> Embed newBuilder(T event)
+	public static Embed fromMessageEmbed(MessageEmbed m)
 	{
-		return new Embed();
+		return new Embed(m);
 	}
 
 	public static Embed newBuilder()
 	{
 		return new Embed();
 	}
 
-	private <T extends Event<T>> Embed(T event)
+	private Embed(MessageEmbed messageEmbed)
 	{
-		this.builder = new EmbedBuilder();
-		this.event = event;
+		this.builder = new EmbedBuilder(messageEmbed);
 	}
 
 	private Embed()
@@ -75,9 +78,21 @@ public Embed image(HttpUrl url)
 		return this;
 	}
 
-	public Embed setAuthor()
+	public Embed setAuthor(String author)
+	{
+		this.builder.setAuthor(author);
+		return this;
+	}
+
+	public Embed setAuthor(User user)
 	{
-		if(event != null)
+		this.builder.setAuthor(user.getAsTag(), null, user.getEffectiveAvatarUrl());
+		return this;
+	}
+
+	public <T extends Event<T>> Embed setAuthor(T event)
+	{
+		if (event != null)
 		{
 			User author = event.getAuthor();
 			this.builder.setAuthor(author.getAsTag(), null, author.getEffectiveAvatarUrl());
@@ -97,6 +112,22 @@ public Embed footer(String text)
 		return this;
 	}
 
+	public Embed addFieldConditionally(Condition<Field> predicate)
+	{
+		if (predicate.pass())
+		{
+			field(predicate.get());
+		}
+
+		return this;
+	}
+
+	public Embed field(Field field)
+	{
+		this.builder.addField(field);
+		return this;
+	}
+
 	public Embed field(String title, String content)
 	{
 		this.builder.addField(title, content, false);
@@ -119,4 +150,32 @@ public final MessageEmbed toEmbed()
 	{
 		return this.builder.build();
 	}
+
+	public static class Condition<T> implements Supplier<T>
+	{
+		private final T				obj;
+		private final Predicate<T>	predicate;
+
+		private Condition(@NonNull T obj, @NonNull Predicate<T> predicate)
+		{
+			this.obj = obj;
+			this.predicate = predicate;
+		}
+
+		public static <T> Condition<T> NotNull(@NonNull T obj)
+		{
+			return new Condition<T>(obj, p -> p != null);
+		}
+
+		public boolean pass()
+		{
+			return predicate.test(obj);
+		}
+
+		@Override
+		public T get()
+		{
+			return obj;
+		}
+	}
 }

src/main/java/io/github/readonly/common/util/RGB.java

@@ -19,6 +19,7 @@
 
 package io.github.readonly.common.util;
 
+import java.awt.Color;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -262,6 +263,11 @@ public static RGB parse(String str) {
 		return new RGB(color);
 	}
 
+	public static RGB colorToRGB(Color c)
+	{
+		return new RGB(c.getRGB());
+	}
+
 	/**
 	 * Attempt to parse a color, returning the default if it is not valid.
 	 *