Refactor/mutliplayer

OctoAwesome/Design Documents/Notifications_Multiplayer_Rework.md

@@ -0,0 +1,26 @@
+Fragen:
+1. Was macht eine Notification aus?
+   1. Will man steuern können, ob Notifications gesendet werden (Beibehaltung des Network Channels)? 
+   2. Einfach jede senden?
+2. Darf man am PAH (PackageActionHub) auf eine Notification Registern?
+   1. Dürfen mehrere Leute an einer Notification am PAH registrieren?
+3. Sollte Notification den Target Channel beinhalten?
+   1. Darf eine Notification nur in ein Target Channel gepusht werden?
+4. Mehr über Updatehub machen und weniger über locale Relays?
+
+Antworten:
+1. Package Flag Notification
+   1. Ja (Wie noch zu klären)
+      1. Network Channel beibehalten fürs senden
+      2. UpdateHub prüft auf SerID Existenz und sendet bei Ja vorhanden
+      3. Man regelt das über die AddSource Methode im Update hub, das hießt der updatehub kann das intern regeln, das wäre ein Mixtur aus 1 und 2. New Parameter SendOverNetwork
+   2. Nein
+2. Ja
+   1. Wäre toll, aber aufwand
+3. Vlt. müsste nach SerId kommen und wäre damit Pflichtfeld. Als erweiterung vom UpdateHub
+   1. Eher nicht, sondern nur mit multi Relays / PushNetworkOnly
+4. Joa why not? Maxi sieht damit kein Problem
+
+Aussagen:
+1. Alle "Notifications" eigene Ser Id 
+2. Serializer Neue Methode SerializeNetwork wegen SerId

OctoAwesome/OctoAwesome.Basics/AssemblyInfo.cs

@@ -0,0 +1,52 @@
+using OctoAwesome;
+using OctoAwesome.Basics;
+using OctoAwesome.Basics.Entities;
+using OctoAwesome.Basics.EntityComponents;
+using OctoAwesome.Basics.FunctionBlocks;
+using OctoAwesome.Basics.SimulationComponents;
+using OctoAwesome.Basics.UI.Components;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+[assembly: NoosonConfiguration(
+    GenerateDeserializeExtension = false,
+    DisableWarnings = true,
+    GenerateStaticDeserializeWithCtor = true,
+    GenerateDeserializeOnInstance = true,
+    GenerateStaticSerialize = true,
+    GenerateStaticDeserializeIntoInstance = true,
+    NameOfStaticDeserializeWithCtor = "DeserializeAndCreate",
+    NameOfDeserializeOnInstance = "Deserialize",
+    NameOfStaticDeserializeIntoInstance = "Deserialize",
+    NameOfStaticDeserializeWithOutParams = "DeserializeOut")]
+
+[assembly: SerializationId<WauziEntity>(2, 1)]
+[assembly: SerializationId<Chest>(2, 2)]
+[assembly: SerializationId<Furnace>(2, 3)]
+[assembly: SerializationId<ComplexPlanet>(2, 4)]
+[assembly: SerializationId<BodyPowerComponent>(2, 5)]
+[assembly: SerializationId<ProductionInventoriesComponent>(2, 6)]
+[assembly: SerializationId<BurningComponent>(2, 7)]
+[assembly: SerializationId<EntityCollisionComponent>(2, 8)]
+[assembly: SerializationId<ForceComponent>(2, 9)]
+[assembly: SerializationId<GravityComponent>(2, 10)]
+[assembly: SerializationId<MassComponent>(2, 11)]
+[assembly: SerializationId<MoveableComponent>(2, 12)]
+[assembly: SerializationId<PowerComponent>(2, 13)]
+[assembly: SerializationId<RelatedEntityComponent>(2, 14)]
+[assembly: SerializationId<TransferComponent>(2, 15)]
+[assembly: SerializationId<AccelerationComponent>(2, 16)]
+[assembly: SerializationId<BlockInteractionComponent>(2, 17)]
+[assembly: SerializationId<CollisionComponent>(2, 18)]
+[assembly: SerializationId<ComponentContainerInteractionComponent>(2, 19)]
+[assembly: SerializationId<ForceAggregatorComponent>(2, 20)]
+[assembly: SerializationId<MoveComponent>(2, 21)]
+[assembly: SerializationId<NewtonGravitatorComponent>(2, 22)]
+[assembly: SerializationId<PowerAggregatorComponent>(2, 23)]
+[assembly: SerializationId<WattMoverComponent>(2, 24)]
+[assembly: SerializationId<FurnaceUIComponent>(2, 25)]
+[assembly: SerializationId<TransferUIComponent>(2, 26)]

OctoAwesome/OctoAwesome.Basics/ComplexPlanet.cs

@@ -1,4 +1,6 @@
 using OctoAwesome.Basics.Biomes;
+using OctoAwesome.Serialization;
+
 using OctoAwesome.Location;
 
 using System;
