rename ddo -> ddon

.github/workflows/release.yml

@@ -19,18 +19,18 @@ jobs:
  - name: Build Release
  id: build_release
  run: |
- DDO_VERSION_FILE=${{ github.workspace }}/ddo.version
- DDO_VERSION=$(<"$DDO_VERSION_FILE")
- echo "DDO_VERSION=$DDO_VERSION" >> $GITHUB_ENV
- echo "DDO_VERSION_E=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_ENV
+ DDON_VERSION_FILE=${{ github.workspace }}/ddon.version
+ DDON_VERSION=$(<"$DDON_VERSION_FILE")
+ echo "DDON_VERSION=$DDON_VERSION" >> $GITHUB_ENV
+ echo "DDON_VERSION_E=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_ENV
  mkdir ./release
- for DDO_RUNTIME in win-x86 win-x64 linux-x64 osx-x64; do
+ for DDON_RUNTIME in win-x86 win-x64 linux-x64 osx-x64; do
  # Server
- dotnet publish Arrowgene.Ddo.Cli/Arrowgene.Ddo.Cli.csproj /p:Version=$DDO_VERSION /p:FromMSBuild=true --runtime $DDO_RUNTIME --configuration Release --output ./publish/$DDO_RUNTIME-$DDO_VERSION/Server
+ dotnet publish Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj /p:Version=$DDON_VERSION /p:FromMSBuild=true --runtime $DDON_RUNTIME --configuration Release --output ./publish/$DDON_RUNTIME-$DDON_VERSION/Server
  # ReleaseFiles
- cp -r ./ReleaseFiles/. ./publish/$DDO_RUNTIME-$DDO_VERSION/
+ cp -r ./ReleaseFiles/. ./publish/$DDON_RUNTIME-$DDON_VERSION/
  # Pack
- tar cjf ./release/$DDO_RUNTIME-$DDO_VERSION.tar.gz ./publish/$DDO_RUNTIME-$DDO_VERSION
+ tar cjf ./release/$DDON_RUNTIME-$DDON_VERSION.tar.gz ./publish/$DDON_RUNTIME-$DDON_VERSION
  done
  
  - name: Create Release
@@ -39,8 +39,8 @@ jobs:
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
- tag_name: release-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}
- release_name: Release ${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}
+ tag_name: release-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}
+ release_name: Release ${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}
  draft: false
  prerelease: false
 
@@ -50,8 +50,8 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./release/win-x86-${{ env.DDO_VERSION }}.tar.gz
- asset_name: win-x86-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz
+ asset_path: ./release/win-x86-${{ env.DDON_VERSION }}.tar.gz
+ asset_name: win-x86-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz
  asset_content_type: application/gzip
 
  - name: Upload win-x64 Release Asset
@@ -60,8 +60,8 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./release/win-x64-${{ env.DDO_VERSION }}.tar.gz
- asset_name: win-x64-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz
+ asset_path: ./release/win-x64-${{ env.DDON_VERSION }}.tar.gz
+ asset_name: win-x64-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz
  asset_content_type: application/gzip
 
  - name: Upload linux-x64 Release Asset
@@ -70,8 +70,8 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./release/linux-x64-${{ env.DDO_VERSION }}.tar.gz
- asset_name: linux-x64-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz
+ asset_path: ./release/linux-x64-${{ env.DDON_VERSION }}.tar.gz
+ asset_name: linux-x64-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz
  asset_content_type: application/gzip
 
  - name: Upload osx-x64 Release Asset
@@ -80,6 +80,6 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  upload_url: ${{ steps.create_release.outputs.upload_url }}
- asset_path: ./release/osx-x64-${{ env.DDO_VERSION }}.tar.gz
- asset_name: osx-x64-${{ env.DDO_VERSION }}-${{ env.DDO_VERSION_E }}.tar.gz
+ asset_path: ./release/osx-x64-${{ env.DDON_VERSION }}.tar.gz
+ asset_name: osx-x64-${{ env.DDON_VERSION }}-${{ env.DDON_VERSION_E }}.tar.gz
  asset_content_type: application/gzip

