[#61] retain block order in config (#69)

Imprex-Development · Nov 3, 2020 · 09c9cc7 · 09c9cc7
1 parent 88db4ae
commit 09c9cc7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...ator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java b/...ator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorProximityConfig.java
@@ -1,7 +1,7 @@
 package net.imprex.orebfuscator.config;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -23,9 +23,9 @@ public class OrebfuscatorProximityConfig implements ProximityConfig {
 	private int distanceSquared;
 	private boolean useFastGazeCheck;
 
-	private Map<Material, Short> hiddenBlocks = new HashMap<>();
+	private Map<Material, Short> hiddenBlocks = new LinkedHashMap<>();
 
-	private Map<Material, Integer> randomBlocks = new HashMap<>();
+	private Map<Material, Integer> randomBlocks = new LinkedHashMap<>();
 	private final List<Integer> randomBlockIds = new ArrayList<>();
 	private WeightedRandom<Integer> randomMaterials = new WeightedRandom<>();
 

diff --git a/...fuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorWorldConfig.java b/...fuscator-plugin/src/main/java/net/imprex/orebfuscator/config/OrebfuscatorWorldConfig.java
@@ -1,8 +1,8 @@
 package net.imprex.orebfuscator.config;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -20,9 +20,9 @@ public class OrebfuscatorWorldConfig implements WorldConfig {
 
 	private boolean enabled;
 	private final List<String> worlds = new ArrayList<>();
-	private final Set<Material> hiddenBlocks = new HashSet<>();
+	private final Set<Material> hiddenBlocks = new LinkedHashSet<>();
 
-	private final Map<Material, Integer> randomBlocks = new HashMap<>();
+	private final Map<Material, Integer> randomBlocks = new LinkedHashMap<>();
 	private final List<Integer> randomBlockIds = new ArrayList<>();
 	private final WeightedRandom<Integer> randomMaterials = new WeightedRandom<>();