feat(tsl): add Twitch Subscription Gift event

iGoodie · Oct 24, 2019 · 500eee4 · 500eee4
1 parent 6cabf65
commit 500eee4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 mod_id=twitchspawn
 mod_group=net.programmer.igoodie
-mod_version=1.4.4
+mod_version=1.4.5
 
 minecraft_version=1.14.4
 forge_version=28.0.83

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/TSLRulesetCollection.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/TSLRulesetCollection.java
@@ -64,7 +64,8 @@ public void handleEvent(EventArguments args) {
         }
 
         // Queue incoming event arguments
-        getQueue(args.streamerNickname).queue(() -> eventNode.process(args));
+        getQueue(args.streamerNickname).queue(() ->
+                TwitchSpawn.SERVER.execute(() -> eventNode.process(args)));
         TwitchSpawn.LOGGER.info("Queued handler for {} event.", eventKeyword);
     }
 

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/action/TSLAction.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/action/TSLAction.java
@@ -199,8 +199,6 @@ protected void notifyPlayer(ServerPlayerEntity player, String title, String subt
         SPlaySoundPacket packetSound = new SPlaySoundPacket(soundLocation, category, player.getPositionVec(), volume, pitch);
         player.connection.sendPacket(packetSound);
 
-        System.out.printf("messageDisplay=%s\n", ConfigManager.PREFERENCES.messageDisplay);
-
         if (ConfigManager.PREFERENCES.messageDisplay == PreferencesConfig.MessageDisplay.DISABLED)
             return; // Stop here since message displaying is disabled
 

diff --git a/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/keyword/TSLEventKeyword.java b/src/main/java/net/programmer/igoodie/twitchspawn/tslanguage/keyword/TSLEventKeyword.java
@@ -25,6 +25,10 @@ public enum TSLEventKeyword {
             new TSLEventPair("subscriber", "twitch"),
             new TSLEventPair("resub", "twitch")
     ),
+    TWITCH_SUBSCRIPTION_GIFT(
+            "Twitch Subscription Gift",
+            new TSLEventPair("subMysteryGift", "twitch")
+    ),
     TWITCH_HOST(
             "Twitch Host",
             new TSLEventPair("host", "twitch")

diff --git a/src/main/resources/assets/twitchspawn/default/titles.default.json b/src/main/resources/assets/twitchspawn/default/titles.default.json
@@ -33,6 +33,32 @@
       "color": "gold"
     }
   ],
+  "twitch subscription gift": [
+    {
+      "text": "${actor}",
+      "color": "aqua"
+    },
+    {
+      "text": " gifted",
+      "color": "white"
+    },
+    {
+      "text": " ${amount_i}",
+      "color": "gold"
+    },
+    {
+      "text": " x ",
+      "color": "white"
+    },
+    {
+      "text": "Tier ${tier}",
+      "color": "gold"
+    },
+    {
+      "text": " subs!",
+      "color": "white"
+    }
+  ],
   "twitch host": [
     {
       "text": "${actor}",