Arrowgene.Ddon.Cli/Arrowgene.Ddon.Cli.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+ <PropertyGroup>
+ <OutputType>Exe</OutputType>
+ <TargetFramework>netcoreapp3.0</TargetFramework>
+ <RootNamespace>Arrowgene.Ddon.Cli</RootNamespace>
+ <Title>Dragons Dogma Online - Command Line Interface</Title>
+ <Company>Ddon Team</Company>
+ <Product>Ddon.Cli</Product>
+ <Version>$(Version)</Version>
+ <Copyright>Copyright © 2019-2022 DDON Team</Copyright>
+ </PropertyGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Arrowgene.Ddon.GameServer\Arrowgene.Ddon.GameServer.csproj" />
+ <ProjectReference Include="..\Arrowgene.Ddon.WebServer\Arrowgene.Ddon.WebServer.csproj" />
+ <ProjectReference Include="..\Arrowgene.Ddon.PacketLibrary\Arrowgene.Ddon.PacketLibrary.csproj" />
+ </ItemGroup>
+
+</Project>

Arrowgene.Ddo.Cli/Command/HelpCommand.cs → Arrowgene.Ddon.Cli/Command/HelpCommand.cs

@@ -3,7 +3,7 @@
 using System.Text;
 using Arrowgene.Logging;
 
