From e40f9ecc19a052142c4889cc76bc2689ec736652 Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Wed, 18 Oct 2023 19:04:13 +0800
Subject: [PATCH] feat[lua]: compatible field of inside protocol class in lua

---
 .../zfoo/protocol/serializer/lua/GenerateLuaUtils.java | 10 +++++-----
 .../src/main/resources/lua/{Buffer => }/ByteBuffer.lua |  2 +-
 protocol/src/main/resources/lua/{Buffer => }/Long.lua  |  0
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename protocol/src/main/resources/lua/{Buffer => }/ByteBuffer.lua (99%)
 rename protocol/src/main/resources/lua/{Buffer => }/Long.lua (100%)

diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
index 2672060a..928862d3 100644
--- a/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
+++ b/protocol/src/main/java/com/zfoo/protocol/serializer/lua/GenerateLuaUtils.java
@@ -84,7 +84,7 @@ public abstract class GenerateLuaUtils {
     }
 
     public static void createProtocolManager(List<IProtocolRegistration> protocolList) throws IOException {
-        var list = List.of("lua/Buffer/ByteBuffer.lua", "lua/Buffer/Long.lua");
+        var list = List.of("lua/ByteBuffer.lua", "lua/Long.lua");
         for (var fileName : list) {
             var fileInputStream = ClassUtils.getFileFromClassPath(fileName);
             var createFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, StringUtils.substringAfterFirst(fileName, "lua/")));
@@ -98,11 +98,11 @@ public abstract class GenerateLuaUtils {
         for (var protocol : protocolList) {
             var protocolId = protocol.protocolId();
             var protocolName = protocol.protocolConstructor().getDeclaringClass().getSimpleName();
-            var path = GenerateProtocolPath.getCapitalizeProtocolPath(protocolId);
+            var path = GenerateProtocolPath.getProtocolPath(protocolId);
             if (StringUtils.isBlank(path)) {
-                fieldBuilder.append(TAB).append(StringUtils.format("local {} = require(\"LuaProtocol.{}\")", protocolName, protocolName)).append(LS);
+                fieldBuilder.append(TAB).append(StringUtils.format("local {} = require(\"{}\")", protocolName, protocolName)).append(LS);
             } else {
-                fieldBuilder.append(TAB).append(StringUtils.format("local {} = require(\"LuaProtocol.{}.{}\")"
+                fieldBuilder.append(TAB).append(StringUtils.format("local {} = require(\"{}.{}\")"
                         , protocolName, path.replaceAll(StringUtils.SLASH, StringUtils.PERIOD), protocolName)).append(LS);
             }
 
@@ -131,7 +131,7 @@ public abstract class GenerateLuaUtils {
                 , protocolClazzName, writePacket.trim(), protocolClazzName, protocolClazzName, readPacket.trim(), protocolClazzName);
 
         var outputPath = StringUtils.format("{}/{}/{}.lua"
-                , protocolOutputRootPath, GenerateProtocolPath.getCapitalizeProtocolPath(protocolId), protocolClazzName);
+                , protocolOutputRootPath, GenerateProtocolPath.getProtocolPath(protocolId), protocolClazzName);
         FileUtils.writeStringToFile(new File(outputPath), protocolTemplate, true);
     }
 
diff --git a/protocol/src/main/resources/lua/Buffer/ByteBuffer.lua b/protocol/src/main/resources/lua/ByteBuffer.lua
similarity index 99%
rename from protocol/src/main/resources/lua/Buffer/ByteBuffer.lua
rename to protocol/src/main/resources/lua/ByteBuffer.lua
index 0d4ce412..1a273fc5 100644
--- a/protocol/src/main/resources/lua/Buffer/ByteBuffer.lua
+++ b/protocol/src/main/resources/lua/ByteBuffer.lua
@@ -5,7 +5,7 @@
 --右移操作>>是无符号右移
 --local Long = require("Long")
 
-local ProtocolManager = require("LuaProtocol.ProtocolManager")
+local ProtocolManager = require("ProtocolManager")
 
 local maxInt = 2147483647
 local minInt = -2147483648
diff --git a/protocol/src/main/resources/lua/Buffer/Long.lua b/protocol/src/main/resources/lua/Long.lua
similarity index 100%
rename from protocol/src/main/resources/lua/Buffer/Long.lua
rename to protocol/src/main/resources/lua/Long.lua