Revert "removed null!"

This reverts commit 290f79afd4.
This commit is contained in:
2026-03-08 09:43:12 +01:00
parent 290f79afd4
commit c92eb19a1c
16 changed files with 151 additions and 151 deletions

View File

@@ -8,7 +8,7 @@ namespace Gamesmiths.Forge.Godot.Core;
public class ForgeManagers public class ForgeManagers
{ {
public static ForgeManagers Instance { get; private set; } public static ForgeManagers Instance { get; private set; } = null!;
public TagsManager TagsManager { get; private set; } public TagsManager TagsManager { get; private set; }

View File

@@ -11,7 +11,7 @@ public partial class AttributeEditorProperty : EditorProperty
private const int ButtonSize = 26; private const int ButtonSize = 26;
private const int PopupSize = 300; private const int PopupSize = 300;
private Label _label; private Label _label = null!;
public override void _Ready() public override void _Ready()
{ {

View File

@@ -14,7 +14,7 @@ namespace Gamesmiths.Forge.Godot.Editor.Attributes;
[Tool] [Tool]
public partial class AttributeSetClassEditorProperty : EditorProperty public partial class AttributeSetClassEditorProperty : EditorProperty
{ {
private OptionButton _optionButton; private OptionButton _optionButton = null!;
public override void _Ready() public override void _Ready()
{ {

View File

@@ -14,7 +14,7 @@ public partial class CueKeyEditorProperty : EditorProperty
private const int ButtonSize = 26; private const int ButtonSize = 26;
private const int PopupSize = 300; private const int PopupSize = 300;
private Label _label; private Label _label = null!;
public override void _Ready() public override void _Ready()
{ {

View File

@@ -15,13 +15,13 @@ public partial class TagContainerEditorProperty : EditorProperty
{ {
private readonly Dictionary<TreeItem, TagNode> _treeItemToNode = []; private readonly Dictionary<TreeItem, TagNode> _treeItemToNode = [];
private VBoxContainer _root; private VBoxContainer _root = null!;
private Button _containerButton; private Button _containerButton = null!;
private ScrollContainer _scroll; private ScrollContainer _scroll = null!;
private Tree _tree; private Tree _tree = null!;
private Texture2D _checkedIcon; private Texture2D _checkedIcon = null!;
private Texture2D _uncheckedIcon; private Texture2D _uncheckedIcon = null!;
private GodotStringArray _currentValue = []; private GodotStringArray _currentValue = [];

View File

@@ -13,13 +13,13 @@ public partial class TagEditorProperty : EditorProperty
{ {
private readonly Dictionary<TreeItem, TagNode> _treeItemToNode = []; private readonly Dictionary<TreeItem, TagNode> _treeItemToNode = [];
private VBoxContainer _root; private VBoxContainer _root = null!;
private Button _containerButton; private Button _containerButton = null!;
private ScrollContainer _scroll; private ScrollContainer _scroll = null!;
private Tree _tree; private Tree _tree = null!;
private Texture2D _checkedIcon; private Texture2D _checkedIcon = null!;
private Texture2D _uncheckedIcon; private Texture2D _uncheckedIcon = null!;
private string _currentValue = string.Empty; private string _currentValue = string.Empty;

View File

@@ -16,7 +16,7 @@ public partial class TagsEditor : VBoxContainer, ISerializationListener
{ {
private readonly Dictionary<TreeItem, TagNode> _treeItemToNode = []; private readonly Dictionary<TreeItem, TagNode> _treeItemToNode = [];
private TagsManager _tagsManager; private TagsManager _tagsManager = null!;
private ForgeData? _forgePluginData; private ForgeData? _forgePluginData;

View File

@@ -18,15 +18,15 @@ public partial class ForgeEntity : Node, IForgeEntity
[Export] [Export]
public ForgeTagContainer BaseTags { get; set; } = new(); public ForgeTagContainer BaseTags { get; set; } = new();
public EntityAttributes Attributes { get; set; } public EntityAttributes Attributes { get; set; } = null!;
public EntityTags Tags { get; set; } public EntityTags Tags { get; set; } = null!;
public EffectsManager EffectsManager { get; set; } public EffectsManager EffectsManager { get; set; } = null!;
public EntityAbilities Abilities { get; set; } public EntityAbilities Abilities { get; set; } = null!;
public EventManager Events { get; set; } public EventManager Events { get; set; } = null!;
public override void _Ready() public override void _Ready()
{ {

View File

@@ -7,7 +7,7 @@ using Movementtests.systems.damage;
[GlobalClass] [GlobalClass]
public partial class RDamageModifier : Resource, IDamageable public partial class RDamageModifier : Resource, IDamageable
{ {
public event Action<IDamageable, DamageRecord> DamageTaken; public event Action<IDamageable, DamageRecord> DamageTaken = null!;
[Export] [Export]
public EDamageTypes DamageType { get; set;} public EDamageTypes DamageType { get; set;}

View File

@@ -5,11 +5,11 @@ using Movementtests.interfaces;
[GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_heart.png")] [GlobalClass, Icon("res://assets/ui/IconGodotNode/white/icon_heart.png")]
public partial class CHealth : Node, IHealthable public partial class CHealth : Node, IHealthable
{ {
public event Action<IHealthable, HealthChangedRecord> HealthChanged; public event Action<IHealthable, HealthChangedRecord> HealthChanged = null!;
public event Action<IHealthable> HealthDepleted; public event Action<IHealthable> HealthDepleted = null!;
[Export] [Export]
public RHealth RHealth { get; set; } public RHealth RHealth { get; set; } = null!;
public float CurrentHealth { get; set; } public float CurrentHealth { get; set; }

View File

@@ -5,9 +5,9 @@ using Movementtests.interfaces;
[GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_wind.png")] [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_wind.png")]
public partial class CKnockback : Node3D, IKnockbackable public partial class CKnockback : Node3D, IKnockbackable
{ {
[Export] public RKnockback RKnockback { get; set; } [Export] public RKnockback RKnockback { get; set;} = null!;
private KnockbackRecord _knockbackRecord; private KnockbackRecord _knockbackRecord = null!;
public void RegisterKnockback(KnockbackRecord knockbackRecord) public void RegisterKnockback(KnockbackRecord knockbackRecord)
{ {

View File

@@ -6,9 +6,9 @@ namespace Movementtests.scenes.movement;
[GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_path_follow.png")] [GlobalClass, Icon("res://assets/ui/IconGodotNode/node_3D/icon_path_follow.png")]
public partial class CGroundedMovement : Node3D, IMoveable public partial class CGroundedMovement : Node3D, IMoveable
{ {
[Export] public RMovement RMovement { get; set; } [Export] public RMovement RMovement { get; set; } = null!;
[Export] public RayCast3D WallInFrontRayCast { get; set; } [Export] public RayCast3D WallInFrontRayCast { get; set; } = null!;
public Vector3 ComputeVelocity(MovementInputs inputs) public Vector3 ComputeVelocity(MovementInputs inputs)

View File

@@ -16,37 +16,37 @@ public partial class Enemy : CharacterBody3D,
IStunnable IStunnable
{ {
// Signals and events // Signals and events
public event Action<IDamageable, DamageRecord> DamageTaken; public event Action<IDamageable, DamageRecord> DamageTaken = null!;
public event Action<IHealthable, HealthChangedRecord> HealthChanged; public event Action<IHealthable, HealthChangedRecord> HealthChanged = null!;
public event Action<IHealthable> HealthDepleted; public event Action<IHealthable> HealthDepleted = null!;
// Public export components // Public export components
[Export] [Export]
public Node3D Target { get; set;} public Node3D Target { get; set; } = null!;
[Export] [Export]
public float EnemyHeight { get; set; } = 1f; public float EnemyHeight { get; set; } = 1f;
[ExportGroup("Health")] [ExportGroup("Health")]
[Export] [Export]
public RHealth RHealth { get; set; } public RHealth RHealth { get; set; } = null!;
[Export] [Export]
public RDeathEffect[] DeathEffects { get; set; } public RDeathEffect[] DeathEffects { get; set; } = null!;
public IHealthable CHealth { get; set; } public IHealthable CHealth { get; set; } = null!;
[ExportGroup("Damage")] [ExportGroup("Damage")]
[Export] [Export]
public RDamage RDamage { get; set; } public RDamage RDamage { get; set; } = null!;
public IDamageable CDamageable { get; set; } public IDamageable CDamageable { get; set; } = null!;
[Export] [Export]
public RKnockback RKnockback { get; set; } public RKnockback RKnockback { get; set; } = null!;
public IKnockbackable CKnockback { get; set; } public IKnockbackable CKnockback { get; set; } = null!;
[ExportGroup("Movement")] [ExportGroup("Movement")]
[Export] [Export]
public RMovement RMovement { get; set; } public RMovement RMovement { get; set; } = null!;
public IMoveable CMovement { get; set; } public IMoveable CMovement { get; set; } = null!;
// Public stuff // Public stuff
public float CurrentHealth public float CurrentHealth
@@ -56,9 +56,9 @@ public partial class Enemy : CharacterBody3D,
} }
// Private stuff // Private stuff
private Area3D _damageBox; private Area3D _damageBox = null!;
private Node3D _target; private Node3D _target = null!;
private Healthbar _healthbar; private Healthbar _healthbar = null!;
public override void _Ready() public override void _Ready()
{ {

View File

@@ -24,21 +24,21 @@ public partial class DashSystem: Node3D
public bool ShouldMantle { get; set; } public bool ShouldMantle { get; set; }
public Vector3 PlannedMantleLocation { get; set; } public Vector3 PlannedMantleLocation { get; set; }
public MantleSystem MantleSystem { get; set; } public MantleSystem MantleSystem { get; set; } = null!;
private HeadSystem Head; private HeadSystem Head = null!;
public ShapeCast3D DashCast3D; public ShapeCast3D DashCast3D = null!;
private Camera3D Camera; private Camera3D Camera = null!;
private Vector3 DashDirection = Vector3.Zero; private Vector3 DashDirection = Vector3.Zero;
private ShapeCast3D DashCastDrop; private ShapeCast3D DashCastDrop = null!;
private MeshInstance3D DashDropIndicator; private MeshInstance3D DashDropIndicator = null!;
private MeshInstance3D DashDropLocationIndicator; private MeshInstance3D DashDropLocationIndicator = null!;
private MeshInstance3D DashTarget; private MeshInstance3D DashTarget = null!;
private CpuParticles3D DashIndicator; private CpuParticles3D DashIndicator = null!;
private AnimationPlayer DashIndicatorAnim; private AnimationPlayer DashIndicatorAnim = null!;
[Export] public PackedScene DashIndicatorScene { get; set; } [Export] public PackedScene DashIndicatorScene { get; set; } = null!;
[Signal] [Signal]
public delegate void DashStartedEventHandler(); public delegate void DashStartedEventHandler();

View File

@@ -22,11 +22,11 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer
[Export(PropertyHint.Range, "0,0.2,0.01,or_greater")] [Export(PropertyHint.Range, "0,0.2,0.01,or_greater")]
public float StraightThrowDuration { get; set; } = 0.1f; public float StraightThrowDuration { get; set; } = 0.1f;
private StateChart _weaponState; private StateChart _weaponState = null!;
public StateChartState InHandState; public StateChartState InHandState = null!;
public StateChartState FlyingState; public StateChartState FlyingState = null!;
public StateChartState PlantedState; public StateChartState PlantedState = null!;
private ShapeCast3D _dashCast3D; private ShapeCast3D _dashCast3D = null!;
private Transform3D _startTransform; private Transform3D _startTransform;
private Vector3 _startMeshRotation; private Vector3 _startMeshRotation;
@@ -36,9 +36,9 @@ public partial class WeaponSystem : RigidBody3D, IDamageDealer
public Vector3 PlantNormal { get; set; } public Vector3 PlantNormal { get; set; }
public Node? PlantObject { get; set; } public Node? PlantObject { get; set; }
public MeshInstance3D WeaponLocationIndicator { get; set; } public MeshInstance3D WeaponLocationIndicator { get; set; } = null!;
public StandardMaterial3D WeaponLocationIndicatorMaterial { get; set; } public StandardMaterial3D WeaponLocationIndicatorMaterial { get; set; } = null!;
public MeshInstance3D WeaponMesh { get; set; } public MeshInstance3D WeaponMesh { get; set; } = null!;
public void Init() public void Init()
{ {

View File

@@ -49,45 +49,45 @@ public partial class PlayerController : CharacterBody3D,
[Signal] [Signal]
public delegate void PlayerDiedEventHandler(); public delegate void PlayerDiedEventHandler();
public event Action<IDamageable, DamageRecord> DamageTaken; public event Action<IDamageable, DamageRecord> DamageTaken = null!;
public event Action<IHealthable, HealthChangedRecord> HealthChanged; public event Action<IHealthable, HealthChangedRecord> HealthChanged = null!;
public event Action<IHealthable> HealthDepleted; public event Action<IHealthable> HealthDepleted = null!;
/////////////////////////// ///////////////////////////
// Public stuff // // Public stuff //
/////////////////////////// ///////////////////////////
public HeadSystem HeadSystem; public HeadSystem HeadSystem = null!;
public StairsSystem StairsSystem; public StairsSystem StairsSystem = null!;
public MantleSystem MantleSystem; public MantleSystem MantleSystem = null!;
public DashSystem DashSystem; public DashSystem DashSystem = null!;
public CollisionShape3D StandingCollider; public CollisionShape3D StandingCollider = null!;
public CollisionShape3D SlideCollider; public CollisionShape3D SlideCollider = null!;
public WeaponSystem WeaponSystem; public WeaponSystem WeaponSystem = null!;
public WallHugSystem WallHugSystem; public WallHugSystem WallHugSystem = null!;
public PlayerUi PlayerUi; public PlayerUi PlayerUi = null!;
public TextureRect DashIndicator; public TextureRect DashIndicator = null!;
public ColorRect PowerCooldownIndicator; public ColorRect PowerCooldownIndicator = null!;
public Node3D DashIndicatorNode; public Node3D DashIndicatorNode = null!;
public MeshInstance3D DashIndicatorMesh; public MeshInstance3D DashIndicatorMesh = null!;
public CylinderMesh DashIndicatorMeshCylinder; public CylinderMesh DashIndicatorMeshCylinder = null!;
public RayCast3D WallRunSnapper; public RayCast3D WallRunSnapper = null!;
public ShapeCast3D GroundDetector; public ShapeCast3D GroundDetector = null!;
public ShapeCast3D CeilingDetector; public ShapeCast3D CeilingDetector = null!;
public RayCast3D DirectGroundDetector; public RayCast3D DirectGroundDetector = null!;
public Area3D WeaponHitbox; public Area3D WeaponHitbox = null!;
public AudioStreamPlayer3D SfxPlayer; public AudioStreamPlayer3D SfxPlayer = null!;
public ShapeCast3D DashDamageDetector; public ShapeCast3D DashDamageDetector = null!;
public Area3D SlidingEnemyDetector; public Area3D SlidingEnemyDetector = null!;
public EntityAttributes Attributes { get; set; } public EntityAttributes Attributes { get; set; } = null!;
public EntityTags Tags { get; set; } public EntityTags Tags { get; set; } = null!;
public EffectsManager EffectsManager { get; set; } public EffectsManager EffectsManager { get; set; } = null!;
public EntityAbilities Abilities { get; set; } public EntityAbilities Abilities { get; set; } = null!;
public EventManager Events { get; set; } public EventManager Events { get; set; } = null!;
// Inspector stuff // Inspector stuff
[Export] public Marker3D TutorialWeaponTarget; [Export] public Marker3D TutorialWeaponTarget = null!;
[Export] public bool TutorialDone { get; set; } [Export] public bool TutorialDone { get; set; }
[Export] public bool HasSword { get; set; } = true; [Export] public bool HasSword { get; set; } = true;
[Export] public bool HasParry { get; set; } = true; [Export] public bool HasParry { get; set; } = true;
@@ -102,9 +102,9 @@ public partial class PlayerController : CharacterBody3D,
[Export(PropertyHint.Range, "0,10f,0.1,or_greater")] [Export(PropertyHint.Range, "0,10f,0.1,or_greater")]
public float AimAssistReductionStartDistance { get; set; } = 10f; public float AimAssistReductionStartDistance { get; set; } = 10f;
[ExportGroup("Damage")] [Export] public RDamage RDamage { get; set; } [ExportGroup("Damage")] [Export] public RDamage RDamage { get; set; } = null!;
[Export] public RKnockback? RKnockback { get; set; } [Export] public RKnockback? RKnockback { get; set; } = null!;
[Export] public RHealth? RHealth { get; set; } [Export] public RHealth? RHealth { get; set; } = null!;
[ExportGroup("Targeting")] [ExportGroup("Targeting")]
[Export(PropertyHint.Range, "0,20,0.1,or_greater")] [Export(PropertyHint.Range, "0,20,0.1,or_greater")]
@@ -114,7 +114,7 @@ public partial class PlayerController : CharacterBody3D,
[ExportGroup("Instantiation")] [ExportGroup("Instantiation")]
[Export] [Export]
public PackedScene Explosion { get; set; } public PackedScene Explosion { get; set; } = null!;
// Movement stuff // Movement stuff
[ExportCategory("Movement")] [ExportCategory("Movement")]
@@ -141,7 +141,7 @@ public partial class PlayerController : CharacterBody3D,
[Export(PropertyHint.Range, "0,1,0.01,or_greater")] [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
public float MantleTime { get; set; } = 0.1f; public float MantleTime { get; set; } = 0.1f;
[Export] [Export]
public PackedScene MantlePath { get; set; } public PackedScene MantlePath { get; set; } = null!;
[Export(PropertyHint.Range, "0,50,0.1")] [Export(PropertyHint.Range, "0,50,0.1")]
public float MantleDashStrength { get; set; } = 15f; public float MantleDashStrength { get; set; } = 15f;
@@ -266,8 +266,8 @@ public partial class PlayerController : CharacterBody3D,
// Stairs and shit // Stairs and shit
private float _lastFrameWasOnFloor = -Mathf.Inf; private float _lastFrameWasOnFloor = -Mathf.Inf;
private const int NumOfHeadCollisionDetectors = 4; private const int NumOfHeadCollisionDetectors = 4;
private RayCast3D[] _headCollisionDetectors; private RayCast3D[] _headCollisionDetectors = null!;
private AudioStreamPlaybackInteractive _audioStream; private AudioStreamPlaybackInteractive _audioStream = null!;
// Basic movement // Basic movement
private bool _movementEnabled = true; private bool _movementEnabled = true;
@@ -291,7 +291,7 @@ public partial class PlayerController : CharacterBody3D,
private Path? _mantlePath; private Path? _mantlePath;
private bool _customMantle; private bool _customMantle;
private Transform3D _customMantleStartTransform; private Transform3D _customMantleStartTransform;
private Curve3D _customMantleCurve; private Curve3D _customMantleCurve = null!;
private Vector3 _mantleStartPosition; private Vector3 _mantleStartPosition;
private Vector3 _velocityOnMantleStarted = Vector3.Zero; private Vector3 _velocityOnMantleStarted = Vector3.Zero;
@@ -328,56 +328,56 @@ public partial class PlayerController : CharacterBody3D,
private float _aimAssistMultiplier = 1.0f; private float _aimAssistMultiplier = 1.0f;
// Timers // Timers
private Timer _timeScaleAimInAirTimer; private Timer _timeScaleAimInAirTimer = null!;
private Timer _weaponThrowUncatchableTimer; private Timer _weaponThrowUncatchableTimer = null!;
private Timer _simpleDashCooldownTimer; private Timer _simpleDashCooldownTimer = null!;
private Timer _airborneDashCooldownTimer; private Timer _airborneDashCooldownTimer = null!;
private Timer _powerCooldownTimer; private Timer _powerCooldownTimer = null!;
private Timer _invincibilityTimer; private Timer _invincibilityTimer = null!;
private Timer _attackCooldown; private Timer _attackCooldown = null!;
// State chart // State chart
private StateChart _playerState; private StateChart _playerState = null!;
private StateChartState _aiming; private StateChartState _aiming = null!;
private StateChartState _powerExpired; private StateChartState _powerExpired = null!;
private StateChartState _powerRecharging; private StateChartState _powerRecharging = null!;
private StateChartState _powerFull; private StateChartState _powerFull = null!;
private StateChartState _grounded; private StateChartState _grounded = null!;
private StateChartState _airborne; private StateChartState _airborne = null!;
private StateChartState _coyoteEnabled; private StateChartState _coyoteEnabled = null!;
private StateChartState _jumping; private StateChartState _jumping = null!;
private StateChartState _simpleJump; private StateChartState _simpleJump = null!;
private StateChartState _doubleJump; private StateChartState _doubleJump = null!;
private StateChartState _mantling; private StateChartState _mantling = null!;
private StateChartState _simpleDash; private StateChartState _simpleDash = null!;
private StateChartState _aimedDash; private StateChartState _aimedDash = null!;
private StateChartState _weaponDash; private StateChartState _weaponDash = null!;
private StateChartState _sliding; private StateChartState _sliding = null!;
private StateChartState _groundSliding; private StateChartState _groundSliding = null!;
private StateChartState _airGliding; private StateChartState _airGliding = null!;
private StateChartState _airGlidingDoubleJump; private StateChartState _airGlidingDoubleJump = null!;
private StateChartState _slideCanceled; private StateChartState _slideCanceled = null!;
private StateChartState _slamming; private StateChartState _slamming = null!;
private StateChartState _onWall; private StateChartState _onWall = null!;
private StateChartState _onWallHugging; private StateChartState _onWallHugging = null!;
private StateChartState _onWallHanging; private StateChartState _onWallHanging = null!;
private StateChartState _onWallRunning; private StateChartState _onWallRunning = null!;
private StateChartState _attackStandard; private StateChartState _attackStandard = null!;
private StateChartState _attackDash; private StateChartState _attackDash = null!;
private StateChartState _parryStandard; private StateChartState _parryStandard = null!;
private StateChartState _parryDash; private StateChartState _parryDash = null!;
private Transition _onJumpFromWall; private Transition _onJumpFromWall = null!;
private Transition _onJumpFromWallFalling; private Transition _onJumpFromWallFalling = null!;
private Transition _onJumpFromWallRunning; private Transition _onJumpFromWallRunning = null!;
private Transition _onLeaveWallFromRun; private Transition _onLeaveWallFromRun = null!;
private Transition _onAirborneToGrounded; private Transition _onAirborneToGrounded = null!;
private Transition _onGroundSlideJump; private Transition _onGroundSlideJump = null!;
private Transition _onAirGlideDoubleJump; private Transition _onAirGlideDoubleJump = null!;
// Damage // Damage
public CDamageable? CDamageable { get; set; } public CDamageable? CDamageable { get; set; }
@@ -395,9 +395,9 @@ public partial class PlayerController : CharacterBody3D,
private readonly List<IDamageable> _hitEnemies = new List<IDamageable>(); private readonly List<IDamageable> _hitEnemies = new List<IDamageable>();
private ShapeCast3D _closeEnemyDetector; private ShapeCast3D _closeEnemyDetector = null!;
private RayCast3D _aimAssisRayCast; private RayCast3D _aimAssisRayCast = null!;
private Camera3D _camera; private Camera3D _camera = null!;
public override void _Ready() public override void _Ready()
{ {
@@ -2348,7 +2348,7 @@ public partial class PlayerController : CharacterBody3D,
_audioStream.SwitchToClipByName("parry"); _audioStream.SwitchToClipByName("parry");
} }
private PhysicsDirectSpaceState3D _spaceState; private PhysicsDirectSpaceState3D _spaceState = null!;
public void StartDashAction(bool isParry) public void StartDashAction(bool isParry)
{ {
if (isParry) HeadSystem.OnParry(); if (isParry) HeadSystem.OnParry();