Merge branch 'main' of https://github.com/hrmorley34/papyruscs

Author: PiSaucer

.github/workflows/publish.yml

@@ -1,12 +1,6 @@
 name: Publish
 
-# on: [push, pull_request]
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 env:
   DOTNET_VERSION: "3.1.x" # The .NET SDK version to use

MapLoader.NUnitTests/OtherTests.cs

@@ -166,12 +166,11 @@ public void BenchmarkRender()
             {
                 var dut = new Maploader.World.World();
                 dut.Open(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "benchmark", "world", "db"));
-                int chunkRadius = 1;
-                int centerOffsetX = 1; //65;
-                int centerOffsetZ = 1; //65;
+                int XMin = -1, XMax = 3;
+                int ZMin = -1, ZMax = 4;
                 string filename = "benchmark.png";
 
-                RenderMap(chunkRadius, dut, centerOffsetX, centerOffsetZ, filename);
+                RenderMap(dut, filename, XMin, XMax, ZMin, ZMax);
             }
 
             private static void RenderMap(int chunkRadius, Maploader.World.World dut, int centerOffsetX,
@@ -180,6 +179,12 @@ private static void RenderMap(int chunkRadius, Maploader.World.World dut, int ce
                 int XMin = centerOffsetX - chunkRadius, XMax = centerOffsetX + chunkRadius;
                 int ZMin = centerOffsetZ - chunkRadius, ZMax = centerOffsetZ + chunkRadius;
 
+                RenderMap(dut, filename, XMin, XMax, ZMin, ZMax);
+            }
+
+            private static void RenderMap(Maploader.World.World dut, string filename,
+            int XMin, int XMax, int ZMin, int ZMax)
+            {
                 var json = File.ReadAllText(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"textures",
                     "terrain_texture.json"));
                 var ts = new TerrainTextureJsonParser(json, "");
@@ -189,7 +194,7 @@ private static void RenderMap(int chunkRadius, Maploader.World.World dut, int ce
                     Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "textures"), g);
                 finder.Debug = false;
 
-                var b = g.CreateEmptyImage(16 * 16 * (2 * chunkRadius + 1), 16 * 16 * (2 * chunkRadius + 1));
+                var b = g.CreateEmptyImage(16 * 16 * (XMax - XMin + 1), 16 * 16 * (ZMax - ZMin + 1));
 
                 var render = new ChunkRenderer<Bitmap>(finder, g, new RenderSettings() { YMax = 40 });
 
@@ -205,9 +210,9 @@ private static void RenderMap(int chunkRadius, Maploader.World.World dut, int ce
                     var c = dut.GetChunk(chunkData.X, chunkData.Z, chunkData);
                     if (c != null)
                     {
-                        int dx = chunkData.X - centerOffsetX;
-                        int dz = chunkData.Z - centerOffsetZ;
-                        render.RenderChunk(b, c, (chunkRadius + dx) * 256, (chunkRadius + dz) * 256);
+                        int dx = chunkData.X - XMin;
+                        int dz = chunkData.Z - ZMin;
+                        render.RenderChunk(b, c, dx * 256, dz * 256);
                     }
                 }
 

MapLoader.NUnitTests/textures/terrain_texture.json

@@ -1665,7 +1665,7 @@
          "textures" : "textures/blocks/mangrove_roots_top"
       },
       "mangrove_sign" : {
-         "textures" : "textures/entity/mangrove_sign"
+         "textures" : "textures/blocks/mangrove_planks"
       },
       "mangrove_trapdoor" : {
          "textures" : "textures/blocks/mangrove_trapdoor"

PapyrusCs/PapyrusCs.csproj

@@ -5,9 +5,9 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Authors>Markus Jungnickel</Authors>
     <Company />
-    <AssemblyVersion>0.5.0.0</AssemblyVersion>
+    <AssemblyVersion>0.5.2.0</AssemblyVersion>
     <FileVersion>0.5.0.0</FileVersion>
-    <Version>0.5.0</Version>
+    <Version>0.5.2</Version>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/mjungnickel18</PackageProjectUrl>
   </PropertyGroup>

PapyrusCs/Properties/launchSettings.json

@@ -2,7 +2,6 @@
   "profiles": {
     "PapyrusCs": {
       "commandName": "Project",
-      "commandLineArgs": "-w \"C:\\papyruscs\\world_bedrock_04082019\" -o \"C:\\papyrus\\mergetest3\" chunksperdimension 2 -f png --dim 0 --htmlfile index.html  --threads 1 --maxqueue 1",
       "workingDirectory": "c:\\temp"
     }
   }

PapyrusCs/map.thtml

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
     <link
       rel="stylesheet"
       href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css"
@@ -45,9 +47,10 @@
       }
     </style>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Map</title>
   </head>
 
-  <body margin="0" padding="0">
+  <body>
     <script src="https://openlayers.org/en/v6.1.1/build/ol.js"></script>
     <script
       src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

PapyrusCs/textures/terrain_texture.json

@@ -1665,7 +1665,7 @@
          "textures" : "textures/blocks/mangrove_roots_top"
       },
       "mangrove_sign" : {
-         "textures" : "textures/entity/mangrove_sign"
+         "textures" : "textures/blocks/mangrove_planks"
       },
       "mangrove_trapdoor" : {
          "textures" : "textures/blocks/mangrove_trapdoor"

readme.md

@@ -1,6 +1,5 @@
 Chat: [![Discord](https://img.shields.io/discord/569841820092203011.svg?logo=discord&logoColor=white)](https://discord.gg/J2sBaXa) <br>
-Windows: [![Build status](https://ci.appveyor.com/api/projects/status/tfspbbi72bx73qg8?svg=true)](https://ci.appveyor.com/project/mjungnickel18/papyruscs) <br>
-Linux: [![Build status](https://ci.appveyor.com/api/projects/status/xo9ew31l49hayjcm?svg=true)](https://ci.appveyor.com/project/mjungnickel18/papyruscs-ytqjm) <br>
+Build: [![GitHub Workflow Status](https://img.shields.io/github/workflow/status/hrmorley34/papyruscs/publish?logo=github)](https://github.com/hrmorley34/papyruscs/actions/workflows/publish.yml?query=branch%3Amain) <br>
 
 # Papyrus