forked from SubnauticaNitrox/Nitrox
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge and adapt recent changes from SubnauticaNitrox#2087 and Subnaut…
- Loading branch information
Showing
150 changed files
with
2,531 additions
and
1,191 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| using FluentAssertions; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
|
|
||
| namespace NitroxModel.DataStructures; | ||
|
|
||
| [TestClass] | ||
| public class CircularBufferTest | ||
| { | ||
| [TestMethod] | ||
| public void ShouldLimitSizeToMaxSize() | ||
| { | ||
| CircularBuffer<string> buffer = new(1); | ||
| buffer.Count.Should().Be(0); | ||
| buffer.Add("1"); | ||
| buffer.Count.Should().Be(1); | ||
| buffer.Add("2"); | ||
| buffer.Count.Should().Be(1); | ||
|
|
||
| buffer = new CircularBuffer<string>(5); | ||
| buffer.Count.Should().Be(0); | ||
| buffer.Add("1"); | ||
| buffer.Count.Should().Be(1); | ||
| buffer.Add("2"); | ||
| buffer.Count.Should().Be(2); | ||
| buffer.Add("3"); | ||
| buffer.Count.Should().Be(3); | ||
| buffer.Add("4"); | ||
| buffer.Count.Should().Be(4); | ||
| buffer.Add("5"); | ||
| buffer.Count.Should().Be(5); | ||
| buffer.Add("6"); | ||
| buffer.Count.Should().Be(5); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ShouldOverwriteOldestItemInBufferWhenCapped() | ||
| { | ||
| CircularBuffer<string> buffer = new(3); | ||
| buffer.Add("1"); | ||
| buffer[0].Should().Be("1"); | ||
| buffer.Add("2"); | ||
| buffer[1].Should().Be("2"); | ||
| buffer.Add("3"); | ||
| buffer[2].Should().Be("3"); | ||
| buffer.Add("4"); | ||
| buffer[0].Should().Be("4"); | ||
| buffer.Add("5"); | ||
| buffer[1].Should().Be("5"); | ||
| buffer[2].Should().Be("3"); | ||
| buffer.Add("6"); | ||
| buffer[2].Should().Be("6"); | ||
| buffer.Add("7"); | ||
| buffer.Should().ContainInOrder("7", "5", "6"); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ShouldDiscardAddIfCapacityReached() | ||
| { | ||
| CircularBuffer<string> buffer = new(0); | ||
| buffer.Count.Should().Be(0); | ||
| buffer.Add("1"); | ||
| buffer.Count.Should().Be(0); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ShouldBeEmptyWhenCleared() | ||
| { | ||
| CircularBuffer<string> buffer = new(10); | ||
| buffer.Count.Should().Be(0); | ||
| buffer.Add("1"); | ||
| buffer.Add("1"); | ||
| buffer.Add("1"); | ||
| buffer.Count.Should().Be(3); | ||
| buffer.Clear(); | ||
| buffer.Count.Should().Be(0); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ShouldGiveLastChanged() | ||
| { | ||
| CircularBuffer<int> buffer = new(3); | ||
| buffer.LastChangedIndex.Should().Be(-1); | ||
| buffer.Add(1); | ||
| buffer.LastChangedIndex.Should().Be(0); | ||
| buffer.Add(2); | ||
| buffer.LastChangedIndex.Should().Be(1); | ||
| buffer.Add(3); | ||
| buffer.LastChangedIndex.Should().Be(2); | ||
| buffer.Add(4); | ||
| buffer.LastChangedIndex.Should().Be(0); | ||
| buffer.Add(5); | ||
| buffer.LastChangedIndex.Should().Be(1); | ||
| buffer.Add(6); | ||
| buffer.LastChangedIndex.Should().Be(2); | ||
| buffer.Add(7); | ||
| buffer.LastChangedIndex.Should().Be(0); | ||
| buffer.Add(8); | ||
| buffer.LastChangedIndex.Should().Be(1); | ||
| buffer.Clear(); | ||
| buffer.LastChangedIndex.Should().Be(-1); | ||
| } | ||
|
|
||
| [TestMethod] | ||
| public void ShouldReverseOrderWithNegativeIndex() | ||
| { | ||
| CircularBuffer<int> buffer = new(6); | ||
| buffer.AddRange(1, 2, 3, 4, 5, 6); | ||
| buffer[-1].Should().Be(6); | ||
| buffer[-2].Should().Be(5); | ||
| buffer[-3].Should().Be(4); | ||
| buffer[-4].Should().Be(3); | ||
| buffer[-5].Should().Be(2); | ||
| buffer[-6].Should().Be(1); | ||
| buffer[-7].Should().Be(6); | ||
| buffer[-8].Should().Be(5); | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
Nitrox.Test/Patcher/Patches/Dynamic/Flare_Update_PatchTest.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using FluentAssertions; | ||
| using HarmonyLib; | ||
| using Microsoft.VisualStudio.TestTools.UnitTesting; | ||
| using NitroxTest.Patcher; | ||
|
|
||
| namespace NitroxPatcher.Patches.Dynamic; | ||
|
|
||
| [TestClass] | ||
| public class Flare_Update_PatchTest | ||
| { | ||
| [TestMethod] | ||
| public void Sanity() | ||
| { | ||
| IEnumerable<CodeInstruction> originalIl = PatchTestHelper.GetInstructionsFromMethod(Flare_Update_Patch.TARGET_METHOD); | ||
| IEnumerable<CodeInstruction> transformedIl = Flare_Update_Patch.Transpiler(originalIl); | ||
| transformedIl.Count().Should().Be(originalIl.Count()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 17 additions & 10 deletions
27
NitroxClient/Communication/Packets/Processors/EntityMetadataUpdateProcessor.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,30 @@ | ||
| using NitroxClient.Communication.Packets.Processors.Abstract; | ||
| using NitroxClient.Communication.Packets.Processors.Abstract; | ||
| using NitroxClient.GameLogic.Spawning.Metadata; | ||
| using NitroxClient.GameLogic.Spawning.Metadata.Processor.Abstract; | ||
| using NitroxClient.MonoBehaviours; | ||
| using NitroxModel.DataStructures.Util; | ||
| using NitroxModel.Helper; | ||
| using NitroxModel.Packets; | ||
| using UnityEngine; | ||
|
|
||
| namespace NitroxClient.Communication.Packets.Processors | ||
| namespace NitroxClient.Communication.Packets.Processors; | ||
|
|
||
| public class EntityMetadataUpdateProcessor : ClientPacketProcessor<EntityMetadataUpdate> | ||
| { | ||
| public class EntityMetadataUpdateProcessor : ClientPacketProcessor<EntityMetadataUpdate> | ||
| private readonly EntityMetadataManager entityMetadataManager; | ||
|
|
||
| public EntityMetadataUpdateProcessor(EntityMetadataManager entityMetadataManager) | ||
| { | ||
| this.entityMetadataManager = entityMetadataManager; | ||
| } | ||
|
|
||
| public override void Process(EntityMetadataUpdate update) | ||
| { | ||
| public override void Process(EntityMetadataUpdate update) | ||
| { | ||
| GameObject gameObject = NitroxEntity.RequireObjectFrom(update.Id); | ||
| GameObject gameObject = NitroxEntity.RequireObjectFrom(update.Id); | ||
|
|
||
| Optional<EntityMetadataProcessor> metadataProcessor = EntityMetadataProcessor.FromMetaData(update.NewValue); | ||
| Validate.IsTrue(metadataProcessor.HasValue, $"No processor found for EntityMetadata of type {update.NewValue.GetType()}"); | ||
| Optional<IEntityMetadataProcessor> metadataProcessor = entityMetadataManager.FromMetaData(update.NewValue); | ||
| Validate.IsTrue(metadataProcessor.HasValue, $"No processor found for EntityMetadata of type {update.NewValue.GetType()}"); | ||
|
|
||
| metadataProcessor.Value.ProcessMetadata(gameObject, update.NewValue); | ||
| } | ||
| metadataProcessor.Value.ProcessMetadata(gameObject, update.NewValue); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.