Release of Waypoint Extensions 1.4.0

ApacheTech-Inactive-Repos · May 9, 2021 · c5df03c · c5df03c
1 parent 1f210e3
commit c5df03c
Show file tree

Hide file tree

Showing 50 changed files with 1,175 additions and 403 deletions.
diff --git a/...Client/Extensions/ClientApiExtenstions.cs → ....Client/Extensions/ClientApiExtensions.cs b/...Client/Extensions/ClientApiExtenstions.cs → ....Client/Extensions/ClientApiExtensions.cs
@@ -14,7 +14,7 @@
 
 namespace VintageMods.Core.Client.Extensions
 {
-    public static class ClientApiExtenstions
+    public static class ClientApiExtensions
     {
         /// <summary>
         ///     Gets the world seed.
@@ -100,6 +100,29 @@ public static void EnqueueShowChatMessage(this ClientMain game, string message)
             game?.EnqueueMainThreadTask(() => game.ShowChatMessage(message), "");
         }
 
+        public static TBlockEntity GetNearestBlockEntity<TBlockEntity>(this IWorldAccessor world, BlockPos pos, 
+            float horRange, float vertRange, Func<TBlockEntity, bool> predicate) where TBlockEntity : BlockEntity
+        {
+            TBlockEntity blockEntity = null;
+            var minPos = pos.AddCopy(-horRange, -vertRange, -horRange);
+            var maxPos = pos.AddCopy(horRange, vertRange, horRange);
+            world.BlockAccessor.WalkBlocks(minPos, maxPos, (block, blockPos) =>
+            {
+                var entity = world.BlockAccessor.GetBlockEntity(blockPos);
+                if (entity == null) return;
+                if (entity.GetType() == typeof(TBlockEntity) && predicate((TBlockEntity)entity))
+                {
+                    blockEntity = (TBlockEntity)entity;
+                }
+            }, true);
+            return blockEntity;
+        }
+
+        public static TBlockEntity GetNearestBlockEntity<TBlockEntity>(this IWorldAccessor world, BlockPos pos, 
+            float horRange, float vertRange) where TBlockEntity : BlockEntity
+        {
+            return world.GetNearestBlockEntity<TBlockEntity>(pos, horRange, vertRange, block => true);
+        }
 
 
         /// <summary>

diff --git a/VintageMods.Core.FluentChat/Primitives/FluentChatCommandBase.cs b/VintageMods.Core.FluentChat/Primitives/FluentChatCommandBase.cs
@@ -1,17 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using JetBrains.Annotations;
 using VintageMods.Core.Common.Reflection;
 using VintageMods.Core.FluentChat.Exenstions;
 using Vintagestory.API.Common;
 using Vintagestory.Client.NoObf;
 
-// ReSharper disable VirtualMemberNeverOverridden.Global
-// ReSharper disable UnusedParameter.Global
-// ReSharper disable MemberCanBeProtected.Global
-
 namespace VintageMods.Core.FluentChat.Primitives
 {
+    [UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)]
     public abstract class FluentChatCommandBase<TApi> : IDisposable where TApi : ICoreAPI
     {
         protected TApi Api { get; }

diff --git a/VintageMods.Core.FluentChat/VintageMods.Core.FluentChat.csproj b/VintageMods.Core.FluentChat/VintageMods.Core.FluentChat.csproj
@@ -24,6 +24,10 @@
     <None Include="..\.editorconfig" Link=".editorconfig" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\VintageMods.Core.Common\VintageMods.Core.Common.csproj" />
   </ItemGroup>

diff --git a/VintageMods.Core.MemoryAdaptor/VintageMods.Core.MemoryAdaptor.csproj b/VintageMods.Core.MemoryAdaptor/VintageMods.Core.MemoryAdaptor.csproj
@@ -3,14 +3,17 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
-    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="VintageMods.Core.MemoryAdaptor.saproj" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Native.Compiler" Version="2.2.9-rel-29512-01">
       <PrivateAssets>all</PrivateAssets>

diff --git a/VintageMods.Core.MemoryAdaptor/VintageMods.Core.MemoryAdaptor.saproj b/VintageMods.Core.MemoryAdaptor/VintageMods.Core.MemoryAdaptor.saproj
diff --git a/VintageMods.Mods.ChaosMod/Assets/ChaosMod/en.json b/VintageMods.Mods.ChaosMod/Assets/ChaosMod/en.json
diff --git a/VintageMods.Mods.ChaosMod/Assets/_EmbeddedResources/.gitkeep b/VintageMods.Mods.ChaosMod/Assets/_EmbeddedResources/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Blocks/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Blocks/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Creatures/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Creatures/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Effect.cs b/VintageMods.Mods.ChaosMod/Effects/Effect.cs
diff --git a/VintageMods.Mods.ChaosMod/Effects/Items/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Items/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Meta/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Meta/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Misc/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Misc/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Player/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Player/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Shaders/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Shaders/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Time/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Time/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Effects/Weather/.gitkeep b/VintageMods.Mods.ChaosMod/Effects/Weather/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Engine/Api/.gitkeep b/VintageMods.Mods.ChaosMod/Engine/Api/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Engine/Commands/.gitkeep b/VintageMods.Mods.ChaosMod/Engine/Commands/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Engine/Contracts/.gitkeep b/VintageMods.Mods.ChaosMod/Engine/Contracts/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Engine/Controllers/CreatureController.cs b/VintageMods.Mods.ChaosMod/Engine/Controllers/CreatureController.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Controllers/LocationController.cs b/VintageMods.Mods.ChaosMod/Engine/Controllers/LocationController.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Controllers/PhysicsController.cs b/VintageMods.Mods.ChaosMod/Engine/Controllers/PhysicsController.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Controllers/PlayerController.cs b/VintageMods.Mods.ChaosMod/Engine/Controllers/PlayerController.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Controllers/TimeController.cs b/VintageMods.Mods.ChaosMod/Engine/Controllers/TimeController.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Controllers/WeatherController.cs b/VintageMods.Mods.ChaosMod/Engine/Controllers/WeatherController.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Enums/EffectDuration.cs b/VintageMods.Mods.ChaosMod/Engine/Enums/EffectDuration.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Extensions/ApiExtensions.cs b/VintageMods.Mods.ChaosMod/Engine/Extensions/ApiExtensions.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Renderers/.gitkeep b/VintageMods.Mods.ChaosMod/Engine/Renderers/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Engine/Shaders/.gitkeep b/VintageMods.Mods.ChaosMod/Engine/Shaders/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Engine/Spawners/BlockSpawner.cs b/VintageMods.Mods.ChaosMod/Engine/Spawners/BlockSpawner.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Spawners/CreatureSpawner.cs b/VintageMods.Mods.ChaosMod/Engine/Spawners/CreatureSpawner.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Spawners/ItemSpawner.cs b/VintageMods.Mods.ChaosMod/Engine/Spawners/ItemSpawner.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/Systems/ChaosMod.cs b/VintageMods.Mods.ChaosMod/Engine/Systems/ChaosMod.cs
diff --git a/VintageMods.Mods.ChaosMod/Engine/UI/.gitkeep b/VintageMods.Mods.ChaosMod/Engine/UI/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Interop/Discord/.gitkeep b/VintageMods.Mods.ChaosMod/Interop/Discord/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Interop/IFTTT/.gitkeep b/VintageMods.Mods.ChaosMod/Interop/IFTTT/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Interop/Twitch/.gitkeep b/VintageMods.Mods.ChaosMod/Interop/Twitch/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/Interop/YouTube/.gitkeep b/VintageMods.Mods.ChaosMod/Interop/YouTube/.gitkeep
diff --git a/VintageMods.Mods.ChaosMod/README.md b/VintageMods.Mods.ChaosMod/README.md