Merge pull request #116 from Jleagle/master

Fix module paths - Fixes #115
Philipp15b · Apr 24, 2021 · 19f4df7 · 19f4df7
2 parents f5f3f40 + 43ff7eb
commit 19f4df7
Show file tree

Hide file tree

Showing 41 changed files with 254 additions and 238 deletions.
diff --git a/auth.go b/auth.go
@@ -5,10 +5,10 @@ import (
 	"sync/atomic"
 	"time"
 
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 	"github.com/golang/protobuf/proto"
 )
 

diff --git a/auth_events.go b/auth_events.go
@@ -1,8 +1,8 @@
 package steam
 
 import (
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 type LoggedOnEvent struct {

diff --git a/client.go b/client.go
@@ -13,12 +13,12 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/Philipp15b/go-steam/cryptoutil"
-	"github.com/Philipp15b/go-steam/netutil"
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
+	"github.com/Philipp15b/go-steam/v2/cryptoutil"
+	"github.com/Philipp15b/go-steam/v2/netutil"
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 // Represents a client to the Steam network.

diff --git a/client_events.go b/client_events.go
@@ -1,7 +1,7 @@
 package steam
 
 import (
-	"github.com/Philipp15b/go-steam/netutil"
+	"github.com/Philipp15b/go-steam/v2/netutil"
 )
 
 // When this event is emitted by the Client, the connection is automatically closed.

diff --git a/connection.go b/connection.go
@@ -9,8 +9,8 @@ import (
 	"net"
 	"sync"
 
-	"github.com/Philipp15b/go-steam/cryptoutil"
-	. "github.com/Philipp15b/go-steam/protocol"
+	"github.com/Philipp15b/go-steam/v2/cryptoutil"
+	. "github.com/Philipp15b/go-steam/v2/protocol"
 )
 
 type connection interface {

diff --git a/doc.go b/doc.go
@@ -16,8 +16,8 @@ You can also find a running example in the `gsbot` package.
 		"io/ioutil"
 		"log"
 
-		"github.com/Philipp15b/go-steam"
-		"github.com/Philipp15b/go-steam/protocol/steamlang"
+		"github.com/Philipp15b/go-steam/v2"
+		"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 	)
 
 	func main() {

diff --git a/economy/inventory/inventory.go b/economy/inventory/inventory.go
@@ -7,8 +7,9 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/Philipp15b/go-steam/jsont"
 	"strconv"
+
+	"github.com/Philipp15b/go-steam/v2/jsont"
 )
 
 type GenericInventory map[uint32]map[uint64]*Inventory

diff --git a/economy/inventory/inventory_apps.go b/economy/inventory/inventory_apps.go
@@ -3,11 +3,12 @@ package inventory
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/Philipp15b/go-steam/steamid"
 	"io/ioutil"
 	"net/http"
 	"regexp"
 	"strconv"
+
+	"github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 type InventoryApps map[string]*InventoryApp

diff --git a/gamecoordinator.go b/gamecoordinator.go
@@ -2,10 +2,11 @@ package steam
 
 import (
 	"bytes"
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/gamecoordinator"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/gamecoordinator"
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 	"github.com/golang/protobuf/proto"
 )
 

diff --git a/generator/GoSteamLanguageGenerator/GoGen.cs b/generator/GoSteamLanguageGenerator/GoGen.cs
@@ -58,9 +58,9 @@ public void EmitClasses(Node root, StringBuilder sb)
             sb.AppendLine("    \"io\"");
             sb.AppendLine("    \"encoding/binary\"");
             sb.AppendLine("    \"github.com/golang/protobuf/proto\"");
-            sb.AppendLine("    \"github.com/Philipp15b/go-steam/steamid\"");
-            sb.AppendLine("    \"github.com/Philipp15b/go-steam/rwu\"");
-            sb.AppendLine("   . \"github.com/Philipp15b/go-steam/protocol/protobuf\"");
+            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v2/steamid\"");
+            sb.AppendLine("    \"github.com/Philipp15b/go-steam/v2/rwu\"");
+            sb.AppendLine("   . \"github.com/Philipp15b/go-steam/v2/protocol/protobuf\"");
             sb.AppendLine(")");
             sb.AppendLine();
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Philipp15b/go-steam
+module github.com/Philipp15b/go-steam/v2
 
 go 1.14
 

diff --git a/gsbot/gsbot.go b/gsbot/gsbot.go
@@ -22,9 +22,9 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/Philipp15b/go-steam"
-	"github.com/Philipp15b/go-steam/netutil"
-	"github.com/Philipp15b/go-steam/protocol"
+	"github.com/Philipp15b/go-steam/v2"
+	"github.com/Philipp15b/go-steam/v2/netutil"
+	"github.com/Philipp15b/go-steam/v2/protocol"
 	"github.com/davecgh/go-spew/spew"
 )
 

diff --git a/gsbot/gsbot/gsbot.go b/gsbot/gsbot/gsbot.go
@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Philipp15b/go-steam"
-	"github.com/Philipp15b/go-steam/gsbot"
-	"github.com/Philipp15b/go-steam/protocol/steamlang"
+	"github.com/Philipp15b/go-steam/v2"
+	"github.com/Philipp15b/go-steam/v2/gsbot"
+	"github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 )
 
 func main() {

diff --git a/keys.go b/keys.go
@@ -2,8 +2,9 @@ package steam
 
 import (
 	"crypto/rsa"
-	"github.com/Philipp15b/go-steam/cryptoutil"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+
+	"github.com/Philipp15b/go-steam/v2/cryptoutil"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 )
 
 var publicKeys = map[EUniverse][]byte{

diff --git a/notifications.go b/notifications.go
@@ -1,9 +1,9 @@
 package steam
 
 import (
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 )
 
 type Notifications struct {

diff --git a/protocol/gamecoordinator/msg.go b/protocol/gamecoordinator/msg.go
@@ -3,8 +3,8 @@ package gamecoordinator
 import (
 	"io"
 
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 	"github.com/golang/protobuf/proto"
 )
 

diff --git a/protocol/gamecoordinator/packet.go b/protocol/gamecoordinator/packet.go
@@ -2,9 +2,10 @@ package gamecoordinator
 
 import (
 	"bytes"
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 	"github.com/golang/protobuf/proto"
 )
 

diff --git a/protocol/internal.go b/protocol/internal.go
@@ -6,7 +6,7 @@ import (
 	"math"
 	"strconv"
 
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
 )
 
 type JobId uint64

diff --git a/protocol/msg.go b/protocol/msg.go
@@ -1,10 +1,11 @@
 package protocol
 
 import (
-	"github.com/golang/protobuf/proto"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
 	"io"
+
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/golang/protobuf/proto"
 )
 
 // Interface for all messages, typically outgoing. They can also be created by

diff --git a/protocol/packet.go b/protocol/packet.go
@@ -2,10 +2,11 @@ package protocol
 
 import (
 	"bytes"
-	"github.com/golang/protobuf/proto"
 	"encoding/binary"
 	"fmt"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
+
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	"github.com/golang/protobuf/proto"
 )
 
 // TODO: Headers are always deserialized twice.

diff --git a/protocol/steamlang/messages.go b/protocol/steamlang/messages.go
@@ -5,11 +5,12 @@ package steamlang
 
 import (
 	"encoding/binary"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	"github.com/Philipp15b/go-steam/rwu"
-	"github.com/Philipp15b/go-steam/steamid"
-	"github.com/golang/protobuf/proto"
 	"io"
+
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	"github.com/Philipp15b/go-steam/v2/rwu"
+	"github.com/Philipp15b/go-steam/v2/steamid"
+	"github.com/golang/protobuf/proto"
 )
 
 const UdpHeader_MAGIC uint32 = 0x31305356

diff --git a/servers.go b/servers.go
@@ -4,7 +4,7 @@ import (
 	"math/rand"
 	"time"
 
-	"github.com/Philipp15b/go-steam/netutil"
+	"github.com/Philipp15b/go-steam/v2/netutil"
 )
 
 // CMServers contains a list of worlwide servers

diff --git a/social.go b/social.go
@@ -7,12 +7,12 @@ import (
 	"sync"
 	"time"
 
-	. "github.com/Philipp15b/go-steam/protocol"
-	. "github.com/Philipp15b/go-steam/protocol/protobuf"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/rwu"
-	"github.com/Philipp15b/go-steam/socialcache"
-	. "github.com/Philipp15b/go-steam/steamid"
+	. "github.com/Philipp15b/go-steam/v2/protocol"
+	. "github.com/Philipp15b/go-steam/v2/protocol/protobuf"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/rwu"
+	"github.com/Philipp15b/go-steam/v2/socialcache"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 	"github.com/golang/protobuf/proto"
 )
 

diff --git a/social_events.go b/social_events.go
@@ -3,8 +3,8 @@ package steam
 import (
 	"time"
 
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 type FriendsListEvent struct{}

diff --git a/socialcache/chats.go b/socialcache/chats.go
@@ -2,9 +2,10 @@ package socialcache
 
 import (
 	"errors"
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
 	"sync"
+
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 // Chats list is a thread safe map

diff --git a/socialcache/friends.go b/socialcache/friends.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"sync"
 
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 // Friends list is a thread safe map

diff --git a/socialcache/groups.go b/socialcache/groups.go
@@ -4,8 +4,8 @@ import (
 	"errors"
 	"sync"
 
-	. "github.com/Philipp15b/go-steam/protocol/steamlang"
-	. "github.com/Philipp15b/go-steam/steamid"
+	. "github.com/Philipp15b/go-steam/v2/protocol/steamlang"
+	. "github.com/Philipp15b/go-steam/v2/steamid"
 )
 
 // Groups list is a thread safe map

diff --git a/steam_directory.go b/steam_directory.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Philipp15b/go-steam/netutil"
+	"github.com/Philipp15b/go-steam/v2/netutil"
 )
 
 // Load initial server list from Steam Directory Web API.
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ import ( @@
     	"sync"
     	"time"
-    	"github.com/Philipp15b/go-steam/netutil"
+    	"github.com/Philipp15b/go-steam/v2/netutil"
     )
     // Load initial server list from Steam Directory Web API.
@@ Expand Down @@