Skip to content

Commit cfe543c

Browse files
RestartFURestartFU
andauthored
feat: add golang plugin support (#23)
* feat: add golang plugin support * go module * various changes * various changes * remove go mod * use remote for grpc go --------- Co-authored-by: RestartFU <me@restartfu.com>
1 parent a7b3983 commit cfe543c

20 files changed

Lines changed: 133 additions & 13 deletions

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,9 @@ to generate our protobuf types, you will need to install [buf](https://buf.build
262262
# Install buf
263263
# Follow instructions at https://buf.build/docs/cli/installation/
264264

265-
# Install protoc-gen-go
265+
# Install protoc-gen-go and protoc-gen-go-grpc
266266
go install google.golang.org/protobuf/cmd/protoc-gen-go@latest
267+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest
267268
```
268269

269270
Then run:

plugin/adapters/plugin/actions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/df-mc/dragonfly/server/world/sound"
1515
"github.com/go-gl/mathgl/mgl64"
1616
"github.com/google/uuid"
17-
pb "github.com/secmc/plugin/proto/generated"
17+
pb "github.com/secmc/plugin/proto/generated/go"
1818
)
1919

2020
func (m *Manager) applyActions(p *pluginProcess, batch *pb.ActionBatch) {

plugin/adapters/plugin/commands.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"github.com/df-mc/dragonfly/server/cmd"
77
"github.com/df-mc/dragonfly/server/player"
88
"github.com/df-mc/dragonfly/server/world"
9-
pb "github.com/secmc/plugin/proto/generated"
9+
pb "github.com/secmc/plugin/proto/generated/go"
1010
)
1111

1212
func (m *Manager) registerCommands(p *pluginProcess, specs []*pb.CommandSpec) {

plugin/adapters/plugin/custom_items.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/df-mc/dragonfly/server/item/category"
1010
"github.com/df-mc/dragonfly/server/world"
11-
pb "github.com/secmc/plugin/proto/generated"
11+
pb "github.com/secmc/plugin/proto/generated/go"
1212
)
1313

1414
// customItem implements world.CustomItem

plugin/adapters/plugin/event_helpers.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/df-mc/dragonfly/server/session"
1313
"github.com/df-mc/dragonfly/server/world"
1414
"github.com/go-gl/mathgl/mgl64"
15-
pb "github.com/secmc/plugin/proto/generated"
15+
pb "github.com/secmc/plugin/proto/generated/go"
1616
)
1717

1818
type cancelContext interface {
@@ -272,4 +272,3 @@ func worldFromContext(ctx *world.Context) *world.World {
272272
}
273273
return tx.World()
274274
}
275-

plugin/adapters/plugin/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/secmc/plugin/plugin/adapters/grpc"
2323
"github.com/secmc/plugin/plugin/config"
2424
"github.com/secmc/plugin/plugin/ports"
25-
pb "github.com/secmc/plugin/proto/generated"
25+
pb "github.com/secmc/plugin/proto/generated/go"
2626
)
2727

2828
type Manager struct {

plugin/adapters/plugin/player_events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/df-mc/dragonfly/server/session"
1313
"github.com/df-mc/dragonfly/server/world"
1414
"github.com/go-gl/mathgl/mgl64"
15-
pb "github.com/secmc/plugin/proto/generated"
15+
pb "github.com/secmc/plugin/proto/generated/go"
1616
)
1717

1818
func (m *Manager) EmitPlayerJoin(p *player.Player) {

plugin/adapters/plugin/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
"github.com/secmc/plugin/plugin/adapters/grpc"
2020
"github.com/secmc/plugin/plugin/config"
21-
pb "github.com/secmc/plugin/proto/generated"
21+
pb "github.com/secmc/plugin/proto/generated/go"
2222
)
2323

2424
const (

plugin/adapters/plugin/world_events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/df-mc/dragonfly/server/block/cube"
88
"github.com/df-mc/dragonfly/server/world"
99
"github.com/go-gl/mathgl/mgl64"
10-
pb "github.com/secmc/plugin/proto/generated"
10+
pb "github.com/secmc/plugin/proto/generated/go"
1111
)
1212

1313
func (m *Manager) EmitWorldLiquidFlow(ctx *world.Context, from, into cube.Pos, liquid world.Liquid, replaced world.Block) {

plugin/ports/ports.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/df-mc/dragonfly/server/session"
1313
"github.com/df-mc/dragonfly/server/world"
1414
"github.com/go-gl/mathgl/mgl64"
15-
pb "github.com/secmc/plugin/proto/generated"
15+
pb "github.com/secmc/plugin/proto/generated/go"
1616
)
1717

1818
type PluginManager interface {

0 commit comments

Comments
 (0)