Merge remote-tracking branch 'origin/equip' into equip

logic/bag-logic/src/main/java/com/iohao/mmo/bag/config/ItemCommandLineRunner.java

@@ -18,7 +18,7 @@
  */
 package com.iohao.mmo.bag.config;
 
-import com.iohao.mmo.bag.ItemTypeIdConst;
+import com.iohao.mmo.common.provide.item.ItemTypeIdConst;
 import com.iohao.mmo.bag.entity.ItemTypeConfig;
 import com.iohao.mmo.bag.region.ItemTypeConfigRegion;
 import com.iohao.mmo.bag.region.UseRegion;

logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/internal/DefaultUseProcess.java

@@ -20,7 +20,7 @@ package com.iohao.mmo.bag.region.internal;
 
 import com.iohao.game.action.skeleton.core.exception.ActionErrorEnum;
 import com.iohao.game.action.skeleton.core.flow.FlowContext;
-import com.iohao.mmo.bag.ItemTypeIdConst;
+import com.iohao.mmo.common.provide.item.ItemTypeIdConst;
 import com.iohao.mmo.bag.entity.BagItem;
 import com.iohao.mmo.bag.mapper.UseItemMapper;
 import com.iohao.mmo.bag.pojo.UseItemPOJO;

logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/internal/equip/BuildEquipParse.java

@@ -20,7 +20,7 @@ package com.iohao.mmo.bag.region.internal.equip;
 
 import com.iohao.game.action.skeleton.core.exception.ActionErrorEnum;
 import com.iohao.game.external.client.kit.SplitParam;
-import com.iohao.mmo.bag.ItemTypeConst;
+import com.iohao.mmo.common.provide.item.ItemTypeConst;
 import com.iohao.mmo.bag.pojo.UseItemPOJO;
 import com.iohao.mmo.common.config.GameCode;
 import lombok.AccessLevel;

one-client/pom.xml

@@ -30,6 +30,13 @@
             <version>${project.parent.version}</version>
         </dependency>
 
+        <!-- 模拟客户端请求模块 https://www.yuque.com/iohao/game/tc83ud -->
+        <dependency>
+            <groupId>com.iohao.game</groupId>
+            <artifactId>light-client</artifactId>
+            <version>${ioGame.version}</version>
+        </dependency>
+
         <!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
         <dependency>
             <groupId>org.slf4j</groupId>

one-client/src/main/java/com/iohao/mmo/client/CommonClient.java

@@ -22,15 +22,15 @@ import com.iohao.game.external.client.InputCommandRegion;
 import com.iohao.game.external.client.join.ClientRunOne;
 import com.iohao.game.external.client.user.ClientUser;
 import com.iohao.game.external.client.user.DefaultClientUser;
-import com.iohao.mmo.bag.client.BagInputCommandRegion;
-import com.iohao.mmo.bag.client.ItemInputCommandRegion;
-import com.iohao.mmo.common.provide.client.CommonInputCommandRegion;
-import com.iohao.mmo.equip.client.EquipInputCommandRegion;
-import com.iohao.mmo.level.client.LevelInputCommandRegion;
-import com.iohao.mmo.login.client.LoginInputCommandRegion;
-import com.iohao.mmo.mail.client.MailInputCommandRegion;
-import com.iohao.mmo.map.client.MapInputCommandRegion;
-import com.iohao.mmo.person.client.PersonInputCommandRegion;
+import com.iohao.mmo.client.input.BagInputCommandRegion;
+import com.iohao.mmo.client.input.ItemInputCommandRegion;
+import com.iohao.mmo.client.input.CommonInputCommandRegion;
+import com.iohao.mmo.client.input.EquipInputCommandRegion;
+import com.iohao.mmo.client.input.LevelInputCommandRegion;
+import com.iohao.mmo.client.input.LoginInputCommandRegion;
+import com.iohao.mmo.client.input.MailInputCommandRegion;
+import com.iohao.mmo.client.input.MapInputCommandRegion;
+import com.iohao.mmo.client.input.PersonInputCommandRegion;
 
 import java.util.List;
 

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/kit/ItemNode.java → one-client/src/main/java/com/iohao/mmo/client/common/item/InternalItemTypeConfig.java

