CPunch/gopenfusion
1
0
Fork 0
mirror of https://github.com/CPunch/gopenfusion.git synced 2025-10-11 03:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename cnpeer package to cnet

Browse Source
This commit is contained in:
CPunch
2023-12-01 17:11:41 -06:00
parent e1804a1042
commit c60017f78f
11 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shard/chat.go
View File

@@ -3,12 +3,12 @@ package shard
import (
"fmt"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/internal/protocol"
"github.com/CPunch/gopenfusion/shard/entity"
)
func (server *ShardServer) freeChat(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) freeChat(peer *cnet.CNPeer, pkt protocol.Packet) error {
var chat protocol.SP_CL2FE_REQ_SEND_FREECHAT_MESSAGE
pkt.Decode(&chat)
@@ -25,7 +25,7 @@ func (server *ShardServer) freeChat(peer *cnpeer.CNPeer, pkt protocol.Packet) er
})
}
func (server *ShardServer) menuChat(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) menuChat(peer *cnet.CNPeer, pkt protocol.Packet) error {
var chat protocol.SP_CL2FE_REQ_SEND_MENUCHAT_MESSAGE
pkt.Decode(&chat)
@@ -42,7 +42,7 @@ func (server *ShardServer) menuChat(peer *cnpeer.CNPeer, pkt protocol.Packet) er
})
}
func (server *ShardServer) emoteChat(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) emoteChat(peer *cnet.CNPeer, pkt protocol.Packet) error {
var chat protocol.SP_CL2FE_REQ_PC_AVATAR_EMOTES_CHAT
pkt.Decode(&chat)

6
shard/entity/entity.go
View File

@@ -1,6 +1,6 @@
package entity
import "github.com/CPunch/gopenfusion/cnpeer"
import "github.com/CPunch/gopenfusion/cnet"
type EntityKind int
@@ -20,6 +20,6 @@ type Entity interface {
SetPosition(x, y, z int)
SetAngle(angle int)
DisappearFromViewOf(peer *cnpeer.CNPeer)
EnterIntoViewOf(peer *cnpeer.CNPeer)
DisappearFromViewOf(peer *cnet.CNPeer)
EnterIntoViewOf(peer *cnet.CNPeer)
}

6
shard/entity/npc.go
View File

@@ -3,7 +3,7 @@ package entity
import (
"sync/atomic"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/internal/protocol"
)
@@ -63,13 +63,13 @@ func (npc *NPC) SetAngle(angle int) {
npc.Angle = angle
}
func (npc *NPC) DisappearFromViewOf(peer *cnpeer.CNPeer) {
func (npc *NPC) DisappearFromViewOf(peer *cnet.CNPeer) {
peer.Send(protocol.P_FE2CL_NPC_EXIT, protocol.SP_FE2CL_NPC_EXIT{
INPC_ID: int32(npc.ID),
})
}
func (npc *NPC) EnterIntoViewOf(peer *cnpeer.CNPeer) {
func (npc *NPC) EnterIntoViewOf(peer *cnet.CNPeer) {
peer.Send(protocol.P_FE2CL_NPC_NEW, protocol.SP_FE2CL_NPC_NEW{
NPCAppearanceData: npc.GetAppearanceData(),
})

10
shard/entity/player.go
View File

@@ -1,18 +1,18 @@
package entity
import (
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/internal/db"
"github.com/CPunch/gopenfusion/internal/protocol"
)
type Player struct {
db.Player
Peer *cnpeer.CNPeer
Peer *cnet.CNPeer
Chunk ChunkPosition
}
func NewPlayer(peer *cnpeer.CNPeer, player *db.Player) *Player {
func NewPlayer(peer *cnet.CNPeer, player *db.Player) *Player {
return &Player{
Player: *player,
Peer: peer,
@@ -52,13 +52,13 @@ func (plr *Player) SetAngle(angle int) {
plr.Angle = angle
}
func (plr *Player) DisappearFromViewOf(peer *cnpeer.CNPeer) {
func (plr *Player) DisappearFromViewOf(peer *cnet.CNPeer) {
peer.Send(protocol.P_FE2CL_PC_EXIT, protocol.SP_FE2CL_PC_EXIT{
IID: int32(plr.PlayerID),
})
}
func (plr *Player) EnterIntoViewOf(peer *cnpeer.CNPeer) {
func (plr *Player) EnterIntoViewOf(peer *cnet.CNPeer) {
peer.Send(protocol.P_FE2CL_PC_NEW, protocol.SP_FE2CL_PC_NEW{
PCAppearanceData: plr.GetAppearanceData(),
})

10
shard/join.go
View File

@@ -4,14 +4,14 @@ import (
"fmt"
"log"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/internal/protocol"
"github.com/CPunch/gopenfusion/internal/redis"
"github.com/CPunch/gopenfusion/shard/entity"
"github.com/CPunch/gopenfusion/util"
)
func (server *ShardServer) attachPlayer(peer *cnpeer.CNPeer, meta redis.LoginMetadata) (*entity.Player, error) {
func (server *ShardServer) attachPlayer(peer *cnet.CNPeer, meta redis.LoginMetadata) (*entity.Player, error) {
dbPlr, err := server.dbHndlr.GetPlayer(int(meta.PlayerID))
if err != nil {
return nil, err
@@ -26,7 +26,7 @@ func (server *ShardServer) attachPlayer(peer *cnpeer.CNPeer, meta redis.LoginMet
return plr, nil
}
func (server *ShardServer) RequestEnter(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) RequestEnter(peer *cnet.CNPeer, pkt protocol.Packet) error {
var enter protocol.SP_CL2FE_REQ_PC_ENTER
pkt.Decode(&enter)
@@ -57,7 +57,7 @@ func (server *ShardServer) RequestEnter(peer *cnpeer.CNPeer, pkt protocol.Packet
// setup peer
peer.E_key = protocol.CreateNewKey(resp.UiSvrTime, uint64(resp.IID+1), uint64(resp.PCLoadData2CL.IFusionMatter+1))
peer.FE_key = loginData.FEKey
peer.SetActiveKey(cnpeer.USE_FE)
peer.SetActiveKey(cnet.USE_FE)
log.Printf("Player %d (AccountID %d) entered\n", resp.IID, loginData.AccountID)
if err := peer.Send(protocol.P_FE2CL_REP_PC_ENTER_SUCC, resp); err != nil {
@@ -67,7 +67,7 @@ func (server *ShardServer) RequestEnter(peer *cnpeer.CNPeer, pkt protocol.Packet
return nil
}
func (server *ShardServer) LoadingComplete(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) LoadingComplete(peer *cnet.CNPeer, pkt protocol.Packet) error {
var loadComplete protocol.SP_CL2FE_REQ_PC_LOADING_COMPLETE
pkt.Decode(&loadComplete)

8
shard/movement.go
View File

@@ -3,7 +3,7 @@ package shard
import (
"fmt"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/internal/protocol"
"github.com/CPunch/gopenfusion/shard/entity"
"github.com/CPunch/gopenfusion/util"
@@ -17,7 +17,7 @@ func (server *ShardServer) updatePlayerPosition(plr *entity.Player, X, Y, Z, Ang
server.updateEntityChunk(plr, plr.GetChunkPos(), entity.MakeChunkPosition(X, Y))
}
func (server *ShardServer) playerMove(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) playerMove(peer *cnet.CNPeer, pkt protocol.Packet) error {
var move protocol.SP_CL2FE_REQ_PC_MOVE
pkt.Decode(&move)
@@ -45,7 +45,7 @@ func (server *ShardServer) playerMove(peer *cnpeer.CNPeer, pkt protocol.Packet)
})
}
func (server *ShardServer) playerStop(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) playerStop(peer *cnet.CNPeer, pkt protocol.Packet) error {
var stop protocol.SP_CL2FE_REQ_PC_STOP
pkt.Decode(&stop)
@@ -67,7 +67,7 @@ func (server *ShardServer) playerStop(peer *cnpeer.CNPeer, pkt protocol.Packet)
})
}
func (server *ShardServer) playerJump(peer *cnpeer.CNPeer, pkt protocol.Packet) error {
func (server *ShardServer) playerJump(peer *cnet.CNPeer, pkt protocol.Packet) error {
var jump protocol.SP_CL2FE_REQ_PC_JUMP
pkt.Decode(&jump)

8
shard/shardserver.go
View File

@@ -3,7 +3,7 @@ package shard
import (
"context"
"github.com/CPunch/gopenfusion/cnpeer"
"github.com/CPunch/gopenfusion/cnet"
"github.com/CPunch/gopenfusion/config"
"github.com/CPunch/gopenfusion/internal/db"
"github.com/CPunch/gopenfusion/internal/protocol"
@@ -12,7 +12,7 @@ import (
"github.com/CPunch/gopenfusion/shard/entity"
)
type PacketHandler func(peer *cnpeer.CNPeer, pkt protocol.Packet) error
type PacketHandler func(peer *cnet.CNPeer, pkt protocol.Packet) error
type ShardServer struct {
service *service.Service
@@ -56,7 +56,7 @@ func (server *ShardServer) Start() {
server.service.Start()
}
func (server *ShardServer) onDisconnect(peer *cnpeer.CNPeer) {
func (server *ShardServer) onDisconnect(peer *cnet.CNPeer) {
// remove from chunks
plr, ok := peer.UserData().(*entity.Player)
if ok && plr != nil {
@@ -64,6 +64,6 @@ func (server *ShardServer) onDisconnect(peer *cnpeer.CNPeer) {
}
}
func (server *ShardServer) onConnect(peer *cnpeer.CNPeer) {
func (server *ShardServer) onConnect(peer *cnet.CNPeer) {
}