aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fischer@muhq.space>2025-09-02 14:11:56 +0200
committerFlorian Fischer <florian.fischer@muhq.space>2025-09-03 12:39:41 +0200
commit4c3e641243ee0ce712dbdd6da7085253b4bdcc91 (patch)
tree354338c561b1bb0591a05247962adbfa8ca63b92
parentfcc55c047eaf7275b9154b8448a56800849fccae (diff)
downloadmuhqs-game-4c3e641243ee0ce712dbdd6da7085253b4bdcc91.tar.gz
muhqs-game-4c3e641243ee0ce712dbdd6da7085253b4bdcc91.zip
switch exp/slices to slices module
-rw-r--r--go/game/action.go3
-rw-r--r--go/game/ai.go3
-rw-r--r--go/game/card.go2
-rw-r--r--go/game/map.go3
-rw-r--r--go/game/map_test.go3
-rw-r--r--go/game/permanent.go3
-rw-r--r--go/game/pileOfCards.go3
-rw-r--r--go/game/pileOfCards_test.go3
-rw-r--r--go/game/range_test.go3
-rw-r--r--go/game/targets.go2
-rw-r--r--go/game/trigger.go2
-rw-r--r--go/game/winCondition.go3
-rw-r--r--go/game/winCondition_test.go3
-rw-r--r--go/go.mod1
-rw-r--r--go/go.sum2
-rw-r--r--go/log/handler.go3
-rw-r--r--go/ui/collection.go2
17 files changed, 15 insertions, 29 deletions
diff --git a/go/game/action.go b/go/game/action.go
index 382eeaae..5bb8bd67 100644
--- a/go/game/action.go
+++ b/go/game/action.go
@@ -4,10 +4,9 @@ import (
"errors"
"fmt"
"regexp"
+ "slices"
"strings"
- "golang.org/x/exp/slices"
-
"muhq.space/muhqs-game/go/log"
"muhq.space/muhqs-game/go/utils"
)
diff --git a/go/game/ai.go b/go/game/ai.go
index b1365baa..5d1c217e 100644
--- a/go/game/ai.go
+++ b/go/game/ai.go
@@ -4,12 +4,11 @@ import (
"errors"
"fmt"
"math/rand"
+ "slices"
"strconv"
"strings"
"sync"
- "golang.org/x/exp/slices"
-
"github.com/RyanCarrier/dijkstra"
"muhq.space/muhqs-game/go/log"
)
diff --git a/go/game/card.go b/go/game/card.go
index aa15689a..fe7f6ca8 100644
--- a/go/game/card.go
+++ b/go/game/card.go
@@ -5,10 +5,10 @@ import (
"io"
"net/http"
"path"
+ "slices"
"strconv"
"strings"
- "golang.org/x/exp/slices"
"gopkg.in/yaml.v3"
"muhq.space/muhqs-game/go/assets"
"muhq.space/muhqs-game/go/log"
diff --git a/go/game/map.go b/go/game/map.go
index 75621b71..ea733833 100644
--- a/go/game/map.go
+++ b/go/game/map.go
@@ -7,11 +7,10 @@ import (
"net/http"
"os"
"path"
+ "slices"
"strconv"
"strings"
- "golang.org/x/exp/slices"
-
"gopkg.in/yaml.v3"
"muhq.space/muhqs-game/go/assets"
diff --git a/go/game/map_test.go b/go/game/map_test.go
index 038cde93..4b2b2960 100644
--- a/go/game/map_test.go
+++ b/go/game/map_test.go
@@ -2,10 +2,9 @@ package game
import (
"reflect"
+ "slices"
"strings"
"testing"
-
- "golang.org/x/exp/slices"
)
func parseMapString(t *testing.T, mapDef string) *Map {
diff --git a/go/game/permanent.go b/go/game/permanent.go
index 5e42973a..1f78cb87 100644
--- a/go/game/permanent.go
+++ b/go/game/permanent.go
@@ -2,10 +2,9 @@ package game
import (
"fmt"
+ "slices"
"strings"
- "golang.org/x/exp/slices"
-
"muhq.space/muhqs-game/go/log"
"muhq.space/muhqs-game/go/utils"
)
diff --git a/go/game/pileOfCards.go b/go/game/pileOfCards.go
index 1d49fda6..ad4b3cbf 100644
--- a/go/game/pileOfCards.go
+++ b/go/game/pileOfCards.go
@@ -4,9 +4,8 @@ import (
"errors"
"fmt"
"math/rand"
+ "slices"
"strings"
-
- "golang.org/x/exp/slices"
)
type PileOfCards interface {
diff --git a/go/game/pileOfCards_test.go b/go/game/pileOfCards_test.go
index f1927b8c..d238e516 100644
--- a/go/game/pileOfCards_test.go
+++ b/go/game/pileOfCards_test.go
@@ -2,9 +2,8 @@ package game
import (
"errors"
+ "slices"
"testing"
-
- "golang.org/x/exp/slices"
)
func TestPocToString(t *testing.T) {
diff --git a/go/game/range_test.go b/go/game/range_test.go
index 3d1636a6..268e9a54 100644
--- a/go/game/range_test.go
+++ b/go/game/range_test.go
@@ -1,10 +1,9 @@
package game
import (
+ "slices"
"strings"
"testing"
-
- "golang.org/x/exp/slices"
)
func assertPosSliceEqual(is, exp []Position, t *testing.T) {
diff --git a/go/game/targets.go b/go/game/targets.go
index 2eba87eb..6b5a6eb9 100644
--- a/go/game/targets.go
+++ b/go/game/targets.go
@@ -3,10 +3,10 @@ package game
import (
"errors"
"fmt"
+ "slices"
"strconv"
"strings"
- "golang.org/x/exp/slices"
"muhq.space/muhqs-game/go/log"
"muhq.space/muhqs-game/go/utils"
)
diff --git a/go/game/trigger.go b/go/game/trigger.go
index 93b155c6..e5b00a9c 100644
--- a/go/game/trigger.go
+++ b/go/game/trigger.go
@@ -1,7 +1,7 @@
package game
import (
- "golang.org/x/exp/slices"
+ "slices"
"muhq.space/muhqs-game/go/log"
"muhq.space/muhqs-game/go/utils"
diff --git a/go/game/winCondition.go b/go/game/winCondition.go
index a36dfc1f..67c0190e 100644
--- a/go/game/winCondition.go
+++ b/go/game/winCondition.go
@@ -2,8 +2,7 @@ package game
import (
"fmt"
-
- "golang.org/x/exp/slices"
+ "slices"
)
// A WinCondition determines if there are winners using the current game state.
diff --git a/go/game/winCondition_test.go b/go/game/winCondition_test.go
index 8f2d44ff..0f380e92 100644
--- a/go/game/winCondition_test.go
+++ b/go/game/winCondition_test.go
@@ -1,9 +1,8 @@
package game
import (
+ "slices"
"testing"
-
- "golang.org/x/exp/slices"
)
func TestKingGame(t *testing.T) {
diff --git a/go/go.mod b/go/go.mod
index 32d86a76..bf061f26 100644
--- a/go/go.mod
+++ b/go/go.mod
@@ -7,7 +7,6 @@ toolchain go1.24.6
require (
github.com/RyanCarrier/dijkstra v1.4.0
github.com/hajimehoshi/ebiten/v2 v2.8.8
- golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b
golang.org/x/image v0.30.0
golang.org/x/net v0.43.0
gopkg.in/yaml.v3 v3.0.1
diff --git a/go/go.sum b/go/go.sum
index ee57d9f8..816466ef 100644
--- a/go/go.sum
+++ b/go/go.sum
@@ -23,8 +23,6 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ=
github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b h1:DXr+pvt3nC887026GRP39Ej11UATqWDmWuS99x26cD0=
-golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b/go.mod h1:4QTo5u+SEIbbKW1RacMZq1YEfOBqeXa19JeshGi+zc4=
golang.org/x/image v0.30.0 h1:jD5RhkmVAnjqaCUXfbGBrn3lpxbknfN9w2UhHHU+5B4=
golang.org/x/image v0.30.0/go.mod h1:SAEUTxCCMWSrJcCy/4HwavEsfZZJlYxeHLc6tTiAe/c=
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
diff --git a/go/log/handler.go b/go/log/handler.go
index 05d19fb3..9398bba6 100644
--- a/go/log/handler.go
+++ b/go/log/handler.go
@@ -8,10 +8,9 @@ import (
"os"
"path"
"runtime"
+ "slices"
"sync"
"time"
-
- "golang.org/x/exp/slices"
)
type gameLogHandler struct {
diff --git a/go/ui/collection.go b/go/ui/collection.go
index 84b37366..20dff35e 100644
--- a/go/ui/collection.go
+++ b/go/ui/collection.go
@@ -2,9 +2,9 @@ package ui
import (
"log"
+ "slices"
"github.com/hajimehoshi/ebiten/v2"
- "golang.org/x/exp/slices"
)
// Container to organise multiple Widgets