From 2d74117fe23c14841cfe56832aa1247c8d3fc08b Mon Sep 17 00:00:00 2001 From: tiennm99 Date: Fri, 10 Apr 2026 19:14:02 +0700 Subject: [PATCH] refactor: rename packages org.nico.ratel.landlords -> com.miti99.caro.{common,server} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Move all 11 shared sub-packages (channel, entity, enums, exception, features, handler, helper, print, robot, transfer, utils) under com.miti99.caro.common. - Move server sub-packages (event, handler, proxy, timer) + SimpleServer + ServerContains under com.miti99.caro.server. - Move tests under com.miti99.caro.common.{helper,robot}.tests. - Rewrite package declarations and imports across all 58 .java files via regex script (server rules applied before common to avoid overlap). - Update in server/pom.xml to com.miti99.caro.server.SimpleServer. - Update .proto files' package + java_package to com.miti99.caro.common.entity (for future regeneration). - Fix generate.sh relative output path (common/ no longer exists). - Include rewrite-packages.py script under plans/ for auditability. Note: protoc-generated ClientTransferData.java / ServerTransferData.java retain internal_static_* variable names and embedded descriptor byte strings with the old package — these are implementation details that do not affect the public Java package and preserve protobuf wire compatibility. Validation: mvn -f server/pom.xml clean verify on Java 25 — all 37 tests pass (29 GomokuHelperTest + 8 GomokuAITest). --- .../rewrite-packages.py | 50 ++++++++++ server/pom.xml | 2 +- .../caro/common}/channel/ChannelUtils.java | 14 +-- .../miti99/caro/common}/entity/Board.java | 6 +- .../caro/common}/entity/ClientSide.java | 6 +- .../common}/entity/ClientTransferData.java | 96 +++++++++---------- .../miti99/caro/common}/entity/GameMove.java | 4 +- .../miti99/caro/common}/entity/Msg.java | 2 +- .../miti99/caro/common}/entity/Room.java | 8 +- .../common}/entity/ServerTransferData.java | 96 +++++++++---------- .../caro/common}/enums/ClientEventCode.java | 2 +- .../miti99/caro/common}/enums/ClientRole.java | 2 +- .../caro/common}/enums/ClientStatus.java | 2 +- .../miti99/caro/common}/enums/GameResult.java | 2 +- .../miti99/caro/common}/enums/PieceType.java | 2 +- .../miti99/caro/common}/enums/RoomStatus.java | 2 +- .../miti99/caro/common}/enums/RoomType.java | 2 +- .../caro/common}/enums/ServerEventCode.java | 2 +- .../common}/exception/LandlordException.java | 2 +- .../caro/common}/features/Features.java | 2 +- .../caro/common}/handler/DefaultDecoder.java | 4 +- .../caro/common}/helper/GomokuHelper.java | 12 +-- .../miti99/caro/common}/helper/MapHelper.java | 4 +- .../caro/common}/helper/TimeHelper.java | 2 +- .../caro/common}/print/FormatPrinter.java | 2 +- .../caro/common}/print/SimplePrinter.java | 2 +- .../caro/common}/print/SimpleWriter.java | 2 +- .../miti99/caro/common}/robot/GomokuAI.java | 8 +- .../miti99/caro/common}/transfer/ByteKit.java | 2 +- .../caro/common}/transfer/ByteLink.java | 2 +- .../transfer/TransferProtocolUtils.java | 6 +- .../miti99/caro/common}/utils/JsonUtils.java | 2 +- .../miti99/caro/common}/utils/ListUtils.java | 2 +- .../caro/common}/utils/OptionsUtils.java | 2 +- .../caro/common}/utils/StreamUtils.java | 2 +- .../miti99/caro}/server/ServerContains.java | 6 +- .../miti99/caro}/server/SimpleServer.java | 6 +- .../server/event/ServerEventListener.java | 8 +- .../ServerEventListener_CODE_CLIENT_EXIT.java | 14 +-- ...verEventListener_CODE_CLIENT_INFO_SET.java | 6 +- ...ventListener_CODE_CLIENT_NICKNAME_SET.java | 12 +-- ...rverEventListener_CODE_CLIENT_OFFLINE.java | 14 +-- .../ServerEventListener_CODE_GAME_MOVE.java | 28 +++--- .../ServerEventListener_CODE_GAME_READY.java | 20 ++-- ...erverEventListener_CODE_GAME_STARTING.java | 22 ++--- .../ServerEventListener_CODE_GAME_WATCH.java | 16 ++-- ...verEventListener_CODE_GAME_WATCH_EXIT.java | 10 +- .../ServerEventListener_CODE_GET_ROOMS.java | 16 ++-- .../ServerEventListener_CODE_ROOM_CREATE.java | 22 ++--- ...verEventListener_CODE_ROOM_CREATE_PVE.java | 22 ++--- .../ServerEventListener_CODE_ROOM_JOIN.java | 20 ++-- .../handler/ProtobufTransferHandler.java | 22 ++--- .../server/handler/SecondProtobufCodec.java | 4 +- .../handler/WebsocketTransferHandler.java | 26 ++--- .../caro}/server/proxy/ProtobufProxy.java | 14 +-- .../miti99/caro}/server/proxy/Proxy.java | 2 +- .../caro}/server/proxy/WebsocketProxy.java | 12 +-- .../caro}/server/timer/RoomClearTask.java | 16 ++-- .../proto/ClientTransferDataProtoc.proto | 4 +- .../proto/ServerTransferDataProtoc.proto | 4 +- server/src/main/resources/proto/generate.sh | 5 +- .../helper/tests/GomokuHelperTest.java | 12 +-- .../common}/robot/tests/GomokuAITest.java | 10 +- 63 files changed, 392 insertions(+), 339 deletions(-) create mode 100644 plans/260410-1843-refactor-project-structure/rewrite-packages.py rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/channel/ChannelUtils.java (82%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/Board.java (95%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/ClientSide.java (92%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/ClientTransferData.java (82%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/GameMove.java (92%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/Msg.java (92%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/Room.java (95%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/entity/ServerTransferData.java (80%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/ClientEventCode.java (97%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/ClientRole.java (64%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/ClientStatus.java (67%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/GameResult.java (88%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/PieceType.java (87%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/RoomStatus.java (87%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/RoomType.java (86%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/enums/ServerEventCode.java (95%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/exception/LandlordException.java (92%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/features/Features.java (93%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/handler/DefaultDecoder.java (87%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/helper/GomokuHelper.java (91%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/helper/MapHelper.java (87%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/helper/TimeHelper.java (81%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/print/FormatPrinter.java (80%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/print/SimplePrinter.java (90%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/print/SimpleWriter.java (94%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/robot/GomokuAI.java (96%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/transfer/ByteKit.java (96%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/transfer/ByteLink.java (96%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/transfer/TransferProtocolUtils.java (90%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/utils/JsonUtils.java (88%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/utils/ListUtils.java (93%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/utils/OptionsUtils.java (82%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro/common}/utils/StreamUtils.java (96%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/ServerContains.java (92%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/SimpleServer.java (75%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener.java (81%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_CLIENT_EXIT.java (73%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java (75%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java (68%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java (72%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_GAME_MOVE.java (86%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_GAME_READY.java (72%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_GAME_STARTING.java (75%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_GAME_WATCH.java (71%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java (71%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_GET_ROOMS.java (66%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_ROOM_CREATE.java (59%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java (75%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/event/ServerEventListener_CODE_ROOM_JOIN.java (79%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/handler/ProtobufTransferHandler.java (82%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/handler/SecondProtobufCodec.java (79%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/handler/WebsocketTransferHandler.java (84%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/proxy/ProtobufProxy.java (87%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/proxy/Proxy.java (64%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/proxy/WebsocketProxy.java (87%) rename server/src/main/java/{org/nico/ratel/landlords => com/miti99/caro}/server/timer/RoomClearTask.java (77%) rename server/src/test/java/{org/nico/ratel/landlords => com/miti99/caro/common}/helper/tests/GomokuHelperTest.java (97%) rename server/src/test/java/{org/nico/ratel/landlords => com/miti99/caro/common}/robot/tests/GomokuAITest.java (92%) diff --git a/plans/260410-1843-refactor-project-structure/rewrite-packages.py b/plans/260410-1843-refactor-project-structure/rewrite-packages.py new file mode 100644 index 0000000..96b5a22 --- /dev/null +++ b/plans/260410-1843-refactor-project-structure/rewrite-packages.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 +"""One-shot package rewriter: org.nico.ratel.landlords.* -> com.miti99.caro.{common,server}.*. + +Rules (order matters — server rules first so they don't get absorbed by common): +- org.nico.ratel.landlords.server -> com.miti99.caro.server +- org.nico.ratel.landlords -> com.miti99.caro.common + +Touches: package declarations, imports, and any fully-qualified references in code/strings. +""" +from __future__ import annotations + +import pathlib +import re +import sys + +ROOT = pathlib.Path(__file__).resolve().parents[2] / "server" / "src" + +# Server rule must precede common rule (otherwise landlords.server.X becomes common.server.X). +REPLACEMENTS = [ + (re.compile(r"org\.nico\.ratel\.landlords\.server"), "com.miti99.caro.server"), + (re.compile(r"org\.nico\.ratel\.landlords"), "com.miti99.caro.common"), +] + + +def rewrite(path: pathlib.Path) -> bool: + text = path.read_text(encoding="utf-8") + new = text + for pattern, repl in REPLACEMENTS: + new = pattern.sub(repl, new) + if new != text: + path.write_text(new, encoding="utf-8") + return True + return False + + +def main() -> int: + files = sorted(ROOT.rglob("*.java")) + if not files: + print(f"no .java files under {ROOT}", file=sys.stderr) + return 1 + changed = 0 + for f in files: + if rewrite(f): + changed += 1 + print(f"rewrote {changed}/{len(files)} files") + return 0 + + +if __name__ == "__main__": + raise SystemExit(main()) diff --git a/server/pom.xml b/server/pom.xml index 0b2a321..910c906 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -15,7 +15,7 @@ 25 UTF-8 - org.nico.ratel.landlords.server.SimpleServer + com.miti99.caro.server.SimpleServer 4.1.115.Final 3.25.5 diff --git a/server/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java b/server/src/main/java/com/miti99/caro/common/channel/ChannelUtils.java similarity index 82% rename from server/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java rename to server/src/main/java/com/miti99/caro/common/channel/ChannelUtils.java index 33f5679..5716d7e 100644 --- a/server/src/main/java/org/nico/ratel/landlords/channel/ChannelUtils.java +++ b/server/src/main/java/com/miti99/caro/common/channel/ChannelUtils.java @@ -1,11 +1,11 @@ -package org.nico.ratel.landlords.channel; +package com.miti99.caro.common.channel; -import org.nico.ratel.landlords.entity.ClientTransferData; -import org.nico.ratel.landlords.entity.Msg; -import org.nico.ratel.landlords.entity.ServerTransferData; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.entity.ClientTransferData; +import com.miti99.caro.common.entity.Msg; +import com.miti99.caro.common.entity.ServerTransferData; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.common.utils.JsonUtils; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/Board.java b/server/src/main/java/com/miti99/caro/common/entity/Board.java similarity index 95% rename from server/src/main/java/org/nico/ratel/landlords/entity/Board.java rename to server/src/main/java/com/miti99/caro/common/entity/Board.java index 41d6b37..a38471b 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/Board.java +++ b/server/src/main/java/com/miti99/caro/common/entity/Board.java @@ -1,7 +1,7 @@ -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; -import org.nico.ratel.landlords.enums.PieceType; -import org.nico.ratel.landlords.enums.GameResult; +import com.miti99.caro.common.enums.PieceType; +import com.miti99.caro.common.enums.GameResult; public class Board { diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java b/server/src/main/java/com/miti99/caro/common/entity/ClientSide.java similarity index 92% rename from server/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java rename to server/src/main/java/com/miti99/caro/common/entity/ClientSide.java index d8698f8..4d7b3fa 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/ClientSide.java +++ b/server/src/main/java/com/miti99/caro/common/entity/ClientSide.java @@ -1,7 +1,7 @@ -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; -import org.nico.ratel.landlords.enums.ClientRole; -import org.nico.ratel.landlords.enums.ClientStatus; +import com.miti99.caro.common.enums.ClientRole; +import com.miti99.caro.common.enums.ClientStatus; import io.netty.channel.Channel; diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java b/server/src/main/java/com/miti99/caro/common/entity/ClientTransferData.java similarity index 82% rename from server/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java rename to server/src/main/java/com/miti99/caro/common/entity/ClientTransferData.java index 70d1d7c..8f7c8f3 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/ClientTransferData.java +++ b/server/src/main/java/com/miti99/caro/common/entity/ClientTransferData.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ClientTransferDataProtoc.proto -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; public final class ClientTransferData { private ClientTransferData() {} @@ -15,7 +15,7 @@ public final class ClientTransferData { (com.google.protobuf.ExtensionRegistryLite) registry); } public interface ClientTransferDataProtocOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.nico.ratel.landlords.entity.ClientTransferDataProtoc) + // @@protoc_insertion_point(interface_extends:com.miti99.caro.common.entity.ClientTransferDataProtoc) com.google.protobuf.MessageOrBuilder { /** @@ -49,11 +49,11 @@ public final class ClientTransferData { getInfoBytes(); } /** - * Protobuf type {@code org.nico.ratel.landlords.entity.ClientTransferDataProtoc} + * Protobuf type {@code com.miti99.caro.common.entity.ClientTransferDataProtoc} */ public static final class ClientTransferDataProtoc extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.nico.ratel.landlords.entity.ClientTransferDataProtoc) + // @@protoc_insertion_point(message_implements:com.miti99.caro.common.entity.ClientTransferDataProtoc) ClientTransferDataProtocOrBuilder { private static final long serialVersionUID = 0L; // Use ClientTransferDataProtoc.newBuilder() to construct. @@ -129,15 +129,15 @@ public final class ClientTransferData { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.nico.ratel.landlords.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_descriptor; + return com.miti99.caro.common.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.nico.ratel.landlords.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_fieldAccessorTable + return com.miti99.caro.common.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.class, org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.Builder.class); + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.class, com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.Builder.class); } public static final int CODE_FIELD_NUMBER = 1; @@ -293,10 +293,10 @@ public final class ClientTransferData { if (obj == this) { return true; } - if (!(obj instanceof org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc)) { + if (!(obj instanceof com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc)) { return super.equals(obj); } - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc other = (org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc) obj; + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc other = (com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc) obj; boolean result = true; result = result && getCode() @@ -327,69 +327,69 @@ public final class ClientTransferData { return hash; } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom(byte[] data) + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom(java.io.InputStream input) + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseDelimitedFrom(java.io.InputStream input) + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseDelimitedFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -402,7 +402,7 @@ public final class ClientTransferData { public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc prototype) { + public static Builder newBuilder(com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @java.lang.Override @@ -418,26 +418,26 @@ public final class ClientTransferData { return builder; } /** - * Protobuf type {@code org.nico.ratel.landlords.entity.ClientTransferDataProtoc} + * Protobuf type {@code com.miti99.caro.common.entity.ClientTransferDataProtoc} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.nico.ratel.landlords.entity.ClientTransferDataProtoc) - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtocOrBuilder { + // @@protoc_insertion_point(builder_implements:com.miti99.caro.common.entity.ClientTransferDataProtoc) + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtocOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.nico.ratel.landlords.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_descriptor; + return com.miti99.caro.common.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.nico.ratel.landlords.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_fieldAccessorTable + return com.miti99.caro.common.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.class, org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.Builder.class); + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.class, com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.Builder.class); } - // Construct using org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.newBuilder() + // Construct using com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -467,17 +467,17 @@ public final class ClientTransferData { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.nico.ratel.landlords.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_descriptor; + return com.miti99.caro.common.entity.ClientTransferData.internal_static_org_nico_ratel_landlords_entity_ClientTransferDataProtoc_descriptor; } @java.lang.Override - public org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc getDefaultInstanceForType() { - return org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.getDefaultInstance(); + public com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc getDefaultInstanceForType() { + return com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.getDefaultInstance(); } @java.lang.Override - public org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc build() { - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc result = buildPartial(); + public com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc build() { + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -485,8 +485,8 @@ public final class ClientTransferData { } @java.lang.Override - public org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc buildPartial() { - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc result = new org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc(this); + public com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc buildPartial() { + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc result = new com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc(this); result.code_ = code_; result.data_ = data_; result.info_ = info_; @@ -528,16 +528,16 @@ public final class ClientTransferData { } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc) { - return mergeFrom((org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc)other); + if (other instanceof com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc) { + return mergeFrom((com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc other) { - if (other == org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc.getDefaultInstance()) return this; + public Builder mergeFrom(com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc other) { + if (other == com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc.getDefaultInstance()) return this; if (!other.getCode().isEmpty()) { code_ = other.code_; onChanged(); @@ -565,11 +565,11 @@ public final class ClientTransferData { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc parsedMessage = null; + com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc) e.getUnfinishedMessage(); + parsedMessage = (com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -798,16 +798,16 @@ public final class ClientTransferData { } - // @@protoc_insertion_point(builder_scope:org.nico.ratel.landlords.entity.ClientTransferDataProtoc) + // @@protoc_insertion_point(builder_scope:com.miti99.caro.common.entity.ClientTransferDataProtoc) } - // @@protoc_insertion_point(class_scope:org.nico.ratel.landlords.entity.ClientTransferDataProtoc) - private static final org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:com.miti99.caro.common.entity.ClientTransferDataProtoc) + private static final com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc(); + DEFAULT_INSTANCE = new com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc(); } - public static org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc getDefaultInstance() { + public static com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -832,7 +832,7 @@ public final class ClientTransferData { } @java.lang.Override - public org.nico.ratel.landlords.entity.ClientTransferData.ClientTransferDataProtoc getDefaultInstanceForType() { + public com.miti99.caro.common.entity.ClientTransferData.ClientTransferDataProtoc getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/GameMove.java b/server/src/main/java/com/miti99/caro/common/entity/GameMove.java similarity index 92% rename from server/src/main/java/org/nico/ratel/landlords/entity/GameMove.java rename to server/src/main/java/com/miti99/caro/common/entity/GameMove.java index 8854d8a..6f1e1cc 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/GameMove.java +++ b/server/src/main/java/com/miti99/caro/common/entity/GameMove.java @@ -1,6 +1,6 @@ -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; -import org.nico.ratel.landlords.enums.PieceType; +import com.miti99.caro.common.enums.PieceType; public class GameMove { diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/Msg.java b/server/src/main/java/com/miti99/caro/common/entity/Msg.java similarity index 92% rename from server/src/main/java/org/nico/ratel/landlords/entity/Msg.java rename to server/src/main/java/com/miti99/caro/common/entity/Msg.java index b0a59de..42b7792 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/Msg.java +++ b/server/src/main/java/com/miti99/caro/common/entity/Msg.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; public class Msg { diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/Room.java b/server/src/main/java/com/miti99/caro/common/entity/Room.java similarity index 95% rename from server/src/main/java/org/nico/ratel/landlords/entity/Room.java rename to server/src/main/java/com/miti99/caro/common/entity/Room.java index 7a25207..36cded3 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/Room.java +++ b/server/src/main/java/com/miti99/caro/common/entity/Room.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; import java.util.ArrayList; import java.util.LinkedList; @@ -6,9 +6,9 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentSkipListMap; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.enums.RoomType; -import org.nico.ratel.landlords.enums.PieceType; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.enums.RoomType; +import com.miti99.caro.common.enums.PieceType; public class Room { diff --git a/server/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java b/server/src/main/java/com/miti99/caro/common/entity/ServerTransferData.java similarity index 80% rename from server/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java rename to server/src/main/java/com/miti99/caro/common/entity/ServerTransferData.java index 45ccce3..657bc48 100644 --- a/server/src/main/java/org/nico/ratel/landlords/entity/ServerTransferData.java +++ b/server/src/main/java/com/miti99/caro/common/entity/ServerTransferData.java @@ -1,7 +1,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: ServerTransferDataProtoc.proto -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; public final class ServerTransferData { private ServerTransferData() { @@ -18,7 +18,7 @@ public final class ServerTransferData { } public interface ServerTransferDataProtocOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.nico.ratel.landlords.entity.ServerTransferDataProtoc) + // @@protoc_insertion_point(interface_extends:com.miti99.caro.common.entity.ServerTransferDataProtoc) com.google.protobuf.MessageOrBuilder { /** @@ -56,11 +56,11 @@ public final class ServerTransferData { } /** - * Protobuf type {@code org.nico.ratel.landlords.entity.ServerTransferDataProtoc} + * Protobuf type {@code com.miti99.caro.common.entity.ServerTransferDataProtoc} */ public static final class ServerTransferDataProtoc extends com.google.protobuf.GeneratedMessageV3 implements - // @@protoc_insertion_point(message_implements:org.nico.ratel.landlords.entity.ServerTransferDataProtoc) + // @@protoc_insertion_point(message_implements:com.miti99.caro.common.entity.ServerTransferDataProtoc) ServerTransferDataProtocOrBuilder { private static final long serialVersionUID = 0L; @@ -140,15 +140,15 @@ public final class ServerTransferData { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.nico.ratel.landlords.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_descriptor; + return com.miti99.caro.common.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.nico.ratel.landlords.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_fieldAccessorTable + return com.miti99.caro.common.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.class, org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.Builder.class); + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.class, com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.Builder.class); } public static final int CODE_FIELD_NUMBER = 1; @@ -311,10 +311,10 @@ public final class ServerTransferData { if (obj == this) { return true; } - if (!(obj instanceof org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc)) { + if (!(obj instanceof com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc)) { return super.equals(obj); } - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc other = (org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc) obj; + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc other = (com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc) obj; boolean result = true; result = result && getCode() @@ -345,51 +345,51 @@ public final class ServerTransferData { return hash; } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom(byte[] data) + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom(java.io.InputStream input) + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -397,13 +397,13 @@ public final class ServerTransferData { .parseWithIOException(PARSER, input, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseDelimitedFrom(java.io.InputStream input) + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseDelimitedFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -411,14 +411,14 @@ public final class ServerTransferData { .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -435,7 +435,7 @@ public final class ServerTransferData { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc prototype) { + public static Builder newBuilder(com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } @@ -453,26 +453,26 @@ public final class ServerTransferData { } /** - * Protobuf type {@code org.nico.ratel.landlords.entity.ServerTransferDataProtoc} + * Protobuf type {@code com.miti99.caro.common.entity.ServerTransferDataProtoc} */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder implements - // @@protoc_insertion_point(builder_implements:org.nico.ratel.landlords.entity.ServerTransferDataProtoc) - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtocOrBuilder { + // @@protoc_insertion_point(builder_implements:com.miti99.caro.common.entity.ServerTransferDataProtoc) + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtocOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.nico.ratel.landlords.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_descriptor; + return com.miti99.caro.common.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { - return org.nico.ratel.landlords.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_fieldAccessorTable + return com.miti99.caro.common.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.class, org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.Builder.class); + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.class, com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.Builder.class); } - // Construct using org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.newBuilder() + // Construct using com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -504,17 +504,17 @@ public final class ServerTransferData { @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.nico.ratel.landlords.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_descriptor; + return com.miti99.caro.common.entity.ServerTransferData.internal_static_org_nico_ratel_landlords_entity_ServerTransferDataProtoc_descriptor; } @java.lang.Override - public org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc getDefaultInstanceForType() { - return org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.getDefaultInstance(); + public com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc getDefaultInstanceForType() { + return com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.getDefaultInstance(); } @java.lang.Override - public org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc build() { - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc result = buildPartial(); + public com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc build() { + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } @@ -522,8 +522,8 @@ public final class ServerTransferData { } @java.lang.Override - public org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc buildPartial() { - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc result = new org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc(this); + public com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc buildPartial() { + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc result = new com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc(this); result.code_ = code_; result.data_ = data_; result.info_ = info_; @@ -571,16 +571,16 @@ public final class ServerTransferData { @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc) { - return mergeFrom((org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc) other); + if (other instanceof com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc) { + return mergeFrom((com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc) other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc other) { - if (other == org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc.getDefaultInstance()) + public Builder mergeFrom(com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc other) { + if (other == com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc.getDefaultInstance()) return this; if (!other.getCode().isEmpty()) { code_ = other.code_; @@ -609,11 +609,11 @@ public final class ServerTransferData { com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc parsedMessage = null; + com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc) e.getUnfinishedMessage(); + parsedMessage = (com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { if (parsedMessage != null) { @@ -858,17 +858,17 @@ public final class ServerTransferData { } - // @@protoc_insertion_point(builder_scope:org.nico.ratel.landlords.entity.ServerTransferDataProtoc) + // @@protoc_insertion_point(builder_scope:com.miti99.caro.common.entity.ServerTransferDataProtoc) } - // @@protoc_insertion_point(class_scope:org.nico.ratel.landlords.entity.ServerTransferDataProtoc) - private static final org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:com.miti99.caro.common.entity.ServerTransferDataProtoc) + private static final com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc(); + DEFAULT_INSTANCE = new com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc(); } - public static org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc getDefaultInstance() { + public static com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc getDefaultInstance() { return DEFAULT_INSTANCE; } @@ -893,7 +893,7 @@ public final class ServerTransferData { } @java.lang.Override - public org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc getDefaultInstanceForType() { + public com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java b/server/src/main/java/com/miti99/caro/common/enums/ClientEventCode.java similarity index 97% rename from server/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java rename to server/src/main/java/com/miti99/caro/common/enums/ClientEventCode.java index ca17a95..bfd81ef 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/ClientEventCode.java +++ b/server/src/main/java/com/miti99/caro/common/enums/ClientEventCode.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; import java.io.Serializable; diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java b/server/src/main/java/com/miti99/caro/common/enums/ClientRole.java similarity index 64% rename from server/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java rename to server/src/main/java/com/miti99/caro/common/enums/ClientRole.java index 1f54ce9..c549720 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/ClientRole.java +++ b/server/src/main/java/com/miti99/caro/common/enums/ClientRole.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; public enum ClientRole { diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java b/server/src/main/java/com/miti99/caro/common/enums/ClientStatus.java similarity index 67% rename from server/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java rename to server/src/main/java/com/miti99/caro/common/enums/ClientStatus.java index 65359f2..14209dd 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/ClientStatus.java +++ b/server/src/main/java/com/miti99/caro/common/enums/ClientStatus.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; public enum ClientStatus { diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/GameResult.java b/server/src/main/java/com/miti99/caro/common/enums/GameResult.java similarity index 88% rename from server/src/main/java/org/nico/ratel/landlords/enums/GameResult.java rename to server/src/main/java/com/miti99/caro/common/enums/GameResult.java index 8b73c1e..d863baf 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/GameResult.java +++ b/server/src/main/java/com/miti99/caro/common/enums/GameResult.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; public enum GameResult { diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/PieceType.java b/server/src/main/java/com/miti99/caro/common/enums/PieceType.java similarity index 87% rename from server/src/main/java/org/nico/ratel/landlords/enums/PieceType.java rename to server/src/main/java/com/miti99/caro/common/enums/PieceType.java index e8b5de5..6401e3f 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/PieceType.java +++ b/server/src/main/java/com/miti99/caro/common/enums/PieceType.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; public enum PieceType { diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java b/server/src/main/java/com/miti99/caro/common/enums/RoomStatus.java similarity index 87% rename from server/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java rename to server/src/main/java/com/miti99/caro/common/enums/RoomStatus.java index 28921b1..8d96e4b 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/RoomStatus.java +++ b/server/src/main/java/com/miti99/caro/common/enums/RoomStatus.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; public enum RoomStatus { diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/RoomType.java b/server/src/main/java/com/miti99/caro/common/enums/RoomType.java similarity index 86% rename from server/src/main/java/org/nico/ratel/landlords/enums/RoomType.java rename to server/src/main/java/com/miti99/caro/common/enums/RoomType.java index dd0bbd5..078428e 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/RoomType.java +++ b/server/src/main/java/com/miti99/caro/common/enums/RoomType.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; public enum RoomType { diff --git a/server/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java b/server/src/main/java/com/miti99/caro/common/enums/ServerEventCode.java similarity index 95% rename from server/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java rename to server/src/main/java/com/miti99/caro/common/enums/ServerEventCode.java index f47d475..672b72c 100644 --- a/server/src/main/java/org/nico/ratel/landlords/enums/ServerEventCode.java +++ b/server/src/main/java/com/miti99/caro/common/enums/ServerEventCode.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.enums; +package com.miti99.caro.common.enums; import java.io.Serializable; diff --git a/server/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java b/server/src/main/java/com/miti99/caro/common/exception/LandlordException.java similarity index 92% rename from server/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java rename to server/src/main/java/com/miti99/caro/common/exception/LandlordException.java index 2643a2a..3c6b55d 100644 --- a/server/src/main/java/org/nico/ratel/landlords/exception/LandlordException.java +++ b/server/src/main/java/com/miti99/caro/common/exception/LandlordException.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.exception; +package com.miti99.caro.common.exception; public class LandlordException extends RuntimeException { diff --git a/server/src/main/java/org/nico/ratel/landlords/features/Features.java b/server/src/main/java/com/miti99/caro/common/features/Features.java similarity index 93% rename from server/src/main/java/org/nico/ratel/landlords/features/Features.java rename to server/src/main/java/com/miti99/caro/common/features/Features.java index 40b1db7..94b17b6 100644 --- a/server/src/main/java/org/nico/ratel/landlords/features/Features.java +++ b/server/src/main/java/com/miti99/caro/common/features/Features.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.features; +package com.miti99.caro.common.features; import java.util.*; diff --git a/server/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java b/server/src/main/java/com/miti99/caro/common/handler/DefaultDecoder.java similarity index 87% rename from server/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java rename to server/src/main/java/com/miti99/caro/common/handler/DefaultDecoder.java index 60e2ef1..227865c 100644 --- a/server/src/main/java/org/nico/ratel/landlords/handler/DefaultDecoder.java +++ b/server/src/main/java/com/miti99/caro/common/handler/DefaultDecoder.java @@ -1,8 +1,8 @@ -package org.nico.ratel.landlords.handler; +package com.miti99.caro.common.handler; import java.util.List; -import org.nico.ratel.landlords.transfer.TransferProtocolUtils; +import com.miti99.caro.common.transfer.TransferProtocolUtils; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/server/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java b/server/src/main/java/com/miti99/caro/common/helper/GomokuHelper.java similarity index 91% rename from server/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java rename to server/src/main/java/com/miti99/caro/common/helper/GomokuHelper.java index c842a97..6d00993 100644 --- a/server/src/main/java/org/nico/ratel/landlords/helper/GomokuHelper.java +++ b/server/src/main/java/com/miti99/caro/common/helper/GomokuHelper.java @@ -1,10 +1,10 @@ -package org.nico.ratel.landlords.helper; +package com.miti99.caro.common.helper; -import org.nico.ratel.landlords.entity.Board; -import org.nico.ratel.landlords.entity.GameMove; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.PieceType; -import org.nico.ratel.landlords.enums.GameResult; +import com.miti99.caro.common.entity.Board; +import com.miti99.caro.common.entity.GameMove; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.PieceType; +import com.miti99.caro.common.enums.GameResult; import java.util.List; import java.util.ArrayList; diff --git a/server/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java b/server/src/main/java/com/miti99/caro/common/helper/MapHelper.java similarity index 87% rename from server/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java rename to server/src/main/java/com/miti99/caro/common/helper/MapHelper.java index 742c712..96f8982 100644 --- a/server/src/main/java/org/nico/ratel/landlords/helper/MapHelper.java +++ b/server/src/main/java/com/miti99/caro/common/helper/MapHelper.java @@ -1,9 +1,9 @@ -package org.nico.ratel.landlords.helper; +package com.miti99.caro.common.helper; import java.util.LinkedHashMap; import java.util.Map; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.utils.JsonUtils; public class MapHelper { diff --git a/server/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java b/server/src/main/java/com/miti99/caro/common/helper/TimeHelper.java similarity index 81% rename from server/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java rename to server/src/main/java/com/miti99/caro/common/helper/TimeHelper.java index dfc9c58..15da6fd 100644 --- a/server/src/main/java/org/nico/ratel/landlords/helper/TimeHelper.java +++ b/server/src/main/java/com/miti99/caro/common/helper/TimeHelper.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.helper; +package com.miti99.caro.common.helper; /** * @author nico diff --git a/server/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java b/server/src/main/java/com/miti99/caro/common/print/FormatPrinter.java similarity index 80% rename from server/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java rename to server/src/main/java/com/miti99/caro/common/print/FormatPrinter.java index 20f62fe..77c0490 100644 --- a/server/src/main/java/org/nico/ratel/landlords/print/FormatPrinter.java +++ b/server/src/main/java/com/miti99/caro/common/print/FormatPrinter.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.print; +package com.miti99.caro.common.print; public class FormatPrinter { diff --git a/server/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java b/server/src/main/java/com/miti99/caro/common/print/SimplePrinter.java similarity index 90% rename from server/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java rename to server/src/main/java/com/miti99/caro/common/print/SimplePrinter.java index c48ba48..692e059 100644 --- a/server/src/main/java/org/nico/ratel/landlords/print/SimplePrinter.java +++ b/server/src/main/java/com/miti99/caro/common/print/SimplePrinter.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.print; +package com.miti99.caro.common.print; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/server/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java b/server/src/main/java/com/miti99/caro/common/print/SimpleWriter.java similarity index 94% rename from server/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java rename to server/src/main/java/com/miti99/caro/common/print/SimpleWriter.java index 231deed..cf88540 100644 --- a/server/src/main/java/org/nico/ratel/landlords/print/SimpleWriter.java +++ b/server/src/main/java/com/miti99/caro/common/print/SimpleWriter.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.print; +package com.miti99.caro.common.print; import java.io.BufferedReader; import java.io.IOException; diff --git a/server/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java b/server/src/main/java/com/miti99/caro/common/robot/GomokuAI.java similarity index 96% rename from server/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java rename to server/src/main/java/com/miti99/caro/common/robot/GomokuAI.java index 01daec8..0d05209 100644 --- a/server/src/main/java/org/nico/ratel/landlords/robot/GomokuAI.java +++ b/server/src/main/java/com/miti99/caro/common/robot/GomokuAI.java @@ -1,8 +1,8 @@ -package org.nico.ratel.landlords.robot; +package com.miti99.caro.common.robot; -import org.nico.ratel.landlords.entity.Board; -import org.nico.ratel.landlords.entity.GameMove; -import org.nico.ratel.landlords.enums.PieceType; +import com.miti99.caro.common.entity.Board; +import com.miti99.caro.common.entity.GameMove; +import com.miti99.caro.common.enums.PieceType; import java.util.ArrayList; import java.util.List; diff --git a/server/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java b/server/src/main/java/com/miti99/caro/common/transfer/ByteKit.java similarity index 96% rename from server/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java rename to server/src/main/java/com/miti99/caro/common/transfer/ByteKit.java index df827ad..c9fd420 100644 --- a/server/src/main/java/org/nico/ratel/landlords/transfer/ByteKit.java +++ b/server/src/main/java/com/miti99/caro/common/transfer/ByteKit.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.transfer; +package com.miti99.caro.common.transfer; /** * Byte manipulation tool diff --git a/server/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java b/server/src/main/java/com/miti99/caro/common/transfer/ByteLink.java similarity index 96% rename from server/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java rename to server/src/main/java/com/miti99/caro/common/transfer/ByteLink.java index d069672..8af10aa 100644 --- a/server/src/main/java/org/nico/ratel/landlords/transfer/ByteLink.java +++ b/server/src/main/java/com/miti99/caro/common/transfer/ByteLink.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.transfer; +package com.miti99.caro.common.transfer; public class ByteLink { diff --git a/server/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java b/server/src/main/java/com/miti99/caro/common/transfer/TransferProtocolUtils.java similarity index 90% rename from server/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java rename to server/src/main/java/com/miti99/caro/common/transfer/TransferProtocolUtils.java index 8d7fd0d..507f138 100644 --- a/server/src/main/java/org/nico/ratel/landlords/transfer/TransferProtocolUtils.java +++ b/server/src/main/java/com/miti99/caro/common/transfer/TransferProtocolUtils.java @@ -1,7 +1,7 @@ -package org.nico.ratel.landlords.transfer; +package com.miti99.caro.common.transfer; -import org.nico.ratel.landlords.exception.LandlordException; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.exception.LandlordException; +import com.miti99.caro.common.utils.JsonUtils; /** * Protocol transport related tools diff --git a/server/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java b/server/src/main/java/com/miti99/caro/common/utils/JsonUtils.java similarity index 88% rename from server/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java rename to server/src/main/java/com/miti99/caro/common/utils/JsonUtils.java index dd8517c..7961ef5 100644 --- a/server/src/main/java/org/nico/ratel/landlords/utils/JsonUtils.java +++ b/server/src/main/java/com/miti99/caro/common/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.utils; +package com.miti99.caro.common.utils; import com.google.gson.Gson; diff --git a/server/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java b/server/src/main/java/com/miti99/caro/common/utils/ListUtils.java similarity index 93% rename from server/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java rename to server/src/main/java/com/miti99/caro/common/utils/ListUtils.java index 35ae406..2dadecd 100644 --- a/server/src/main/java/org/nico/ratel/landlords/utils/ListUtils.java +++ b/server/src/main/java/com/miti99/caro/common/utils/ListUtils.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.utils; +package com.miti99.caro.common.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/server/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java b/server/src/main/java/com/miti99/caro/common/utils/OptionsUtils.java similarity index 82% rename from server/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java rename to server/src/main/java/com/miti99/caro/common/utils/OptionsUtils.java index 20fc172..2eb8a0c 100644 --- a/server/src/main/java/org/nico/ratel/landlords/utils/OptionsUtils.java +++ b/server/src/main/java/com/miti99/caro/common/utils/OptionsUtils.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.utils; +package com.miti99.caro.common.utils; public class OptionsUtils { diff --git a/server/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java b/server/src/main/java/com/miti99/caro/common/utils/StreamUtils.java similarity index 96% rename from server/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java rename to server/src/main/java/com/miti99/caro/common/utils/StreamUtils.java index a389a3b..354c094 100644 --- a/server/src/main/java/org/nico/ratel/landlords/utils/StreamUtils.java +++ b/server/src/main/java/com/miti99/caro/common/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.utils; +package com.miti99.caro.common.utils; import java.io.BufferedReader; import java.io.IOException; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/ServerContains.java b/server/src/main/java/com/miti99/caro/server/ServerContains.java similarity index 92% rename from server/src/main/java/org/nico/ratel/landlords/server/ServerContains.java rename to server/src/main/java/com/miti99/caro/server/ServerContains.java index 5b8191b..7dc07ec 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/ServerContains.java +++ b/server/src/main/java/com/miti99/caro/server/ServerContains.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.server; +package com.miti99.caro.server; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -8,8 +8,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; public class ServerContains { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/SimpleServer.java b/server/src/main/java/com/miti99/caro/server/SimpleServer.java similarity index 75% rename from server/src/main/java/org/nico/ratel/landlords/server/SimpleServer.java rename to server/src/main/java/com/miti99/caro/server/SimpleServer.java index 7b41e21..c8fd1f7 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/SimpleServer.java +++ b/server/src/main/java/com/miti99/caro/server/SimpleServer.java @@ -1,7 +1,7 @@ -package org.nico.ratel.landlords.server; +package com.miti99.caro.server; -import org.nico.ratel.landlords.server.proxy.ProtobufProxy; -import org.nico.ratel.landlords.server.proxy.WebsocketProxy; +import com.miti99.caro.server.proxy.ProtobufProxy; +import com.miti99.caro.server.proxy.WebsocketProxy; public class SimpleServer { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener.java similarity index 81% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener.java index 8892b28..feb2270 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener.java @@ -1,11 +1,11 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.enums.ServerEventCode; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.enums.ServerEventCode; public interface ServerEventListener { @@ -13,7 +13,7 @@ public interface ServerEventListener { Map LISTENER_MAP = new HashMap<>(); - String LISTENER_PREFIX = "org.nico.ratel.landlords.server.event.ServerEventListener_"; + String LISTENER_PREFIX = "com.miti99.caro.server.event.ServerEventListener_"; @SuppressWarnings("unchecked") static ServerEventListener get(ServerEventCode code) { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_EXIT.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_EXIT.java similarity index 73% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_EXIT.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_EXIT.java index a55cd9e..9537a4a 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_EXIT.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_EXIT.java @@ -1,11 +1,11 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_CLIENT_EXIT implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java similarity index 75% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java index 4735a36..55dcf0d 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_INFO_SET.java @@ -1,7 +1,7 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.utils.JsonUtils; import java.util.Map; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java similarity index 68% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java index 844acda..fdacb9f 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_NICKNAME_SET.java @@ -1,10 +1,10 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_CLIENT_NICKNAME_SET implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java similarity index 72% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java index 5dd2b86..56010d2 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_CLIENT_OFFLINE.java @@ -1,11 +1,11 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_CLIENT_OFFLINE implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_MOVE.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_MOVE.java similarity index 86% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_MOVE.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_MOVE.java index 6542e57..63e66b8 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_MOVE.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_MOVE.java @@ -1,18 +1,18 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Board; -import org.nico.ratel.landlords.entity.GameMove; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.GameResult; -import org.nico.ratel.landlords.enums.PieceType; -import org.nico.ratel.landlords.enums.RoomType; -import org.nico.ratel.landlords.helper.GomokuHelper; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.robot.GomokuAI; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Board; +import com.miti99.caro.common.entity.GameMove; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.GameResult; +import com.miti99.caro.common.enums.PieceType; +import com.miti99.caro.common.enums.RoomType; +import com.miti99.caro.common.helper.GomokuHelper; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.common.robot.GomokuAI; +import com.miti99.caro.server.ServerContains; import java.util.Map; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_READY.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_READY.java similarity index 72% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_READY.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_READY.java index ae83f6f..5a2c5b9 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_READY.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_READY.java @@ -1,14 +1,14 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_GAME_READY implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_STARTING.java similarity index 75% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_STARTING.java index 4d1b93d..864889f 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_STARTING.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_STARTING.java @@ -1,17 +1,17 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; import java.util.LinkedList; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientRole; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.PieceType; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientRole; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.PieceType; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_GAME_STARTING implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_WATCH.java similarity index 71% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_WATCH.java index f600a2b..eabdad0 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_WATCH.java @@ -1,12 +1,12 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.common.utils.JsonUtils; import java.util.HashMap; import java.util.Map; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java similarity index 71% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java index a9f6d7f..7fb95a1 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GAME_WATCH_EXIT.java @@ -1,9 +1,9 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.print.SimplePrinter; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.print.SimplePrinter; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_GAME_WATCH_EXIT implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GET_ROOMS.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GET_ROOMS.java similarity index 66% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GET_ROOMS.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GET_ROOMS.java index 4e0a900..0d80fa3 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_GET_ROOMS.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_GET_ROOMS.java @@ -1,17 +1,17 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.common.utils.JsonUtils; public class ServerEventListener_CODE_GET_ROOMS implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_CREATE.java similarity index 59% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_CREATE.java index bb51aab..0861707 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_CREATE.java @@ -1,15 +1,15 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientRole; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.enums.RoomType; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientRole; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.enums.RoomType; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.common.utils.JsonUtils; public class ServerEventListener_CODE_ROOM_CREATE implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java similarity index 75% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java index 7e7618f..e18bcd8 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_CREATE_PVE.java @@ -1,15 +1,15 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientRole; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.enums.RoomType; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientRole; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.enums.RoomType; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_ROOM_CREATE_PVE implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_JOIN.java b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_JOIN.java similarity index 79% rename from server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_JOIN.java rename to server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_JOIN.java index f5b5b74..20c8645 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/event/ServerEventListener_CODE_ROOM_JOIN.java +++ b/server/src/main/java/com/miti99/caro/server/event/ServerEventListener_CODE_ROOM_JOIN.java @@ -1,16 +1,16 @@ -package org.nico.ratel.landlords.server.event; +package com.miti99.caro.server.event; import java.util.LinkedList; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.helper.MapHelper; -import org.nico.ratel.landlords.server.ServerContains; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.common.helper.MapHelper; +import com.miti99.caro.server.ServerContains; public class ServerEventListener_CODE_ROOM_JOIN implements ServerEventListener { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/handler/ProtobufTransferHandler.java b/server/src/main/java/com/miti99/caro/server/handler/ProtobufTransferHandler.java similarity index 82% rename from server/src/main/java/org/nico/ratel/landlords/server/handler/ProtobufTransferHandler.java rename to server/src/main/java/com/miti99/caro/server/handler/ProtobufTransferHandler.java index 6cda7d4..b4566ca 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/handler/ProtobufTransferHandler.java +++ b/server/src/main/java/com/miti99/caro/server/handler/ProtobufTransferHandler.java @@ -1,15 +1,15 @@ -package org.nico.ratel.landlords.server.handler; +package com.miti99.caro.server.handler; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientRole; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.print.SimplePrinter; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.server.event.ServerEventListener; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientRole; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.common.print.SimplePrinter; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.server.event.ServerEventListener; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/handler/SecondProtobufCodec.java b/server/src/main/java/com/miti99/caro/server/handler/SecondProtobufCodec.java similarity index 79% rename from server/src/main/java/org/nico/ratel/landlords/server/handler/SecondProtobufCodec.java rename to server/src/main/java/com/miti99/caro/server/handler/SecondProtobufCodec.java index 77884ab..732978a 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/handler/SecondProtobufCodec.java +++ b/server/src/main/java/com/miti99/caro/server/handler/SecondProtobufCodec.java @@ -1,8 +1,8 @@ -package org.nico.ratel.landlords.server.handler; +package com.miti99.caro.server.handler; import java.util.List; -import org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc; +import com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc; import com.google.protobuf.MessageLite; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/handler/WebsocketTransferHandler.java b/server/src/main/java/com/miti99/caro/server/handler/WebsocketTransferHandler.java similarity index 84% rename from server/src/main/java/org/nico/ratel/landlords/server/handler/WebsocketTransferHandler.java rename to server/src/main/java/com/miti99/caro/server/handler/WebsocketTransferHandler.java index 3be7ea4..992c198 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/handler/WebsocketTransferHandler.java +++ b/server/src/main/java/com/miti99/caro/server/handler/WebsocketTransferHandler.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.server.handler; +package com.miti99.caro.server.handler; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; @@ -8,18 +8,18 @@ import io.netty.handler.codec.http.websocketx.TextWebSocketFrame; import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; -import org.nico.ratel.landlords.channel.ChannelUtils; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Msg; -import org.nico.ratel.landlords.entity.ServerTransferData.ServerTransferDataProtoc; -import org.nico.ratel.landlords.enums.ClientEventCode; -import org.nico.ratel.landlords.enums.ClientRole; -import org.nico.ratel.landlords.enums.ClientStatus; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.print.SimplePrinter; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.server.event.ServerEventListener; -import org.nico.ratel.landlords.utils.JsonUtils; +import com.miti99.caro.common.channel.ChannelUtils; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Msg; +import com.miti99.caro.common.entity.ServerTransferData.ServerTransferDataProtoc; +import com.miti99.caro.common.enums.ClientEventCode; +import com.miti99.caro.common.enums.ClientRole; +import com.miti99.caro.common.enums.ClientStatus; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.common.print.SimplePrinter; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.server.event.ServerEventListener; +import com.miti99.caro.common.utils.JsonUtils; import java.util.Objects; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/proxy/ProtobufProxy.java b/server/src/main/java/com/miti99/caro/server/proxy/ProtobufProxy.java similarity index 87% rename from server/src/main/java/org/nico/ratel/landlords/server/proxy/ProtobufProxy.java rename to server/src/main/java/com/miti99/caro/server/proxy/ProtobufProxy.java index 13a2cc0..a4821cd 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/proxy/ProtobufProxy.java +++ b/server/src/main/java/com/miti99/caro/server/proxy/ProtobufProxy.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.server.proxy; +package com.miti99.caro.server.proxy; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; @@ -15,13 +15,13 @@ import io.netty.handler.codec.protobuf.ProtobufEncoder; import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder; import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender; import io.netty.handler.timeout.IdleStateHandler; -import org.nico.ratel.landlords.entity.ServerTransferData; -import org.nico.ratel.landlords.print.SimplePrinter; +import com.miti99.caro.common.entity.ServerTransferData; +import com.miti99.caro.common.print.SimplePrinter; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.server.handler.SecondProtobufCodec; -import org.nico.ratel.landlords.server.handler.ProtobufTransferHandler; -import org.nico.ratel.landlords.server.timer.RoomClearTask; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.server.handler.SecondProtobufCodec; +import com.miti99.caro.server.handler.ProtobufTransferHandler; +import com.miti99.caro.server.timer.RoomClearTask; import java.net.InetSocketAddress; import java.util.Timer; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/proxy/Proxy.java b/server/src/main/java/com/miti99/caro/server/proxy/Proxy.java similarity index 64% rename from server/src/main/java/org/nico/ratel/landlords/server/proxy/Proxy.java rename to server/src/main/java/com/miti99/caro/server/proxy/Proxy.java index 98d021e..70c860a 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/proxy/Proxy.java +++ b/server/src/main/java/com/miti99/caro/server/proxy/Proxy.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.server.proxy; +package com.miti99.caro.server.proxy; public interface Proxy { diff --git a/server/src/main/java/org/nico/ratel/landlords/server/proxy/WebsocketProxy.java b/server/src/main/java/com/miti99/caro/server/proxy/WebsocketProxy.java similarity index 87% rename from server/src/main/java/org/nico/ratel/landlords/server/proxy/WebsocketProxy.java rename to server/src/main/java/com/miti99/caro/server/proxy/WebsocketProxy.java index 964437b..2fd206b 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/proxy/WebsocketProxy.java +++ b/server/src/main/java/com/miti99/caro/server/proxy/WebsocketProxy.java @@ -1,4 +1,4 @@ -package org.nico.ratel.landlords.server.proxy; +package com.miti99.caro.server.proxy; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; @@ -15,12 +15,12 @@ import io.netty.handler.codec.http.HttpServerCodec; import io.netty.handler.codec.http.websocketx.WebSocketServerProtocolHandler; import io.netty.handler.stream.ChunkedWriteHandler; import io.netty.handler.timeout.IdleStateHandler; -import org.nico.ratel.landlords.print.SimplePrinter; +import com.miti99.caro.common.print.SimplePrinter; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.server.handler.ProtobufTransferHandler; -import org.nico.ratel.landlords.server.handler.WebsocketTransferHandler; -import org.nico.ratel.landlords.server.timer.RoomClearTask; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.server.handler.ProtobufTransferHandler; +import com.miti99.caro.server.handler.WebsocketTransferHandler; +import com.miti99.caro.server.timer.RoomClearTask; import java.net.InetSocketAddress; import java.util.Timer; diff --git a/server/src/main/java/org/nico/ratel/landlords/server/timer/RoomClearTask.java b/server/src/main/java/com/miti99/caro/server/timer/RoomClearTask.java similarity index 77% rename from server/src/main/java/org/nico/ratel/landlords/server/timer/RoomClearTask.java rename to server/src/main/java/com/miti99/caro/server/timer/RoomClearTask.java index 2208cfa..177bf70 100644 --- a/server/src/main/java/org/nico/ratel/landlords/server/timer/RoomClearTask.java +++ b/server/src/main/java/com/miti99/caro/server/timer/RoomClearTask.java @@ -1,15 +1,15 @@ -package org.nico.ratel.landlords.server.timer; +package com.miti99.caro.server.timer; import java.util.Map; import java.util.TimerTask; -import org.nico.ratel.landlords.entity.ClientSide; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.RoomStatus; -import org.nico.ratel.landlords.enums.ServerEventCode; -import org.nico.ratel.landlords.print.SimplePrinter; -import org.nico.ratel.landlords.server.ServerContains; -import org.nico.ratel.landlords.server.event.ServerEventListener; +import com.miti99.caro.common.entity.ClientSide; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.RoomStatus; +import com.miti99.caro.common.enums.ServerEventCode; +import com.miti99.caro.common.print.SimplePrinter; +import com.miti99.caro.server.ServerContains; +import com.miti99.caro.server.event.ServerEventListener; /** * Periodically cleans up idle or expired rooms. diff --git a/server/src/main/resources/proto/ClientTransferDataProtoc.proto b/server/src/main/resources/proto/ClientTransferDataProtoc.proto index 4504523..3018121 100644 --- a/server/src/main/resources/proto/ClientTransferDataProtoc.proto +++ b/server/src/main/resources/proto/ClientTransferDataProtoc.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; -option java_package = "org.nico.ratel.landlords.entity"; +option java_package = "com.miti99.caro.common.entity"; option java_outer_classname = "ClientTransferData"; message ClientTransferDataProtoc{ diff --git a/server/src/main/resources/proto/ServerTransferDataProtoc.proto b/server/src/main/resources/proto/ServerTransferDataProtoc.proto index 27a59d0..3ba0cfc 100644 --- a/server/src/main/resources/proto/ServerTransferDataProtoc.proto +++ b/server/src/main/resources/proto/ServerTransferDataProtoc.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package org.nico.ratel.landlords.entity; +package com.miti99.caro.common.entity; -option java_package = "org.nico.ratel.landlords.entity"; +option java_package = "com.miti99.caro.common.entity"; option java_outer_classname = "ServerTransferData"; message ServerTransferDataProtoc{ diff --git a/server/src/main/resources/proto/generate.sh b/server/src/main/resources/proto/generate.sh index 17f107e..1365477 100755 --- a/server/src/main/resources/proto/generate.sh +++ b/server/src/main/resources/proto/generate.sh @@ -1 +1,4 @@ -protoc -I=. --java_out=../landlords-common/src/main/java/ ./*.proto \ No newline at end of file +#!/usr/bin/env bash +# Regenerate protobuf Java classes from .proto files. +# Run from server/src/main/resources/proto/ directory. +protoc -I=. --java_out=../../../java/ ./*.proto diff --git a/server/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java b/server/src/test/java/com/miti99/caro/common/helper/tests/GomokuHelperTest.java similarity index 97% rename from server/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java rename to server/src/test/java/com/miti99/caro/common/helper/tests/GomokuHelperTest.java index 2354edd..f2880ce 100644 --- a/server/src/test/java/org/nico/ratel/landlords/helper/tests/GomokuHelperTest.java +++ b/server/src/test/java/com/miti99/caro/common/helper/tests/GomokuHelperTest.java @@ -1,11 +1,11 @@ -package org.nico.ratel.landlords.helper.tests; +package com.miti99.caro.common.helper.tests; import org.junit.jupiter.api.Test; -import org.nico.ratel.landlords.entity.Board; -import org.nico.ratel.landlords.entity.Room; -import org.nico.ratel.landlords.enums.PieceType; -import org.nico.ratel.landlords.enums.GameResult; -import org.nico.ratel.landlords.helper.GomokuHelper; +import com.miti99.caro.common.entity.Board; +import com.miti99.caro.common.entity.Room; +import com.miti99.caro.common.enums.PieceType; +import com.miti99.caro.common.enums.GameResult; +import com.miti99.caro.common.helper.GomokuHelper; import java.util.List; diff --git a/server/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java b/server/src/test/java/com/miti99/caro/common/robot/tests/GomokuAITest.java similarity index 92% rename from server/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java rename to server/src/test/java/com/miti99/caro/common/robot/tests/GomokuAITest.java index 77cab53..602f1a0 100644 --- a/server/src/test/java/org/nico/ratel/landlords/robot/tests/GomokuAITest.java +++ b/server/src/test/java/com/miti99/caro/common/robot/tests/GomokuAITest.java @@ -1,10 +1,10 @@ -package org.nico.ratel.landlords.robot.tests; +package com.miti99.caro.common.robot.tests; import org.junit.jupiter.api.Test; -import org.nico.ratel.landlords.entity.Board; -import org.nico.ratel.landlords.entity.GameMove; -import org.nico.ratel.landlords.enums.PieceType; -import org.nico.ratel.landlords.robot.GomokuAI; +import com.miti99.caro.common.entity.Board; +import com.miti99.caro.common.entity.GameMove; +import com.miti99.caro.common.enums.PieceType; +import com.miti99.caro.common.robot.GomokuAI; import static org.junit.jupiter.api.Assertions.*;