PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-03-09 23:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor package naming scheme and line endings (CRLF)

Browse source
This commit is contained in:
Chord 2016-05-03 03:58:58 -04:00
parent 14e48d47ae
commit df1d222df8
31 changed files with 404 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pslogin/src/main/scala/CryptoSessionActor.scala
View file

@ -2,9 +2,9 @@
import java.net.{InetAddress, InetSocketAddress}
import akka.actor.{Actor, ActorLogging, ActorRef, DiagnosticActorLogging, Identify, MDCContextAware}
import psforever.crypto.CryptoInterface.{CryptoState, CryptoStateWithMAC}
import psforever.crypto.CryptoInterface
import psforever.net._
import net.psforever.crypto.CryptoInterface.{CryptoState, CryptoStateWithMAC}
import net.psforever.crypto.CryptoInterface
import net.psforever.packet._
import scodec.Attempt.{Failure, Successful}
import scodec.bits._
import scodec.{Attempt, Codec, Err}

2
pslogin/src/main/scala/LoginSessionActor.scala
View file

@ -2,7 +2,7 @@
import java.net.{InetAddress, InetSocketAddress}
import akka.actor.{Actor, ActorLogging, ActorRef, Identify, MDCContextAware}
import psforever.net._
import net.psforever.packet._
import scodec.Attempt.{Failure, Successful}
import scodec.bits._

2
pslogin/src/main/scala/PsLogin.scala
View file

@ -4,7 +4,7 @@ import ch.qos.logback.classic.LoggerContext
import ch.qos.logback.core.status._
import ch.qos.logback.core.util.StatusPrinter
import com.typesafe.config.ConfigFactory
import psforever.crypto.CryptoInterface
import net.psforever.crypto.CryptoInterface
import org.slf4j
import org.fusesource.jansi.Ansi._
import org.fusesource.jansi.Ansi.Color._

4
pslogin/src/main/scala/psforever/crypto/CryptoStateManager.scala → pslogin/src/main/scala/net/psforever/crypto/CryptoStateManager.scala
View file

@ -1,5 +1,5 @@
// Copyright (c) 2016 PSForever.net to present
package psforever.crypto
package net.psforever.crypto
import akka.actor.{Actor, ActorLogging, FSM}
import akka.util.ByteString
@ -22,7 +22,7 @@ class CryptoStateManager extends Actor with ActorLogging with FSM[CryptoState, C
when(ClientStart()) {
/*case Event(RawPacket(msg), _) => {
val decoded = Codec.decode[psforever.net.ClientStart](msg.bits)
val decoded = Codec.decode[net.psforever.net.ClientStart](msg.bits)
try {
val packet = decoded.require.value
println("Got cNonce: " + packet.clientNonce)