Skip to content

Commit 7115ae4

Browse files
ShonP40ShonP40
authored
Merge branch 'master' into master
2 parents 8da90e1 + e7697d0 commit 7115ae4

File tree

26 files changed

+312
-64
lines changed

26 files changed

+312
-64
lines changed

‎.github/pull_request_template.md‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* You can view our patterns here: [metadata.schema.json](https://github.com/CheatBreakerNet/Client-API/blob/master/mappings/metadata.schema.json), or take a look below and complete the field checklist:
1212
- [ ] `id`: a lowercase string, which should match the folder name *(ex. `goldenpvpnetwork`)*
1313
- [ ] `name`: a string *(ex. `GoldenPvP Network`)*
14-
- [ ] `description`: hook between 16 and 40 characters *(ex. `We're the home of classic PvP gamemodes`)*
14+
- [ ] `description`: between 16 and 50 characters *(ex. `We're the home of classic PvP gamemodes`)*
1515
- [ ] `addresses`: an array with lowercase strings *(ex. `["goldenpvp.net", "routing.center"]`)*
1616
- You do not need to specify subdomains, CheatBreaker services automatically detect them.
1717
- [ ] `primaryAddress`: the primary address that people connect to with (please include the subdomain if required) *(ex. `mc.goldenpvp.net`)*
@@ -58,16 +58,9 @@
5858
* [ ] My logo is between `512` and `1024` pixels in width and height.
5959
* [ ] My logo is my own/the server's property and complies with relevant copyright/privacy laws.
6060

61-
#### Primary Background (Only required for partnered servers)
62-
* [ ] My primary background is a `png` file.
63-
* [ ] I have uploaded my primary background to my server folder *(ex. `goldenpvpnetwork`)* and named it `primarybackground.png`.
64-
* [ ] My primary background is `774` pixels in width and `363` pixels in height.
65-
* [ ] My primary background contains relevant content pertaining to the server, is my own/the server's property, and complies with relevant copyright/privacy laws.
66-
* [ ] My primary background doesn't contain any markings, text, or logos (unless part of a build).
67-
68-
#### Secondary Background (Only required for partnered servers)
69-
* [ ] My secondary background is a `png` file.
70-
* [ ] I have uploaded my secondary background to my server folder *(ex. `goldenpvpnetwork`)* and named it `secondarybackground.png`.
71-
* [ ] My secondary background is `447` pixels in width and `172` pixels in height.
72-
* [ ] My secondary background contains relevant content pertaining to the server, is my own/the server's property, and complies with relevant copyright/privacy laws.
73-
* [ ] My secondary background doesn't contain any markings, text, or logos (unless part of a build).
61+
#### Background
62+
* [ ] My background is a `png` file.
63+
* [ ] I have uploaded my background to my server folder *(ex. `goldenpvpnetwork`)* and named it `primarybackground.png`.
64+
* [ ] My background has an aspect ratio of `16:9`.
65+
* [ ] My background contains relevant content pertaining to the server, is my own/the server's property, and complies with relevant copyright/privacy laws.
66+
* [ ] My background doesn't contain any markings, text, or logos (unless part of a build).

‎mappings/index.json‎

Lines changed: 208 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,44 @@
110110
},
111111
"inactive": false
112112
},
113+
{
114+
"id": "cavepvp",
115+
"name": "CavePvP",
116+
"addresses": [
117+
"cavepvp.org",
118+
"cavepvp.com"
119+
],
120+
"primaryAddress": "cavepvp.com",
121+
"primaryColor": "#db213a",
122+
"secondaryColor": "#3f3e4c",
123+
"gameTypes": [
124+
"HCF",
125+
"PvP"
126+
],
127+
"minecraftVersions": [
128+
"1.7.10",
129+
"1.7",
130+
"1.8.9",
131+
"1.8"
132+
],
133+
"primaryMinecraftVersion": "1.8.9",
134+
"primaryRegion": "NA",
135+
"regions": [
136+
"NA"
137+
],
138+
"primaryLanguage": "en",
139+
"languages": [
140+
"en"
141+
],
142+
"website": "https://cavepvp.com/",
143+
"store": "https://store.cavepvp.com/",
144+
"socials": {
145+
"twitter": "playCavePvP",
146+
"discord": "https://discord.com/invite/cavepvp",
147+
"telegram": "cavepvporg"
148+
},
149+
"inactive": false
150+
},
113151
{
114152
"id": "cobranetwork",
115153
"name": "Cobra Network",
@@ -296,15 +334,83 @@
296334
},
297335
"inactive": false
298336
},
337+
{
338+
"id": "electronnetwork",
339+
"name": "Electron Network",
340+
"description": "A unique PVP server with HCF, PVP and minigames",
341+
"addresses": [
342+
"electronmc.club"
343+
],
344+
"primaryAddress": "electronmc.club",
345+
"primaryColor": "#AA00AA",
346+
"secondaryColor": "#AAAAAA",
347+
"primaryLanguage": "en",
348+
"languages": [
349+
"en"
350+
],
351+
"minecraftVersions": [
352+
"1.7.10",
353+
"1.7",
354+
"1.8.9",
355+
"1.8"
356+
],
357+
"primaryMinecraftVersion": "1.8.9",
358+
"primaryRegion": "EU",
359+
"regions": [
360+
"EU"
361+
],
362+
"gameTypes": [
363+
"HCF",
364+
"PvP",
365+
"Minigames"
366+
],
367+
"website": "https://www.electronmc.club/",
368+
"store": "https://store.electronmc.club/",
369+
"socials": {
370+
"discord": "https://dsc.gg/electronmc",
371+
"youtube": "ElectronNetwork",
372+
"twitter": "ElectronNetMC"
373+
},
374+
"inactive": false
375+
},
376+
{
377+
"id": "elevatemc",
378+
"name": "ElevateMC Network",
379+
"website": "https://elevatemc.com/",
380+
"store": "https://store.elevatemc.com/",
381+
"addresses": [
382+
"elevatemc.com"
383+
],
384+
"primaryAddress": "elevatemc.com",
385+
"primaryColor": "#494949",
386+
"secondaryColor": "#1BDDCB",
387+
"minecraftVersions": [
388+
"1.7.10",
389+
"1.7",
390+
"1.8.9",
391+
"1.8"
392+
],
393+
"primaryMinecraftVersion": "1.8.9",
394+
"gameTypes": [
395+
"PvP"
396+
],
397+
"socials": {
398+
"twitter": "ElevateMCNet",
399+
"discord": "https://discord.com/invite/GkqtzCYCvF",
400+
"telegram": "ElevateMC"
401+
},
402+
"inactive": false
403+
},
299404
{
300405
"id": "ezpvp",
301406
"name": "EzPvP Network",
302407
"description": "KitPvP Network in Europe",
303408
"addresses": [
409+
"ezpvp.org",
304410
"ezpvp.lol",
305411
"jamals.lol"
306412
],
307-
"primaryAddress": "ezpvp.lol",
413+
"primaryAddress": "ezpvp.org",
308414
"minecraftVersions": [
309415
"1.7.10",
310416
"1.7",
@@ -314,9 +420,9 @@
314420
"primaryMinecraftVersion": "1.8.9",
315421
"primaryColor": "#AF15CA",
316422
"secondaryColor": "#FFFFFF",
317-
"primaryLanguage": "en",
423+
"primaryLanguage": "it",
318424
"languages": [
319-
"en"
425+
"it"
320426
],
321427
"primaryRegion": "EU",
322428
"regions": [
@@ -689,24 +795,20 @@
689795
"inactive": false
690796
},
691797
{
692-
"id": "potpvpnetwork",
693-
"name": "PotPvP Network",
694-
"website": "https://www.potpvp.com/",
695-
"store": "https://store.potpvp.com/",
696-
"description": "Competitive Minecraft PvP Network",
798+
"id": "protocolnetwork",
799+
"name": "Protocol Network",
800+
"description": "Where the best players play",
697801
"addresses": [
698-
"potpvp.com",
699-
"skylandkits.net",
700-
"bridge.rip"
802+
"protocol.rip"
701803
],
702-
"primaryAddress": "potpvp.com",
804+
"primaryAddress": "protocol.rip",
703805
"minecraftVersions": [
704806
"1.7.10",
705807
"1.8.9"
706808
],
707809
"primaryMinecraftVersion": "1.7.10",
708-
"primaryColor": "#f7b204",
709-
"secondaryColor": "#ffffff",
810+
"primaryColor": "#f26151",
811+
"secondaryColor": "#6a2338",
710812
"primaryLanguage": "en",
711813
"languages": [
712814
"en"
@@ -717,47 +819,90 @@
717819
],
718820
"gameTypes": [
719821
"PvP",
822+
"HCF",
720823
"UHC"
721824
],
825+
"website": "https://protocol.rip/",
826+
"store": "https://protocol.rip/store/",
722827
"socials": {
723-
"twitter": "PotPvPServer",
724-
"discord": "https://discord.gg/PotPvP",
725-
"telegram": "PotPvP"
828+
"discord": "https://discord.com/invite/eG2NS9XS"
726829
},
727830
"inactive": false
728831
},
729832
{
730-
"id": "protocolnetwork",
731-
"name": "Protocol Network",
732-
"description": "Where the best players play",
833+
"id": "scalanetwork",
834+
"name": "Scala Network",
835+
"website": "https://www.scala.gg/",
836+
"store": "https://store.scala.gg/",
837+
"description": "Competitive Minecraft PvP Network",
733838
"addresses": [
734-
"protocol.rip"
839+
"scala.gg",
840+
"potpvp.com",
841+
"esta.land"
735842
],
736-
"primaryAddress": "protocol.rip",
843+
"primaryAddress": "scala.gg",
737844
"minecraftVersions": [
738845
"1.7.10",
739846
"1.8.9"
740847
],
741-
"primaryMinecraftVersion": "1.7.10",
742-
"primaryColor": "#f26151",
743-
"secondaryColor": "#6a2338",
848+
"primaryMinecraftVersion": "1.8.9",
849+
"primaryColor": "#f7b204",
850+
"secondaryColor": "#ffffff",
744851
"primaryLanguage": "en",
745852
"languages": [
746853
"en"
747854
],
748855
"primaryRegion": "NA",
749856
"regions": [
750-
"NA"
857+
"NA",
858+
"EU"
751859
],
752860
"gameTypes": [
753861
"PvP",
754-
"HCF",
862+
"Minigames",
755863
"UHC"
756864
],
757-
"website": "https://protocol.rip/",
758-
"store": "https://protocol.rip/store/",
759865
"socials": {
760-
"discord": "https://discord.com/invite/eG2NS9XS"
866+
"twitter": "ScalaStudios",
867+
"discord": "https://discord.gg/PotPvP",
868+
"telegram": "ScalaStudios"
869+
},
870+
"inactive": false
871+
},
872+
{
873+
"id": "slyce",
874+
"name": "Slyce",
875+
"description": "Competitive Mini-Game Network",
876+
"addresses": [
877+
"slycemc.eu",
878+
"slycemc.com",
879+
"slyce.fr"
880+
],
881+
"primaryAddress": "play.slyce.fr",
882+
"minecraftVersions": [
883+
"1.8.9",
884+
"1.8"
885+
],
886+
"primaryLanguage": "en",
887+
"languages": [
888+
"en",
889+
"fr"
890+
],
891+
"primaryRegion": "EU",
892+
"regions": [
893+
"EU"
894+
],
895+
"primaryMinecraftVersion": "1.8.9",
896+
"primaryColor": "#f29001",
897+
"secondaryColor": "#6d617d",
898+
"gameTypes": [
899+
"PvP",
900+
"Minigames"
901+
],
902+
"website": "https://www.slyce.fr/",
903+
"socials": {
904+
"twitter": "slycemc",
905+
"discord": "https://discord.com/invite/r9zEakVkxt"
761906
},
762907
"inactive": false
763908
},
@@ -895,6 +1040,39 @@
8951040
},
8961041
"inactive": false
8971042
},
1043+
{
1044+
"id": "vanicnetwork",
1045+
"name": "Vanic Network",
1046+
"description": "Home of the largest Competitive UHC",
1047+
"addresses": [
1048+
"vanic.gg"
1049+
],
1050+
"primaryAddress": "vanic.gg",
1051+
"minecraftVersions": [
1052+
"1.7.10",
1053+
"1.8.9"
1054+
],
1055+
"primaryMinecraftVersion": "1.7.10",
1056+
"primaryColor": "#6ea3d2",
1057+
"secondaryColor": "#454545",
1058+
"primaryLanguage": "en",
1059+
"languages": [
1060+
"en"
1061+
],
1062+
"primaryRegion": "NA",
1063+
"regions": [
1064+
"NA"
1065+
],
1066+
"gameTypes": [
1067+
"PvP",
1068+
"UHC"
1069+
],
1070+
"socials": {
1071+
"twitter": "vanicfeed",
1072+
"discord:": "https://discord.gg/vanicmc"
1073+
},
1074+
"inactive": false
1075+
},
8981076
{
8991077
"id": "veltpvpnetwork",
9001078
"name": "VeltPvP",

‎mappings/metadata.schema.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"description": {
2121
"type": "string",
2222
"minLength": 16,
23-
"maxLength": 40
23+
"maxLength": 50
2424
},
2525
"server_brand": {
2626
"type": "string",

‎mappings/scripts/utils.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def validate_discord_logo(path, server_name) -> list:
154154
'''
155155
Validate that server primary background meets the following requirements:
156156
* is a PNG
157-
* is 774x363
157+
* is 774x363 or 16:9
158158
'''
159159
def validate_primary_background(path, server_name) -> list:
160160
# Check image exits - silently skip if not (as it is not yet a requirement)
@@ -170,10 +170,12 @@ def validate_primary_background(path, server_name) -> list:
170170
errors.append(
171171
f'{server_name}\'s server primary background is not a PNG (currently {primary_background_image.format})... Please ensure the image meets the requirements before proceeding.')
172172

173-
# Check image dimensions are 774x363
174-
if primary_background_image.width != 774 or primary_background_image.height != 363:
175-
errors.append(
176-
f'{server_name}\'s server primary background resolution is not 774x363... Please ensure the image meets the requirements before proceeding.')
173+
aspect_ratio = primary_background_image.width / primary_background_image.height
174+
# Check image dimensions are 774x363 or if the aspect ratio is 16:9
175+
if (abs(aspect_ratio - (16 / 9)) > 0.01):
176+
if (primary_background_image.width != 774 or primary_background_image.height != 363):
177+
errors.append(
178+
f'{server_name}\'s server primary background resolution is not 774x363 or 16:9... Please ensure the image meets the requirements before proceeding.')
177179

178180
return errors
179181

‎mappings/servers/cavepvp/background.png‎

2.39 MB
Loading

‎mappings/servers/cavepvp/discord.png‎

152 KB
Loading

‎mappings/servers/cavepvp/icon.png‎

6.21 KB
Loading

‎mappings/servers/cavepvp/logo.png‎

14.9 KB
Loading

0 commit comments

Comments
 (0)