Refactor server modules into main package and improve error handling
This commit is contained in:
@@ -9,18 +9,18 @@ package data
|
||||
// "releaseType": "snapshot"
|
||||
// },
|
||||
|
||||
type ProtocolVersion struct {
|
||||
type VersionInfo struct {
|
||||
MinecraftVersion string
|
||||
Version int
|
||||
Version int32
|
||||
DataVersion int
|
||||
UsesNetty bool
|
||||
MajorVersion string
|
||||
ReleaseType string
|
||||
}
|
||||
|
||||
var ProtocolVersions []ProtocolVersion
|
||||
var ProtocolVersions []VersionInfo
|
||||
|
||||
func LookUpProtocolVersionByName(name string) (ret ProtocolVersion, err error) {
|
||||
func LookUpVersionByName(name string) (ret VersionInfo, err error) {
|
||||
for _, v := range ProtocolVersions {
|
||||
if v.MinecraftVersion == name {
|
||||
ret = v
|
||||
@@ -31,7 +31,7 @@ func LookUpProtocolVersionByName(name string) (ret ProtocolVersion, err error) {
|
||||
return
|
||||
}
|
||||
|
||||
func LookUpProtocolVersionByVersion(version int) (ret ProtocolVersion, err error) {
|
||||
func LookUpVersionByProtocolVersion(version int32) (ret VersionInfo, err error) {
|
||||
for _, v := range ProtocolVersions {
|
||||
if v.Version == version {
|
||||
ret = v
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
)
|
||||
|
||||
func TestLookUpProtocolVersion(t *testing.T) {
|
||||
version, err := data.LookUpProtocolVersionByVersion(772)
|
||||
version, err := data.LookUpVersionByProtocolVersion(772)
|
||||
if err != nil {
|
||||
t.Fatalf("Expected to find version 772, got error: %v", err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user