From 2cd72d3a7f353f5bcb66181ef27062b5ce97cb16 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Tue, 30 May 2023 02:18:56 -0400 Subject: [PATCH] giving VehicleFormat its own file; fixing imports --- .../BattleFrameFlightConverter.scala | 2 +- .../BattleFrameRoboticsConverter.scala | 2 +- .../converter/UtilityVehicleConverter.scala | 3 ++- .../converter/VariantVehicleConverter.scala | 3 ++- .../converter/VehicleConverter.scala | 2 +- .../BattleFrameRoboticsData.scala | 1 + .../objectcreate/MountableInventory.scala | 4 ++-- .../game/objectcreate/ObjectClass.scala | 1 + .../game/objectcreate/VehicleData.scala | 20 +------------------ .../net/psforever/types/VehicleFormat.scala | 19 ++++++++++++++++++ 10 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 src/main/scala/net/psforever/types/VehicleFormat.scala diff --git a/src/main/scala/net/psforever/objects/definition/converter/BattleFrameFlightConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/BattleFrameFlightConverter.scala index 49fcd57c7..0d652db9e 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/BattleFrameFlightConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/BattleFrameFlightConverter.scala @@ -4,7 +4,7 @@ package net.psforever.objects.definition.converter import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.vehicles.VehicleSubsystemEntry import net.psforever.objects.{PlanetSideGameObject, Vehicle} -import net.psforever.types.PlanetSideGUID +import net.psforever.types.{PlanetSideGUID, VehicleFormat} import net.psforever.packet.game.objectcreate._ import scala.util.{Failure, Success, Try} diff --git a/src/main/scala/net/psforever/objects/definition/converter/BattleFrameRoboticsConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/BattleFrameRoboticsConverter.scala index 0f94dfc9c..1c51b1afb 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/BattleFrameRoboticsConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/BattleFrameRoboticsConverter.scala @@ -4,7 +4,7 @@ package net.psforever.objects.definition.converter import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.vehicles.VehicleSubsystemEntry import net.psforever.objects.{PlanetSideGameObject, Vehicle} -import net.psforever.types.PlanetSideGUID +import net.psforever.types.{PlanetSideGUID, VehicleFormat} import net.psforever.packet.game.objectcreate._ import scala.util.{Failure, Success, Try} diff --git a/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala index 633e0fc17..61812407c 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/UtilityVehicleConverter.scala @@ -2,7 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.Vehicle -import net.psforever.packet.game.objectcreate.{UtilityVehicleData, VehicleFormat} +import net.psforever.packet.game.objectcreate.UtilityVehicleData +import net.psforever.types.VehicleFormat class UtilityVehicleConverter extends VehicleConverter { override protected def SpecificFormatModifier: VehicleFormat = VehicleFormat.Utility diff --git a/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala index 3a451bed2..9b07c88c8 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/VariantVehicleConverter.scala @@ -2,7 +2,8 @@ package net.psforever.objects.definition.converter import net.psforever.objects.Vehicle -import net.psforever.packet.game.objectcreate.{VariantVehicleData, VehicleFormat} +import net.psforever.packet.game.objectcreate.VariantVehicleData +import net.psforever.types.VehicleFormat class VariantVehicleConverter extends VehicleConverter { override protected def SpecificFormatModifier: VehicleFormat = VehicleFormat.Variant diff --git a/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala b/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala index d862babfe..6ce558c2e 100644 --- a/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala +++ b/src/main/scala/net/psforever/objects/definition/converter/VehicleConverter.scala @@ -4,7 +4,7 @@ package net.psforever.objects.definition.converter import net.psforever.objects.equipment.{Equipment, EquipmentSlot} import net.psforever.objects.{PlanetSideGameObject, Vehicle} import net.psforever.packet.game.objectcreate._ -import net.psforever.types.{DriveState, PlanetSideGUID} +import net.psforever.types.{DriveState, PlanetSideGUID, VehicleFormat} import scala.util.{Failure, Success, Try} diff --git a/src/main/scala/net/psforever/packet/game/objectcreate/BattleFrameRoboticsData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/BattleFrameRoboticsData.scala index 03c4692b5..a0e63db6d 100644 --- a/src/main/scala/net/psforever/packet/game/objectcreate/BattleFrameRoboticsData.scala +++ b/src/main/scala/net/psforever/packet/game/objectcreate/BattleFrameRoboticsData.scala @@ -2,6 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.Marshallable +import net.psforever.types.VehicleFormat import scodec.{Attempt, Codec, Err} import shapeless.HNil import scodec.codecs._ diff --git a/src/main/scala/net/psforever/packet/game/objectcreate/MountableInventory.scala b/src/main/scala/net/psforever/packet/game/objectcreate/MountableInventory.scala index a4e1d535e..76d2c50a3 100644 --- a/src/main/scala/net/psforever/packet/game/objectcreate/MountableInventory.scala +++ b/src/main/scala/net/psforever/packet/game/objectcreate/MountableInventory.scala @@ -2,7 +2,7 @@ package net.psforever.packet.game.objectcreate import net.psforever.packet.PacketHelpers -import net.psforever.types.PlanetSideGUID +import net.psforever.types.{PlanetSideGUID, VehicleFormat} import scodec.Attempt.{Failure, Successful} import scodec.{Codec, Err} import scodec.codecs._ @@ -118,7 +118,7 @@ object MountableInventory { accumulative: Long ): Player_Data = { val appearance = basic_appearance(CumulativeSeatedPlayerNamePadding(accumulative)) - Player_Data.apply(None, appearance, character_data(appearance.b.backpack, true), None, drawn_slot)(position_defined = false) + Player_Data.apply(None, appearance, character_data(false, true), None, drawn_slot)(position_defined = false) } /** diff --git a/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala index 25a20a14d..224e1e896 100644 --- a/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala +++ b/src/main/scala/net/psforever/packet/game/objectcreate/ObjectClass.scala @@ -1,6 +1,7 @@ // Copyright (c) 2017 PSForever package net.psforever.packet.game.objectcreate +import net.psforever.types.VehicleFormat import scodec.{Attempt, Codec, Err} import scodec.codecs._ diff --git a/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala b/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala index 415f5963e..c4f2921c3 100644 --- a/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala +++ b/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala @@ -6,25 +6,7 @@ import scodec.Attempt.{Failure, Successful} import scodec.{Attempt, Codec, Err} import shapeless.HNil import scodec.codecs._ -import net.psforever.types.DriveState -import enumeratum.values.{IntEnum, IntEnumEntry} - -/** - * An enumeration of the various formats that known structures that the stream of bits for `VehicleData` can assume. - */ -sealed abstract class VehicleFormat(val value: Int) extends IntEnumEntry - -object VehicleFormat extends IntEnum[VehicleFormat] { - val values = findValues - - case object Normal extends VehicleFormat(value = 0) - case object Battleframe extends VehicleFormat(value = 1) - case object BattleframeFlight extends VehicleFormat(value = 2) - case object Utility extends VehicleFormat(value = 6) - case object Variant extends VehicleFormat(value = 8) - - //val Battleframe, BattleframeFlight, Normal, Utility, Variant = Value -} +import net.psforever.types.{DriveState, VehicleFormat} /** * A basic `Trait` connecting all of the vehicle data formats (excepting `Normal`/`None`). diff --git a/src/main/scala/net/psforever/types/VehicleFormat.scala b/src/main/scala/net/psforever/types/VehicleFormat.scala new file mode 100644 index 000000000..30cf9b099 --- /dev/null +++ b/src/main/scala/net/psforever/types/VehicleFormat.scala @@ -0,0 +1,19 @@ +// Copyright (c) 2023 PSForever +package net.psforever.types + +import enumeratum.values.{IntEnum, IntEnumEntry} + +/** + * An enumeration of the various formats that known structures that the stream of bits for `VehicleData` can assume. + */ +sealed abstract class VehicleFormat(val value: Int) extends IntEnumEntry + +object VehicleFormat extends IntEnum[VehicleFormat] { + val values: IndexedSeq[VehicleFormat] = findValues + + case object Normal extends VehicleFormat(value = 0) + case object Battleframe extends VehicleFormat(value = 1) + case object BattleframeFlight extends VehicleFormat(value = 2) + case object Utility extends VehicleFormat(value = 6) + case object Variant extends VehicleFormat(value = 8) +}