Merge branch 'LabyMod:master' into master

.github/actions/validate-manifest/validate.py

@@ -49,6 +49,12 @@ def main():
         if server_directory != data['server_name']:
             comment += '**Servername has to be directory name!**\n'
 
+        # Validate wildcards
+        if 'server_wildcards' in data:
+            for wildcard in data['server_wildcards']:
+                if not wildcard.startswith('%.'):
+                    comment += '- Invalid wildcard entry. Each entry must start with **%.**. Further information here: https://en.wikipedia.org/wiki/Wildcard_DNS_record (`server_wildcards`)\n'
+
         # Check for https
         if 'social' in data:
             social = data['social']

minecraft_servers/adventuresmp/manifest.json

@@ -6,6 +6,8 @@
         "de"
     ],
     "social": {
+        "web_shop": "https://store.adventuresmp.de",
+        "tiktok": "adventuresmp.de",
         "discord": "https://discord.gg/E7EWKugWXR"
     },
     "gamemodes": {

minecraft_servers/akratis/manifest.json

@@ -0,0 +1,24 @@
+{
+  "server_name": "akratis",
+  "nice_name": "Akratis",
+  "direct_ip": "Akratis.de",
+  "server_wildcards": [
+    "%.akratis.de"
+  ],
+  "supported_languages": [
+    "de"
+  ],
+  "social": {
+    "web": "https://akratis.de",
+    "discord": "https://discord.gg/mjfpcV3g9M"
+  },
+  "discord": {
+    "server_id": 1275921226396602378,
+    "rename_to_minecraft_name": false
+  },
+  "location": {
+    "city": "Nordhorn",
+    "country": "Germany",
+    "country_code": "DE"
+  }
+}

minecraft_servers/anturnia/manifest.json

@@ -11,62 +11,34 @@
   ],
   "social": {
     "web": "https://anturnia.net",
-    "twitter": "Anturnia",
+    "twitter": "anturnia",
     "discord": "https://discord.gg/gYsf49MzwH",
     "tiktok": "anturnia",
     "youtube": "https://www.youtube.com/@anturnia"
   },
   "gamemodes": {
+    "smp": {
+      "name": "SMP",
+      "color": "#00aa00",
+      "versions": "1.21<*"
+    },
     "oneblock": {
       "name": "OneBlock",
-      "command": "/oneblock",
       "color": "#00aa00",
       "versions": "1.18<*"
-    },
-    "duels": {
-      "name": "Duels",
-      "command": "/duel",
-      "color": "#00aa00",
-      "versions": "1.8<*"
-    },
-    "blocksumo": {
-      "name": "BlockSumo",
-      "command": "/blocksumo",
-      "color": "#00aa00",
-      "versions": "1.8<*"
-    },
-    "bedwars": {
-      "name": "BedWars",
-      "command": "/bedwars",
-      "color": "#00aa00",
-      "versions": "1.16<*"
-    },
-    "creative": {
-      "name": "Creative",
-      "command": "/creative",
-      "color": "#00aa00",
-      "versions": "1.19<*"
-    },
-    "fallingfalling": {
-        "name": "FallingFalling",
-        "command": "/fallingfalling",
-        "color": "#00aa00",
-        "versions": "1.16<*"
     }
   },
   "discord": {
     "server_id": 870227603615805441,
     "rename_to_minecraft_name": false
   },
   "brand": {
-     "primary": "#00AA00",
-     "background": "#005500",
-     "text": "#FFFFFF"
+     "primary": "#001400",
+     "background": "#02ad02"
   },
   "location": {
     "city": "Nürnberg",
     "country": "Germany",
     "country_code": "DE"
-  },
-  "yt_trailer": "BJUVPXoQKpY"
+  }
 }

minecraft_servers/badhub/manifest.json

@@ -0,0 +1,46 @@
+{
+  "server_name": "badhub",
+  "nice_name": "BadHub",
+  "direct_ip": "mc.badhub.cz",
+  "server_wildcards": [
+    "%.badhub.cz"
+  ],
+  "supported_languages": [
+     "cz",
+     "sk"
+  ],
+  "social": {
+    "web": "https://www.badhub.cz",
+    "web_shop": "https://vip.vagonbrei.eu/link/LAkWETe4mc",
+    "tiktok": "mc.badhub.cz",
+    "instagram": "badhub.cz",
+    "discord": "https://discord.com/invite/9vhUGpzrwt"
+  },
+  "gamemodes": {
+    "origin": {
+      "name": "Origin", 
+      "color": "#009013",
+      "versions": "1.13<*"
+    },
+    "tgttos": {
+      "name": "TGTTOS",
+      "color": "#009013",
+      "versions": "1.13<*"
+    }
+  },
+  "discord": {
+    "server_id": 1087120870859866122,
+    "rename_to_minecraft_name": false
+  },
+  "brand": {
+     "primary": "#009013",
+     "background": "#ffffff",
+     "text": "#FFFFFF"
+  }, 
+  "location": {
+     "city": "Prague",
+     "country": "Czechia",
+     "country_code": "CZ"
+  },
+  "yt_trailer": "ckX8RK2whTc"
+}

minecraft_servers/bencraft/manifest.json

@@ -0,0 +1,37 @@
+{
+    "server_name": "bencraft",
+    "nice_name": "Bencraft",
+    "direct_ip": "play.bencraft.xyz",
+    "supported_languages": ["de"],
+    "social": {
+        "web": "https://bencraft.xyz",
+        "web_shop": "https://shop.bencraft.xyz",
+        "discord": "https://discord.com/invite/mdWBX7whUG",
+        "youtube": "https://www.youtube.com/channel/UCZ_4IvaHjkJuKjP6FJSeb8Q"
+    },
+    "gamemodes": {
+        "bedwars": {
+            "name": "BedWars",
+            "color": "#f5c945",
+            "version": "1.20<*"
+        },
+        "hideandseek": {
+            "name": "Hide and Seek",
+            "color": "#c28610",
+            "version": "1.20<*"
+        },
+        "tycoon": {
+            "name": "Tycoon",
+            "color": "#e33d20",
+            "version": "1.20<*"
+        }
+    },
+    "discord": {
+        "server_id": "1137731868440137738"
+    },
+    "location": {
+        "country_code": "DE",
+        "country": "Germany",
+        "city": "Hessen"
+    }
+}