various deprecation cleanups for v2

Author: markus-wa

examples/print-events/print_events.go

@@ -57,7 +57,7 @@ func main() {
 	})
 
 	p.RegisterEventHandler(func(e events.RankUpdate) {
-		fmt.Printf("Rank Update: %d went from rank %d to rank %d, change: %f\n", e.SteamID, e.RankOld, e.RankNew, e.RankChange)
+		fmt.Printf("Rank Update: %d went from rank %d to rank %d, change: %f\n", e.SteamID32, e.RankOld, e.RankNew, e.RankChange)
 	})
 
 	// Parse to end

pkg/demoinfocs/common/common.go

@@ -170,7 +170,7 @@ func (ts TeamState) FreezeTimeEndEquipmentValue() (value int) {
 // CashSpentThisRound returns the total amount of cash spent by the whole team in the current round.
 func (ts TeamState) CashSpentThisRound() (value int) {
 	for _, pl := range ts.Members() {
-		value += pl.AdditionalPlayerInformation.CashSpentThisRound
+		value += pl.AdditionalInformation.CashSpentThisRound
 	}
 
 	return
@@ -179,7 +179,7 @@ func (ts TeamState) CashSpentThisRound() (value int) {
 // CashSpentThisRound returns the total amount of cash spent by the whole team during the whole game up to the current point.
 func (ts TeamState) CashSpentTotal() (value int) {
 	for _, pl := range ts.Members() {
-		value += pl.AdditionalPlayerInformation.TotalCashSpent
+		value += pl.AdditionalInformation.CashSpentTotal
 	}
 
 	return

pkg/demoinfocs/common/common_test.go

@@ -82,8 +82,8 @@ func TestTeamState_FreezeTimeEndEquipmentValue(t *testing.T) {
 
 func TestTeamState_CashSpentThisRound(t *testing.T) {
 	members := []*Player{
-		{AdditionalPlayerInformation: &AdditionalPlayerInformation{CashSpentThisRound: 100}},
-		{AdditionalPlayerInformation: &AdditionalPlayerInformation{CashSpentThisRound: 200}},
+		{AdditionalInformation: &AdditionalPlayerInformation{CashSpentThisRound: 100}},
+		{AdditionalInformation: &AdditionalPlayerInformation{CashSpentThisRound: 200}},
 	}
 	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members })
 
@@ -92,8 +92,8 @@ func TestTeamState_CashSpentThisRound(t *testing.T) {
 
 func TestTeamState_CashSpentTotal(t *testing.T) {
 	members := []*Player{
-		{AdditionalPlayerInformation: &AdditionalPlayerInformation{TotalCashSpent: 100}},
-		{AdditionalPlayerInformation: &AdditionalPlayerInformation{TotalCashSpent: 200}},
+		{AdditionalInformation: &AdditionalPlayerInformation{CashSpentTotal: 100}},
+		{AdditionalInformation: &AdditionalPlayerInformation{CashSpentTotal: 200}},
 	}
 	state := NewTeamState(TeamTerrorists, func(Team) []*Player { return members })
 

pkg/demoinfocs/common/equipment.go

@@ -52,7 +52,6 @@ const (
 	EqDeagle       EquipmentType = 4
 	EqFiveSeven    EquipmentType = 5
 	EqDualBerettas EquipmentType = 6
-	EqDualBarettas EquipmentType = 6 // Deprecated, use EqDualBerettas instead (spelling error)
 	EqTec9         EquipmentType = 7
 	EqCZ           EquipmentType = 8
 	EqUSP          EquipmentType = 9

pkg/demoinfocs/common/player.go

@@ -36,7 +36,7 @@ type Player struct {
 	Inventory                   map[int]*Equipment           // All weapons / equipment the player is currently carrying
 	AmmoLeft                    [32]int                      // Ammo left for special weapons (e.g. grenades), index corresponds Equipment.AmmoType
 	Entity                      st.IEntity                   // May be nil between player-death and re-spawn
-	AdditionalPlayerInformation *AdditionalPlayerInformation // Mostly scoreboard information such as kills, deaths, etc.
+	AdditionalInformation       *AdditionalPlayerInformation // Mostly scoreboard information such as kills, deaths, etc.
 	ViewDirectionX              float32                      // Yaw in degrees, 0 to 360
 	ViewDirectionY              float32                      // Pitch in degrees, 270 to 90 (270=-90)
 	FlashDuration               float32                      // Blindness duration from the flashbang currently affecting the player (seconds)
@@ -194,20 +194,6 @@ func (p *Player) IsScoped() bool {
 	return p.Entity.FindProperty("m_bIsScoped").Value().IntVal == 1
 }
 
-// CashSpentThisRound returns the amount of cash the player spent in the current round.
-//
-// Deprecated, use Player.AdditionalPlayerInformation.CashSpentThisRound instead.
-func (p *Player) CashSpentThisRound() int {
-	return p.AdditionalPlayerInformation.CashSpentThisRound
-}
-
-// CashSpentTotal returns the amount of cash the player spent during the whole game up to the current point.
-//
-// Deprecated, use Player.AdditionalPlayerInformation.TotalCashSpent instead.
-func (p *Player) CashSpentTotal() int {
-	return p.AdditionalPlayerInformation.TotalCashSpent
-}
-
 // IsControllingBot returns true if the player is currently controlling a bot.
 // See also ControlledBot().
 func (p *Player) IsControllingBot() bool {
@@ -239,7 +225,7 @@ type AdditionalPlayerInformation struct {
 	MVPs               int
 	Ping               int
 	ClanTag            string
-	TotalCashSpent     int
+	CashSpentTotal     int
 	CashSpentThisRound int
 }
 

pkg/demoinfocs/datatables.go

@@ -187,7 +187,7 @@ func (p *Parser) bindPlayers() {
 			plInfo.BindProperty("m_iDeaths."+iStr, &p.additionalPlayerInfo[i2].Deaths, st.ValTypeInt)
 			plInfo.BindProperty("m_iAssists."+iStr, &p.additionalPlayerInfo[i2].Assists, st.ValTypeInt)
 			plInfo.BindProperty("m_iMVPs."+iStr, &p.additionalPlayerInfo[i2].MVPs, st.ValTypeInt)
-			plInfo.BindProperty("m_iTotalCashSpent."+iStr, &p.additionalPlayerInfo[i2].TotalCashSpent, st.ValTypeInt)
+			plInfo.BindProperty("m_iTotalCashSpent."+iStr, &p.additionalPlayerInfo[i2].CashSpentTotal, st.ValTypeInt)
 			if prop := plInfo.FindProperty("m_iCashSpentThisRound." + iStr); prop != nil {
 				prop.Bind(&p.additionalPlayerInfo[i2].CashSpentThisRound, st.ValTypeInt)
 			}
@@ -239,7 +239,7 @@ func (p *Parser) bindNewPlayer(playerEntity st.IEntity) {
 
 	pl.EntityID = entityID
 	pl.Entity = playerEntity
-	pl.AdditionalPlayerInformation = &p.additionalPlayerInfo[entityID]
+	pl.AdditionalInformation = &p.additionalPlayerInfo[entityID]
 	pl.IsConnected = true
 
 	playerEntity.OnDestroy(func() {

pkg/demoinfocs/events/events.go

@@ -14,10 +14,6 @@ import (
 	msg "github.com/markus-wa/demoinfocs-golang/v2/pkg/demoinfocs/msg"
 )
 
-// TickDone is deprecated, use the identical FrameDone event instead.
-// It does NOT signal the end of a tick, it signals the end of a demo-frame instead.
-type TickDone struct{}
-
 // FrameDone signals that a demo-frame has been processed.
 // A frame can contain multiple ticks (usually 2 or 4) if the tv_snapshotrate differs from the tick-rate the game was played at.
 type FrameDone struct{}
@@ -414,7 +410,6 @@ type ChatMessage struct {
 // RankUpdate signals the new rank. Not sure if this
 // only occurs if the rank changed.
 type RankUpdate struct {
-	SteamID    int64 // 32-bit SteamID. Deprecated, use SteamID32 instead
 	SteamID32  int32
 	RankChange float32
 	RankOld    int

pkg/demoinfocs/parsing.go

@@ -366,7 +366,6 @@ func (p *Parser) handleFrameParsed(*frameParsedTokenType) {
 	p.delayedEventHandlers = p.delayedEventHandlers[:0]
 
 	p.currentFrame++
-	p.eventDispatcher.Dispatch(events.TickDone{})
 	p.eventDispatcher.Dispatch(events.FrameDone{})
 }
 

pkg/demoinfocs/user_messages.go

@@ -120,7 +120,6 @@ func (umh userMessageHandler) rankUpdate(um *msg.CSVCMsg_UserMessage) {
 
 	for _, v := range st.RankUpdate {
 		umh.dispatch(events.RankUpdate{
-			SteamID:    int64(v.AccountId),
 			SteamID32:  v.AccountId,
 			RankOld:    int(v.RankOld),
 			RankNew:    int(v.RankNew),

pkg/demoinfocs/user_messages_test.go

@@ -44,14 +44,12 @@ func Test_UserMessages_ServerRankUpdate(t *testing.T) {
 	p.handleUserMessage(um)
 
 	expected := []events.RankUpdate{{
-		SteamID:    123,
 		SteamID32:  123,
 		RankOld:    1,
 		RankNew:    2,
 		WinCount:   5,
 		RankChange: 1,
 	}, {
-		SteamID:    456,
 		SteamID32:  456,
 		RankOld:    2,
 		RankNew:    3,