partial modernization

Author: BuckarooBanzay

app/config.go

@@ -88,7 +88,7 @@ func ParseConfig(filename string) (*Config, error) {
 		Locator:                 false,
 		Signs:                   true,
 		MapserverAirutils:       true,
-		UnifiefMoneyAreaForSale: true,
+		UnifiedMoneyAreaForSale: true,
 		Phonograph:              true,
 	}
 

app/types.go

@@ -67,7 +67,7 @@ type MapObjectConfig struct {
 	Signs                   bool `json:"signs"`
 	MapserverAirutils       bool `json:"mapserver_airutils"`
 	Phonograph              bool `json:"phonograph"`
-	UnifiefMoneyAreaForSale bool `json:"um_area_forsale"`
+	UnifiedMoneyAreaForSale bool `json:"um_area_forsale"`
 }
 
 type WebApiConfig struct {

eventbus/eventbus.go

@@ -27,18 +27,18 @@ func New() *Eventbus {
 	return &eb
 }
 
-func (this *Eventbus) Emit(eventtype string, o interface{}) {
-	this.mutex.RLock()
-	defer this.mutex.RUnlock()
+func (b *Eventbus) Emit(eventtype string, o interface{}) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
 
-	for _, l := range this.listeners {
+	for _, l := range b.listeners {
 		l.OnEvent(eventtype, o)
 	}
 }
 
-func (this *Eventbus) AddListener(l Listener) {
-	this.mutex.Lock()
-	defer this.mutex.Unlock()
+func (b *Eventbus) AddListener(l Listener) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
 
-	this.listeners = append(this.listeners, l)
+	b.listeners = append(b.listeners, l)
 }

luaparser/luaparser.go

@@ -2,8 +2,9 @@ package luaparser
 
 import (
 	"errors"
-	"github.com/yuin/gopher-lua"
 	"strconv"
+
+	lua "github.com/yuin/gopher-lua"
 )
 
 func New() *LuaParser {
@@ -47,15 +48,15 @@ func parseMap(t *lua.LTable) map[string]interface{} {
 	return result
 }
 
-func (this *LuaParser) ParseList(expr string) ([]map[string]interface{}, error) {
+func (lp *LuaParser) ParseList(expr string) ([]map[string]interface{}, error) {
 	result := make([]map[string]interface{}, 0)
 
-	err := this.state.DoString(expr)
+	err := lp.state.DoString(expr)
 	if err != nil {
 		return result, err
 	}
 
-	lv := this.state.Get(-1)
+	lv := lp.state.Get(-1)
 
 	tbl, ok := lv.(*lua.LTable)
 	if !ok {
@@ -77,15 +78,15 @@ func (this *LuaParser) ParseList(expr string) ([]map[string]interface{}, error)
 	return result, nil
 }
 
-func (this *LuaParser) ParseMap(expr string) (map[string]interface{}, error) {
+func (lp *LuaParser) ParseMap(expr string) (map[string]interface{}, error) {
 	result := make(map[string]interface{})
 
-	err := this.state.DoString(expr)
+	err := lp.state.DoString(expr)
 	if err != nil {
 		return result, err
 	}
 
-	lv := this.state.Get(-1)
+	lv := lp.state.Get(-1)
 
 	tbl, ok := lv.(*lua.LTable)
 	if !ok {

mapobject/atm.go

@@ -9,20 +9,20 @@ import (
 
 type ATM struct{}
 
-func (this *ATM) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
+func (atm *ATM) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
 	nodename := block.GetNodeName(x, y, z)
 
 	o := mapobjectdb.NewMapObject(mbpos, x, y, z, "atm")
 
 	switch nodename {
-		case "atm:wtt", "um_wtt:wtt":
-			o.Attributes["type"] = "wiretransfer"
-		case "atm:atm2", "um_atm:atm_2":
-			o.Attributes["type"] = "atm2"
-		case "atm:atm3", "um_atm:atm_3":
-			o.Attributes["type"] = "atm3"
-		default:
-			o.Attributes["type"] = "atm"
+	case "atm:wtt", "um_wtt:wtt":
+		o.Attributes["type"] = "wiretransfer"
+	case "atm:atm2", "um_atm:atm_2":
+		o.Attributes["type"] = "atm2"
+	case "atm:atm3", "um_atm:atm_3":
+		o.Attributes["type"] = "atm3"
+	default:
+		o.Attributes["type"] = "atm"
 	}
 
 	return o

mapobject/bones.go

@@ -10,7 +10,7 @@ import (
 
 type BonesBlock struct{}
 
-func (this *BonesBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
+func (bb *BonesBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
 	md := block.Metadata.GetMetadata(x, y, z)
 
 	invMap := block.Metadata.GetInventoryMapAtPos(x, y, z)

mapobject/border.go

@@ -9,7 +9,7 @@ import (
 
 type BorderBlock struct{}
 
-func (this *BorderBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
+func (bb *BorderBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
 	md := block.Metadata.GetMetadata(x, y, z)
 
 	o := mapobjectdb.NewMapObject(mbpos, x, y, z, "border")

mapobject/digilinelcd.go

@@ -9,7 +9,7 @@ import (
 
 type DigilineLcdBlock struct{}
 
-func (this *DigilineLcdBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
+func (blk *DigilineLcdBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
 	md := block.Metadata.GetMetadata(x, y, z)
 
 	o := mapobjectdb.NewMapObject(mbpos, x, y, z, "digilinelcd")

mapobject/digiterms.go

@@ -9,7 +9,7 @@ import (
 
 type DigitermsBlock struct{}
 
-func (this *DigitermsBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
+func (blk *DigitermsBlock) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
 	md := block.Metadata.GetMetadata(x, y, z)
 
 	o := mapobjectdb.NewMapObject(mbpos, x, y, z, "digiterm")

mapobject/fancyvend.go

@@ -13,7 +13,7 @@ import (
 
 type FancyVend struct{}
 
-func (this *FancyVend) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
+func (blk *FancyVend) onMapObject(mbpos *types.MapBlockCoords, x, y, z int, block *mapparser.MapBlock) *mapobjectdb.MapObject {
 	md := block.Metadata.GetMetadata(x, y, z)
 	nodename := block.GetNodeName(x, y, z)
 	invMap := block.Metadata.GetInventoryMapAtPos(x, y, z)