Client emote stop events

KosmX · Oct 8, 2022 · 0dd732d · 0dd732d
1 parent 19c9491
commit 0dd732d
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/emotesAPI/src/main/java/io/github/kosmx/emotes/api/events/client/ClientEmoteEvents.java b/emotesAPI/src/main/java/io/github/kosmx/emotes/api/events/client/ClientEmoteEvents.java
@@ -70,4 +70,46 @@ public interface EmotePlayEvent {
         void onEmotePlay(KeyframeAnimation emoteData, UUID userID);
     }
 
+    /**
+     * A player is stopping the played emote by command
+     * <p>
+     * NOTE: Emote ending won't trigger any events
+     */
+    public static final Event<EmoteStopEvent> EMOTE_STOP = new Event<>(EmoteStopEvent.class, listeners -> (emote, userID) -> {
+        for (EmoteStopEvent listener : listeners) {
+            listener.onEmoteStop(emote, userID);
+        }
+    });
+
+
+    @FunctionalInterface
+    public interface EmoteStopEvent {
+
+        /**
+         * Used to create emote stop side effects
+         * @param userID User ID
+         */
+        void onEmoteStop(UUID emoteID, UUID userID);
+    }
+
+
+    /**
+     * The client player is stopping its own emote
+     * It will trigger only if the command is from the client
+     */
+    public static final Event<LocalEmoteStopEvent> LOCAL_EMOTE_STOP = new Event<>(LocalEmoteStopEvent.class, listeners -> () -> {
+        for (LocalEmoteStopEvent listener : listeners) {
+            listener.onEmoteStop();
+        }
+    });
+
+
+    @FunctionalInterface
+    public interface LocalEmoteStopEvent {
+
+        /**
+         * Used to create emote stop side effects
+         */
+        void onEmoteStop();
+    }
 }
diff --git a/emotesMain/src/main/java/io/github/kosmx/emotes/main/network/ClientEmotePlay.java b/emotesMain/src/main/java/io/github/kosmx/emotes/main/network/ClientEmotePlay.java
@@ -72,6 +72,8 @@ public static boolean clientStopLocalEmote(KeyframeAnimation emoteData) {
             packetBuilder.configureToSendStop(emoteData.getUuid(), EmoteInstance.instance.getClientMethods().getMainPlayer().emotes_getUUID());
             ClientPacketManager.send(packetBuilder, null);
             EmoteInstance.instance.getClientMethods().getMainPlayer().stopEmote();
+
+            ClientEmoteEvents.LOCAL_EMOTE_STOP.invoker().onEmoteStop();
             return true;
         }
         return false;
@@ -96,6 +98,7 @@ static void executeMessage(NetData data, INetworkInstance networkInstance) throw
                 IEmotePlayerEntity player = EmoteInstance.instance.getGetters().getPlayerFromUUID(data.player);
                 assert data.stopEmoteID != null;
                 if(player != null) {
+                    ClientEmoteEvents.EMOTE_STOP.invoker().onEmoteStop(data.stopEmoteID, player.emotes_getUUID());
                     player.stopEmote(data.stopEmoteID);
                     if(player.isMainPlayer() && !data.isForced){
                         EmoteInstance.instance.getClientMethods().sendChatMessage(EmoteInstance.instance.getDefaults().newTranslationText("emotecraft.blockedEmote"));

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.jvmargs  = -Xmx4G
 #See copy-paste
 mod_description = Play emotes in Minecraft\\nOpen the menu to setup your fast-choose wheel\\n\\nYou can add custom emotes, and you can play these even if nobody else has them\\n\\nSpecial thanks:\\nKale Ko for creating emotes and help in the UI design\\nOrsond for inspiring me and providing CollarMC\\nArchitectury for the Forge build tools
 #Mod properties
-version_base         = 2.2.5
+version_base         = 2.2.6
 maven_group         = io.github.kosmx.emotes
 archives_base_name  = emotecraft
 #Most of this project is compiled against Java8. but it can be overwritten