Skip to content

Commit b4dd310

Browse files
GikkmanGikkman
committed
Merge branch 'develop'
2 parents 8ea6825 + 926f537 commit b4dd310

53 files changed

Lines changed: 584 additions & 167 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎twirc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.gikk</groupId>
66
<artifactId>twirc</artifactId>
7-
<version>0.1</version>
7+
<version>0.2</version>
88
<packaging>jar</packaging>
99

1010
<name>twirc</name>

‎twirc/src/example/java/com/gikk/twirk/commands/CommandExampleBase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import java.util.Locale;
55
import java.util.Set;
66

7+
import com.gikk.twirk.enums.USER_TYPE;
78
import com.gikk.twirk.events.TwirkListenerBaseImpl;
8-
import com.gikk.twirk.types.USER_TYPE;
99
import com.gikk.twirk.types.twitchMessage.TwitchMessage;
1010
import com.gikk.twirk.types.users.TwitchUser;
1111

‎twirc/src/example/java/com/gikk/twirk/commands/PatternCommandExample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.gikk.twirk.commands;
22

33
import com.gikk.twirk.Twirk;
4-
import com.gikk.twirk.types.USER_TYPE;
4+
import com.gikk.twirk.enums.USER_TYPE;
55
import com.gikk.twirk.types.twitchMessage.TwitchMessage;
66
import com.gikk.twirk.types.users.TwitchUser;
77

‎twirc/src/example/java/com/gikk/twirk/commands/PrefixCommandExample.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.Date;
55

66
import com.gikk.twirk.Twirk;
7-
import com.gikk.twirk.types.USER_TYPE;
7+
import com.gikk.twirk.enums.USER_TYPE;
88
import com.gikk.twirk.types.twitchMessage.TwitchMessage;
99
import com.gikk.twirk.types.users.TwitchUser;
1010

