dragonfly: Use Go 1.21 and use std slices package

df-mc · Nov 5, 2023 · 884aaa5 · 884aaa5
1 parent 21e8df6
commit 884aaa5
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/df-mc/dragonfly
 
-go 1.19
+go 1.21
 
 require (
 	github.com/brentp/intintmap v0.0.0-20190211203843-30dc0ade9af9

diff --git a/go.sum b/go.sum
@@ -26,6 +26,7 @@ github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
@@ -59,6 +60,7 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
@@ -124,3 +126,4 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/server/conf.go b/server/conf.go
@@ -15,9 +15,9 @@ import (
 	"github.com/google/uuid"
 	"github.com/sandertv/gophertunnel/minecraft/resource"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/exp/slices"
 	"os"
 	"path/filepath"
+	"slices"
 )
 
 // Config contains options for starting a Minecraft server.

diff --git a/server/entity/experience_orb.go b/server/entity/experience_orb.go
@@ -5,7 +5,7 @@ import (
 	"github.com/df-mc/dragonfly/server/internal/nbtconv"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/go-gl/mathgl/mgl64"
-	"golang.org/x/exp/slices"
+	"slices"
 	"time"
 )
 

diff --git a/server/internal/blockinternal/builder.go b/server/internal/blockinternal/builder.go
@@ -3,7 +3,7 @@ package blockinternal
 import (
 	"github.com/df-mc/dragonfly/server/item/category"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // ComponentBuilder represents a builder that can be used to construct a block components map to be sent to a client.

diff --git a/server/internal/sliceutil/sliceutil.go b/server/internal/sliceutil/sliceutil.go
@@ -1,6 +1,6 @@
 package sliceutil
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 // Convert converts a slice of type B to a slice of type A. Convert panics if B
 // cannot be type asserted to type A.

diff --git a/server/item/book_and_quill.go b/server/item/book_and_quill.go
@@ -1,6 +1,6 @@
 package item
 
-import "golang.org/x/exp/slices"
+import "slices"
 
 // BookAndQuill is an item used to write WrittenBook(s).
 type BookAndQuill struct {

diff --git a/server/item/inventory/inventory.go b/server/item/inventory/inventory.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/df-mc/dragonfly/server/item"
-	"golang.org/x/exp/slices"
 	"math"
+	"slices"
 	"strings"
 	"sync"
 )

diff --git a/server/item/recipe/register.go b/server/item/recipe/register.go
@@ -1,7 +1,7 @@
 package recipe
 
 import (
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // recipes is a list of each recipe.

diff --git a/server/item/stack.go b/server/item/stack.go
@@ -3,8 +3,8 @@ package item
 import (
 	"fmt"
 	"github.com/df-mc/dragonfly/server/world"
-	"golang.org/x/exp/slices"
 	"reflect"
+	"slices"
 	"sort"
 	"strings"
 	"sync/atomic"

diff --git a/server/player/scoreboard/scoreboard.go b/server/player/scoreboard/scoreboard.go
@@ -2,7 +2,7 @@ package scoreboard
 
 import (
 	"fmt"
-	"golang.org/x/exp/slices"
+	"slices"
 	"strings"
 )
 

diff --git a/server/session/handler_crafting.go b/server/session/handler_crafting.go
@@ -8,8 +8,8 @@ import (
 	"github.com/df-mc/dragonfly/server/item/recipe"
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
-	"golang.org/x/exp/slices"
 	"math"
+	"slices"
 )
 
 // handleCraft handles the CraftRecipe request action.

diff --git a/server/session/handler_enchanting.go b/server/session/handler_enchanting.go
@@ -9,9 +9,9 @@ import (
 	"github.com/df-mc/dragonfly/server/world"
 	"github.com/sandertv/gophertunnel/minecraft/protocol"
 	"github.com/sandertv/gophertunnel/minecraft/protocol/packet"
-	"golang.org/x/exp/slices"
 	"math"
 	"math/rand"
+	"slices"
 )
 
 const (

diff --git a/server/world/block_state.go b/server/world/block_state.go
@@ -7,8 +7,8 @@ import (
 	"github.com/df-mc/dragonfly/server/world/chunk"
 	"github.com/sandertv/gophertunnel/minecraft/nbt"
 	"github.com/segmentio/fasthash/fnv1"
-	"golang.org/x/exp/slices"
 	"math"
+	"slices"
 	"sort"
 	"strings"
 	"unsafe"

diff --git a/server/world/tick.go b/server/world/tick.go
@@ -4,8 +4,8 @@ import (
 	"github.com/df-mc/dragonfly/server/block/cube"
 	"github.com/df-mc/dragonfly/server/internal/sliceutil"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 	"math/rand"
+	"slices"
 	"time"
 )
 

diff --git a/server/world/world.go b/server/world/world.go
@@ -15,7 +15,7 @@ import (
 	"github.com/go-gl/mathgl/mgl64"
 	"github.com/google/uuid"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
+	"slices"
 )
 
 // World implements a Minecraft world. It manages all aspects of what players can see, such as blocks,