Rework stickers

src/main/java/net/dv8tion/jda/internal/entities/sticker/GuildStickerImpl.java

@@ -151,7 +151,7 @@ public GuildStickerImpl copy()
     @Override
     public String toString()
     {
-        return "RichSticker:" + getType() + ':' + name + '(' + getId() + ",guild=" + getGuildId() + ')';
+        return "GuildSticker:" + name + '(' + getId() + ", guild=" + getGuildId() + ')';
     }
 
     @Override

src/main/java/net/dv8tion/jda/internal/entities/sticker/RichStickerImpl.java

@@ -20,11 +20,9 @@
 import net.dv8tion.jda.api.entities.sticker.RichSticker;
 import net.dv8tion.jda.api.entities.sticker.StandardSticker;
 import net.dv8tion.jda.api.entities.sticker.StickerUnion;
-import net.dv8tion.jda.internal.utils.Helpers;
 
 import javax.annotation.Nonnull;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.Set;
 
 public abstract class RichStickerImpl extends StickerItemImpl implements RichSticker, StickerUnion
@@ -90,28 +88,6 @@ public String setDescription(String description)
     @Override
     public String toString()
     {
-        return "RichSticker:" + getType() + ':' + name + '(' + getId() + ')';
-    }
-
-    @Override
-    public int hashCode()
-    {
-        return Objects.hash(id, format, name, getType(), tags, description);
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (obj == this)
-            return true;
-        if (!(obj instanceof RichStickerImpl))
-            return false;
-        RichStickerImpl other = (RichStickerImpl) obj;
-        return id == other.id
-                && format == other.format
-                && getType() == other.getType()
-                && Objects.equals(name, other.name)
-                && Objects.equals(description, other.description)
-                && Helpers.deepEqualsUnordered(tags, other.tags);
+        return "RichSticker[" + getType() + "]:" + name + '(' + getId() + ')';
     }
 }

src/main/java/net/dv8tion/jda/internal/entities/sticker/StandardStickerImpl.java

@@ -64,7 +64,7 @@ public int getSortValue()
     @Override
     public String toString()
     {
-        return "RichSticker:" + getType() + ":" + name + '(' + getId() + ",pack=" + getPackId() + ')';
+        return "StandardSticker:" + name + '(' + getId() + ", pack=" + getPackId() + ')';
     }
 
     @Override

src/main/java/net/dv8tion/jda/internal/entities/sticker/StickerPackImpl.java

@@ -18,8 +18,8 @@
 
 import net.dv8tion.jda.api.entities.sticker.StandardSticker;
 import net.dv8tion.jda.api.entities.sticker.StickerPack;
-import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.Nonnull;
 import java.util.Collections;
 import java.util.List;
 
@@ -49,21 +49,21 @@ public long getIdLong()
         return id;
     }
 
-    @NotNull
+    @Nonnull
     @Override
     public List<StandardSticker> getStickers()
     {
         return stickers;
     }
 
-    @NotNull
+    @Nonnull
     @Override
     public String getName()
     {
         return name;
     }
 
-    @NotNull
+    @Nonnull
     @Override
     public String getDescription()
     {

src/main/java/net/dv8tion/jda/internal/entities/sticker/StickerSnowflakeImpl.java

@@ -48,4 +48,10 @@ public boolean equals(Object obj)
             return false;
         return ((StickerSnowflakeImpl) obj).id == id;
     }
+
+    @Override
+    public String toString()
+    {
+        return "StickerSnowflake(" + getId() + ')';
+    }
 }