Fixed gmcp-individual-nodes to use UserInterface instead of TextFormats

Updated all references from GetTextFormatsConfig() to
GetUserInterfaceConfig().Formats to maintain compatibility with the
UserInterface configuration structure introduced in mob-equipment-templates.

Changed:
- Config struct to use UserInterface instead of TextFormats
- gmcp.Game.go to use c.UserInterface.Formats.Time
- All usercommands and mobcommands to use GetUserInterfaceConfig().Formats
- inbox.go DateString() to use UserInterface.Formats.Time
- userrecord.prompt.go to use GetUserInterfaceConfig().Formats.Prompt

Author: MorquinDevlar

internal/configs/config.userinterface.go

@@ -0,0 +1,72 @@
+package configs
+
+import (
+	"strings"
+)
+
+type UserInterface struct {
+	Formats UserInterfaceFormats `yaml:"Formats"`
+	Display UserInterfaceDisplay `yaml:"Display"`
+}
+
+type UserInterfaceFormats struct {
+	Prompt                  ConfigString `yaml:"Prompt"`                  // The in-game status prompt style
+	EnterRoomMessageWrapper ConfigString `yaml:"EnterRoomMessageWrapper"` // Special enter messages
+	ExitRoomMessageWrapper  ConfigString `yaml:"ExitRoomMessageWrapper"`  // Special exit messages
+	Time                    ConfigString `yaml:"Time"`                    // How to format time when displaying real time
+	TimeShort               ConfigString `yaml:"TimeShort"`               // How to format time when displaying real time (shortform)
+}
+
+type UserInterfaceDisplay struct {
+	ShowEmptyEquipmentSlots ConfigBool `yaml:"ShowEmptyEquipmentSlots"` // Whether to show empty equipment slots when looking at characters/mobs
+}
+
+func (u *UserInterface) Validate() {
+	u.Formats.Validate()
+	u.Display.Validate()
+}
+
+func (f *UserInterfaceFormats) Validate() {
+	if f.Prompt == `` {
+		f.Prompt = `{8}[{t} {T} {255}HP:{hp}{8}/{HP} {255}MP:{13}{mp}{8}/{13}{MP}{8}]{239}{h}{8}:`
+	}
+
+	// Must have a message wrapper...
+	if f.EnterRoomMessageWrapper == `` {
+		f.EnterRoomMessageWrapper = `%s` // default
+	}
+	if strings.LastIndex(string(f.EnterRoomMessageWrapper), `%s`) < 0 {
+		f.EnterRoomMessageWrapper += `%s` // append if missing
+	}
+
+	// Must have a message wrapper...
+	if f.ExitRoomMessageWrapper == `` {
+		f.ExitRoomMessageWrapper = `%s` // default
+	}
+	if strings.LastIndex(string(f.ExitRoomMessageWrapper), `%s`) < 0 {
+		f.ExitRoomMessageWrapper += `%s` // append if missing
+	}
+
+	if f.Time == `` {
+		f.Time = `Monday, 02-Jan-2006 03:04:05PM`
+	}
+
+	if f.TimeShort == `` {
+		f.TimeShort = `Jan 2 '06 3:04PM`
+	}
+}
+
+func (d *UserInterfaceDisplay) Validate() {
+	// ShowEmptyEquipmentSlots defaults to true (show all slots)
+	// The ConfigBool type handles the default value
+}
+
+// Convenience method to check if empty equipment slots should be shown
+func (c Config) ShouldShowEmptyEquipmentSlots() bool {
+	return bool(c.UserInterface.Display.ShowEmptyEquipmentSlots)
+}
+
+// GetUserInterfaceConfig returns the UserInterface configuration
+func GetUserInterfaceConfig() UserInterface {
+	return GetConfig().UserInterface
+}

internal/configs/configs.go

