Version Bump & Cleanup

Author: MinnDevelopment

build.gradle

@@ -28,7 +28,7 @@ plugins {
     id 'com.github.johnrengelman.shadow' version '2.0.1'
 }
 
-def versionObj = new Version(major: 3, minor: 4, revision: 0)
+def versionObj = new Version(major: 3, minor: 5, revision: 0)
 
 group = "net.dv8tion"
 archivesBaseName = "JDA"

src/main/java/net/dv8tion/jda/bot/sharding/DefaultShardManagerBuilder.java

@@ -358,8 +358,8 @@ public DefaultShardManagerBuilder setEventManager(final IEventManager manager)
      * <br>This value can be changed at any time in the {@link net.dv8tion.jda.core.managers.Presence Presence} from a JDA instance.
      *
      * <p><b>Hint:</b> You can create a {@link net.dv8tion.jda.core.entities.Game Game} object using
-     * {@link net.dv8tion.jda.core.entities.Game#of(String) Game.of(String)} or
-     * {@link net.dv8tion.jda.core.entities.Game#of(String, String) Game.of(String, String)}.
+     * {@link net.dv8tion.jda.core.entities.Game#playing(String) Game.playing(String)} or
+     * {@link net.dv8tion.jda.core.entities.Game#streaming(String, String)} Game.streaming(String, String)}.
      *
      * @param  game
      *         An instance of {@link net.dv8tion.jda.core.entities.Game Game} (null allowed)
@@ -378,8 +378,8 @@ public DefaultShardManagerBuilder setGame(final Game game)
      * <br>This value can be changed at any time in the {@link net.dv8tion.jda.core.managers.Presence Presence} from a JDA instance.
      *
      * <p><b>Hint:</b> You can create a {@link net.dv8tion.jda.core.entities.Game Game} object using
-     * {@link net.dv8tion.jda.core.entities.Game#of(String) Game.of(String)} or
-     * {@link net.dv8tion.jda.core.entities.Game#of(String, String) Game.of(String, String)}.
+     * {@link net.dv8tion.jda.core.entities.Game#playing(String) Game.playing(String)} or
+     * {@link net.dv8tion.jda.core.entities.Game#streaming(String, String) Game.streaming(String, String)}.
      *
      * @param  gameProvider
      *         An instance of {@link net.dv8tion.jda.core.entities.Game Game} (null allowed)

src/main/java/net/dv8tion/jda/bot/sharding/ShardManager.java

@@ -761,16 +761,16 @@ default List<VoiceChannel> getVoiceChannels()
 
     /**
      * Sets the {@link net.dv8tion.jda.core.entities.Game Game} for all shards.
-     * <br>A Game can be retrieved via {@link net.dv8tion.jda.core.entities.Game#of(String)}.
+     * <br>A Game can be retrieved via {@link net.dv8tion.jda.core.entities.Game#playing(String)}.
      * For streams you provide a valid streaming url as second parameter.
      *
      * <p>This will also change the game for shards that are created in the future.
      *
      * @param  game
      *         A {@link net.dv8tion.jda.core.entities.Game Game} instance or null to reset
      *
-     * @see    net.dv8tion.jda.core.entities.Game#of(String)
-     * @see    net.dv8tion.jda.core.entities.Game#of(String, String)
+     * @see    net.dv8tion.jda.core.entities.Game#playing(String)
+     * @see    net.dv8tion.jda.core.entities.Game#streaming(String, String)
      */
     default void setGame(final Game game)
     {
@@ -779,16 +779,16 @@ default void setGame(final Game game)
 
     /**
      * Sets provider that provider the {@link net.dv8tion.jda.core.entities.Game Game} for all shards.
-     * <br>A Game can be retrieved via {@link net.dv8tion.jda.core.entities.Game#of(String)}.
+     * <br>A Game can be retrieved via {@link net.dv8tion.jda.core.entities.Game#playing(String)}.
      * For streams you provide a valid streaming url as second parameter.
      *
      * <p>This will also change the provider for shards that are created in the future.
      *
      * @param  gameProvider
      *         A {@link net.dv8tion.jda.core.entities.Game Game} instance or null to reset
      *
-     * @see    net.dv8tion.jda.core.entities.Game#of(String)
-     * @see    net.dv8tion.jda.core.entities.Game#of(String, String)
+     * @see    net.dv8tion.jda.core.entities.Game#playing(String)
+     * @see    net.dv8tion.jda.core.entities.Game#streaming(String, String)
      */
     default void setGameProvider(final IntFunction<Game> gameProvider)
     {

src/main/java/net/dv8tion/jda/client/events/message/group/GenericGroupMessageEvent.java

@@ -40,30 +40,4 @@ public long getMessageIdLong()
     {
         return messageId;
     }
-
-    @Deprecated
-    public boolean isFromType(ChannelType type)
-    {
-        return group.getType() == type;
-    }
-
-    @Deprecated
-    public ChannelType getChannelType()
-    {
-        return group.getType();
-    }
-
-    /**
-     * The {@link net.dv8tion.jda.client.entities.Group Group}
-     *
-     * @return The {@link net.dv8tion.jda.client.entities.Group Group}
-     *
-     * @deprecated
-     *         Use {@link #getGroup()} instead
-     */
-    @Deprecated
-    public Group getChannel()
-    {
-        return getGroup();
-    }
 }

src/main/java/net/dv8tion/jda/core/MessageBuilder.java

@@ -359,27 +359,6 @@ public boolean isEmpty() {
         return builder.length() == 0 && embed == null;
     }
 
-    /**
-     * Replaces each substring that matches the target string with the specified replacement string.
-     * The replacement proceeds from the beginning of the string to the end, for example, replacing
-     * "aa" with "b" in the message "aaa" will result in "ba" rather than "ab".
-     *
-     * @param  target
-     *         the sequence of char values to be replaced
-     * @param  replacement
-     *         the replacement sequence of char values
-     *
-     * @return The MessageBuilder instance. Useful for chaining.
-     *
-     * @deprecated
-     *         Deprecated in favor to {@link #replace(String, String)} due to clearer naming (not using regex)
-     */
-    @Deprecated
-    public MessageBuilder replaceAll(String target, String replacement)
-    {
-        return replace(target, replacement);
-    }
-
     /**
      * Replaces each substring that matches the target string with the specified replacement string.
      * The replacement proceeds from the beginning of the string to the end, for example, replacing
@@ -499,33 +478,6 @@ public MessageBuilder stripMentions(Guild guild, Message.MentionType... types)
         return this.stripMentions(guild.getJDA(), guild, types);
     }
 
-    /**
-     * Removes all mentions of the specified types and replaces them with the closest looking textual representation.
-     *
-     * <p>Use this over {@link #stripMentions(JDA, Message.MentionType...)} if {@link net.dv8tion.jda.core.entities.User User} mentions should
-     * be replaced with their nicknames in a specific guild based.
-     * <br>Uses {@link net.dv8tion.jda.core.entities.Member#getEffectiveName()}
-     *
-     * @param  guild
-     *         the guild for {@link net.dv8tion.jda.core.entities.User User} mentions
-     * @param  types
-     *         the {@link MentionType MentionTypes} that should be stripped
-     *
-     * @return The MessageBuilder instance. Useful for chaining.
-     *
-     * @deprecated
-     *         Use {@link #stripMentions(Guild, Message.MentionType...)} instead.
-     */
-    @Deprecated
-    public MessageBuilder stripMentions(Guild guild, MentionType... types)
-    {
-        if (types == null) return this;
-        Message.MentionType[] mentionTypes = new Message.MentionType[types.length];
-        for (int i = 0; i < mentionTypes.length; i++)
-            mentionTypes[i] = convertNewType(types[i]);
-        return stripMentions(guild, mentionTypes);
-    }
-
     /**
      * Removes all mentions of the specified types and replaces them with the closest looking textual representation.
      *
@@ -544,32 +496,6 @@ public MessageBuilder stripMentions(JDA jda, Message.MentionType... types)
         return this.stripMentions(jda, null, types);
     }
 
-    /**
-     * Removes all mentions of the specified types and replaces them with the closest looking textual representation.
-     *
-     * <p>Use this over {@link #stripMentions(Guild, Message.MentionType...)} if {@link net.dv8tion.jda.core.entities.User User}
-     * mentions should be replaced with their {@link net.dv8tion.jda.core.entities.User#getName()}.
-     *
-     * @param  jda
-     *         The JDA instance used to resolve the mentions.
-     * @param  types
-     *         the {@link MentionType MentionTypes} that should be stripped
-     *
-     * @return The MessageBuilder instance. Useful for chaining.
-     *
-     * @deprecated
-     *         Use {@link #stripMentions(JDA, Message.MentionType...)} instead
-     */
-    @Deprecated
-    public MessageBuilder stripMentions(JDA jda, MentionType... types)
-    {
-        if (types == null) return this;
-        Message.MentionType[] mentionTypes = new Message.MentionType[types.length];
-        for (int i = 0; i < mentionTypes.length; i++)
-            mentionTypes[i] = convertNewType(types[i]);
-        return stripMentions(jda, mentionTypes);
-    }
-
     private MessageBuilder stripMentions(JDA jda, Guild guild, Message.MentionType... types)
     {
         if (types == null)
@@ -1042,50 +968,6 @@ public int nextMessage(final int currentBeginIndex, final MessageBuilder builder
         int nextMessage(int currentBeginIndex, MessageBuilder builder);
     }
 
-    /**
-     * Holds the strippable mention types used in {@link MessageBuilder#stripMentions(JDA, MentionType...)}
-     * and {@link MessageBuilder#stripMentions(Guild, MentionType...)}
-     *
-     * @deprecated Getting replaced by {@link net.dv8tion.jda.core.entities.Message.MentionType Message.MentionType}
-     */
-    @Deprecated
-    public enum MentionType {
-        /**
-         * <b>@everyone</b> mentions 
-         */
-        EVERYONE,
-        /**
-         * <b>@here</b> mentions
-         */
-        HERE,
-        /**
-         * <b>@User</b> mentions
-         */
-        USER,
-        /**
-         * <b>#channel</b> mentions
-         */
-        CHANNEL,
-        /**
-         * <b>@Role</b> mentions
-         */
-        ROLE
-    }
-
-    @Deprecated
-    private Message.MentionType convertNewType(MentionType oldType)
-    {
-        switch (oldType)
-        {
-            case HERE: return Message.MentionType.HERE;
-            case EVERYONE: return Message.MentionType.EVERYONE;
-            case ROLE: return Message.MentionType.ROLE;
-            case USER: return Message.MentionType.USER;
-            case CHANNEL: return Message.MentionType.CHANNEL;
-            default: return null;
-        }
-    }
-
     /**
      * Holds the available formatting used in {@link MessageBuilder#append(java.lang.CharSequence, net.dv8tion.jda.core.MessageBuilder.Formatting...)}
      */

src/main/java/net/dv8tion/jda/core/entities/Game.java

@@ -150,28 +150,6 @@ public static Game playing(String name)
         return new Game(name, null, GameType.DEFAULT);
     }
 
-    /**
-     * Creates a new Game instance with the specified name.
-     * <br>In order to appear as "streaming" in the official client you must
-     * provide a valid (see documentation of method) streaming URL in {@link #streaming(String, String) Game.of(String, String)}.
-     *
-     * @param  name
-     *         The not-null name of the newly created game
-     *
-     * @throws IllegalArgumentException
-     *         if the specified name is null, empty or blank
-     *
-     * @return A valid Game instance with the provided name with {@link GameType#DEFAULT}
-     *
-     * @deprecated
-     *        Use {@link #playing(String)} instead
-     */
-    @Deprecated
-    public static Game of(String name)
-    {
-        return playing(name);
-    }
-
     /**
      * Creates a new Game instance with the specified name and url.
      * <br>The specified URL must be valid according to discord standards in order to display as "streaming" in the official client.
@@ -200,32 +178,6 @@ public static Game streaming(String name, String url)
         return new Game(name, url, type);
     }
 
-    /**
-     * Creates a new Game instance with the specified name and url.
-     * <br>The specified URL must be valid according to discord standards in order to display as "streaming" in the official client.
-     * A valid streaming URL must be derived from {@code https://twitch.tv/} and can be verified using {@link #isValidStreamingUrl(String)}. (see documentation)
-     *
-     * @param  name
-     *         The not-null name of the newly created game
-     * @param  url
-     *         The streaming url to use, required to display as "streaming"
-     *
-     * @throws IllegalArgumentException
-     *         If the specified name is null or empty
-     *
-     * @return A valid Game instance with the provided name and url
-     *
-     * @see    #isValidStreamingUrl(String)
-     *
-     * @deprecated
-     *         Use {@link #streaming(String, String)} instead!
-     */
-    @Deprecated
-    public static Game of(String name, String url)
-    {
-        return streaming(name, url);
-    }
-
     /**
      * Creates a new Game instance with the specified name.
      * <br>This will display as {@code Listening name} in the official client

src/main/java/net/dv8tion/jda/core/entities/Message.java

@@ -318,35 +318,6 @@ public interface Message extends ISnowflake, Formattable
      */
     String getContentDisplay();
 
-    /**
-     * The textual content of this message in the format that would be shown to the Discord client. All
-     * {@link net.dv8tion.jda.core.entities.IMentionable IMentionable} entities will be resolved to the format
-     * shown by the Discord client instead of the {@literal <id>} format.
-     *
-     * <p>This includes resolving:
-     * <br>{@link net.dv8tion.jda.core.entities.User Users} / {@link net.dv8tion.jda.core.entities.Member Members}
-     * to their @Username/@Nickname format,
-     * <br>{@link net.dv8tion.jda.core.entities.TextChannel TextChannels} to their #ChannelName format,
-     * <br>{@link net.dv8tion.jda.core.entities.Role Roles} to their @RoleName format
-     * <br>{@link net.dv8tion.jda.core.entities.Emote Emotes} (not emojis!) to their {@code :name:} format.
-     *
-     * <p>If you want the actual Content (mentions as {@literal <@id>}), use {@link #getContentRaw()} instead
-     *
-     * @throws java.lang.UnsupportedOperationException
-     *         If this is not a Received Message from {@link net.dv8tion.jda.core.entities.MessageType#DEFAULT MessageType.DEFAULT}
-     *
-     * @return Output of {@link #getContentDisplay()}
-     *
-     * @deprecated
-     *         You may use {@link #getContentDisplay()} instead.
-     *         <br>This method will be removed due to ambiguous meanings and major confusion for newer users.
-     */
-    @Deprecated
-    default String getContent()
-    {
-        return getContentDisplay();
-    }
-
     /**
      * The raw textual content of this message. Does not resolve {@link net.dv8tion.jda.core.entities.IMentionable IMentionable}
      * entities like {@link #getContentDisplay()} does. This means that this is the completely raw textual content of the message
@@ -357,24 +328,6 @@ default String getContent()
      */
     String getContentRaw();
 
-    /**
-     * The raw textual content of this message. Does not resolve {@link net.dv8tion.jda.core.entities.IMentionable IMentionable}
-     * entities like {@link #getContentDisplay()} does. This means that this is the completely raw textual content of the message
-     * received from Discord and can contain mentions specified by
-     * <a href="https://discordapp.com/developers/docs/resources/channel#message-formatting" target="_blank">Discord's Message Formatting</a>.
-     *
-     * @return The raw textual content of the message, containing unresolved Discord message formatting.
-     *
-     * @deprecated
-     *         You may use {@link #getContentRaw()} instead.
-     *         <br>This method will be removed due to ambiguous meanings and major confusion for newer users.
-     */
-    @Deprecated
-    default String getRawContent()
-    {
-        return getContentRaw();
-    }
-
     /**
      * Gets the textual content of this message using {@link #getContentDisplay()} and then strips it of all markdown characters
      * like {@literal *, **, __, ~~} that provide text formatting. Any characters that match these but are not being used
@@ -384,23 +337,6 @@ default String getRawContent()
      */
     String getContentStripped();
 
-    /**
-     * Gets the textual content of this message using {@link #getContentDisplay()} and then strips it of all markdown characters
-     * like {@literal *, **, __, ~~} that provide text formatting. Any characters that match these but are not being used
-     * for formatting are escaped to prevent possible formatting.
-     *
-     * @return The textual content from {@link #getContentDisplay()} with all text formatting characters removed or escaped.
-     *
-     * @deprecated
-     *         You may use {@link #getContentStripped()} instead.
-     *         <br>This method will be removed due to ambiguous meanings and major confusion for newer users.
-     */
-    @Deprecated
-    default String getStrippedContent()
-    {
-        return getContentStripped();
-    }
-
     /**
      * Creates an immutable List of {@link net.dv8tion.jda.core.entities.Invite Invite} codes
      * that are included in this Message.