Skip to content

Fix/split package conflict #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jo4sDev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/split package conflict #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15c98e
fix: detection of auto-generated proto files in the IDE
Jo4sDev Sep 12, 2026
df0d9a8
refactor(jpms): move API and client base classes to .api and .client …
Jo4sDev Sep 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions API/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,35 @@
<configuration>
<includeMavenTypes>direct</includeMavenTypes>
<protocVersion>4.26.1</protocVersion>
<outputDirectory>${project.build.directory}/generated-sources/protobuf/src/java</outputDirectory>
<inputDirectories>
<include>src/main/proto</include>
</inputDirectories>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.1</version>
<executions>
<execution>
<id>add-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
</goals>
<configuration>
<sources>
<source>${project.build.directory}/generated-sources/protobuf/src/java</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...veloper/tiktok/annotations/EventMeta.java → ...per/tiktok/api/annotations/EventMeta.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.annotations;
package io.github.jwdeveloper.tiktok.api.annotations;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down
2 changes: 1 addition & 1 deletion ...veloper/tiktok/annotations/EventType.java → ...per/tiktok/api/annotations/EventType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.annotations;
package io.github.jwdeveloper.tiktok.api.annotations;


public enum EventType
Expand Down
2 changes: 1 addition & 1 deletion ...eveloper/tiktok/annotations/Priority.java → ...oper/tiktok/api/annotations/Priority.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.annotations;
package io.github.jwdeveloper.tiktok.api.annotations;

