mirror of
https://github.com/psforever/PSF-LoginServer.git
synced 2026-01-19 18:44:45 +00:00
formatting
This commit is contained in:
parent
1609a702c6
commit
1b367c455f
|
|
@ -76,4 +76,4 @@ ignore:
|
||||||
- "src/main/scala/net/psforever/services/local/LocalAction.scala"
|
- "src/main/scala/net/psforever/services/local/LocalAction.scala"
|
||||||
- "src/main/scala/net/psforever/services/local/LocalResponse.scala"
|
- "src/main/scala/net/psforever/services/local/LocalResponse.scala"
|
||||||
- "src/main/scala/net/psforever/services/vehicle/VehicleAction.scala"
|
- "src/main/scala/net/psforever/services/vehicle/VehicleAction.scala"
|
||||||
- "src/main/scala/net/psforever/services/vehicle/VehicleResponse.scala"
|
- "src/main/scala/net/psforever/services/vehicle/VehicleResponse.scala"
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
FROM mcr.microsoft.com/vscode/devcontainers/base:debian
|
FROM mcr.microsoft.com/vscode/devcontainers/base:debian
|
||||||
|
|
|
||||||
2
.github/workflows/publish.yaml
vendored
2
.github/workflows/publish.yaml
vendored
|
|
@ -35,4 +35,4 @@ jobs:
|
||||||
uses: docker/build-push-action@v2
|
uses: docker/build-push-action@v2
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.prep.outputs.tags }}
|
tags: ${{ steps.prep.outputs.tags }}
|
||||||
|
|
|
||||||
2
.github/workflows/test.yaml
vendored
2
.github/workflows/test.yaml
vendored
|
|
@ -46,4 +46,4 @@ jobs:
|
||||||
uses: actions/upload-artifact@v2
|
uses: actions/upload-artifact@v2
|
||||||
with:
|
with:
|
||||||
name: server.zip
|
name: server.zip
|
||||||
path: server/target/psforever-server-*.zip
|
path: server/target/psforever-server-*.zip
|
||||||
|
|
|
||||||
2
.jvmopts
2
.jvmopts
|
|
@ -2,4 +2,4 @@
|
||||||
-Xss6M
|
-Xss6M
|
||||||
-Dconfig.override_with_env_vars=true
|
-Dconfig.override_with_env_vars=true
|
||||||
-Dsbt.server.forcestart=true
|
-Dsbt.server.forcestart=true
|
||||||
-Dquill.macro.log=false
|
-Dquill.macro.log=false
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
version = 2.6.4
|
version = 2.6.4
|
||||||
preset = defaultWithAlign
|
preset = defaultWithAlign
|
||||||
maxColumn = 120
|
maxColumn = 120
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
GNU General Public License
|
GNU General Public License
|
||||||
==========================
|
==========================
|
||||||
|
|
||||||
_Version 3, 29 June 2007_
|
_Version 3, 29 June 2007_
|
||||||
_Copyright © 2007 Free Software Foundation, Inc. <<http://fsf.org/>>_
|
_Copyright © 2007 Free Software Foundation, Inc. <<http://fsf.org/>>_
|
||||||
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies of this license
|
Everyone is permitted to copy and distribute verbatim copies of this license
|
||||||
|
|
|
||||||
12
README.md
12
README.md
|
|
@ -30,7 +30,7 @@ which has the instructions on downloading the game and using the PSForever launc
|
||||||
- Up to date
|
- Up to date
|
||||||
- [PostgreSQL](https://www.postgresql.org/)
|
- [PostgreSQL](https://www.postgresql.org/)
|
||||||
- 10+
|
- 10+
|
||||||
- Development (+Running)
|
- Development (+Running)
|
||||||
- [Git](https://en.wikipedia.org/wiki/Git)
|
- [Git](https://en.wikipedia.org/wiki/Git)
|
||||||
- IDE or Text Editor
|
- IDE or Text Editor
|
||||||
|
|
||||||
|
|
@ -87,7 +87,7 @@ arguments - is recommended in order to avoid this startup time.
|
||||||
### PostgreSQL Database
|
### PostgreSQL Database
|
||||||
A database is required for persistence of game state and player characters. The login server and game server (which are
|
A database is required for persistence of game state and player characters. The login server and game server (which are
|
||||||
considered the same things, more or else) are set up to accept queries to a PostgreSQL server. It doesn't matter if you
|
considered the same things, more or else) are set up to accept queries to a PostgreSQL server. It doesn't matter if you
|
||||||
don't understand what PostgreSQL actually is compared to MySQL. I don't get it either - just install it:
|
don't understand what PostgreSQL actually is compared to MySQL. I don't get it either - just install it:
|
||||||
for [Windows](https://www.postgresql.org/download/windows/);
|
for [Windows](https://www.postgresql.org/download/windows/);
|
||||||
for Linux [Debian](https://www.postgresql.org/download/linux/debian/),
|
for Linux [Debian](https://www.postgresql.org/download/linux/debian/),
|
||||||
for Linux [Ubuntu](https://www.postgresql.org/download/linux/ubuntu/);
|
for Linux [Ubuntu](https://www.postgresql.org/download/linux/ubuntu/);
|
||||||
|
|
@ -102,7 +102,7 @@ To use pgAdmin, run the appropriate binary to start the pgAdmin server. Dependi
|
||||||
browser will open, or maybe a dedicated application window will open. Either way, create necessary passwords during
|
browser will open, or maybe a dedicated application window will open. Either way, create necessary passwords during
|
||||||
the first login, then enter the connection details that were used during the PostgreSQL installation. When connected,
|
the first login, then enter the connection details that were used during the PostgreSQL installation. When connected,
|
||||||
expand the tree and right click on "Databases", menu -> Create... -> Database. Enter name as "psforever", then Save.
|
expand the tree and right click on "Databases", menu -> Create... -> Database. Enter name as "psforever", then Save.
|
||||||
Right click on the psforever database, menu -> Query Tool... Copy and paste the commands below, then hit the
|
Right click on the psforever database, menu -> Query Tool... Copy and paste the commands below, then hit the
|
||||||
"Play/Run" button. The user should be created and made owner of the database. (Prior to that, it should be "postgresql".)
|
"Play/Run" button. The user should be created and made owner of the database. (Prior to that, it should be "postgresql".)
|
||||||
(Check menu -> Properties to confirm. May need to refresh first to see these changes.)
|
(Check menu -> Properties to confirm. May need to refresh first to see these changes.)
|
||||||
```sql
|
```sql
|
||||||
|
|
@ -117,11 +117,11 @@ If this happens, drop all objects and try again or apply permissions to everythi
|
||||||
Scala code can be fairly complex, and a good IDE helps you understand the code and what methods are available for certain
|
Scala code can be fairly complex, and a good IDE helps you understand the code and what methods are available for certain
|
||||||
types, especially as you are learning the language. IntelliJ IDEA has some of the most mature support for Scala of any
|
types, especially as you are learning the language. IntelliJ IDEA has some of the most mature support for Scala of any
|
||||||
IDE today. It has advanced type introspection (examine the properties of an object at runtime) and excellent code
|
IDE today. It has advanced type introspection (examine the properties of an object at runtime) and excellent code
|
||||||
completion (examine the code as you are writing it).
|
completion (examine the code as you are writing it).
|
||||||
Download the [community edition of IDEA](https://www.jetbrains.com/idea/download/) directly from IntelliJ's website
|
Download the [community edition of IDEA](https://www.jetbrains.com/idea/download/) directly from IntelliJ's website
|
||||||
then get the [required Scala plugin for IDEA](https://www.jetbrains.com/help/idea/managing-plugins.html).
|
then get the [required Scala plugin for IDEA](https://www.jetbrains.com/help/idea/managing-plugins.html).
|
||||||
|
|
||||||
You will need to import the project into the IDE. Older versions of IDEA (2016.3.4, etc.) have an
|
You will need to import the project into the IDE. Older versions of IDEA (2016.3.4, etc.) have an
|
||||||
[import procedure](https://www.lagomframework.com/documentation/1.6.x/scala/IntellijSbt.html)
|
[import procedure](https://www.lagomframework.com/documentation/1.6.x/scala/IntellijSbt.html)
|
||||||
where it is necessary to instruct the IDE what kind of project is being imported. Modern IDEA (2022.1.3) still
|
where it is necessary to instruct the IDE what kind of project is being imported. Modern IDEA (2022.1.3) still
|
||||||
utilizes this procedure but can also open the repo as a project and contextually determine what
|
utilizes this procedure but can also open the repo as a project and contextually determine what
|
||||||
|
|
@ -206,7 +206,7 @@ some helper scripts. Run the correct file for your platform (.BAT for Windows an
|
||||||
1. If dependency resolution results in certificate issues or generates a `/null/` directory into which some library
|
1. If dependency resolution results in certificate issues or generates a `/null/` directory into which some library
|
||||||
files are placed, the Java versioning is incorrectly applied. Your system's Java, via `JAVA_HOME` environment variable,
|
files are placed, the Java versioning is incorrectly applied. Your system's Java, via `JAVA_HOME` environment variable,
|
||||||
must be advanced enough to operate the toolset and only the project itself requires JDK 8. Check that project settings
|
must be advanced enough to operate the toolset and only the project itself requires JDK 8. Check that project settings
|
||||||
import and utilize Java 1.8_251. Perform normal generated file cleanup, e.g., sbt's `clean`.
|
import and utilize Java 1.8_251. Perform normal generated file cleanup, e.g., sbt's `clean`.
|
||||||
Any extraneous folders may also be deleted without issue.
|
Any extraneous folders may also be deleted without issue.
|
||||||
2. If the server repeatedly complains that "authentication method 10 not supported" during startup, your PostgreSQL
|
2. If the server repeatedly complains that "authentication method 10 not supported" during startup, your PostgreSQL
|
||||||
database does not support [scram-sha-256](https://www.postgresql.org/docs/current/auth-password.html) authentication.
|
database does not support [scram-sha-256](https://www.postgresql.org/docs/current/auth-password.html) authentication.
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,19 @@
|
||||||
\usepackage{lmodern}
|
\usepackage{lmodern}
|
||||||
|
|
||||||
\usepackage{graphicx}
|
\usepackage{graphicx}
|
||||||
\usepackage[margin=1in]{geometry}
|
\usepackage[margin=1in]{geometry}
|
||||||
\usepackage{float}
|
\usepackage{float}
|
||||||
\usepackage{xcolor}
|
\usepackage{xcolor}
|
||||||
\usepackage{hyperref}
|
\usepackage{hyperref}
|
||||||
\usepackage{float}
|
\usepackage{float}
|
||||||
\usepackage{amsmath}
|
\usepackage{amsmath}
|
||||||
|
|
||||||
\begin{document}
|
\begin{document}
|
||||||
|
|
||||||
\title{PSForever Server Notes}
|
\title{PSForever Server Notes}
|
||||||
|
|
||||||
\author{Chord $<$chord@tuta.io$>$}
|
\author{Chord $<$chord@tuta.io$>$}
|
||||||
|
|
||||||
\maketitle
|
\maketitle
|
||||||
|
|
||||||
%\section*{Security Model}
|
%\section*{Security Model}
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ for f in $FILES; do
|
||||||
else
|
else
|
||||||
SED_CMD='s#'"$LINESPEC_EXISTING_COPY"'#'"$COPYRIGHT"'#'
|
SED_CMD='s#'"$LINESPEC_EXISTING_COPY"'#'"$COPYRIGHT"'#'
|
||||||
echo "Replacing '$LINESPEC_EXISTING_COPY' --> '$COPYRIGHT'"
|
echo "Replacing '$LINESPEC_EXISTING_COPY' --> '$COPYRIGHT'"
|
||||||
sed -i -b "$SED_CMD" "$f"
|
sed -i -b "$SED_CMD" "$f"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
echo "$f: Not found"
|
echo "$f: Not found"
|
||||||
|
|
@ -63,7 +63,7 @@ for f in $FILES; do
|
||||||
if [ $CHOICE = "n" ]; then
|
if [ $CHOICE = "n" ]; then
|
||||||
:
|
:
|
||||||
else
|
else
|
||||||
sed -i -b '1i '"$COPYRIGHT"'' "$f"
|
sed -i -b '1i '"$COPYRIGHT"'' "$f"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -3,4 +3,4 @@ CREATE TABLE IF NOT EXISTS "buildings" (
|
||||||
zone_id INT NOT NULL,
|
zone_id INT NOT NULL,
|
||||||
faction_id INT NOT NULL,
|
faction_id INT NOT NULL,
|
||||||
PRIMARY KEY (local_id, zone_id)
|
PRIMARY KEY (local_id, zone_id)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,4 @@ CREATE TABLE implant (
|
||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
avatar_id INT NOT NULL REFERENCES avatar (id),
|
avatar_id INT NOT NULL REFERENCES avatar (id),
|
||||||
PRIMARY KEY (name, avatar_id)
|
PRIMARY KEY (name, avatar_id)
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
stacktrace.app.packages=net.psforever
|
stacktrace.app.packages=net.psforever
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,4 @@ interface PrivacyHelper {
|
||||||
return new ByteString1C(array);
|
return new ByteString1C(array);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
|
@ -4808,4 +4808,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -11689,4 +11689,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -7393,4 +7393,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -5656,4 +5656,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -4340,4 +4340,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -5992,4 +5992,4 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -256,5 +256,3 @@ object Tool {
|
||||||
def Definition: FireModeDefinition = fdef
|
def Definition: FireModeDefinition = fdef
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,4 +39,4 @@ object NonvitalDefinition {
|
||||||
out
|
out
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -654,4 +654,3 @@ object CarrierBehavior {
|
||||||
msgs
|
msgs
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,4 +40,3 @@ trait MountableWeapons
|
||||||
|
|
||||||
def Definition: MountableWeaponsDefinition
|
def Definition: MountableWeaponsDefinition
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,4 +55,3 @@ class AmsControl(vehicle: Vehicle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -613,7 +613,7 @@ object BfrControl {
|
||||||
final val Enabled = 38
|
final val Enabled = 38
|
||||||
final val Disabled = 39
|
final val Disabled = 39
|
||||||
}
|
}
|
||||||
|
|
||||||
private case object VehicleExplosion
|
private case object VehicleExplosion
|
||||||
|
|
||||||
val dimorphics: List[EquipmentHandiness] = {
|
val dimorphics: List[EquipmentHandiness] = {
|
||||||
|
|
|
||||||
|
|
@ -59,4 +59,4 @@ object TriggerUsedReason {
|
||||||
ResistUsing = NoResistanceSelection
|
ResistUsing = NoResistanceSelection
|
||||||
Model = SimpleResolutions.calculate
|
Model = SimpleResolutions.calculate
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,4 +15,3 @@ final case class Ignore(data: ByteVector) extends PlanetSideCryptoPacket {
|
||||||
object Ignore extends Marshallable[Ignore] {
|
object Ignore extends Marshallable[Ignore] {
|
||||||
implicit val codec: Codec[Ignore] = ("data" | bytes).as[Ignore]
|
implicit val codec: Codec[Ignore] = ("data" | bytes).as[Ignore]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -332,4 +332,3 @@ object MountableInventory {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -549,7 +549,7 @@ class CavernRotationService(
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @param sendToSession callback reference
|
* @param sendToSession callback reference
|
||||||
*/
|
*/
|
||||||
def sendCavernRotationUpdates(sendToSession: ActorRef): Unit = {
|
def sendCavernRotationUpdates(sendToSession: ActorRef): Unit = {
|
||||||
|
|
|
||||||
|
|
@ -56,4 +56,4 @@ object HartTimerActions {
|
||||||
LocalAction.ShuttleState(shuttle.GUID, shuttle.Position, shuttle.Orientation, state)
|
LocalAction.ShuttleState(shuttle.GUID, shuttle.Position, shuttle.Orientation, state)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,4 +12,4 @@ object MemberAction extends Enumeration {
|
||||||
RemoveIgnoredPlayer = Value
|
RemoveIgnoredPlayer = Value
|
||||||
|
|
||||||
implicit val codec: Codec[MemberAction.Value] = PacketHelpers.createEnumerationCodec(this, uint(bits = 3))
|
implicit val codec: Codec[MemberAction.Value] = PacketHelpers.createEnumerationCodec(this, uint(bits = 3))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,4 +45,3 @@ class CaptureFlagUpdateMessageTest extends Specification with Debug {
|
||||||
pkt mustEqual stringOne
|
pkt mustEqual stringOne
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -65,4 +65,3 @@ class ComponentDamageMessageTest extends Specification {
|
||||||
pkt mustEqual string_off
|
pkt mustEqual string_off
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,4 +54,3 @@ class FrameVehicleStateMessageTest extends Specification {
|
||||||
pkt mustEqual string
|
pkt mustEqual string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -28,4 +28,3 @@ class GenericObjectActionAtPositionMessageTest extends Specification {
|
||||||
pkt mustEqual string
|
pkt mustEqual string
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -347,4 +347,3 @@ class BattleframeRoboticsTest extends Specification {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,4 +21,4 @@ class LocalTest extends Specification {
|
||||||
obj.Definition.Name mustEqual "locker-equipment"
|
obj.Definition.Name mustEqual "locker-equipment"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue