refactor: allow-deny lists refactor also allows for backwards compati…

…bility

Code strucutre is different in SelectGameScreen and ServerConnectListManager
due to compiling error otherwise.
We check if path exist then we set the value if it does,
otherwise it applies "previous" behaviour (meaning in case if even blacklist or whitelist)
do not exist it sets the file to null.

So no different behaviour is to be expected.

.gitignore

@@ -94,9 +94,11 @@ config/metrics/
 API_file.txt
 New_API_file.txt
 
-# Ignore Allowlist and Denylist files
+# Ignore Allowlist and Denylist files (Whitelist and Blacklist are old filenames)
 allowlist.json
 denylist.json
+whitelist.json
+blacklist.json
 
 # Profiling related
 terasology.jfr

docs/Modding-API.md

@@ -1,7 +1,7 @@
 Modding API
 =================
 
-Terasology's engine uses allowlisting approach to expose an API for modules using two primary methods and a rarely needed third one:
+Terasology's engine uses an allowlisting approach to expose an API for modules using two primary methods and a rarely needed third one:
 
 * Classes or packages marked with the `@API` annotation
 * Classes or packages in the basic allowlist defined in `ExternalApiAllowlist.java`

engine/src/main/java/org/terasology/engine/network/internal/ServerConnectListManager.java

@@ -34,8 +34,20 @@ public class ServerConnectListManager {
     private final Path allowlistPath;
 
     public ServerConnectListManager(Context context) {
-        denylistPath = PathManager.getInstance().getHomePath().resolve("denylist.json");
-        allowlistPath = PathManager.getInstance().getHomePath().resolve("allowlist.json");
+        // although this seems redundant, compiler wouldn't accept assigning then checking
+        if (Files.exists(PathManager.getInstance().getHomePath().resolve("denylist.json"))) {
+            denylistPath = PathManager.getInstance().getHomePath().resolve("denylist.json");
+        }
+        else {
+            denylistPath = PathManager.getInstance().getHomePath().resolve("blacklist.json");
+        }
+        // although this seems redundant, compiler wouldn't accept assigning then checking
+        if (Files.exists(PathManager.getInstance().getHomePath().resolve("allowlist.json"))) {
+            allowlistPath = PathManager.getInstance().getHomePath().resolve("allowlist.json");
+        }
+        else {
+            allowlistPath = PathManager.getInstance().getHomePath().resolve("whitelist.json");
+        }
         this.context = context;
         loadLists();
     }

engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/SelectGameScreen.java

@@ -151,6 +151,13 @@ private void loadGame(GameInfo item) {
         if (isLoadingAsServer()) {
             Path denylistPath = PathManager.getInstance().getHomePath().resolve("denylist.json");
             Path allowlistPath = PathManager.getInstance().getHomePath().resolve("allowlist.json");
+            if (!Files.exists(denylistPath)) {
+                denylistPath = PathManager.getInstance().getHomePath().resolve("blacklist.json");
+            }
+
+            if (!Files.exists(allowlistPath)) {
+                allowlistPath = PathManager.getInstance().getHomePath().resolve("whitelist.json");
+            }
             if (!Files.exists(denylistPath)) {
                 try {
                     Files.createFile(denylistPath);