emoji fixes

1A3Dev · Dec 8, 2022 · a460ef0 · a460ef0
1 parent aeec62d
commit a460ef0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,15 +23,15 @@
             <name>m2-dv8tion</name>
             <url>https://m2.dv8tion.net/releases</url>
         </repository>
-<!--        <repository>-->
-<!--            <id>skript-releases</id>-->
-<!--            <name>Skript Repository</name>-->
-<!--            <url>https://repo.skriptlang.org/releases</url>-->
-<!--        </repository>-->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>skript-releases</id>
+            <name>Skript Repository</name>
+            <url>https://repo.skriptlang.org/releases</url>
+        </repository>
     </repositories>
     <dependencies>
         <dependency>
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.github.SkriptLang</groupId>
             <artifactId>Skript</artifactId>
-            <version>2.6.1</version>
+            <version>2.6.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-media</artifactId>
-            <version>11</version>
+            <version>19</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -70,25 +70,25 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.17.1</version>
+            <version>2.19.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.19.0</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.9</version>
+            <version>2.0.5</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.10</version>
+            <version>1.4.5</version>
             <scope>runtime</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/me/iblitzkriegi/vixio/events/EvtAddReaction.java b/src/main/java/me/iblitzkriegi/vixio/events/EvtAddReaction.java
@@ -10,6 +10,8 @@
 import me.iblitzkriegi.vixio.util.wrapper.Bot;
 import me.iblitzkriegi.vixio.util.wrapper.Emote;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.entities.emoji.EmojiUnion;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.exceptions.RateLimitedException;
 
@@ -75,11 +77,11 @@ public GuildChannel get(ReactionAddEvent event) {
         EventValues.registerEventValue(ReactionAddEvent.class, Emote.class, new Getter<Emote, ReactionAddEvent>() {
             @Override
             public Emote get(ReactionAddEvent event) {
-                Emote reactionEmote = (Emote) event.getJDAEvent().getEmoji();
-                if (!reactionEmote.isEmote()) {
+                EmojiUnion reactionEmote = event.getJDAEvent().getEmoji();
+                if (reactionEmote.getType().equals(Emoji.Type.UNICODE)) {
                     return Util.unicodeFrom(reactionEmote.getName());
                 } else {
-                    return new Emote(reactionEmote.getEmote());
+                    return new Emote(reactionEmote.getName());
                 }
             }
         }, 0);

diff --git a/src/main/java/me/iblitzkriegi/vixio/events/EvtReactionRemove.java b/src/main/java/me/iblitzkriegi/vixio/events/EvtReactionRemove.java
@@ -10,6 +10,8 @@
 import me.iblitzkriegi.vixio.util.wrapper.Bot;
 import me.iblitzkriegi.vixio.util.wrapper.Emote;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.emoji.Emoji;
+import net.dv8tion.jda.api.entities.emoji.EmojiUnion;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.exceptions.RateLimitedException;
 
@@ -76,14 +78,14 @@ public GuildChannel get(ReactionRemoveEvent event) {
         EventValues.registerEventValue(ReactionRemoveEvent.class, Emote.class, new Getter<Emote, ReactionRemoveEvent>() {
                 @Override
                 public Emote get(ReactionRemoveEvent event) {
-                    Emote reactionEmote = (Emote) event.getJDAEvent().getEmoji();
-                    if (!reactionEmote.isEmote()) {
+                    EmojiUnion reactionEmote = event.getJDAEvent().getEmoji();
+                    if (reactionEmote.getType().equals(Emoji.Type.UNICODE)) {
                         return Util.unicodeFrom(reactionEmote.getName());
                     } else {
-                        return new Emote(reactionEmote.getEmote());
+                        return new Emote(reactionEmote.getName());
                     }
-                }
-            }, 0);
+            }
+        }, 0);
 
     }