Minimal changes to make VSHUD work in 1.18-pre.3. Also .NET to v4.8.

.gitignore

@@ -1,3 +1,12 @@
+usefulstuff*.csproj
+usefulstuff*.csproj.user
+usefulstuff*.dll
+usefulstuff*.pdb
+screenshots
+/bin/Debug Normal
+/obj/Debug Normal
+
+
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 

BlockAnimTest/BlockAnimTest.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>BlockAnimTest</RootNamespace>
     <AssemblyName>BlockAnimTest</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

BlockPhysics/StandaloneBlockPhysics.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>StandAloneBlockPhysics</RootNamespace>
     <AssemblyName>BlockPhysics</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

CivMods/CivMods.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CivMods</RootNamespace>
     <AssemblyName>CivMods</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

Collectible Exchange/Collectible Exchange.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Collectible_Exchange</RootNamespace>
     <AssemblyName>Collectible Exchange</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

CustomGLSetter/CustomGLSetter.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CustomGLSetter</RootNamespace>
     <AssemblyName>CustomGLSetter</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <PublishUrl>publish\</PublishUrl>
@@ -27,6 +27,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

CustomGLSetter/app.config

@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
+        <assemblyIdentity name="OpenTK" publicKeyToken="bad199fe84eb3df4" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Open.Nat" publicKeyToken="f22a6a4582336c76" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+        <assemblyIdentity name="Open.Nat" publicKeyToken="f22a6a4582336c76" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
 	  <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <probing privatePath="lib;mods;" />
+      <probing privatePath="lib;mods;"/>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

CustomMeshMod/CustomMeshMod.csproj

@@ -9,11 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CustomMeshMod</RootNamespace>
     <AssemblyName>CustomMeshMod</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

DeepOreBits/DeepOreBits.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeepOreBits</RootNamespace>
     <AssemblyName>DeepOreBits</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

GravelSandFix/GravelSandFix.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>GravelSandFix</RootNamespace>
     <AssemblyName>GravelSandFix</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

HarvestCraftLoader/HarvestCraftLoader.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>HarvestCraftLoader</RootNamespace>
     <AssemblyName>HarvestCraftLoader</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

Instruments/Instruments.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Instruments</RootNamespace>
     <AssemblyName>Instruments</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

ItemSorting/ItemSorting.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>ItemSorting</RootNamespace>
     <AssemblyName>ItemSorting</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

JarLoaderTest/JarLoaderTest.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>JarLoader</RootNamespace>
     <AssemblyName>JarLoader</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

LightingForReshade/LightingForReshade.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LightingForReshade</RootNamespace>
     <AssemblyName>LightingForReshade</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

RandomTests/RandomTests.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>RandomTests</RootNamespace>
     <AssemblyName>RandomTests</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />

ShaderLoader/Shaders.csproj

@@ -6,7 +6,7 @@
     <OutputType>Library</OutputType>
     <NoStandardLibraries>false</NoStandardLibraries>
     <AssemblyName>OthographicShadersLoader</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

SwingingDoorMod/SwingingDoorMod.csproj

@@ -9,11 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SwingingDoorMod</RootNamespace>
     <AssemblyName>SwingingDoorMod</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

VSHUD/Commands/CommandPlacementPreview.cs

@@ -1,10 +1,43 @@
 using Vintagestory.API.Client;
+using Vintagestory.API.Common;
+using Vintagestory.API.Common.CommandAbbr;
 using Vintagestory.API.MathTools;
 
 namespace VSHUD
 {
     public class CommandPlacementPreview : VSHUDCommand
     {
+
+        protected void RegisterCommands(ICoreClientAPI capi)
+        {
+            var parsers = capi.ChatCommands.Parsers;
+
+            capi.ChatCommands
+                .GetOrCreate("pconfig")
+                .IgnoreAdditionalArgs()
+                .WithDesc("Configure placement preview.")
+                .HandleWith(_ => TextCommandResult.Error("Specify subcommand."))
+                .BeginSub("show")
+                    .WithDesc("Switches placement preview on/off")
+                    .WithArgs(parsers.OptionalBool("on/off"))
+                    .HandleWith(TogglePlacementPreview)
+                .EndSub()
+                .BeginSub("tint")
+                    .WithDesc("Switches tinting placement preview meshes on/off")
+                    .WithArgs(parsers.OptionalBool("on/off"))
+                    .HandleWith(TogglePlacementPreviewTint)
+                .EndSub();
+        }
+        private TextCommandResult TogglePlacementPreview(TextCommandCallingArgs args)
+        {
+            Config.PRShow = (args.Parsers[0].IsMissing) ? !Config.PRShow : (bool)args[0];
+            return TextCommandResult.Success($"Block placement preview set to {Config.PRShow}.");
+        }
+        private TextCommandResult TogglePlacementPreviewTint(TextCommandCallingArgs args)
+        {
+            Config.PRTint = (args.Parsers[0].IsMissing) ? !Config.PRTint : (bool)args[0];
+            return TextCommandResult.Success($"Block placement preview set to {Config.PRTint}.");
+        }
         public CommandPlacementPreview(ICoreClientAPI capi) : base(capi)
         {
             Command = "pconfig";

VSHUD/Renderer/PlacementRenderer.cs

@@ -24,7 +24,7 @@ class PlacementRenderer : IRenderer
         VSHUDConfig config { get => capi.ModLoader.GetModSystem<WaypointUtils>().Config; }
         ShapeTesselatorManager tesselatormanager { get => capi.TesselatorManager as ShapeTesselatorManager; }
         bool shouldDispose = true;
-        
+
         List<Type> NonCulledTypes { get; set; }
         List<Type> IgnoredTypes { get; set; }
         List<Type> SneakPlacedTypes { get; set; }
@@ -66,7 +66,7 @@ public PlacementRenderer(ICoreClientAPI capi)
             };
         }
 
-        public Block GetInvBlock() 
+        public Block GetInvBlock()
         {
             Block block = invStack?.Block;
             if (block == null && invItem != null)
@@ -108,7 +108,7 @@ public void UpdateBlockMesh(Block toBlock, BlockPos altPos)
             }
             else if (toBlock is BlockChisel)
             {
-                mRef = capi.ModLoader.GetModSystem<ChiselBlockModelCache>().GetOrCreateMeshRef(invStack);
+                mRef = capi.ModLoader.GetModSystem<MicroBlockModelCache>().GetOrCreateMeshRef(invStack);
                 shouldDispose = false;
                 return;
             }
@@ -133,7 +133,7 @@ public void UpdateBlockMesh(Block toBlock, BlockPos altPos)
                 mesh.CompactBuffers();
             }
             else