@@ -16,13 +16,14 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.common.provide.kit;
+package com.iohao.mmo.client.common.item;
 
 /**
- * @param itemId   物品 id
- * @param quantity 物品数量
+ * @param itemTypeId  物品类型 id
+ * @param name        物品名
+ * @param description 物品描述
  * @author 渔民小镇
- * @date 2023-08-15
+ * @date 2023-08-22
  */
-public record ItemNode(String itemId, int quantity) {
+record InternalItemTypeConfig(String itemTypeId, String name, String description) {
 }

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/kit/ItemTypeNode.java → one-client/src/main/java/com/iohao/mmo/client/common/item/ItemTypeNode.java

@@ -16,14 +16,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.common.provide.kit;
+package com.iohao.mmo.client.common.item;
 
 /**
- * @param itemTypeId  物品类型 id
- * @param name        物品名
- * @param description 物品描述
+ * @param itemTypeId 物品类型 id
+ * @param quantity   物品数量
  * @author 渔民小镇
- * @date 2023-08-22
+ * @date 2023-08-15
  */
-public record ItemTypeNode(String itemTypeId, String name, String description) {
+public record ItemTypeNode(String itemTypeId, int quantity) {
 }

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/kit/ItemTypeNodeKit.java → one-client/src/main/java/com/iohao/mmo/client/common/item/ItemTypeNodeKit.java

@@ -16,11 +16,15 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.common.provide.kit;
+package com.iohao.mmo.client.common.item;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.iohao.mmo.common.provide.kit.JsonKit;
 import lombok.experimental.UtilityClass;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 客户端 - 物品通用工具
  *
@@ -29,21 +33,27 @@ import lombok.experimental.UtilityClass;
  */
 @UtilityClass
 public class ItemTypeNodeKit {
-    public ItemNodeMap itemNodeMap = new ItemNodeMap();
+    final Map<String, InternalItemTypeConfig> map = new HashMap<>();
+
+    public void add(String itemTypeId, String name, String description) {
+        var nodeConfig = new InternalItemTypeConfig(itemTypeId, name, description);
+
+        map.put(itemTypeId, nodeConfig);
+    }
 
-    public String toString(ItemNode itemNode) {
-        var node = itemNodeMap.getItem(itemNode.itemId());
+    public String toString(ItemTypeNode itemTypeNode) {
+        var nodeConfig = map.get(itemTypeNode.itemTypeId());
         String line = "\n物品信息：[%s x %s]；物品描述:%s";
 
         return String.format(line
-                , node.name()
-                , itemNode.quantity()
-                , node.description()
+                , nodeConfig.name()
+                , itemTypeNode.quantity()
+                , nodeConfig.description()
         );
     }
 
-    public JSONObject toJSON(String itemId) {
-        var item = itemNodeMap.getItem(itemId);
-        return JsonKit.toJSON(item);
+    public JSONObject toJSON(String itemTypeId) {
+        var nodeConfig = map.get(itemTypeId);
+        return JsonKit.toJSON(nodeConfig);
     }
 }

provide/bag-provide/src/main/java/com/iohao/mmo/bag/client/BagInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/BagInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.bag.client;
+package com.iohao.mmo.client.input;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.iohao.game.action.skeleton.protocol.wrapper.BoolValue;
@@ -26,13 +26,13 @@ import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.game.external.client.command.InputRequestData;
 import com.iohao.game.external.client.kit.ScannerKit;
 import com.iohao.game.external.client.kit.SplitParam;
-import com.iohao.mmo.bag.ItemTypeIdConst;
+import com.iohao.mmo.common.provide.item.ItemTypeIdConst;
 import com.iohao.mmo.bag.cmd.BagCmd;
 import com.iohao.mmo.bag.proto.BagItemMessage;
 import com.iohao.mmo.bag.proto.BagMessage;
 import com.iohao.mmo.bag.proto.UseItemMessage;
 import com.iohao.mmo.bag.proto.UseMessage;
-import com.iohao.mmo.common.provide.kit.ItemTypeNodeKit;
+import com.iohao.mmo.client.common.item.ItemTypeNodeKit;
 import com.iohao.mmo.common.provide.kit.JsonKit;
 import com.iohao.mmo.common.snow.SnowKit;
 import lombok.extern.slf4j.Slf4j;

provide/bag-provide/src/main/java/com/iohao/mmo/bag/client/BagInternalHelper.java → one-client/src/main/java/com/iohao/mmo/client/input/BagInternalHelper.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.bag.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.mmo.bag.proto.BagItemMessage;
 import com.iohao.mmo.bag.proto.UseItemMessage;

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/client/CommonInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/CommonInputCommandRegion.java

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.common.provide.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.action.skeleton.protocol.wrapper.ByteValueList;
 import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.mmo.common.provide.cmd.CommonCmd;
-import com.iohao.mmo.common.provide.kit.ItemTypeNodeKit;
-import com.iohao.mmo.common.provide.kit.ItemNode;
+import com.iohao.mmo.client.common.item.ItemTypeNodeKit;
+import com.iohao.mmo.client.common.item.ItemTypeNode;
 import com.iohao.mmo.common.provide.proto.ShowItemMessage;
 import lombok.extern.slf4j.Slf4j;
 
@@ -51,7 +51,7 @@ public class CommonInputCommandRegion extends AbstractInputCommandRegion {
         }, CommonCmd.broadcastShowItem, "获得新物品");
     }
 
-    ItemNode convert(ShowItemMessage showItemMessage) {
-        return new ItemNode(showItemMessage.itemTypeId, showItemMessage.quantity);
+    ItemTypeNode convert(ShowItemMessage showItemMessage) {
+        return new ItemTypeNode(showItemMessage.itemTypeId, showItemMessage.quantity);
     }
 }

provide/equip-provide/src/main/java/com/iohao/mmo/equip/client/EquipInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/EquipInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.equip.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.action.skeleton.protocol.wrapper.ByteValueList;
 import com.iohao.game.action.skeleton.protocol.wrapper.StringValue;

provide/bag-provide/src/main/java/com/iohao/mmo/bag/client/ItemInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/ItemInputCommandRegion.java

@@ -16,13 +16,13 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.bag.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.action.skeleton.protocol.wrapper.ByteValueList;
 import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.mmo.bag.cmd.ItemCmd;
 import com.iohao.mmo.bag.proto.ItemMessage;
-import com.iohao.mmo.common.provide.kit.ItemTypeNodeKit;
+import com.iohao.mmo.client.common.item.ItemTypeNodeKit;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
@@ -39,7 +39,7 @@ public class ItemInputCommandRegion extends AbstractInputCommandRegion {
 
         ofCommand(ItemCmd.listItem).callback(ByteValueList.class, result -> {
             List<ItemMessage> list = result.toList(ItemMessage.class);
-            list.forEach(itemMessage -> ItemTypeNodeKit.itemNodeMap.add(itemMessage.itemTypeId, itemMessage.name, itemMessage.description));
+            list.forEach(itemMessage -> ItemTypeNodeKit.add(itemMessage.itemTypeId, itemMessage.name, itemMessage.description));
         }).setDescription("物品配置列表");
     }
 

provide/level-provide/src/main/java/com/iohao/mmo/level/client/LevelInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/LevelInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.level.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.action.skeleton.protocol.wrapper.LongValue;
 import com.iohao.game.external.client.AbstractInputCommandRegion;

provide/login-provide/src/main/java/com/iohao/mmo/login/client/LoginInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/LoginInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.login.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.action.skeleton.protocol.wrapper.StringValue;
 import com.iohao.game.common.kit.InternalKit;

provide/mail-provide/src/main/java/com/iohao/mmo/mail/client/MailInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/MailInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.mail.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.action.skeleton.protocol.wrapper.BoolValue;
 import com.iohao.game.action.skeleton.protocol.wrapper.ByteValueList;
@@ -25,9 +25,9 @@ import com.iohao.game.action.skeleton.protocol.wrapper.WrapperKit;
 import com.iohao.game.common.kit.TimeKit;
 import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.game.external.client.kit.ScannerKit;
-import com.iohao.mmo.bag.ItemTypeIdConst;
-import com.iohao.mmo.common.provide.kit.ItemTypeNodeKit;
-import com.iohao.mmo.common.provide.kit.ItemNode;
+import com.iohao.mmo.common.provide.item.ItemTypeIdConst;
+import com.iohao.mmo.client.common.item.ItemTypeNodeKit;
+import com.iohao.mmo.client.common.item.ItemTypeNode;
 import com.iohao.mmo.mail.cmd.MailCmd;
 import com.iohao.mmo.mail.kit.InternalMailBuilder;
 import com.iohao.mmo.mail.proto.InternalMailMessage;
@@ -142,8 +142,8 @@ public class MailInputCommandRegion extends AbstractInputCommandRegion {
             arguments = list.toArray();
         }
 
-        ItemNode convert(MailAttachmentMessage attachmentMessage) {
-            return new ItemNode(attachmentMessage.itemTypeId, attachmentMessage.quantity);
+        ItemTypeNode convert(MailAttachmentMessage attachmentMessage) {
+            return new ItemTypeNode(attachmentMessage.itemTypeId, attachmentMessage.quantity);
         }
     }
 }

provide/map-provide/src/main/java/com/iohao/mmo/map/client/MapInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/MapInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.map.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.common.kit.attr.AttrOption;
 import com.iohao.game.external.client.AbstractInputCommandRegion;

provide/person-provide/src/main/java/com/iohao/mmo/person/client/PersonInputCommandRegion.java → one-client/src/main/java/com/iohao/mmo/client/input/PersonInputCommandRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.person.client;
+package com.iohao.mmo.client.input;
 
 import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.mmo.common.provide.kit.JsonKit;

provide/common-provide/pom.xml

@@ -18,13 +18,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <!-- 模拟客户端请求模块 https://www.yuque.com/iohao/game/tc83ud -->
-        <dependency>
-            <groupId>com.iohao.game</groupId>
-            <artifactId>light-client</artifactId>
-            <version>${ioGame.version}</version>
-        </dependency>
-
         <!-- protobuf 模块 https://www.yuque.com/iohao/game/vpe2t6 -->
         <dependency>
             <groupId>com.iohao.game</groupId>

provide/bag-provide/src/main/java/com/iohao/mmo/bag/ItemTypeConst.java → provide/common-provide/src/main/java/com/iohao/mmo/common/provide/item/ItemTypeConst.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.bag;
+package com.iohao.mmo.common.provide.item;
 
 /**
  * 物品大类

provide/bag-provide/src/main/java/com/iohao/mmo/bag/ItemTypeIdConst.java → provide/common-provide/src/main/java/com/iohao/mmo/common/provide/item/ItemTypeIdConst.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.iohao.mmo.bag;
+package com.iohao.mmo.common.provide.item;
 
 /**
  * 物品类型 id - itemTypeId

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/kit/ItemNodeMap.java

@@ -1,49 +0,0 @@
-/*
- * ioGame
- * Copyright (C) 2021 - 2023  渔民小镇 （262610965@qq.com、luoyizhu@gmail.com） . All Rights Reserved.
- * # iohao.com . 渔民小镇
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.iohao.mmo.common.provide.kit;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.FieldDefaults;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author 渔民小镇
- * @date 2023-08-15
- */
-@Getter
-@Setter
-@FieldDefaults(level = AccessLevel.PRIVATE)
-public class ItemNodeMap {
-    final Map<String, ItemTypeNode> map = new HashMap<>();
-
-    public void add(String itemTypeId, String name, String description) {
-        var itemTypeNode = new ItemTypeNode(itemTypeId, name, description);
-
-        map.put(itemTypeId, itemTypeNode);
-    }
-
-    public ItemTypeNode getItem(String itemId) {
-        return map.get(itemId);
-    }
-
-}