Fix plurality

FAForever · Jun 19, 2024 · 5ac5b71 · 5ac5b71
1 parent c97ee72
commit 5ac5b71
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 24 deletions.
diff --git a/src/main/java/com/faforever/client/game/GenerateMapController.java b/src/main/java/com/faforever/client/game/GenerateMapController.java
@@ -260,10 +260,10 @@ private void initCustomStyleOptions() {
     generatorPrefs.reclaimDensityMaxProperty().bind(reclaimDensitySlider.highValueProperty());
     reclaimDensitySlider.setLowValue(generatorPrefs.getReclaimDensityMin());
     generatorPrefs.reclaimDensityMinProperty().bind(reclaimDensitySlider.lowValueProperty());
-    resourcesDensitySlider.setHighValue(generatorPrefs.getResourcesDensityMax());
-    generatorPrefs.resourcesDensityMaxProperty().bind(resourcesDensitySlider.highValueProperty());
-    resourcesDensitySlider.setLowValue(generatorPrefs.getResourcesDensityMin());
-    generatorPrefs.resourcesDensityMinProperty().bind(resourcesDensitySlider.lowValueProperty());
+    resourcesDensitySlider.setHighValue(generatorPrefs.getResourceDensityMax());
+    generatorPrefs.resourceDensityMaxProperty().bind(resourcesDensitySlider.highValueProperty());
+    resourcesDensitySlider.setLowValue(generatorPrefs.getResourceDensityMin());
+    generatorPrefs.resourceDensityMinProperty().bind(resourcesDensitySlider.lowValueProperty());
   }
 
   private void initSeedField() {

diff --git a/src/main/java/com/faforever/client/map/generator/GeneratorOptions.java b/src/main/java/com/faforever/client/map/generator/GeneratorOptions.java
@@ -13,7 +13,6 @@ public record GeneratorOptions(
     String style,
     String terrainStyle,
     String textureStyle,
-    String resourceStyle,
-    String propStyle, Float reclaimDensity, Float resourceDensity,
+    String resourceStyle, String propStyle, Float reclaimDensity, Float resourceDensity,
     String commandLineArgs
 ) {}
diff --git a/src/main/java/com/faforever/client/preferences/GeneratorPrefs.java b/src/main/java/com/faforever/client/preferences/GeneratorPrefs.java
@@ -30,8 +30,8 @@ public class GeneratorPrefs {
   private final StringProperty propStyle = new SimpleStringProperty("");
   private final IntegerProperty reclaimDensityMin = new SimpleIntegerProperty(0);
   private final IntegerProperty reclaimDensityMax = new SimpleIntegerProperty(127);
-  private final IntegerProperty resourcesDensityMin = new SimpleIntegerProperty(0);
-  private final IntegerProperty resourcesDensityMax = new SimpleIntegerProperty(127);
+  private final IntegerProperty resourceDensityMin = new SimpleIntegerProperty(0);
+  private final IntegerProperty resourceDensityMax = new SimpleIntegerProperty(127);
 
   public GenerationType getGenerationType() {
     return generationType.get();
@@ -233,27 +233,27 @@ public void setReclaimDensityMax(int max) {
     this.reclaimDensityMax.set(max);
   }
 
-  public int getResourcesDensityMin() {
-    return resourcesDensityMin.get();
+  public int getResourceDensityMin() {
+    return resourceDensityMin.get();
   }
 
-  public IntegerProperty resourcesDensityMinProperty() {
-    return resourcesDensityMin;
+  public IntegerProperty resourceDensityMinProperty() {
+    return resourceDensityMin;
   }
 
-  public void setResourcesDensityMin(int min) {
-    this.resourcesDensityMin.set(min);
+  public void setResourceDensityMin(int min) {
+    this.resourceDensityMin.set(min);
   }
 
-  public int getResourcesDensityMax() {
-    return resourcesDensityMax.get();
+  public int getResourceDensityMax() {
+    return resourceDensityMax.get();
   }
 
-  public IntegerProperty resourcesDensityMaxProperty() {
-    return resourcesDensityMax;
+  public IntegerProperty resourceDensityMaxProperty() {
+    return resourceDensityMax;
   }
 
-  public void setResourcesDensityMax(int max) {
-    this.resourcesDensityMax.set(max);
+  public void setResourceDensityMax(int max) {
+    this.resourceDensityMax.set(max);
   }
 }
diff --git a/src/test/java/com/faforever/client/game/GenerateMapControllerTest.java b/src/test/java/com/faforever/client/game/GenerateMapControllerTest.java
@@ -62,8 +62,8 @@ public void unbindProperties() {
     generatorPrefs.commandLineArgsProperty().unbind();
     generatorPrefs.reclaimDensityMinProperty().unbind();
     generatorPrefs.reclaimDensityMaxProperty().unbind();
-    generatorPrefs.resourcesDensityMinProperty().unbind();
-    generatorPrefs.resourcesDensityMaxProperty().unbind();
+    generatorPrefs.resourceDensityMinProperty().unbind();
+    generatorPrefs.resourceDensityMaxProperty().unbind();
   }
 
   @BeforeEach
@@ -453,8 +453,8 @@ public void testGetGenerateMapNoNameCustomStyle() {
     generatorPrefs.setNumTeams(2);
     generatorPrefs.setMapSizeInKm(10.0);
     generatorPrefs.setGenerationType(GenerationType.CASUAL);
-    generatorPrefs.setResourcesDensityMin(5);
-    generatorPrefs.setResourcesDensityMax(5);
+    generatorPrefs.setResourceDensityMin(5);
+    generatorPrefs.setResourceDensityMax(5);
     generatorPrefs.setReclaimDensityMin(10);
     generatorPrefs.setReclaimDensityMax(10);