@@ -10,16 +12,19 @@ namespace OctoAwesome.Basics
     /// <summary>
     /// A complex planet implementation with complex features.
     /// </summary>
-    public class ComplexPlanet : Planet
+    [SerializationId(), Nooson]
+    public partial class ComplexPlanet : Planet, IConstructionSerializable<ComplexPlanet>
     {
         // The gravitational constant was chosen on purpose to be that "big", see Issue #220
+
         private const double GravitationalConstant = 6.67e-7;
 
         private SurfaceBiomeGenerator? biomeGenerator;
 
         /// <summary>
         /// Gets the biome generator used for generating biomes on the planet.
         /// </summary>
+        [NoosonIgnore]
         public SurfaceBiomeGenerator BiomeGenerator
         {
             get
@@ -49,20 +54,15 @@ public ComplexPlanet(int id, Guid universe, Index3 size, IMapGenerator generator
             Initialize();
         }
 
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ComplexPlanet"/> class.
         /// </summary>
         /// <param name="generator">The map generator to use for generating the planet.</param>
         public ComplexPlanet(IMapGenerator generator)
             : base(generator)
         {
-            //Initalize();
-        }
-
-        /// <inheritdoc />
-        public override void Deserialize(BinaryReader reader)
-        {
-            base.Deserialize(reader);
             Initialize();
         }
 

OctoAwesome/OctoAwesome.Basics/ComplexPlanetGenerator.cs

@@ -3,18 +3,18 @@
 using OctoAwesome.Definitions;
 using OctoAwesome.Location;
 using OctoAwesome.Pooling;
+using OctoAwesome.Serialization;
 
 using System;
 using System.Buffers;
 using System.IO;
-using System.Linq;
 
 namespace OctoAwesome.Basics
 {
     /// <summary>
     /// Map generator used for generating a <see cref="ComplexPlanet"/>.
     /// </summary>
-    public class ComplexPlanetGenerator : IMapGenerator
+    public partial class ComplexPlanetGenerator : IMapGenerator
     {
         private readonly ChunkPool chunkPool;
 
@@ -58,7 +58,7 @@ ushort GetBlockDefinitionInfo<T>()
 
             IChunk[] chunks = new IChunk[planet.Size.Z];
             for (int i = 0; i < planet.Size.Z; i++)
-                chunks[i] = chunkPool.Rent(new Index3(index, i), localPlanet);
+                chunks[i] = chunkPool.Rent(new Index3(index, i), localPlanet.Id);
 
             int obersteSchicht;
             bool surfaceBlock;
@@ -148,7 +148,7 @@ ushort GetBlockDefinitionInfo<T>()
                 }
             }
             ArrayPool<float>.Shared.Return(localHeightmap);
-            ChunkColumn column = new ChunkColumn(chunks, localPlanet, index);
+            ChunkColumn column = new ChunkColumn(chunks, localPlanet.Id, index);
             column.CalculateHeights();
             return column;
         }
@@ -165,7 +165,7 @@ public IPlanet GeneratePlanet(Stream stream)
         /// <inheritdoc />
         public IChunkColumn GenerateColumn(Stream stream, IPlanet planet, Index2 index)
         {
-            IChunkColumn column = new ChunkColumn(planet);
+            IChunkColumn column = new ChunkColumn(planet.Id);
             using (var reader = new BinaryReader(stream))
                 column.Deserialize(reader);
             return column;

OctoAwesome/OctoAwesome.Basics/DebugMapGenerator.cs

@@ -30,11 +30,11 @@ public IChunkColumn GenerateColumn(IDefinitionManager definitionManager, IPlanet
 
             IChunk[] result = new IChunk[planet.Size.Z];
 
-            ChunkColumn column = new ChunkColumn(result, planet, index);
+            ChunkColumn column = new ChunkColumn(result, planet.Id, index);
 
 
             for (int layer = 0; layer < planet.Size.Z; layer++)
-                result[layer] = new Chunk(new Index3(index.X, index.Y, layer), planet);
+                result[layer] = new Chunk(new Index3(index.X, index.Y, layer), planet.Id);
 
             int part = (planet.Size.Z * Chunk.CHUNKSIZE_Z) / 4;
 
@@ -74,7 +74,7 @@ public IPlanet GeneratePlanet(Stream stream)
         /// <inheritdoc />
         public IChunkColumn GenerateColumn(Stream stream, IPlanet planet, Index2 index)
         {
-            IChunkColumn column = new ChunkColumn(planet);
+            IChunkColumn column = new ChunkColumn(planet.Id);
             using (var reader = new BinaryReader(stream))
                 column.Deserialize(reader);
             return column;

OctoAwesome/OctoAwesome.Basics/Definitions/Items/ChestItem.cs

@@ -18,6 +18,7 @@ namespace OctoAwesome.Basics.Definitions.Items
     /// </summary>
     public class ChestItem : Item, IDisposable
     {
+        private readonly IUpdateHub updateHub;
         private readonly Relay<Notification> simulationRelay;
         private readonly IDisposable simulationSource;
 
@@ -29,7 +30,7 @@ public class ChestItem : Item, IDisposable
         public ChestItem(ChestItemDefinition definition, IMaterialDefinition materialDefinition)
             : base(definition, materialDefinition)
         {
-            var updateHub = TypeContainer.Get<IUpdateHub>();
+            updateHub = TypeContainer.Get<IUpdateHub>();
             simulationRelay = new Relay<Notification>();
 
             simulationSource = updateHub.AddSource(simulationRelay, DefaultChannels.Simulation);
@@ -49,6 +50,7 @@ public override int Apply(IMaterialDefinition material, IBlockInteraction hitInf
             };
 
             simulationRelay.OnNext(notification);
+
             return 0;
         }
 

OctoAwesome/OctoAwesome.Basics/Entities/WauziEntity.cs

@@ -1,5 +1,5 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
+
 using engenious;
 
 using OctoAwesome.Basics.Definitions.Items.Food;
@@ -9,14 +9,14 @@
 using OctoAwesome.Location;
 using OctoAwesome.Extension;
 using OctoAwesome.Serialization;
-
 namespace OctoAwesome.Basics.Entities
 {
     /// <summary>
     /// An entity used for dogs in the game.
     /// </summary>
-    [SerializationId(1, 2)]
-    public class WauziEntity : Entity
+    [SerializationId()]
+    [Nooson]
+    public partial class WauziEntity : Entity, ISerializable<WauziEntity>
     {
         class MoveLogic
         {
@@ -127,31 +127,32 @@ public WauziEntity() : base()
         {
         }
 
-        /// <inheritdoc />
-        protected override void OnInteract(GameTime gameTime, Entity entity)
-        {
-            if (!entity.Components.TryGet<ToolBarComponent>(out var toolbar)
-                || !entity.Components.TryGet<InventoryComponent>(out var inventory)
-                || !entity.Components.TryGet<PositionComponent>(out var position)
-                || toolbar.ActiveTool?.Item is not MeatRaw)
-                return;
-
-            Controller.JumpInput = true;
-            if (!Components.Contains<RelatedEntityComponent>())
-            {
-                var relEntity = new RelatedEntityComponent();
-                relEntity.RelatedEntityId = entity.Id;
-                Components.Add(relEntity);
-                followEntity = entity;
-            }
-
-            inventory.RemoveUnit(toolbar.ActiveTool);
-            if (toolbar.ActiveTool.Amount < 1)
-            {
-                inventory.Remove(toolbar.ActiveTool);
-                toolbar.RemoveSlot(toolbar.ActiveTool);
-            }
-        }
+        ///<inheritdoc/>
+        //protected override void OnInteract(GameTime gameTime, Entity entity)
+        //{
+        //    if (!entity.Components.TryGet<ToolBarComponent>(out var toolbar)
+        //        || !entity.Components.TryGet<InventoryComponent>(out var inventory)
+        //        || !entity.Components.TryGet<PositionComponent>(out var position)
+        //        || toolbar.ActiveTool?.Item is not MeatRaw
+        //        || !Components.TryGet<ControllableComponent>(out var controller))
+        //        return;
+
+        //    controller.JumpInput = true;
+        //    if (!Components.Contains<RelatedEntityComponent>())
+        //    {
+        //        var relEntity = new RelatedEntityComponent();
+        //        relEntity.RelatedEntityId = entity.Id;
+        //        Components.AddIfTypeNotExists(relEntity);
+        //        followEntity = entity;
+        //    }
+
+        //    inventory.RemoveUnit(toolbar.ActiveTool);
+        //    if (toolbar.ActiveTool.Amount < 1)
+        //    {
+        //        inventory.Remove(toolbar.ActiveTool);
+        //        toolbar.RemoveSlot(toolbar.ActiveTool);
+        //    }
+        //}
 
 
         /// <inheritdoc />

OctoAwesome/OctoAwesome.Basics/EntityComponents/BodyPowerComponent.cs

@@ -1,31 +1,17 @@
-using System.IO;
-
-namespace OctoAwesome.Basics.EntityComponents
+namespace OctoAwesome.Basics.EntityComponents
 {
     /// <summary>
     /// Component to apply power to the body of an entity.
     /// </summary>
-    public sealed class BodyPowerComponent : PowerComponent
+    [Nooson]
+    [SerializationId()]
+    public sealed partial class BodyPowerComponent : PowerComponent
     {
         /// <summary>
         /// Gets or sets a value indicating the time a jump should take.
         /// </summary>
         public int JumpTime { get; set; }
 
-        /// <inheritdoc />
-        public override void Serialize(BinaryWriter writer)
-        {
-            base.Serialize(writer);
-
-            writer.Write(JumpTime);
-        }
-
-        /// <inheritdoc />
-        public override void Deserialize(BinaryReader reader)
-        {
-            base.Deserialize(reader);
-
-            JumpTime = reader.ReadInt32();
-        }
     }
 }
+