Preserve W3I flags in synthesized headers

Author: Frotty

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java

@@ -107,7 +107,7 @@ public static MapRequest.CompilationResult apply(WurstProjectConfigData projectC
         w3I.write(result.w3i);
 
         // Apply map header (this is cheap, so we always do it)
-        applyMapHeader(projectConfig, targetMap, w3I.getPlayers().size(), w3I.getMapName());
+        applyMapHeader(projectConfig, targetMap, w3I.getPlayers().size(), w3I.getMapName(), w3I.getFlags().toInt());
 
         // Update the manifest with new config hash (must open writable to insert)
         try (MpqEditor mpq = MpqEditorFactory.getEditor(Optional.of(targetMap), false)) {
@@ -357,7 +357,8 @@ private static void setVolatilePlayerConfig(WurstProjectBuildPlayer wplayer, W3I
     }
 
     private static void applyMapHeader(WurstProjectConfigData projectConfig, File targetMap,
-                                       int existingPlayerCount, String existingMapName) throws IOException {
+                                       int existingPlayerCount, String existingMapName,
+                                       int existingMapFlags) throws IOException {
         boolean shouldWrite = false;
         WurstProjectBuildMapData buildMapData = projectConfig.buildMapData();
         if (buildMapData.players().isEmpty() && StringUtils.isBlank(buildMapData.name())) {
@@ -381,6 +382,9 @@ private static void applyMapHeader(WurstProjectConfigData projectConfig, File ta
         if (hasNoMapHeader && StringUtils.isBlank(buildMapData.name())) {
             mapHeader.setMapName(existingMapName);
         }
+        if (hasNoMapHeader) {
+            mapHeader.setFlags(existingMapFlags);
+        }
         if (StringUtils.isNotBlank(buildMapData.name())) {
             mapHeader.setMapName(buildMapData.name());
             shouldWrite = true;

de.peeeq.wurstscript/src/test/java/tests/wurstscript/tests/WurstBuildConfigTests.java

@@ -238,7 +238,7 @@ public void mapHeaderConfigAcceptsAnArchiveWithoutAnHm3wPrefix() throws Exceptio
         Files.write(mapWithoutHeader, original);
 
         Method applyMapHeader = ProjectConfigBuilder.class.getDeclaredMethod(
-            "applyMapHeader", WurstProjectConfigData.class, File.class, int.class, String.class
+            "applyMapHeader", WurstProjectConfigData.class, File.class, int.class, String.class, int.class
         );
         applyMapHeader.setAccessible(true);
 
@@ -253,7 +253,8 @@ public void mapHeaderConfigAcceptsAnArchiveWithoutAnHm3wPrefix() throws Exceptio
             ),
             mapWithoutHeader.toFile(),
             3,
-            "Existing map"
+            "Existing map",
+            0x1234
         );
 
         assertEquals(Files.readAllBytes(mapWithoutHeader)[0], (byte) 'H');
@@ -272,10 +273,10 @@ public void mapHeaderConfigDoesNotReadAnArchiveWhenNothingNeedsChanging() throws
         Files.write(mapWithoutHeader, original);
 
         Method applyMapHeader = ProjectConfigBuilder.class.getDeclaredMethod(
-            "applyMapHeader", WurstProjectConfigData.class, File.class, int.class, String.class
+            "applyMapHeader", WurstProjectConfigData.class, File.class, int.class, String.class, int.class
         );
         applyMapHeader.setAccessible(true);
-        applyMapHeader.invoke(null, WurstProjectConfigData.empty(), mapWithoutHeader.toFile(), 0, null);
+        applyMapHeader.invoke(null, WurstProjectConfigData.empty(), mapWithoutHeader.toFile(), 0, null, 0);
 
         assertEquals(Files.readAllBytes(mapWithoutHeader), original);
     }
@@ -291,7 +292,7 @@ public void mapHeaderConfigPreservesExistingMapNameWhenOnlyPlayersChange() throw
         Files.write(mapWithoutHeader, original);
 
         Method applyMapHeader = ProjectConfigBuilder.class.getDeclaredMethod(
-            "applyMapHeader", WurstProjectConfigData.class, File.class, int.class, String.class
+            "applyMapHeader", WurstProjectConfigData.class, File.class, int.class, String.class, int.class
         );
         applyMapHeader.setAccessible(true);
 
@@ -310,11 +311,13 @@ public void mapHeaderConfigPreservesExistingMapNameWhenOnlyPlayersChange() throw
             ),
             mapWithoutHeader.toFile(),
             4,
-            "Existing map"
+            "Existing map",
+            0x1234
         );
 
         byte[] result = Files.readAllBytes(mapWithoutHeader);
         assertEquals(MapHeader.ofFile(mapWithoutHeader.toFile()).getMaxPlayersCount(), 1);
+        assertEquals(MapHeader.ofFile(mapWithoutHeader.toFile()).getFlags(), 0x1234);
         assertTrue(new String(result, StandardCharsets.UTF_8).contains("Existing map"));
     }