Version 0.8.20 and updated ports in containers and readme

MUnique · Oct 6, 2024 · 1d9ebd8 · 1d9ebd8
1 parent 15e2651
commit 1d9ebd8
Show file tree

Hide file tree

Showing 11 changed files with 38 additions and 26 deletions.
diff --git a/QuickStart.md b/QuickStart.md
@@ -4,37 +4,33 @@ General requirements:
 
 * Free TCP ports:
   * 80 (admin panel)
-  * 55901, 55902, 55903 (game servers)
-  * 44405 (connect server)
+  * 55901 - 55906 (game servers)
+  * 44405 - 44406 (connect servers)
+    * 44405: default connection port for the original client
+    * 44406: connection port especially for the [open source client](https://github.com/sven-n/MuMain)
   * 55980 (chat server)
 
 * A game client (check our Discord FAQs)
 * Knowledge or way to start the game client, so that it connects to the server. Our Launcher will do that.
 
-  * Launcher binaries: [MUnique.OpenMU.ClientLauncher v0.8.0.zip](https://github.com/MUnique/OpenMU/releases/download/v0.8.0/MUnique.OpenMU.ClientLauncher_0.8.0.zip)
+  * Launcher binaries: [MUnique.OpenMU.ClientLauncher v0.8.17.zip](https://github.com/MUnique/OpenMU/releases/download/v0.8.17/MUnique.OpenMU.ClientLauncher_0.8.17.zip)
     * It requires the [.NET 8 runtime](https://dotnet.microsoft.com/download/dotnet/8.0)
   * If your server and client runs on your local host, use any IP of 127.x.x.x, except 127.0.0.1, because this one is blocked by the client. For example, you could use 127.127.127.127
 
 This guide describes two ways of starting the server. Use Docker, if you just
 want to play around. If you want to develop or debug the server, choose the
 manual way.
 
+As you can see on the connect server ports, the server is initialized for two different clients by default.
+They can connect to the same game servers through different ports. However, if you connect to the wrong port,
+it may currently still work all correctly, you'll just get warnings in the logs. However, as soon as
+we change encryption keys or methods, this will change.
+
 ## Docker
 
 Please take a look at the deploy-folder of this project. There you'll find a more
 detailed guide about how to set up this project.
 
-### Demo Mode
-
-If you just want to play around with the server, you can find the newest docker
-all-in-one image on the Docker Hub: <https://hub.docker.com/r/munique/openmu>
-
-To pull and run the latest docker image, run this command:
-`docker run --name openmu -d -p 80:8080 -p 44405:44405 -p 55901:55901 -p 55902:55902 -p 55903:55903 -p 55980:55980 munique/openmu:latest -demo`
-
-The last argument is there to start the server in demo mode, without a
-database. To use a postgres database, you can use docker-compose.
-
 ### Environment Variables
 
 It's possible to define additional environment variables to influence the
@@ -96,8 +92,8 @@ If you have that, you'll need to do:
   * Optional: You can reinitialize the database by adding a ```-reinit``` parameter.
 
 * When the Admin Panel is initialized, go to <http://localhost/>. Then you
-  should see three gameservers, the chat server and the connect server. Start
-  the connect server and at least one gameserver.
+  should see three gameservers, the chat server and two connect servers. Start
+  the connect servers and at least one gameserver.
 
 * If you update to a newer state of the master-branch, it could be possible
     that you have to update the database and configuration.

diff --git a/README.md b/README.md
@@ -18,7 +18,9 @@
 This project aims to create an easy to use, extendable and customizable server
 for a MMORPG called "MU Online".
 The server supports multiple versions of the game, but the main focus is
-version of Season 6 Episode 3 using the ENG (english) protocol.
+version of Season 6 Episode 3 using the ENG (english) protocol. Additionally,
+the long-term focus is on the [open source client](https://github.com/sven-n/MuMain)
+which supports a slightly extended network protocol.
 However, parts of the software can also be suitable for the development of
 other games, even for other kind of games.
 

diff --git a/deploy/all-in-one-traefik/docker-compose.prod.yml b/deploy/all-in-one-traefik/docker-compose.prod.yml
@@ -8,6 +8,9 @@ services:
       - "55901:55901"
       - "55902:55902"
       - "55903:55903"
+      - "55904:55904"
+      - "55905:55905"
+      - "55906:55906"
       - "44405:44405"
       - "55980:55980"
     environment:

diff --git a/deploy/all-in-one-traefik/docker-compose.yml b/deploy/all-in-one-traefik/docker-compose.yml
@@ -8,6 +8,9 @@ services:
       - "55901:55901"
       - "55902:55902"
       - "55903:55903"
+      - "55904:55904"
+      - "55905:55905"
+      - "55906:55906"
       - "44405:44405"
       - "55980:55980"
     environment:

diff --git a/deploy/all-in-one/docker-compose.yml b/deploy/all-in-one/docker-compose.yml
@@ -20,6 +20,9 @@ services:
       - "55901:55901"
       - "55902:55902"
       - "55903:55903"
+      - "55904:55904"
+      - "55905:55905"
+      - "55906:55906"
       - "44405:44405"
       - "55980:55980"
     environment:

diff --git a/deploy/distributed/docker-compose.yml b/deploy/distributed/docker-compose.yml
@@ -285,6 +285,7 @@ services:
       - "8080"
       - "50001"
       - "55901:55901"
+      - "55902:55902"
       - "9464" # Prometheus
     environment:
       GS_ID: 0
@@ -322,7 +323,8 @@ services:
     ports:
       - "8080"
       - "50001"
-      - "55902:55902"
+      - "55903:55903"
+      - "55904:55904"
       - "9464" # Prometheus
     environment:
       GS_ID: 1

diff --git a/src/Network/MUnique.OpenMU.Network.csproj b/src/Network/MUnique.OpenMU.Network.csproj
@@ -18,8 +18,8 @@
       MUnique.OpenMU.Network contains all what's required to connect from and to a MU Online game, connect or chat server. It implements the MU Online network protocol.
       It also contains several the encryption algorithms and keys which were used until a few years ago up to Season 6 Episode 3.
     </Description>
-    <PackageVersion>0.8.18</PackageVersion>
-    <Version>0.8.18</Version>
+    <PackageVersion>0.8.20</PackageVersion>
+    <Version>0.8.20</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj b/src/Network/Packets/MUnique.OpenMU.Network.Packets.csproj
@@ -16,8 +16,8 @@
     <PackageTags>MUnique OpenMU MUOnline Network Packets</PackageTags>
     <PackageId>MUnique.OpenMU.Network.Packets</PackageId>
     <Description>This package contains message structs for the MMORPG "MU Online", which are primarily focused on the english version of Season 6 Episode 3.</Description>
-    <PackageVersion>0.8.18</PackageVersion>
-    <Version>0.8.18</Version>
+    <PackageVersion>0.8.20</PackageVersion>
+    <Version>0.8.20</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/PlugIns/MUnique.OpenMU.PlugIns.csproj b/src/PlugIns/MUnique.OpenMU.PlugIns.csproj
@@ -17,8 +17,8 @@
     <Description>
       MUnique.OpenMU.PlugIns contains all what's required to create plugins extension points and own plugins for dependent applications.
     </Description>
-    <PackageVersion>0.8.18</PackageVersion>
-    <Version>0.8.18</Version>
+    <PackageVersion>0.8.20</PackageVersion>
+    <Version>0.8.20</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -29,5 +29,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.8.18.0")]
-[assembly: AssemblyFileVersion("0.8.18.0")]
+[assembly: AssemblyVersion("0.8.20.0")]
+[assembly: AssemblyFileVersion("0.8.20.0")]
diff --git a/src/Startup/Dockerfile b/src/Startup/Dockerfile
@@ -4,6 +4,9 @@ EXPOSE 8080
 EXPOSE 55901
 EXPOSE 55902
 EXPOSE 55903
+EXPOSE 55904
+EXPOSE 55905
+EXPOSE 55906
 EXPOSE 44405
 EXPOSE 55980