Merge branch 'master' into feat/26.1

Author: wi

.scripts/utils.py

@@ -19,7 +19,7 @@
     "1.18.*": ["1.18.1", "1.18.2", "1.18"],
     "1.19.*": ["1.19", "1.19.2", "1.19.3", "1.19.4"],
     "1.20.*": ["1.20", "1.20.1", "1.20.2", "1.20.3", "1.20.4", "1.20.5", "1.20.6"],
-    "1.21.*": ["1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"],
+    "1.21.*": ["1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11"],
     "26.*": ["26.1"]
 }
 

.scripts/validate.py

@@ -36,6 +36,16 @@
     "docs",
 ]
 
+HOSTING_DOMAIN_BLACKLIST = [
+    # https://apexminecrafthosting.com/
+    "mc.gg",
+    "apexmc.co",
+    # https://lilypad.gg/
+    "smp.fan",
+    "modpack.lol",
+    "minecraft.vodka",
+    "minecraft.horse"
+]
 
 
 
@@ -218,6 +228,7 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
             messages[server_id] = [f"{server_id} is being edited but is in the inactive file!"]
 
     # Looping over each server folder
+    seen_domains = defaultdict(set)
     for root, _, _ in os.walk(args.servers_dir):
         server_id = root.split(os.path.sep)[-1]
         if (
@@ -241,6 +252,8 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
                     primary_domain = get_tld(server.get("primaryAddress", ""), as_object=True, fail_silently=True, fix_protocol=True)
                     if primary_domain is not None and primary_domain.fld not in server["addresses"]:
                         messages[server_id].append(f"The primary address' domain ({primary_domain.fld}) is not in the addresses list. Or the primary address is not a valid domain.")
+                    elif primary_domain is None:
+                        messages[server_id].append(f"The primary address `{server.get('primaryAddress', '')}` is not a valid domain. Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata).")
 
 
                     all_versions = get_all_versions(server["minecraftVersions"])
@@ -254,8 +267,19 @@ def check_metadata(args: argparse.Namespace) -> defaultdict[str, list[str]]:
                             continue
 
                         domain = get_tld(address, as_object=True, fail_silently=True, fix_protocol=True)
+
+                        if domain is not None and domain.fld in HOSTING_DOMAIN_BLACKLIST:
+                            messages[server_id].append(f"The domain {domain.fld} belongs to a hosting provider. You must use a custom domain that you fully own (e.g. myserver.com instead of myserver.hosting.com). Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata#addresses).")
+                        
                         if domain is not None and domain.subdomain:
                             messages[server_id].append(f"{address} does not follow the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata). Please make sure the address is a valid domain, and does not have a subdomain.")
+                        
+                        if domain is not None and domain.fld in seen_domains:
+                            messages[server_id].append(f"The domain {domain.fld} is also present in {', '.join(map(lambda s: f"`{s}`", seen_domains[domain.fld]))}. Please ensure each server has a unique domain(s).")
+                        elif domain is not None:
+                            seen_domains[domain.fld].add(server_id)
+                        else:
+                            messages[server_id].append(f"`{address}` is not a valid domain. Please review the [documentation](https://lunarclient.dev/server-mappings/adding-servers/metadata).")
 
                     if primary_region := server.get("primaryRegion"):
                         if not (regions := server.get("regions")) or primary_region not in regions:

docs/adding-servers/metadata.mdx

@@ -1,3 +1,5 @@
+import { Callout } from "nextra/components";
+
 # Server Metadata
 
 Each server must have a `metadata.json`, this file should follow the schema found in the root of this repository `metadata.schema.json`.
@@ -30,6 +32,11 @@ The `addresses` array in each server object is actually an array of IP suffixes.
 
 The `primaryAddress` in each server object is for users to connect to your server on and is required to be resolvable. This primary address will be used to ensure that the server remains online and active. **This can (and should) include the subdomain for the server**.
 
+<Callout type="warning" emoji="⚠️">
+    Make sure that you own the root domain you want to submit. We do not support domains provided by hosting services (e.g. `myserver.host.com`). You must purchase and configure your own custom domain (e.g. `myserver.com`).
+</Callout>
+
+
 ### Game Types
 
 Game types help identify the style of games that your server will offer to player. The following are games you may include: `PvP`, `PvE`, `HCF`, `Factions`, `Minigames`, `Skyblock`, `Parkour`, `UHC`, `Hardcore`, `Survival`, `Open World`, `Prison`, `Creative`, `Roleplay`, `Adventure`, and `Pixelmon`.

inactive.json

@@ -45,6 +45,7 @@
     "cometmc",
     "corepvp",
     "craftoriya",
+    "crimsonsmp",
     "crystal",
     "crobarus",
     "crove",
@@ -156,7 +157,6 @@
     "vestpvp",
     "vibria",
     "vicnix",
-    "voltagenetwork",
     "vulcanmc",
     "whitepvp",
     "witchythings",
@@ -170,7 +170,6 @@
     "exaltedmc",
     "fademc",
     "firecraft",
-    "floramc",
     "frozedclub",
     "fruitscraft",
     "hcfrevival",
@@ -203,6 +202,7 @@
     "mysticlands",
     "mythicnetwork",
     "nasgar",
+    "naturemc",
     "navybridge",
     "neptunemc",
     "nexopvp",
@@ -261,10 +261,12 @@
     "plasma",
     "evamc",
     "voidmc",
+    "voidpixel",
     "mushroomnet",
     "zeromc",
     "asrbw",
     "nesiummc",
     "xeroxnetwork",
-    "akaris"
+    "akaris",
+    "visualpvp"
 ]

metadata.schema.json

@@ -219,7 +219,6 @@
             "type": "string",
             "pattern": "^(?!.*https?://)(?!.*@).+$"
         },
-
         "MinecraftVersion": {
             "type": "string",
             "enum": [
@@ -262,6 +261,7 @@
                 "1.21.8",
                 "1.21.9",
                 "1.21.10",
+                "1.21.11",
                 "26.1"
             ]
         },
@@ -297,6 +297,7 @@
                 "1.21.8",
                 "1.21.9",
                 "1.21.10",
+                "1.21.11",
                 "26.1"
             ]
         },
@@ -376,4 +377,4 @@
             }
         }
     }
-}
+}

servers/acapsmp/metadata.json

@@ -1,21 +1,21 @@
 {
     "id": "acapsmp",
     "name": "MongolVibes",
-    "website": "https://www.mnvibes.fun",
-    "store": "https://mnvibes.fun/store",
+    "website": "https://www.mnvibes.org",
+    "store": "https://mnvibes.org/#store",
     "description": "MongolVibes is a chill Minecraft server for Mongolian gamers.",
     "addresses": [
-        "mnvibes.fun",
+        "mnvibes.org",
         "mnvibes.mn",
         "mongolvibes.net"
     ],
-    "primaryAddress": "mnvibes.fun",
+    "primaryAddress": "mnvibes.org",
     "primaryColor": "#050053",
     "secondaryColor": "#00f5ff",
     "minecraftVersions": [
         "1.21.*"
     ],
-    "primaryMinecraftVersion": "1.21.5",
+    "primaryMinecraftVersion": "1.21.8",
     "crossplay": true,
     "primaryRegion": "AS",
     "regions": [
@@ -35,9 +35,9 @@
         "discord": "https://discord.com/invite/XKFtYsN7YF"
     },
     "compliance": {
-        "privacyPolicy": "https://www.mnvibes.fun/privacy",
-        "termsOfService": "https://www.mnvibes.fun/terms",
-        "rules": "https://www.mnvibes.fun/rules"
+        "privacyPolicy": "https://www.mnvibes.org/#privacy",
+        "termsOfService": "https://www.mnvibes.org/#terms",
+        "rules": "https://www.mnvibes.org/#rules"
     },
     "presentationVideo": "M_AQ9zDow8c"
-}
+}

servers/akyto/metadata.json

@@ -5,7 +5,6 @@
     "addresses": [
         "akyto.club",
         "akyto.net",
-        "potted.gg",
         "groupezk.fr",
         "pvptemple.it"
     ],

servers/aripvp/background.png

@@ -0,0 +1,31 @@
+{
+    "id": "aripvp",
+    "name": "AriPvP",
+    "website": "https://www.aripvp.cc",
+    "description": "AriPvP, a WarSimulation and Practice server!",
+    "addresses": [
+        "aripvp.cc"
+    ],
+    "primaryAddress": "aripvp.cc",
+    "primaryColor": "#daa520",
+    "secondaryColor": "#FFFF55",
+    "minecraftVersions": [
+        "1.8.*"
+    ],
+    "primaryMinecraftVersion": "1.8.9",
+    "primaryRegion": "EU",
+    "regions": [
+        "EU"
+    ],
+    "primaryLanguage": "nl",
+    "languages": [
+        "nl",
+        "en"
+    ],
+    "gameTypes": [
+        "PvP"
+    ],
+    "socials": {
+        "discord": "https://discord.gg/uC9gN9sHYw"
+    }
+}