import cleanup

mapblockparser/mapblock.go

@@ -6,4 +6,21 @@ type MapBlock struct {
 	Underground bool
 	Mapdata []byte
 	Metadata Metadata
+}
+
+
+type Metadata struct {
+	Inventories map[int]map[string]Inventory
+	Pairs map[int]map[string]string
+}
+
+type Item struct {
+	Name string
+	Count int
+	Wear int
+}
+
+type Inventory struct {
+	Size int
+	Items []Item
 }

mapblockparser/metadata.go

@@ -9,21 +9,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-type Metadata struct {
-	Inventories map[int]map[string]Inventory
-	Pairs map[int]map[string]string
-}
-
-type Item struct {
-	Name string
-	Count int
-	Wear int
-}
-
-type Inventory struct {
-	Size int
-	Items []Item
-}
 
 func readU16(data []byte, offset int) int {
 	return (int(data[offset]) << 8) | int(data[offset + 1])

mapblockparser/parse_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 	"io/ioutil"
 	"strconv"
-	mapblockparser "mapserver/mapblockparser"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -16,7 +15,7 @@ func TestParse(t *testing.T){
 		t.Error(err)
 	}
 
-	mapblock, err := mapblockparser.Parse(data)
+	mapblock, err := Parse(data)
 
 	if err != nil {
 		t.Error(err)