Merge branch 'refactor/baseclient' into refactor/mutliplayer

Co-authored-by: Marcus Aurelius <[email protected]>

OctoAwesome/Design Documents/RecipeOrReceipt.md

@@ -28,6 +28,7 @@
 ### Iron Smelting Recipe Sample
 ``` json
 {
+    "Type": "Blast Furnace", //, Crafting, etc.pp. Freitext
     "Inputs":[
         {
             "ItemName":"IronOre",

OctoAwesome/OctoAwesome.Basics/Biomes/BiomeBase.cs

@@ -1,4 +1,6 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Chunking;
+using OctoAwesome.Location;
 
 using System.Buffers;
 using System.Collections.Generic;

OctoAwesome/OctoAwesome.Basics/Biomes/FlatlandBiome.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Location;
 
 namespace OctoAwesome.Basics.Biomes
 {

OctoAwesome/OctoAwesome.Basics/Biomes/HighMountainBiome.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Location;
 
 namespace OctoAwesome.Basics.Biomes
 {

OctoAwesome/OctoAwesome.Basics/Biomes/HillsBiome.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Location;
 
 namespace OctoAwesome.Basics.Biomes
 {

OctoAwesome/OctoAwesome.Basics/Biomes/IBiome.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Location;
 
 namespace OctoAwesome.Basics.Biomes
 {
@@ -43,7 +44,7 @@ public interface IBiome
         /// <param name="chunkIndex">The chunk position to read the heightmap at.</param>
         /// <param name="heightmap">
         /// The heightmap array to read into.
-        /// Should be size <see cref="Chunk.CHUNKSIZE_X"/> * <see cref="Chunk.CHUNKSIZE_Y"/>.
+        /// Should be size <see cref="Chunking.Chunk.CHUNKSIZE_X"/> * <see cref="Chunking.Chunk.CHUNKSIZE_Y"/>.
         /// </param>
         void FillHeightmap(Index2 chunkIndex, float[] heightmap);
     }

OctoAwesome/OctoAwesome.Basics/Biomes/LandBiomeGenerator.cs

@@ -1,5 +1,7 @@
 
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Chunking;
+using OctoAwesome.Location;
 
 using System;
 using System.Buffers;

OctoAwesome/OctoAwesome.Basics/Biomes/LargeBiomeBase.cs

@@ -1,8 +1,9 @@
-
+using OctoAwesome.Basics.Noise;
+using OctoAwesome.Location;
+
 using System;
 using System.Diagnostics;
 using System.Linq;
-using OctoAwesome.Basics.Noise;
 
 namespace OctoAwesome.Basics.Biomes
 {

OctoAwesome/OctoAwesome.Basics/Biomes/OceanBiomeGenerator.cs

@@ -1,4 +1,7 @@
-namespace OctoAwesome.Basics.Biomes
+using OctoAwesome.Chunking;
+using OctoAwesome.Location;
+
+namespace OctoAwesome.Basics.Biomes
 {
     /// <summary>
     /// Biome class or generating the oceanic floor.

OctoAwesome/OctoAwesome.Basics/Biomes/SurfaceBiomeGenerator.cs

@@ -1,4 +1,6 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Chunking;
+using OctoAwesome.Location;
 
 using System;
 using System.Buffers;

OctoAwesome/OctoAwesome.Basics/Climate/ComplexClimateMap.cs

@@ -1,4 +1,6 @@
 using OctoAwesome.Basics.Noise;
+using OctoAwesome.Chunking;
+using OctoAwesome.Location;
 
 using System;
 

OctoAwesome/OctoAwesome.Basics/ComplexPlanet.cs

@@ -1,6 +1,8 @@
 using OctoAwesome.Basics.Biomes;
 using OctoAwesome.Serialization;
 
+using OctoAwesome.Location;
+
 using System;
 using System.Diagnostics;
 using System.IO;

OctoAwesome/OctoAwesome.Basics/ComplexPlanetGenerator.cs

@@ -1,5 +1,7 @@
 using OctoAwesome.Basics.Definitions.Blocks;
+using OctoAwesome.Chunking;
 using OctoAwesome.Definitions;
+using OctoAwesome.Location;
 using OctoAwesome.Pooling;
 using OctoAwesome.Serialization;
 

OctoAwesome/OctoAwesome.Basics/DebugMapGenerator.cs

@@ -3,6 +3,8 @@
 using System.IO;
 using OctoAwesome.Basics.Definitions.Blocks;
 using OctoAwesome.Definitions;
+using OctoAwesome.Chunking;
+using OctoAwesome.Location;
 
 namespace OctoAwesome.Basics
 {

OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/BirchWoodBlockDefinition.cs

@@ -1,5 +1,8 @@
 using OctoAwesome.Basics.Definitions.Materials;
+using OctoAwesome.Basics.Properties;
+using OctoAwesome.Chunking;
 using OctoAwesome.Definitions;
+using OctoAwesome.Information;
 
 namespace OctoAwesome.Basics.Definitions.Blocks
 {

OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/CactusBlockDefinition.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Definitions.Materials;
+using OctoAwesome.Chunking;
 using OctoAwesome.Definitions;
 
 namespace OctoAwesome.Basics.Definitions.Blocks

OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/GrassBlockDefinition.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Definitions.Materials;
+using OctoAwesome.Chunking;
 using OctoAwesome.Definitions;
 
 namespace OctoAwesome.Basics.Definitions.Blocks

OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/RedCottonBlockDefinition.cs

@@ -1,5 +1,8 @@
-using OctoAwesome.Basics.Definitions.Materials;
+using System;
+using OctoAwesome.Basics.Definitions.Materials;
+using OctoAwesome.Chunking;
 using OctoAwesome.Definitions;
+using OctoAwesome.Location;
 
 namespace OctoAwesome.Basics.Definitions.Blocks
 {
@@ -15,7 +18,25 @@ public sealed class RedCottonBlockDefinition : BlockDefinition
         public override string Icon => "cotton_red";
 
         /// <inheritdoc />
-        public override string[] Textures { get; } = { "cotton_red" };
+        public override string[] Textures =>
+            new[]{
+                "cotton_red_0",
+                "cotton_red_1",
+                "cotton_red_2",
+                "cotton_red_3",
+                "cotton_red_4",
+                "cotton_red_5",
+                "cotton_red_6",
+                "cotton_red_7",
+                "cotton_red_8",
+                "cotton_red_9",
+                "cotton_red_10",
+                "cotton_red_11",
+                "cotton_red_12",
+                "cotton_red_13",
+                "cotton_red_14",
+                "cotton_red_15",
+            };
 
         /// <inheritdoc />
         public override IMaterialDefinition Material { get; }
@@ -28,5 +49,46 @@ public RedCottonBlockDefinition(CottonMaterialDefinition material)
         {
             Material = material;
         }
+
+        /// <inheritdoc />
+        public override int GetTextureIndex(Wall wall, ILocalChunkCache manager, int x, int y, int z)
+        {
+            int fullBlockTextureIndex = 15;
+            var centerBlock = new Index3(x, y, z);
+            var baseBlockIndex = manager.GetBlock(centerBlock);
+
+            var (firstAxis, secondAxis) = wall switch
+            {
+                Wall.Top => (Index3.UnitX, Index3.UnitY),
+                Wall.Bottom => (-Index3.UnitX, Index3.UnitY),
+                Wall.Left => (Index3.UnitY, -Index3.UnitZ),
+                Wall.Right => (-Index3.UnitY, -Index3.UnitZ),
+                Wall.Front => (Index3.UnitX, -Index3.UnitZ),
+                Wall.Back => (-Index3.UnitX, -Index3.UnitZ),
+                _ => throw new ArgumentOutOfRangeException(nameof(wall), wall, null)
+            };
+
+            fullBlockTextureIndex = RemoveEdgesOnAxis(manager, centerBlock, firstAxis, 0, baseBlockIndex, fullBlockTextureIndex);
+            fullBlockTextureIndex = RemoveEdgesOnAxis(manager, centerBlock, secondAxis, 1, baseBlockIndex, fullBlockTextureIndex);
+
+            return fullBlockTextureIndex;
+        }
+
+        private static int RemoveEdgesOnAxis(ILocalChunkCache manager, Index3 centerBlock, Index3 axis, int sideOffset, ushort baseBlockIndex,
+            int fullBlockTextureIndex)
+        {
+            for (int i = -1; i <= 1; i+=2)
+            {
+                var otherIndex = manager.GetBlock(centerBlock + axis * i);
+
+                if (otherIndex == baseBlockIndex)
+                {
+                    var bitOffset = (i + 1) + sideOffset;
+                    fullBlockTextureIndex &= ~(1 << bitOffset);
+                }
+            }
+
+            return fullBlockTextureIndex;
+        }
     }
 }

OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/SnowBlockDefinition.cs

@@ -1,4 +1,5 @@
 using OctoAwesome.Basics.Definitions.Materials;
+using OctoAwesome.Chunking;
 using OctoAwesome.Definitions;
 
 namespace OctoAwesome.Basics.Definitions.Blocks

OctoAwesome/OctoAwesome.Basics/Definitions/Blocks/WoodBlockDefinition.cs

@@ -1,6 +1,7 @@
 using OctoAwesome.Basics.Definitions.Materials;
 using OctoAwesome.Basics.Languages;
 using OctoAwesome.Definitions;
+using OctoAwesome.Chunking;
 
 namespace OctoAwesome.Basics.Definitions.Blocks
 {

OctoAwesome/OctoAwesome.Basics/Definitions/Items/Axe.cs

@@ -1,5 +1,6 @@
 using OctoAwesome.Definitions;
 using OctoAwesome.Definitions.Items;
+using OctoAwesome.Information;
 using OctoAwesome.OctoMath;
 
 namespace OctoAwesome.Basics.Definitions.Items
@@ -38,10 +39,10 @@ public Axe(AxeDefinition definition, IMaterialDefinition materialDefinition)
         }
 
         /// <inheritdoc />
-        public override int Hit(IMaterialDefinition material, BlockInfo blockInfo, decimal volumeRemaining, int volumePerHit)
+        public override int Hit(IMaterialDefinition material, IBlockInteraction hitInfo, decimal volumeRemaining, int volumePerHit)
         {
             //⁅𝑥^2/800+3𝑥/8+(−𝑥^3)/320000⁆
-            var baseEfficiency = base.Hit(material, blockInfo, volumeRemaining, volumePerHit);
+            var baseEfficiency = base.Hit(material, hitInfo, volumeRemaining, volumePerHit);
             //typeof(Item).GUID
             if (material is ISolidMaterialDefinition solid && baseEfficiency > 0)
             {

OctoAwesome/OctoAwesome.Basics/Definitions/Items/Bucket.cs

@@ -1,5 +1,7 @@
 using OctoAwesome.Definitions;
 using OctoAwesome.Definitions.Items;
+using OctoAwesome.Information;
+using OctoAwesome.Services;
 
 namespace OctoAwesome.Basics.Definitions.Items
 {
@@ -25,7 +27,7 @@ public class Bucket : Item, IFluidInventory
         public Bucket(BucketDefinition definition, IMaterialDefinition materialDefinition)
             : base(definition, materialDefinition)
         {
-            MaxQuantity = 125;
+            MaxQuantity = 1250;
         }
 
         /// <inheritdoc />
@@ -34,12 +36,14 @@ public void AddFluid(int quantity, IBlockDefinition fluidBlock)
             if (!Definition.CanMineMaterial(fluidBlock.Material))
                 return;
 
-            Quantity += quantity;
+            if (Quantity < 125)
+                Quantity += quantity;
+
             FluidBlock = fluidBlock;
         }
 
         /// <inheritdoc />
-        public override int Hit(IMaterialDefinition material, BlockInfo blockInfo, decimal volumeRemaining, int volumePerHit)
+        public override int Hit(IMaterialDefinition material, IBlockInteraction hitInfo, decimal volumeRemaining, int volumePerHit)
         {
             if (!Definition.CanMineMaterial(material))
                 return 0;
@@ -56,7 +60,18 @@ public override int Hit(IMaterialDefinition material, BlockInfo blockInfo, decim
             }
 
 
-            return base.Hit(material, blockInfo, volumeRemaining, volumePerHit);
+            return base.Hit(material, hitInfo, volumeRemaining, volumePerHit);
+        }
+
+        /// <inheritdoc />
+        public override int Apply(IMaterialDefinition material, IBlockInteraction hitInfo, decimal volumeRemaining)
+        {
+            if (Quantity > 125 && FluidBlock is not null)
+            {
+                BlockInteractionService.CalculatePositionAndRotation(hitInfo, out var facingDirection, out _);
+            }
+
+            return base.Apply(material, hitInfo, volumeRemaining);
         }
     }
 }

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

@@ -1,9 +1,14 @@
 using engenious;
+
 using OctoAwesome.Basics.FunctionBlocks;
 using OctoAwesome.Definitions;
 using OctoAwesome.Definitions.Items;
+using OctoAwesome.Information;
+using OctoAwesome.Location;
 using OctoAwesome.Notifications;
 using OctoAwesome.Rx;
+using OctoAwesome.Services;
+
 using System;
 
 namespace OctoAwesome.Basics.Definitions.Items
@@ -32,11 +37,12 @@ public ChestItem(ChestItemDefinition definition, IMaterialDefinition materialDef
         }
 
         /// <inheritdoc />
-        public override int Hit(IMaterialDefinition material, BlockInfo blockInfo, decimal volumeRemaining, int volumePerHit)
+        public override int Apply(IMaterialDefinition material, IBlockInteraction hitInfo, decimal volumeRemaining)
         {
-            //TODO: Implement Place Chest and remove this item
-            var position = blockInfo.Position;
-            Chest chest = new(new Coordinate(0, new(position.X, position.Y, position.Z + 1), new Vector3(0.5f, 0.5f, 0.5f)));
+            BlockInteractionService.CalculatePositionAndRotation(hitInfo, out var facingDirection, out var rot);
+
+            Chest chest = new(new Coordinate(0, facingDirection, new Vector3(0.5f, 0.5f, 0.5f)), rot);
+
             var notification = new EntityNotification
             {
                 Entity = chest,

OctoAwesome/OctoAwesome.Basics/Definitions/Items/FurnaceItem.cs

@@ -3,8 +3,11 @@
 using OctoAwesome.Basics.FunctionBlocks;
 using OctoAwesome.Definitions;
 using OctoAwesome.Definitions.Items;
+using OctoAwesome.Information;
+using OctoAwesome.Location;
 using OctoAwesome.Notifications;
 using OctoAwesome.Rx;
+using OctoAwesome.Services;
 
 using System;
 
@@ -37,15 +40,15 @@ public FurnaceItem(FurnaceItemDefinition definition, IMaterialDefinition materia
             simulationSource = updateHub.AddSource(simulationRelay, DefaultChannels.Simulation);
         }
 
-        /// <inheritdoc/>
-        public override int Hit(IMaterialDefinition material, BlockInfo blockInfo, decimal volumeRemaining, int volumePerHit)
+        /// <inheritdoc />
+        public override int Apply(IMaterialDefinition material, IBlockInteraction hitInfo, decimal volumeRemaining)
         {
-            //TODO: Implement Place Furnace and remove this item
-            var position = blockInfo.Position;
-            Furnace chest = new(new Coordinate(0, new(position.X, position.Y, position.Z + 1), new Vector3(0.5f, 0.5f, 0.5f)));
+            BlockInteractionService.CalculatePositionAndRotation(hitInfo, out var facingDirection, out var rot);
+
+            Furnace furnace = new(new Coordinate(0, facingDirection, new Vector3(0.5f, 0.5f, 0.5f)), rot);
             var notification = new EntityNotification
             {
-                Entity = chest,
+                Entity = furnace,
                 Type = EntityNotification.ActionType.Add
             };
 

OctoAwesome/OctoAwesome.Basics/Definitions/Items/FurnaceItemDefinition.cs

@@ -11,7 +11,7 @@ public class FurnaceItemDefinition : IItemDefinition
         /// <inheritdoc/>
         public string DisplayName { get; }
         /// <inheritdoc/>
-        public string Icon { get; }                
+        public string Icon { get; }
 
         /// <summary>
         /// Initializes a new instance of the<see cref="FurnaceItemDefinition" /> class