From 84094569af0a0fa83a8703f95c7676e4b8fcc4b0 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Sat, 6 May 2023 17:45:39 +0800 Subject: [PATCH] =?UTF-8?q?mod=E5=8F=8Aimport=E6=94=B9=E4=B8=BAgithub.com/?= =?UTF-8?q?kercylan98/minotaur?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/lockstep/lockstep.go | 2 +- exporter/configuration/analyzer/default.go | 6 +++--- exporter/configuration/golang/configuration.go | 4 ++-- exporter/configuration/golang/field.go | 2 +- exporter/configuration/golang/field_type.go | 2 +- game/attrs.go | 2 +- game/builtin/actor_move.go | 2 +- game/builtin/attrs.go | 6 +++--- game/builtin/gameplay.go | 4 ++-- game/builtin/gameplay_over.go | 2 +- game/builtin/gameplay_time.go | 4 ++-- game/builtin/gameplay_time_options.go | 2 +- game/builtin/player.go | 2 +- game/builtin/position.go | 2 +- game/builtin/room.go | 6 +++--- game/builtin/room_manager.go | 4 ++-- game/builtin/room_options.go | 2 +- game/builtin/world.go | 6 +++--- game/builtin/world_options.go | 2 +- game/extension/player_login_launcher.go | 2 +- game/gameplay.go | 2 +- game/room.go | 2 +- game/world.go | 2 +- go.mod | 2 +- notify/manager.go | 2 +- notify/senders/feishu.go | 2 +- server/event.go | 4 ++-- server/multiple.go | 2 +- server/options.go | 2 +- server/server.go | 4 ++-- utils/g2d/g2d.go | 2 +- utils/synchronization/pool.go | 2 +- 32 files changed, 46 insertions(+), 46 deletions(-) diff --git a/component/lockstep/lockstep.go b/component/lockstep/lockstep.go index 279e8dc..1ca22a9 100644 --- a/component/lockstep/lockstep.go +++ b/component/lockstep/lockstep.go @@ -1,7 +1,7 @@ package lockstep import ( - "minotaur/utils/timer" + "github.com/kercylan98/minotaur/utils/timer" "sync" "time" ) diff --git a/exporter/configuration/analyzer/default.go b/exporter/configuration/analyzer/default.go index 412caf1..bd30b90 100644 --- a/exporter/configuration/analyzer/default.go +++ b/exporter/configuration/analyzer/default.go @@ -2,11 +2,11 @@ package analyzer import ( "fmt" + "github.com/kercylan98/minotaur/exporter/configuration" + "github.com/kercylan98/minotaur/exporter/configuration/golang" + "github.com/kercylan98/minotaur/utils/log" "github.com/xuri/excelize/v2" "go.uber.org/zap" - "minotaur/exporter/configuration" - "minotaur/exporter/configuration/golang" - "minotaur/utils/log" "strconv" "strings" ) diff --git a/exporter/configuration/golang/configuration.go b/exporter/configuration/golang/configuration.go index 6f19bcc..5df6b4f 100644 --- a/exporter/configuration/golang/configuration.go +++ b/exporter/configuration/golang/configuration.go @@ -2,8 +2,8 @@ package golang import ( "fmt" - "minotaur/exporter/configuration" - "minotaur/utils/hash" + "github.com/kercylan98/minotaur/exporter/configuration" + "github.com/kercylan98/minotaur/utils/hash" "strings" ) diff --git a/exporter/configuration/golang/field.go b/exporter/configuration/golang/field.go index b5c55dd..887aa67 100644 --- a/exporter/configuration/golang/field.go +++ b/exporter/configuration/golang/field.go @@ -1,7 +1,7 @@ package golang import ( - "minotaur/exporter/configuration" + "github.com/kercylan98/minotaur/exporter/configuration" ) func NewField(id int, name string, fieldType configuration.FieldType, isIndex bool) *Field { diff --git a/exporter/configuration/golang/field_type.go b/exporter/configuration/golang/field_type.go index e261e3e..c301a8b 100644 --- a/exporter/configuration/golang/field_type.go +++ b/exporter/configuration/golang/field_type.go @@ -1,6 +1,6 @@ package golang -import "minotaur/exporter/configuration" +import "github.com/kercylan98/minotaur/exporter/configuration" func GetFieldType(fieldType string) configuration.FieldType { switch fieldType { diff --git a/game/attrs.go b/game/attrs.go index 7df20a9..23f637b 100644 --- a/game/attrs.go +++ b/game/attrs.go @@ -1,6 +1,6 @@ package game -import "minotaur/utils/huge" +import "github.com/kercylan98/minotaur/utils/huge" // Attrs 属性 type Attrs interface { diff --git a/game/builtin/actor_move.go b/game/builtin/actor_move.go index 25cfb51..e1a1b0b 100644 --- a/game/builtin/actor_move.go +++ b/game/builtin/actor_move.go @@ -1,7 +1,7 @@ package builtin import ( - "minotaur/game" + "github.com/kercylan98/minotaur/game" ) type ActorMove struct { diff --git a/game/builtin/attrs.go b/game/builtin/attrs.go index fec24d6..505bf17 100644 --- a/game/builtin/attrs.go +++ b/game/builtin/attrs.go @@ -1,9 +1,9 @@ package builtin import ( - "minotaur/game" - "minotaur/utils/huge" - "minotaur/utils/synchronization" + "github.com/kercylan98/minotaur/game" + "github.com/kercylan98/minotaur/utils/huge" + "github.com/kercylan98/minotaur/utils/synchronization" ) func NewAttrs() *Attrs { diff --git a/game/builtin/gameplay.go b/game/builtin/gameplay.go index a48eb52..90608cb 100644 --- a/game/builtin/gameplay.go +++ b/game/builtin/gameplay.go @@ -1,8 +1,8 @@ package builtin import ( - "minotaur/game" - "minotaur/utils/offset" + "github.com/kercylan98/minotaur/game" + "github.com/kercylan98/minotaur/utils/offset" "time" ) diff --git a/game/builtin/gameplay_over.go b/game/builtin/gameplay_over.go index 3b2b6c8..caeda96 100644 --- a/game/builtin/gameplay_over.go +++ b/game/builtin/gameplay_over.go @@ -1,7 +1,7 @@ package builtin import ( - "minotaur/game" + "github.com/kercylan98/minotaur/game" ) func NewGameplayOver() *GameplayOver { diff --git a/game/builtin/gameplay_time.go b/game/builtin/gameplay_time.go index 5056edf..4129ccf 100644 --- a/game/builtin/gameplay_time.go +++ b/game/builtin/gameplay_time.go @@ -1,8 +1,8 @@ package builtin import ( - "minotaur/game" - "minotaur/utils/timer" + "github.com/kercylan98/minotaur/game" + "github.com/kercylan98/minotaur/utils/timer" "time" ) diff --git a/game/builtin/gameplay_time_options.go b/game/builtin/gameplay_time_options.go index 7c6f6a4..29eece6 100644 --- a/game/builtin/gameplay_time_options.go +++ b/game/builtin/gameplay_time_options.go @@ -2,7 +2,7 @@ package builtin import ( "fmt" - "minotaur/utils/timer" + "github.com/kercylan98/minotaur/utils/timer" ) type GameplayTimeOption func(time *GameplayTime) diff --git a/game/builtin/player.go b/game/builtin/player.go index 24e85e4..f53b003 100644 --- a/game/builtin/player.go +++ b/game/builtin/player.go @@ -1,6 +1,6 @@ package builtin -import "minotaur/server" +import "github.com/kercylan98/minotaur/server" func NewPlayer[ID comparable](id ID, conn *server.Conn) *Player[ID] { return &Player[ID]{ diff --git a/game/builtin/position.go b/game/builtin/position.go index 2e40587..ce64d96 100644 --- a/game/builtin/position.go +++ b/game/builtin/position.go @@ -1,6 +1,6 @@ package builtin -import "minotaur/game" +import "github.com/kercylan98/minotaur/game" // NewPosition 创建一个新的位置对象。 func NewPosition(x, y, z float64) *Position { diff --git a/game/builtin/room.go b/game/builtin/room.go index ab16bc6..1fcc7e2 100644 --- a/game/builtin/room.go +++ b/game/builtin/room.go @@ -1,10 +1,10 @@ package builtin import ( + "github.com/kercylan98/minotaur/game" + "github.com/kercylan98/minotaur/utils/log" + "github.com/kercylan98/minotaur/utils/synchronization" "go.uber.org/zap" - "minotaur/game" - "minotaur/utils/log" - "minotaur/utils/synchronization" ) func NewRoom[PlayerID comparable, Player game.Player[PlayerID]](guid int64) *Room[PlayerID, Player] { diff --git a/game/builtin/room_manager.go b/game/builtin/room_manager.go index 592314f..bd13d08 100644 --- a/game/builtin/room_manager.go +++ b/game/builtin/room_manager.go @@ -1,8 +1,8 @@ package builtin import ( - "minotaur/game" - "minotaur/utils/synchronization" + "github.com/kercylan98/minotaur/game" + "github.com/kercylan98/minotaur/utils/synchronization" "sync/atomic" ) diff --git a/game/builtin/room_options.go b/game/builtin/room_options.go index 993852c..5893af8 100644 --- a/game/builtin/room_options.go +++ b/game/builtin/room_options.go @@ -1,6 +1,6 @@ package builtin -import "minotaur/game" +import "github.com/kercylan98/minotaur/game" // RoomOption 房间构建可选项 type RoomOption[PlayerID comparable, Player game.Player[PlayerID]] func(room *Room[PlayerID, Player]) diff --git a/game/builtin/world.go b/game/builtin/world.go index ebcfeb6..8d1f5ac 100644 --- a/game/builtin/world.go +++ b/game/builtin/world.go @@ -1,10 +1,10 @@ package builtin import ( + "github.com/kercylan98/minotaur/game" + "github.com/kercylan98/minotaur/utils/log" + "github.com/kercylan98/minotaur/utils/synchronization" "go.uber.org/zap" - "minotaur/game" - "minotaur/utils/log" - "minotaur/utils/synchronization" "sync/atomic" ) diff --git a/game/builtin/world_options.go b/game/builtin/world_options.go index 096fc7c..e412c46 100644 --- a/game/builtin/world_options.go +++ b/game/builtin/world_options.go @@ -1,6 +1,6 @@ package builtin -import "minotaur/game" +import "github.com/kercylan98/minotaur/game" // WorldOption 世界构建可选项 type WorldOption[PlayerID comparable, Player game.Player[PlayerID]] func(world *World[PlayerID, Player]) diff --git a/game/extension/player_login_launcher.go b/game/extension/player_login_launcher.go index d931b3e..9ce28b3 100644 --- a/game/extension/player_login_launcher.go +++ b/game/extension/player_login_launcher.go @@ -1,7 +1,7 @@ package extension import ( - "minotaur/game" + "github.com/kercylan98/minotaur/game" "time" ) diff --git a/game/gameplay.go b/game/gameplay.go index 2535b8f..f1cb4df 100644 --- a/game/gameplay.go +++ b/game/gameplay.go @@ -1,7 +1,7 @@ package game import ( - "minotaur/utils/offset" + "github.com/kercylan98/minotaur/utils/offset" "time" ) diff --git a/game/room.go b/game/room.go index 3daa7c9..a2a9450 100644 --- a/game/room.go +++ b/game/room.go @@ -1,6 +1,6 @@ package game -import "minotaur/utils/synchronization" +import "github.com/kercylan98/minotaur/utils/synchronization" // Room 房间类似于简版的游戏世界，不过没有游戏实体 type Room[PlayerID comparable, P Player[PlayerID]] interface { diff --git a/game/world.go b/game/world.go index 81fd1f0..6a5bc6f 100644 --- a/game/world.go +++ b/game/world.go @@ -1,6 +1,6 @@ package game -import "minotaur/utils/synchronization" +import "github.com/kercylan98/minotaur/utils/synchronization" // World 游戏世界接口定义 type World[PlayerID comparable, P Player[PlayerID]] interface { diff --git a/go.mod b/go.mod index e5dd5e3..f5cde8a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module minotaur +module github.com/kercylan98/minotaur go 1.20 diff --git a/notify/manager.go b/notify/manager.go index b6a527a..95d5756 100644 --- a/notify/manager.go +++ b/notify/manager.go @@ -1,8 +1,8 @@ package notify import ( + "github.com/kercylan98/minotaur/utils/log" "go.uber.org/zap" - "minotaur/utils/log" "reflect" ) diff --git a/notify/senders/feishu.go b/notify/senders/feishu.go index 51a7521..2ff6aac 100644 --- a/notify/senders/feishu.go +++ b/notify/senders/feishu.go @@ -3,7 +3,7 @@ package senders import ( "fmt" "github.com/go-resty/resty/v2" - "minotaur/notify" + "github.com/kercylan98/minotaur/notify" "net/http" ) diff --git a/server/event.go b/server/event.go index 2c3ffd5..07eeaf1 100644 --- a/server/event.go +++ b/server/event.go @@ -1,9 +1,9 @@ package server import ( + "github.com/kercylan98/minotaur/utils/log" + "github.com/kercylan98/minotaur/utils/runtimes" "go.uber.org/zap" - "minotaur/utils/log" - "minotaur/utils/runtimes" "reflect" ) diff --git a/server/multiple.go b/server/multiple.go index 57043c6..675e261 100644 --- a/server/multiple.go +++ b/server/multiple.go @@ -1,8 +1,8 @@ package server import ( + "github.com/kercylan98/minotaur/utils/log" "go.uber.org/zap" - "minotaur/utils/log" "os" "os/signal" "syscall" diff --git a/server/options.go b/server/options.go index dfe75f6..3ad5eb8 100644 --- a/server/options.go +++ b/server/options.go @@ -1,8 +1,8 @@ package server import ( + "github.com/kercylan98/minotaur/utils/log" "go.uber.org/zap" - "minotaur/utils/log" ) type Option func(srv *Server) diff --git a/server/server.go b/server/server.go index b02f43f..fa4e0c5 100644 --- a/server/server.go +++ b/server/server.go @@ -5,12 +5,12 @@ import ( "fmt" "github.com/gin-gonic/gin" "github.com/gorilla/websocket" + "github.com/kercylan98/minotaur/utils/log" + "github.com/kercylan98/minotaur/utils/synchronization" "github.com/panjf2000/gnet" "github.com/xtaci/kcp-go/v5" "go.uber.org/zap" "google.golang.org/grpc" - "minotaur/utils/log" - "minotaur/utils/synchronization" "net" "net/http" "os" diff --git a/utils/g2d/g2d.go b/utils/g2d/g2d.go index 63686d6..6c57570 100644 --- a/utils/g2d/g2d.go +++ b/utils/g2d/g2d.go @@ -1,7 +1,7 @@ package g2d import ( - "minotaur/utils/g2d/matrix" + "github.com/kercylan98/minotaur/utils/g2d/matrix" ) // NewMatrix 生成特定宽高的二维矩阵 diff --git a/utils/synchronization/pool.go b/utils/synchronization/pool.go index 21adaf4..4d4256b 100644 --- a/utils/synchronization/pool.go +++ b/utils/synchronization/pool.go @@ -1,8 +1,8 @@ package synchronization import ( + "github.com/kercylan98/minotaur/utils/log" "go.uber.org/zap" - "minotaur/utils/log" "sync" )