From 9a373f960ec7c806e3f7c7decff649d97c9d2f05 Mon Sep 17 00:00:00 2001 From: Mysaa Date: Mon, 24 May 2021 14:40:29 +0200 Subject: [PATCH] =?UTF-8?q?Upgrade=20=C3=A0=20la=20nouvelle=20version=20de?= =?UTF-8?q?=20l'api=20de=20JuLiabot=20et=20quelques=20fautes=20d'autrograf?= =?UTF-8?q?fe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bernard/julianatheme/JuLIAnatheme.java | 4 +-- .../julianatheme/JuliAnathèmeManager.java | 30 ++++++++++++------- .../julianatheme/anathemes/HelloAnatheme.java | 8 ++--- .../anathemes/StopTalkingAnatheme.java | 14 ++++----- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/src/com/bernard/julianatheme/JuLIAnatheme.java b/src/com/bernard/julianatheme/JuLIAnatheme.java index 241b53f..8f07c65 100644 --- a/src/com/bernard/julianatheme/JuLIAnatheme.java +++ b/src/com/bernard/julianatheme/JuLIAnatheme.java @@ -4,8 +4,8 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; public abstract class JuLIAnatheme { diff --git a/src/com/bernard/julianatheme/JuliAnathèmeManager.java b/src/com/bernard/julianatheme/JuliAnathèmeManager.java index d7c58d2..72e02ad 100644 --- a/src/com/bernard/julianatheme/JuliAnathèmeManager.java +++ b/src/com/bernard/julianatheme/JuliAnathèmeManager.java @@ -3,21 +3,31 @@ package com.bernard.julianatheme; import java.awt.Color; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.regex.Pattern; import org.reflections.Reflections; -import com.bernard.discord.api.Command; -import com.bernard.discord.api.Discord; +import com.bernard.juliabot.api.Command; +import com.bernard.juliabot.api.Discord; +import com.bernard.juliabot.api.JuLIAddon; import com.bernard.julianatheme.JuLIAnatheme.InvalidAnathemDescriptionException; -import net.dv8tion.jda.core.EmbedBuilder; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.entities.*; -import net.dv8tion.jda.core.events.Event; +import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.Message; +import net.dv8tion.jda.api.entities.MessageChannel; +import net.dv8tion.jda.api.entities.User; +import net.dv8tion.jda.api.events.Event; +@JuLIAddon(name = "julianatheme",devs="Mysaa",version = "20w33a") public class JuliAnathèmeManager { @@ -58,7 +68,7 @@ public class JuliAnathèmeManager { } } - @Command(admin=true,name="maudir",group="JuL'IAnathème",grp="janatheme",description="Maudit une personne. Usage 'maudir <@pseudo> ") + @Command(admin=true,name="maudir",description="Maudit une personne. Usage 'maudir <@pseudo> ") public void maudir(Message m,Guild g) { if(m.getMentionedUsers().size() < 1) { @@ -127,7 +137,7 @@ public class JuliAnathèmeManager { } - @Command(admin=true,name="oracle",group="JuL'IAnathème",grp="janatheme",description="Demande à l'oracle, quelles sont les maledictions planant sur une personne. Usage: 'oracle <@pseudo>") + @Command(admin=true,name="oracle",description="Demande à l'oracle, quelles sont les maledictions planant sur une personne. Usage: 'oracle <@pseudo>") public void oracle(Message m,Guild g) { if(m.getMentionedUsers().size() < 1) { @@ -161,7 +171,7 @@ public class JuliAnathèmeManager { m.getChannel().sendMessage(dumper.build()).complete(); } - @Command(admin=true,name="exorciser",group="JuL'IAnathème",grp="janatheme",description="Excorcise une personne (lui enlève sa malediction). Usage 'exoriser <@pseudo> ") + @Command(admin=true,name="exorciser",description="Excorcise une personne (lui enlève sa malediction). Usage 'exoriser <@pseudo> ") public void exorciser(Message m,Guild g) { if(m.getMentionedUsers().size() < 1) { notifyUser("Il faut notifier l'utilisateur qu vous voulez exorciser", m.getAuthor(), m.getChannel()); diff --git a/src/com/bernard/julianatheme/anathemes/HelloAnatheme.java b/src/com/bernard/julianatheme/anathemes/HelloAnatheme.java index f7c5cb9..ae324a2 100644 --- a/src/com/bernard/julianatheme/anathemes/HelloAnatheme.java +++ b/src/com/bernard/julianatheme/anathemes/HelloAnatheme.java @@ -4,13 +4,13 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import com.bernard.discord.commands.JulSoundBox; import com.bernard.julianatheme.EventReciever; import com.bernard.julianatheme.JuLIAnatheme; +import com.bernard.julsoundbox.JulSoundBox; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.events.guild.voice.GuildVoiceJoinEvent; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent; public class HelloAnatheme extends JuLIAnatheme { diff --git a/src/com/bernard/julianatheme/anathemes/StopTalkingAnatheme.java b/src/com/bernard/julianatheme/anathemes/StopTalkingAnatheme.java index ab18091..e3a8d39 100644 --- a/src/com/bernard/julianatheme/anathemes/StopTalkingAnatheme.java +++ b/src/com/bernard/julianatheme/anathemes/StopTalkingAnatheme.java @@ -9,11 +9,11 @@ import java.util.List; import com.bernard.julianatheme.EventReciever; import com.bernard.julianatheme.JuLIAnatheme; -import net.dv8tion.jda.core.MessageBuilder; -import net.dv8tion.jda.core.entities.Guild; -import net.dv8tion.jda.core.entities.Member; -import net.dv8tion.jda.core.entities.TextChannel; -import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +import net.dv8tion.jda.api.MessageBuilder; +import net.dv8tion.jda.api.entities.Guild; +import net.dv8tion.jda.api.entities.Member; +import net.dv8tion.jda.api.entities.TextChannel; +import net.dv8tion.jda.api.events.message.MessageReceivedEvent; public class StopTalkingAnatheme extends JuLIAnatheme { @@ -85,8 +85,8 @@ public class StopTalkingAnatheme extends JuLIAnatheme { "Si c'est pour dire de la merd#, ca valait pas la peine", "Là on vois bien qu'il est idiot !", "Tu sais que personne ne veut t'écouter", "Mais Arette de parler !!!", "Shut the fuck up !", "https://youtu.be/Vh2je2c45lg", - "Mais qui a donné une langue à cette personne, un cerveau aurai été un bon début !", - "Tu as de la chance que mes devs m'on interdit de de mute ...", "Ah si tu pouvais fermer ... TA GEULE !", + "Mais qui a donné une langue à cette personne, un cerveau aurait été un bon début !", + "Tu as de la chance que mes devs m'on interdit de de mute ...", "Ah si tu pouvais fermer ... TA GUEULE !", "https://youtu.be/OoNSPEFDuxo", "Als Maul !!! (C'est plus frappant en allemand)" }; }