Merge pull request #29 from FabianTerhorst/dev

Merge beta in stable

Author: FabianTerhorst

Doc.Dockerfile

@@ -0,0 +1,17 @@
+FROM mono:latest
+
+ENV DOCFX_VER 2.43.2
+
+RUN apt-get update && apt-get install unzip wget git -y && \
+    wget -q -P /tmp https://github.com/dotnet/docfx/releases/download/v${DOCFX_VER}/docfx.zip && \
+    mkdir -p /opt/docfx && \
+    unzip /tmp/docfx.zip -d /opt/docfx && \
+    echo '#!/bin/bash\nmono /opt/docfx/docfx.exe $@' > /usr/bin/docfx && \
+    chmod +x /usr/bin/docfx && \
+    rm -f /tmp/*
+
+WORKDIR /docs
+
+COPY api/ .
+
+CMD ["docfx", "-h"]

api/AltV.Net.Async/AltV.Net.Async.csproj

@@ -12,16 +12,9 @@
         <RepositoryUrl>https://github.com/altmp-csharp/docs</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
         <PackageTags>altv gta bridge</PackageTags>
-        <PackageVersion>1.8.1</PackageVersion>
+        <PackageVersion>1.10.0-beta</PackageVersion>
         <PackageLicenseFile>license.txt</PackageLicenseFile>
-        <PackageReleaseNotes>Add Alt.CreateColShapeCylinder(Position pos, float radius, float height);
-Add Alt.CreateColShapeSphere(Position pos, float radius);
-Add Alt.CreateColShapeCircle(Position pos, float radius);
-Add Alt.CreateColShapeCube(Position pos, Position pos2);
-Add Alt.CreateColShapeRectangle(Position pos, Position pos2);
-Add Alt.OnColShape += (shape, entity, state) { }
-Add Alt.GetAllColShapes();
-Add AltAsync.OnColShape += (shape, entity, state) { }</PackageReleaseNotes>
+        <PackageReleaseNotes>Update dependencies</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>

api/AltV.Net.Async/ChannelTickScheduler.cs

@@ -36,7 +36,7 @@ protected override bool TryExecuteTaskInline(Task task, bool taskWasPreviouslyQu
 
         public override void Tick()
         {
-            if (reader.TryRead(out currentTask))
+            while (reader.TryRead(out currentTask))
             {
                 TryExecuteTask(currentTask);
             }

api/AltV.Net.Async/DefaultTickSchedulerFactory.cs

@@ -6,7 +6,7 @@ public class DefaultTickSchedulerFactory : ITickSchedulerFactory
     {
         public TickScheduler Create(Thread mainThread)
         {
-            return new ChannelTickScheduler(mainThread);
+            return new QueueTickScheduler(mainThread);
         }
     }
 }

api/AltV.Net.ColShape.Tests/MockPlayer.cs

@@ -10,6 +10,39 @@ public class MockPlayer : IPlayer
         public IntPtr NativePointer { get; }
         public bool Exists { get; }
         public BaseObjectType Type { get; }
+        public ushort MaxHealth { get; set; }
+        public ushort MaxArmor { get; set; }
+        public uint CurrentWeapon { get; set; }
+        public IEntity EntityAimingAt { get; }
+        public Position EntityAimOffset { get; }
+        public bool IsFlashlightActive { get; }
+        public string Ip { get; }
+        
+        public void AddWeaponComponent(uint weapon, uint weaponComponent)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RemoveWeaponComponent(uint weapon, uint weaponComponent)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void GetCurrentWeaponComponents(out uint[] weaponComponents)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void SetWeaponTintIndex(uint weapon, byte tintIndex)
+        {
+            throw new NotImplementedException();
+        }
+
+        public byte GetCurrentWeaponTintIndex()
+        {
+            throw new NotImplementedException();
+        }
+
         public void SetMetaData(string key, object value)
         {
             throw new NotImplementedException();
@@ -95,6 +128,11 @@ public void GetSyncedMetaData(string key, ref MValue value)
         public IVehicle Vehicle { get; }
         public byte Seat { get; }
         public uint Ping { get; }
+        public ulong SocialClubId { get; }
+        public ulong HardwareIdHash { get; }
+        public ulong HardwareIdExHash { get; }
+        public string AuthToken { get; }
+
         public void Spawn(Position position, uint delayMs = 0)
         {
             throw new NotImplementedException();

api/AltV.Net.ColShape/AltV.Net.ColShape.csproj

@@ -10,7 +10,7 @@
         <PackageProjectUrl>https://github.com/fabianterhorst/coreclr-module</PackageProjectUrl>
         <RepositoryUrl>https://github.com/fabianterhorst/coreclr-module</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <PackageVersion>1.1.1-dev-preview</PackageVersion>
+        <PackageVersion>1.2.0-dev-preview</PackageVersion>
         <PackageLicenseFile>license.txt</PackageLicenseFile>
         <PackageReleaseNotes>update dependencies</PackageReleaseNotes>
     </PropertyGroup>

api/AltV.Net.ColShape/ColShapeModule.cs

@@ -264,7 +264,7 @@ public void Add(IColShape colShape)
                     {
                         var length = colShapeAreas[i][j].Length;
                         Array.Resize(ref colShapeAreas[i][j], length + 1);
-                        colShapeAreas[i][j][length] = colShape;
+                        colShapeAreas[j][i][length] = colShape;
                     }
                 }
             }

api/AltV.Net.Example/ChildConvertibleObject.cs

@@ -33,7 +33,7 @@ public void ToMValue(ChildConvertibleObject value, IMValueWriter writer)
             {
                 writer.BeginObject();
                 writer.Name("test");
-                writer.Value(value.test);
+                writer.Value(value.Test);
                 writer.EndObject();
             }
 
@@ -53,16 +53,16 @@ public void ToMValue(object obj, IMValueWriter writer)
 
         public static readonly IMValueAdapter<ChildConvertibleObject> Adapter = new ChildConvertibleObjectAdapter();
 
-        private readonly string test;
+        public readonly string Test;
 
         public ChildConvertibleObject()
         {
-            test = "123";
+            Test = "123";
         }
 
         private ChildConvertibleObject(string test)
         {
-            this.test = test;
+            this.Test = test;
         }
 
         public IMValueBaseAdapter GetAdapter()

api/AltV.Net.Example/ConvertibleObject.cs

@@ -5,7 +5,7 @@ namespace AltV.Net.Example
 {
     public class ConvertibleObject : IMValueConvertible
     {
-        private class ConvertibleObjectAdapter : IMValueAdapter<ConvertibleObject>
+        public class ConvertibleObjectAdapter : IMValueAdapter<ConvertibleObject>
         {
             private readonly IMValueAdapter<List<ChildConvertibleObject>> listAdapter;
 
@@ -43,9 +43,9 @@ public void ToMValue(ConvertibleObject value, IMValueWriter writer)
             {
                 writer.BeginObject();
                 writer.Name("test");
-                writer.Value(value.test);
+                writer.Value(value.Test);
                 writer.Name("list");
-                listAdapter.ToMValue(value.list, writer);
+                listAdapter.ToMValue(value.List, writer);
                 writer.EndObject();
             }
 
@@ -65,23 +65,23 @@ public void ToMValue(object obj, IMValueWriter writer)
 
         private static readonly IMValueBaseAdapter MyAdapter = new ConvertibleObjectAdapter();
 
-        private readonly string test;
+        public readonly string Test;
 
-        private readonly List<ChildConvertibleObject> list;
+        public readonly List<ChildConvertibleObject> List;
 
         public ConvertibleObject()
         {
-            test = "123";
-            list = new List<ChildConvertibleObject>();
-            list.Add(new ChildConvertibleObject());
-            list.Add(new ChildConvertibleObject());
-            list.Add(new ChildConvertibleObject());
+            Test = "123";
+            List = new List<ChildConvertibleObject>
+            {
+                new ChildConvertibleObject(), new ChildConvertibleObject(), new ChildConvertibleObject()
+            };
         }
 
         private ConvertibleObject(string test, List<ChildConvertibleObject> list)
         {
-            this.test = test;
-            this.list = list;
+            this.Test = test;
+            this.List = list;
         }
 
         public IMValueBaseAdapter GetAdapter()

api/AltV.Net.Example/SampleResource.cs

@@ -207,6 +207,19 @@ async delegate(string s, string s1, long i1, string[] arg3, object[] arg4, IMyVe
 
             Alt.Export("GetBla", () => { Alt.Log("GetBla called"); });
 
+            Action action;
+
+            Alt.Import("example", "GetBla", out action);
+
+            action();
+
+            Alt.Export("functionExport", delegate(string name) { Alt.Log("called with:" + name); });
+
+            Action<string> action2;
+
+            Alt.Import("example", "functionExport", out action2);
+
+            action2("123");
             /*if (Alt.Import("Bla", "GetBla", out Action value))
             {
                 value();