@@ -35,20 +35,20 @@ var (
 
 type Config struct {
 	// Start config subsections
-	Server       Server       `yaml:"Server"`
-	Memory       Memory       `yaml:"Memory"`
-	LootGoblin   LootGoblin   `yaml:"LootGoblin"`
-	Timing       Timing       `yaml:"Timing"`
-	FilePaths    FilePaths    `yaml:"FilePaths"`
-	GamePlay     GamePlay     `yaml:"GamePlay"`
-	Integrations Integrations `yaml:"Integrations"`
-	TextFormats  TextFormats  `yaml:"TextFormats"`
-	Translation  Translation  `yaml:"Translation"`
-	Network      Network      `yaml:"Network"`
-	Scripting    Scripting    `yaml:"Scripting"`
-	SpecialRooms SpecialRooms `yaml:"SpecialRooms"`
-	Validation   Validation   `yaml:"Validation"`
-	Roles        Roles        `yaml:"Roles"`
+	Server        Server        `yaml:"Server"`
+	Memory        Memory        `yaml:"Memory"`
+	LootGoblin    LootGoblin    `yaml:"LootGoblin"`
+	Timing        Timing        `yaml:"Timing"`
+	FilePaths     FilePaths     `yaml:"FilePaths"`
+	GamePlay      GamePlay      `yaml:"GamePlay"`
+	UserInterface UserInterface `yaml:"UserInterface"`
+	Integrations  Integrations  `yaml:"Integrations"`
+	Translation   Translation   `yaml:"Translation"`
+	Network       Network       `yaml:"Network"`
+	Scripting     Scripting     `yaml:"Scripting"`
+	SpecialRooms  SpecialRooms  `yaml:"SpecialRooms"`
+	Validation    Validation    `yaml:"Validation"`
+	Roles         Roles         `yaml:"Roles"`
 	// Plugins is a special case
 	Modules Modules `yaml:"Modules"`
 

internal/mobcommands/go.go

@@ -30,7 +30,7 @@ func Go(rest string, mob *mobs.Mob, room *rooms.Room) (bool, error) {
 		}
 
 		if !foundRoomExit {
-			c := configs.GetTextFormatsConfig()
+			c := configs.GetUserInterfaceConfig().Formats
 
 			if forceRoomId == room.RoomId {
 				return true, nil
@@ -112,7 +112,7 @@ func Go(rest string, mob *mobs.Mob, room *rooms.Room) (bool, error) {
 		room.RemoveMob(mob.InstanceId)
 		destRoom.AddMob(mob.InstanceId)
 
-		c := configs.GetTextFormatsConfig()
+		c := configs.GetUserInterfaceConfig().Formats
 
 		// Tell the old room they are leaving
 		room.SendText(

internal/usercommands/go.go

@@ -29,7 +29,7 @@ func Go(rest string, user *users.UserRecord, room *rooms.Room, flags events.Even
 		return true, nil
 	}
 
-	c := configs.GetTextFormatsConfig()
+	c := configs.GetUserInterfaceConfig().Formats
 
 	isSneaking := user.Character.HasBuffFlag(buffs.Hidden)
 

internal/usercommands/history.go

@@ -21,7 +21,7 @@ func History(rest string, user *users.UserRecord, room *rooms.Room, flags events
 		`<ansi fg="white-bold">%s</ansi>`,
 	}
 
-	tFormat := string(configs.GetTextFormatsConfig().TimeShort)
+	tFormat := string(configs.GetUserInterfaceConfig().Formats.TimeShort)
 
 	for itm := range user.EventLog.Items {
 

internal/usercommands/set.go

@@ -15,7 +15,7 @@ import (
 func Set(rest string, user *users.UserRecord, room *rooms.Room, flags events.EventFlag) (bool, error) {
 
 	args := util.SplitButRespectQuotes(strings.ToLower(rest))
-	c := configs.GetTextFormatsConfig()
+	c := configs.GetUserInterfaceConfig().Formats
 
 	if len(args) == 0 {
 

internal/usercommands/start.go

@@ -211,7 +211,7 @@ func Start(rest string, user *users.UserRecord, room *rooms.Room, flags events.E
 				// Tell the new room they have arrived
 
 				destRoom.SendText(
-					fmt.Sprintf(configs.GetTextFormatsConfig().EnterRoomMessageWrapper.String(),
+					fmt.Sprintf(configs.GetUserInterfaceConfig().Formats.EnterRoomMessageWrapper.String(),
 						fmt.Sprintf(`<ansi fg="username">%s</ansi> enters from <ansi fg="exit">somewhere</ansi>.`, user.Character.Name),
 					),
 					user.UserId,

internal/users/inbox.go

@@ -57,6 +57,6 @@ func (i *Inbox) Empty() {
 }
 
 func (m Message) DateString() string {
-	tFormat := string(configs.GetConfig().TextFormats.Time)
+	tFormat := string(configs.GetConfig().UserInterface.Formats.Time)
 	return m.DateSent.Format(tFormat)
 }

internal/users/userrecord.prompt.go

@@ -48,7 +48,7 @@ func (u *UserRecord) GetCommandPrompt() string {
 	if len(promptOut) == 0 {
 
 		if promptDefaultCompiled == `` {
-			promptDefaultCompiled = util.ConvertColorShortTags(configs.GetTextFormatsConfig().Prompt.String())
+			promptDefaultCompiled = util.ConvertColorShortTags(configs.GetUserInterfaceConfig().Formats.Prompt.String())
 		}
 
 		var customPrompt any = nil

modules/gmcp/gmcp.Game.go

@@ -124,7 +124,7 @@ func (g *GMCPGameModule) sendAllGameNodes(userId int) {
 	}
 
 	c := configs.GetConfig()
-	tFormat := string(c.TextFormats.Time)
+	tFormat := string(c.UserInterface.Formats.Time)
 
 	// Send Game.Info
 	infoPayload := map[string]interface{}{