/**
ORDER -
Expand Down
2 changes: 1 addition & 1 deletion ...ktok/annotations/TikTokEventObserver.java → .../api/annotations/TikTokEventObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.annotations;
package io.github.jwdeveloper.tiktok.api.annotations;

import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
Expand Down
2 changes: 1 addition & 1 deletion ...oper/tiktok/data/dto/MessageMetaData.java → .../tiktok/api/data/dto/MessageMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.dto;
package io.github.jwdeveloper.tiktok.api.data.dto;

import lombok.AllArgsConstructor;
import lombok.Data;
Expand Down
2 changes: 1 addition & 1 deletion ...wdeveloper/tiktok/data/dto/ProxyData.java → ...eloper/tiktok/api/data/dto/ProxyData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.dto;
package io.github.jwdeveloper.tiktok.api.data.dto;

import lombok.*;

Expand Down
14 changes: 7 additions & 7 deletions ...iktok/data/events/TikTokBarrageEvent.java → ...k/api/data/events/TikTokBarrageEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.Picture;
import io.github.jwdeveloper.tiktok.data.models.barrage.BarrageParam;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastBarrageMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.Picture;
import io.github.jwdeveloper.tiktok.api.data.models.barrage.BarrageParam;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastBarrageMessage;
import lombok.Getter;

@Getter
Expand Down
9 changes: 5 additions & 4 deletions ...iktok/data/events/TikTokCaptionEvent.java → ...k/api/data/events/TikTokCaptionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.*;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastCaptionMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastCaptionMessage;
import lombok.Value;

import java.util.*;
Expand Down
16 changes: 8 additions & 8 deletions ...iktok/data/events/TikTokCommentEvent.java → ...k/api/data/events/TikTokCommentEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.Picture;
import io.github.jwdeveloper.tiktok.data.models.users.User;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastChatMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.Picture;
import io.github.jwdeveloper.tiktok.api.data.models.users.User;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastChatMessage;
import lombok.Getter;

import java.util.List;
Expand Down Expand Up @@ -56,7 +56,7 @@ public TikTokCommentEvent(WebcastChatMessage msg) {

public static TikTokCommentEvent of(String userName, String message) {
var builder = WebcastChatMessage.newBuilder();
builder.setUser(io.github.jwdeveloper.tiktok.messages.data.User.newBuilder()
builder.setUser(io.github.jwdeveloper.tiktok.api.messages.data.User.newBuilder()
.setNickname(userName)
.setUsername(userName)
.build());
Expand Down
8 changes: 4 additions & 4 deletions ...tok/data/events/TikTokConnectedEvent.java → ...api/data/events/TikTokConnectedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
package io.github.jwdeveloper.tiktok.api.data.events;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent;

@EventMeta(eventType = EventType.Control)
public class TikTokConnectedEvent extends TikTokLiveClientEvent
Expand Down
10 changes: 5 additions & 5 deletions ...tiktok/data/events/TikTokDetectEvent.java → ...ok/api/data/events/TikTokDetectEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastMsgDetectMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastMsgDetectMessage;
import lombok.Getter;
@Getter
@EventMeta(eventType = EventType.Message)
Expand Down
8 changes: 4 additions & 4 deletions .../data/events/TikTokDisconnectedEvent.java → .../data/events/TikTokDisconnectedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
package io.github.jwdeveloper.tiktok.api.data.events;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent;
import lombok.Getter;


Expand Down
14 changes: 7 additions & 7 deletions .../tiktok/data/events/TikTokEmoteEvent.java → ...tok/api/data/events/TikTokEmoteEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.Emote;
import io.github.jwdeveloper.tiktok.data.models.users.User;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEmoteChatMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.Emote;
import io.github.jwdeveloper.tiktok.api.data.models.users.User;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEmoteChatMessage;
import lombok.Value;

import java.util.List;
Expand Down
12 changes: 6 additions & 6 deletions ...ktok/data/events/TikTokEnvelopeEvent.java → .../api/data/events/TikTokEnvelopeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.users.User;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastEnvelopeMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.users.User;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastEnvelopeMessage;
import lombok.Value;


Expand Down
10 changes: 5 additions & 5 deletions .../tiktok/data/events/TikTokErrorEvent.java → ...tok/api/data/events/TikTokErrorEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokLiveClientEvent;
import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokLiveClientEvent;
import io.github.jwdeveloper.tiktok.api.exceptions.TikTokLiveException;
import lombok.AllArgsConstructor;
import lombok.Getter;

Expand Down
14 changes: 7 additions & 7 deletions ...ok/data/events/TikTokGoalUpdateEvent.java → ...pi/data/events/TikTokGoalUpdateEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.Picture;
import io.github.jwdeveloper.tiktok.data.models.users.User;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.Picture;
import io.github.jwdeveloper.tiktok.api.data.models.users.User;

import io.github.jwdeveloper.tiktok.messages.webcast.WebcastGoalUpdateMessage;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastGoalUpdateMessage;
import lombok.Getter;

import java.util.List;
Expand Down
10 changes: 5 additions & 5 deletions ...ktok/data/events/TikTokIMDeleteEvent.java → .../api/data/events/TikTokIMDeleteEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastImDeleteMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastImDeleteMessage;
import lombok.Getter;

import java.util.List;
Expand Down
9 changes: 5 additions & 4 deletions .../data/events/TikTokInRoomBannerEvent.java → .../data/events/TikTokInRoomBannerEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.*;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastInRoomBannerMessage;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastInRoomBannerMessage;
import lombok.Getter;

@Getter
Expand Down
10 changes: 5 additions & 5 deletions ...tok/data/events/TikTokLinkLayerEvent.java → ...api/data/events/TikTokLinkLayerEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.annotations.EventType;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;

import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkLayerMessage;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkLayerMessage;
import lombok.Getter;

@Getter
Expand Down
16 changes: 10 additions & 6 deletions ...data/events/TikTokLinkMicArmiesEvent.java → ...data/events/TikTokLinkMicArmiesEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.*;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.*;
import io.github.jwdeveloper.tiktok.messages.enums.*;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicArmies;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.LinkMicArmy;
import io.github.jwdeveloper.tiktok.api.data.models.Picture;
import io.github.jwdeveloper.tiktok.api.data.models.*;
import io.github.jwdeveloper.tiktok.api.messages.enums.BattleType;
import io.github.jwdeveloper.tiktok.api.messages.enums.TriggerReason;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicArmies;
import lombok.Getter;

import java.util.*;
Expand Down
19 changes: 11 additions & 8 deletions ...data/events/TikTokLinkMicBattleEvent.java → ...data/events/TikTokLinkMicBattleEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package io.github.jwdeveloper.tiktok.data.events;
package io.github.jwdeveloper.tiktok.api.data.events;

import io.github.jwdeveloper.tiktok.annotations.*;
import io.github.jwdeveloper.tiktok.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.data.models.battles.Team;
import io.github.jwdeveloper.tiktok.data.models.users.User;
import io.github.jwdeveloper.tiktok.messages.data.*;
import io.github.jwdeveloper.tiktok.messages.enums.*;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastLinkMicBattle;
import io.github.jwdeveloper.tiktok.api.annotations.EventMeta;
import io.github.jwdeveloper.tiktok.api.annotations.EventType;
import io.github.jwdeveloper.tiktok.api.data.events.common.TikTokHeaderEvent;
import io.github.jwdeveloper.tiktok.api.data.models.battles.Team;
import io.github.jwdeveloper.tiktok.api.data.models.users.User;
import io.github.jwdeveloper.tiktok.api.messages.data.BattleTeamUser;
import io.github.jwdeveloper.tiktok.api.messages.data.BattleTeamUserArmies;
import io.github.jwdeveloper.tiktok.api.messages.enums.BattleAction;
import io.github.jwdeveloper.tiktok.api.messages.enums.BattleType;
import io.github.jwdeveloper.tiktok.api.messages.webcast.WebcastLinkMicBattle;
import lombok.Getter;

import java.util.*;
Expand Down
Loading