-            { 
+            {
                 mesh = lod1;
                 mesh.IndicesMax = mesh.Indices.Count();
                 if (lod0 != null)
@@ -157,7 +157,7 @@ public void UpdateBlockMesh(Block toBlock, BlockPos altPos)
             if (mRef != null && shouldDispose) mRef.Dispose();
             shouldDispose = true;
             MeshData rotMesh = mesh.Clone().Rotate(new Vec3f(0.5f, 0.5f, 0.5f), 0, toBlock.GetRotY(playerPos, playerSelection), 0);
-            
+
             mRef = rpi.UploadMesh(rotMesh);
         }
 
@@ -200,12 +200,12 @@ public void OnRenderFrame(float deltaTime, EnumRenderStage stage)
 
             toBlock = capi.World.BlockAccessor.GetBlock(SetBlockRedirectMaster.blockId);
             if (toBlock == null || toBlock.Id == 0) return;
-            
+
             BlockPos adjPos = selClone.Position;
 
             UpdateBlockMesh(toBlock, adjPos);
             if (mRef == null) return;
-            
+
             if (!capi.World.BlockAccessor.GetBlock(adjPos).IsReplacableBy(invBlock)) return;
             rpi.GlToggleBlend(true);
 
@@ -214,14 +214,15 @@ public void OnRenderFrame(float deltaTime, EnumRenderStage stage)
             Vec2f offset = adjPos.GetOffset(toBlock);
 
             IStandardShaderProgram prog = rpi.PreparedStandardShader(adjPos.X, adjPos.Y, adjPos.Z);
-            prog.Tex2D = capi.BlockTextureAtlas.AtlasTextureIds[0];
+            //prog.Tex2D = capi.BlockTextureAtlas.AtlasTextureIds[0]; capi.BlockTextureAtlas.AtlasTextures[0]
+            prog.Tex2D = capi.BlockTextureAtlas.AtlasTextures[0].TextureId;
 
             prog.ModelMatrix = ModelMat
                 .Identity()
                 .Translate(adjPos.X - camPos.X, adjPos.Y - camPos.Y, adjPos.Z - camPos.Z)
                 .Translate(offset.X, 0, offset.Y)
                 .Values;
-            
+
             prog.ViewMatrix = rpi.CameraMatrixOriginf;
             prog.ProjectionMatrix = rpi.CurrentProjectionMatrix;
             Vec4f col = new Vec4f(1.0f, 1.0f, 1.0f, config.PROpacity);
@@ -230,7 +231,7 @@ public void OnRenderFrame(float deltaTime, EnumRenderStage stage)
             {
                 col.Add(new Vec4f(config.PRTintColor[0], config.PRTintColor[1], config.PRTintColor[2], 0.0f));
             }
-            
+
             prog.SsaoAttn = 0;
             prog.AlphaTest = 0.05f;
             prog.RgbaTint = new Vec4f(col.R, col.G, col.B, config.PROpacity);

VSHUD/Systems/Patches/ChunkPartGrabber.cs

@@ -31,7 +31,7 @@ public override void StartClientSide(ICoreClientAPI api)
 
                 for (int i = 0; i < mgr.Atlasses.Count; i++)
                 {
-                    mgr.Atlasses[i].Export(Path.Combine(path, "blockAtlas-" + i), game, mgr.AtlasTextureIds[i]);
+                    mgr.Atlasses[i].Export(Path.Combine(path, "blockAtlas-" + i), game, mgr.AtlasTextures[i].TextureId);
                 }
 
                 fileExport = api.VSHUD().fileExport;
@@ -61,7 +61,7 @@ public static void PushToStack(MeshData mesh, int chunkX, int chunkY, int chunkZ
 
             grabber.fileExport.Push(new ExportableChunkPart(mesh, filePath, fileName, id));
         }
-        
+
         public static void Postfix(ChunkTesselator __instance, int chunkX, int chunkY, int chunkZ, TesselatedChunk tessChunk)
         {
             if (!Process) return;