‎twirc/src/main/java/com/gikk/twirk/Twirk.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import com.gikk.twirk.types.subscriberEvent.SubscriberEventBuilder;
3232
import com.gikk.twirk.types.twitchMessage.TwitchMessage;
3333
import com.gikk.twirk.types.twitchMessage.TwitchMessageBuilder;
34+
import com.gikk.twirk.types.usernotice.Usernotice;
35+
import com.gikk.twirk.types.usernotice.UsernoticeBuilder;
3436
import com.gikk.twirk.types.users.TwitchUser;
3537
import com.gikk.twirk.types.users.TwitchUserBuilder;
3638
import com.gikk.twirk.types.users.Userstate;
@@ -95,6 +97,7 @@ public class Twirk {
9597
private final TwitchUserBuilder twitchUserBuilder;
9698
private final UserstateBuilder userstateBuilder;
9799
private final SubscriberEventBuilder subscriberBuilder;
100+
private final UsernoticeBuilder usernoticeBuilder;
98101

99102
//***********************************************************************************************
100103
// CONSTRUCTOR
@@ -117,6 +120,7 @@ public class Twirk {
117120
this.userstateBuilder = builder.getUserstateBuilder();
118121
this.twitchMessageBuilder = builder.getTwitchMessageBuilder();
119122
this.subscriberBuilder= builder.getSubscriberEventBuilder();
123+
this.usernoticeBuilder= builder.getUsernoticeBuilder();
120124

121125

122126
this.queue = new OutputQueue();
@@ -473,6 +477,11 @@ else if( message.getCommand().equals("USERSTATE") ){
473477
for(TwirkListener l : listeners )
474478
l.onUserstate( userstate );
475479
}
480+
else if( message.getCommand().equals("USERNOTICE") ){
481+
Usernotice usernotice = usernoticeBuilder.build(message);
482+
for(TwirkListener l : listeners )
483+
l.onUsernotice( usernotice );
484+
}
476485
else if( message.getCommand().equals("ROOMSTATE") ){
477486
Roomstate roomstate = roomstateBuilder.build(message);
478487
for(TwirkListener l : listeners )

‎twirc/src/main/java/com/gikk/twirk/TwirkBuilder.java‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,24 @@
22

33
import com.gikk.twirk.types.clearChat.ClearChatBuilder;
44
import com.gikk.twirk.types.clearChat.GikkDefault_ClearChatBuilder;
5-
import com.gikk.twirk.types.hostTarget.HostTargetBuilder;
65
import com.gikk.twirk.types.hostTarget.GikkDefault_HostTargetBuilder;
7-
import com.gikk.twirk.types.mode.ModeBuilder;
6+
import com.gikk.twirk.types.hostTarget.HostTargetBuilder;
87
import com.gikk.twirk.types.mode.GikkDefault_ModeBuilder;
9-
import com.gikk.twirk.types.notice.NoticeBuilder;
8+
import com.gikk.twirk.types.mode.ModeBuilder;
109
import com.gikk.twirk.types.notice.GikkDefault_NoticeBuilder;
11-
import com.gikk.twirk.types.roomstate.RoomstateBuilder;
10+
import com.gikk.twirk.types.notice.NoticeBuilder;
1211
import com.gikk.twirk.types.roomstate.GikkDefault_RoomstateBuilder;
13-
import com.gikk.twirk.types.subscriberEvent.SubscriberEventBuilder;
12+
import com.gikk.twirk.types.roomstate.RoomstateBuilder;
1413
import com.gikk.twirk.types.subscriberEvent.GikkDefault_SubscriberEventBuilder;
15-
import com.gikk.twirk.types.twitchMessage.TwitchMessageBuilder;
14+
import com.gikk.twirk.types.subscriberEvent.SubscriberEventBuilder;
1615
import com.gikk.twirk.types.twitchMessage.GikkDefault_TwitchMessageBuilder;
17-
import com.gikk.twirk.types.users.TwitchUserBuilder;
16+
import com.gikk.twirk.types.twitchMessage.TwitchMessageBuilder;
17+
import com.gikk.twirk.types.usernotice.GikkDefault_UsernoticeBuilder;
18+
import com.gikk.twirk.types.usernotice.UsernoticeBuilder;
1819
import com.gikk.twirk.types.users.GikkDefault_TwitchUserBuilder;
19-
import com.gikk.twirk.types.users.UserstateBuilder;
2020
import com.gikk.twirk.types.users.GikkDefault_UserstateBuilder;
21+
import com.gikk.twirk.types.users.TwitchUserBuilder;
22+
import com.gikk.twirk.types.users.UserstateBuilder;
2123

2224
/**Class for creating instances of {@link Twirk}.<br>
2325
* To build an instance of {@link Twirk}, the user has to supply the bot's nick and
@@ -54,6 +56,7 @@ public class TwirkBuilder {
5456
private TwitchUserBuilder twitchUserBuilder;
5557
private UserstateBuilder userstateBuilder;
5658
private SubscriberEventBuilder subEventBuilder;
59+
private UsernoticeBuilder usernoticeBuilder;
5760

5861
//***********************************************************
5962
// CONSTRUCTOR
@@ -291,6 +294,13 @@ public SubscriberEventBuilder getSubscriberEventBuilder() {
291294
return subEventBuilder != null ? subEventBuilder : new GikkDefault_SubscriberEventBuilder();
292295
}
293296

297+
/**Retrieves the assigned {@link UsernoticeBuilder}, or the default one, if none is assigned.
298+
*
299+
* @return This builders current {@link UsernoticeBuilder}
300+
*/
301+
public UsernoticeBuilder getUsernoticeBuilder() {
302+
return usernoticeBuilder != null ? usernoticeBuilder : new GikkDefault_UsernoticeBuilder();
303+
}
294304
/**Creates a Twirk object, with the parameters assigned to this
295305
* builder.
296306
*
@@ -300,5 +310,4 @@ public Twirk build(){
300310
return new Twirk(this);
301311
}
302312

303-
304313
}

twirc/src/main/java/com/gikk/twirk/types/CLEARCHAT_MODE.java renamed to twirc/src/main/java/com/gikk/twirk/enums/CLEARCHAT_MODE.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gikk.twirk.types;
1+
package com.gikk.twirk.enums;
22

33
/**Enum for representing different types of CLEARCHAT messages
44
*

twirc/src/main/java/com/gikk/twirk/types/EMOTE_SIZE.java renamed to twirc/src/main/java/com/gikk/twirk/enums/EMOTE_SIZE.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gikk.twirk.types;
1+
package com.gikk.twirk.enums;
22

33
/**Enum for representing different sizes of Twitch Emotes.<br><br>
44
*

twirc/src/main/java/com/gikk/twirk/types/HOSTTARGET_MODE.java renamed to twirc/src/main/java/com/gikk/twirk/enums/HOSTTARGET_MODE.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gikk.twirk.types;
1+
package com.gikk.twirk.enums;
22

33
/**Enum for representing different types of HOSTTARGET events
44
*

twirc/src/main/java/com/gikk/twirk/types/NOTICE_EVENT.java renamed to twirc/src/main/java/com/gikk/twirk/enums/NOTICE_EVENT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.gikk.twirk.types;
1+
package com.gikk.twirk.enums;
22

33
import com.gikk.twirk.types.notice.Notice;
44

0 commit comments

Comments
 (0)