-namespace Arrowgene.Ddo.Cli.Command
+namespace Arrowgene.Ddon.Cli.Command
 {
  public class HelpCommand : ICommand
  {

Arrowgene.Ddo.Cli/Command/PcapDecryptCommand.cs → Arrowgene.Ddon.Cli/Command/PcapDecryptCommand.cs

@@ -1,13 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
-using Arrowgene.Ddo.GameServer;
-using Arrowgene.Ddo.GameServer.Dump;
-using Arrowgene.Ddo.GameServer.Network;
-using Arrowgene.Ddo.PacketLibrary;
-using Arrowgene.Ddo.Shared;
+using Arrowgene.Ddon.GameServer;
+using Arrowgene.Ddon.GameServer.Dump;
+using Arrowgene.Ddon.GameServer.Network;
+using Arrowgene.Ddon.PacketLibrary;
+using Arrowgene.Ddon.Shared;
 
-namespace Arrowgene.Ddo.Cli.Command
+namespace Arrowgene.Ddon.Cli.Command
 {
  public class PcapDecryptCommand : ICommand
  {
@@ -23,6 +24,11 @@ public class PcapDecryptCommand : ICommand
 
  public CommandResultType Run(CommandParameter parameter)
  {
+ // File.WriteAllBytes("F://d8.bin", LoginDump.data_Dump_8);
+
+
+
+
  string pcapPath = parameter.Arguments[0];
  string key = parameter.Arguments[1];
  byte[] keyBytes = Encoding.UTF8.GetBytes(key);
@@ -34,7 +40,7 @@ public CommandResultType Run(CommandParameter parameter)
  PacketFactory pf = new PacketFactory(new GameServerSetting());
  pf.SetCamelliaKey(keyBytes);
 
- // parse ddo packets
+ // parse ddon packets
  List<Packet> packets = new List<Packet>();
  foreach (PlPacket plPacket in encrypted)
  {

Arrowgene.Ddo.Cli/Command/ServerCommand.cs → Arrowgene.Ddon.Cli/Command/ServerCommand.cs

@@ -1,13 +1,13 @@
 using System;
-using Arrowgene.Ddo.GameServer;
-using Arrowgene.Ddo.WebServer;
+using Arrowgene.Ddon.GameServer;
+using Arrowgene.Ddon.WebServer;
 
-namespace Arrowgene.Ddo.Cli.Command
+namespace Arrowgene.Ddon.Cli.Command
 {
  public class ServerCommand : ICommand
  {
- private DdoGameServer _gameServer;
- private DdoWebServer _webServer;
+ private DdonGameServer _gameServer;
+ private DdonWebServer _webServer;
 
  public string Key => "server";
 
@@ -19,13 +19,13 @@ public CommandResultType Run(CommandParameter parameter)
  if (_gameServer == null)
  {
  GameServerSetting setting = new GameServerSetting();
- _gameServer = new DdoGameServer(setting);
+ _gameServer = new DdonGameServer(setting);
  }
 
  if (_webServer == null)
  {
  WebServerSetting setting = new WebServerSetting();
- _webServer = new DdoWebServer();
+ _webServer = new DdonWebServer();
  }
 
  if (parameter.Arguments.Contains("start"))

Arrowgene.Ddo.Cli/Command/ShowCommand.cs → Arrowgene.Ddon.Cli/Command/ShowCommand.cs

@@ -2,7 +2,7 @@
 using System.Text;
 using Arrowgene.Logging;
 
-namespace Arrowgene.Ddo.Cli.Command
+namespace Arrowgene.Ddon.Cli.Command
 {
  public class ShowCommand : ICommand
  {

Arrowgene.Ddo.Cli/Command/TestCommand.cs → Arrowgene.Ddon.Cli/Command/TestCommand.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Text;
-using Arrowgene.Ddo.Shared;
-using Arrowgene.Ddo.Shared.Crypto;
+using Arrowgene.Ddon.Shared;
+using Arrowgene.Ddon.Shared.Crypto;
 
-namespace Arrowgene.Ddo.Cli.Command
+namespace Arrowgene.Ddon.Cli.Command
 {
  public class TestCommand : ICommand
  {

Arrowgene.Ddo.Cli/CommandParameter.cs → Arrowgene.Ddon.Cli/CommandParameter.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Arrowgene.Ddo.Cli
+namespace Arrowgene.Ddon.Cli
 {
  public class CommandParameter
  {

Arrowgene.Ddo.Cli/CommandResultType.cs → Arrowgene.Ddon.Cli/CommandResultType.cs

@@ -1,4 +1,4 @@
-namespace Arrowgene.Ddo.Cli
+namespace Arrowgene.Ddon.Cli
 {
  public enum CommandResultType
  {

Arrowgene.Ddo.Cli/ICommand.cs → Arrowgene.Ddon.Cli/ICommand.cs

@@ -1,4 +1,4 @@
-namespace Arrowgene.Ddo.Cli
+namespace Arrowgene.Ddon.Cli
 {
  public interface ICommand
  {

Arrowgene.Ddo.Cli/Program.cs → Arrowgene.Ddon.Cli/Program.cs

@@ -1,34 +1,34 @@
 /*
- * This file is part of Arrowgene.Ddo.Cli
+ * This file is part of Arrowgene.Ddon.Cli
  *
- * Arrowgene.Ddo.Cli is a server implementation for the game "Dragons Dogma Online".
- * Copyright (C) 2019-2020 Ddo Team
+ * Arrowgene.Ddon.Cli is a server implementation for the game "Dragons Dogma Online".
+ * Copyright (C) 2019-2020 Ddon Team
  *
- * Github: https://github.com/sebastian-heinz/Ddo-server
+ * Github: https://github.com/sebastian-heinz/Arrowgene.DragonsDogmaOnline
  *
- * Arrowgene.Ddo.Cli is free software: you can redistribute it and/or modify
+ * Arrowgene.Ddon.Cli is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
- * Arrowgene.Ddo.Cli is distributed in the hope that it will be useful,
+ * Arrowgene.Ddon.Cli 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Arrowgene.Ddo.Cli. If not, see <https://www.gnu.org/licenses/>.
+ * along with Arrowgene.Ddon.Cli. If not, see <https://www.gnu.org/licenses/>.
  */
 
 using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading;
-using Arrowgene.Ddo.Cli.Command;
-using Arrowgene.Ddo.GameServer.Network;
+using Arrowgene.Ddon.Cli.Command;
+using Arrowgene.Ddon.GameServer.Network;
 using Arrowgene.Logging;
 
-namespace Arrowgene.Ddo.Cli
+namespace Arrowgene.Ddon.Cli
 {
  internal class Program
  {
@@ -238,7 +238,7 @@ private void ShowCopyright()
  StringBuilder sb = new StringBuilder();
  sb.Append(Environment.NewLine);
  sb.Append(Environment.NewLine);
- sb.Append("Arrowgene.Ddo.Cli Copyright (C) 2019-2020 Ddo Team");
+ sb.Append("Arrowgene.Ddon.Cli Copyright (C) 2019-2022 DDON Team");
  sb.Append(Environment.NewLine);
  sb.Append("This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.");
  sb.Append(Environment.NewLine);

Arrowgene.Ddo.Cli/Setting.cs → Arrowgene.Ddon.Cli/Setting.cs

@@ -1,9 +1,9 @@
 using System.Runtime.Serialization;
-using Arrowgene.Ddo.Database;
-using Arrowgene.Ddo.GameServer;
-using Arrowgene.Ddo.WebServer;
+using Arrowgene.Ddon.Database;
+using Arrowgene.Ddon.GameServer;
+using Arrowgene.Ddon.WebServer;
 
-namespace Arrowgene.Ddo.Cli
+namespace Arrowgene.Ddon.Cli
 {
  [DataContract]
  public class Setting