From 7fbf4cacad7ee14cbdb79b7231b2175a7ee0e529 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 11 Jan 2025 21:11:48 -0500 Subject: [PATCH] Pruned server_v7.json to fix iOS server ping crash --- core/src/mindustry/logic/GlobalVars.java | 8 +- servers_v7.json | 442 +++++++++++------------ 2 files changed, 208 insertions(+), 242 deletions(-) diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java index 4832be2ce8..e1a57959cd 100644 --- a/core/src/mindustry/logic/GlobalVars.java +++ b/core/src/mindustry/logic/GlobalVars.java @@ -34,9 +34,9 @@ public class GlobalVars{ private ObjectSet privilegedNames = new ObjectSet<>(); private UnlockableContent[][] logicIdToContent; private int[][] contentIdToLogicId; - + public static final Seq soundNames = new Seq<>(); - + public void init(){ putEntryOnly("sectionProcessor"); @@ -91,7 +91,7 @@ public class GlobalVars{ put("@ctrlProcessor", ctrlProcessor); put("@ctrlPlayer", ctrlPlayer); put("@ctrlCommand", ctrlCommand); - + //sounds if(Core.assets != null){ for(Sound sound : Core.assets.getAll(Sound.class, new Seq<>(Sound.class))){ @@ -203,7 +203,7 @@ public class GlobalVars{ varClient.numval = net.client() ? 1 : 0; //client - if(!net.server() && player != null){ + if(player != null){ varClientLocale.objval = player.locale(); varClientUnit.objval = player.unit(); varClientName.objval = player.name(); diff --git a/servers_v7.json b/servers_v7.json index 823fe41dfc..8e61f05869 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,339 +1,305 @@ [ { "name": "EscoCorp", - "address": ["121.127.37.17:6567", "121.127.37.17:6568", "121.127.37.17:6569", "121.127.37.17:6570", "121.127.37.17:6571"] - }, - { - "name": "Redundancy Dept", - "address": ["min7.include-once.org:8000", "min7.include-once.org:8001"] + "address": [ + "121.127.37.17:6567", + "121.127.37.17:6568", + "121.127.37.17:6569", + "121.127.37.17:6570", + "121.127.37.17:6571" + ] }, { "name": "EchoDustry", - "address": ["node1.stellarch.org:7003", "node1.stellarch.org:7004"] - }, - { - "name": "TSR Network", - "address": ["de-prem-01.hosts.optikservers.com:35526", "de-prem-01.hosts.optikservers.com:35915", "de-prem-01.hosts.optikservers.com:35250", "de-prem-01.hosts.optikservers.com:27526", "de-prem-01.hosts.optikservers.com:35376", "de-prem-01.hosts.optikservers.com:35895"] - }, - { - "name": "Toast Mindustry", - "address": ["192.3.139.5:6567", "192.3.139.5:6568", "192.3.139.5:6569", "104.168.64.154:6567", "104.168.64.154:6568", "104.168.64.154:6569"] + "address": [ + "node1.stellarch.org:7004" + ] }, { "name": "gods field", - "address": ["n2.akiracloud.net:10225","n2.akiracloud.net:10335"] - }, - { - "name": "STP", - "address": ["23.88.73.88:25617"] - }, - { - "name": "Meow Empire ≫ MEM PROJECT", - "address": ["a2.corenodes.host:25514"] - }, - { - "name" : "LesGarsCools", - "address": ["est1.be"] - }, - { - "name": "meiqiuMDT", - "address": ["cn.meiqiumdt.top","ai.meiqiumdt.top","cn2.meiqiumdt.top"] + "address": [ + "n2.akiracloud.net:10225", + "n2.akiracloud.net:10335" + ] }, { "name": "DontVin", - "address": ["45.84.59.49:1342","45.137.205.185:1068","45.137.205.185:1190","45.137.205.185:1191","134.255.218.3:1142","45.137.205.185:1192","45.137.205.185:1193","45.137.205.185:1221","be.phoenix-network.dev","be.phoenix-network.dev:1111","be.phoenix-network.dev:2222","be.phoenix-network.dev:3333","be.phoenix-network.dev:4444","be.phoenix-network.dev:5555","be.phoenix-network.dev:6666","be.phoenix-network.dev:7777","be.phoenix-network.dev:8888","be.phoenix-network.dev:9999"] - }, - { - "name": "Crux's Citadel", - "address": ["45.158.9.198:32865","45.158.9.198:30055","45.158.9.198:32175","45.158.9.198:30252","176.9.150.40:35899","129.154.47.57:26645","176.9.150.40:35930","129.154.47.57:27993","129.154.47.57:26881","176.9.150.40:35168","176.9.150.40:35900","176.9.150.40:35031","176.9.150.40:35154"] - }, - { - "name": "Chilldustry", - "address": ["trelesco.xyz", "95.84.198.97"] - }, - { - "name": "ShardDustry Eventos", - "address": ["45.158.9.198:31719"] - }, - { - "name": "ShardDustry ES", - "address": ["45.158.9.198:32389"] - }, - { - "name": "Tamazia", - "address": ["5.250.178.221:6567","5.250.178.221:6677"] - }, - { - "name": "Crux's Federation", - "address": ["de-free-01.hosts.optikservers.com:32538", "de-free-01.hosts.optikservers.com:31421", "fsn1.bbn.one:37019"] - }, - { - "name": "Tendhost", - "address": ["tendhost.ddns.net:7576"] - }, - { - "name": "ECAN", - "address": ["mindustry.ecansol.com:6597", "mindustry.ecansol.com:6499", "mindustry.ecansol.com:6599"] - }, - { - "name": "SMoke of Anarchy", - "address": ["mindustry.smokeofanarchy.ru", "mindustry.smokeofanarchy.ru:6568", "mindustry.smokeofanarchy.ru:6569", "mindustry.smokeofanarchy.ru:6570", "mindustry.smokeofanarchy.ru:6571", "mindustry.smokeofanarchy.ru:6572", "mindustry.smokeofanarchy.ru:6573", "mindustry.smokeofanarchy.ru:6574", "mindustry.smokeofanarchy.ru:6575", "mindustry.smokeofanarchy.ru:6576"] - }, - { - "name": "Mindustry.pl", - "address": ["1.baseduser.eu.org:6966", "1.baseduser.eu.org:6666", "1.baseduser.eu.org:6000"] - }, - { - "name": "SynapseOS", - "address": ["0nera.ru:7777"] - }, - { - "name": "Voiddustry Servers", - "address": ["45.144.66.250:6567", "185.189.14.201:6567"] + "address": [ + "be.phoenix-network.dev:4444" + ] }, { "name": "thedimas", - "address": ["130.162.212.232", "130.162.212.232:6503","130.162.212.232:6505", "130.162.212.232:6506", "130.162.212.232:6507", "130.162.212.232:6508", "130.162.212.232:6509", "130.162.212.232:6510", "130.162.212.232:6511", "130.162.212.232:6512", "130.162.212.232:6513"] - }, - { - "name": "HexPvP Network", - "address": ["hexpvp.ddns.net", "kycb42148.ddns.net:6614"] - }, - { - "name": "Unidustry", - "address": ["51.81.57.217:33703"] + "address": [ + "130.162.212.232", + "130.162.212.232:6503", + "130.162.212.232:6505", + "130.162.212.232:6507", + "130.162.212.232:6508", + "130.162.212.232:6509", + "130.162.212.232:6510", + "130.162.212.232:6511", + "130.162.212.232:6513" + ] }, { "name": "KMWStudios", - "address": ["kislota.kmwstudios.org:28101", "kislota.kmwstudios.org:28102", "kislota.kmwstudios.org:28103", "kislota.kmwstudios.org:28104", "kislota.kmwstudios.org:28105", "kislota.kmwstudios.org:28106", "kislota.kmwstudios.org:28107"] + "address": [ + "kislota.kmwstudios.org:28102", + "kislota.kmwstudios.org:28103", + "kislota.kmwstudios.org:28104", + "kislota.kmwstudios.org:28105", + "kislota.kmwstudios.org:28106", + "kislota.kmwstudios.org:28107" + ] }, { "name": "XCore", - "address": ["128.140.88.66", "128.140.88.66:6568", "128.140.88.66:6569", "128.140.88.66:6570", "128.140.88.66:6571", "128.140.88.66:6572", "128.140.88.66:6573", "128.140.88.66:6574", "128.140.88.66:6575"] + "address": [ + "128.140.88.66", + "128.140.88.66:6568", + "128.140.88.66:6569", + "128.140.88.66:6570", + "128.140.88.66:6571", + "128.140.88.66:6572", + "128.140.88.66:6573", + "128.140.88.66:6574", + "128.140.88.66:6575" + ] }, { "name": "MinDurka", - "address": ["mindurka.fun", "mindurka.fun:3001", "mindurka.fun:3002", "mindurka.fun:3003", "mindurka.fun:3004", "mindurka.fun:3005", "mindurka.fun:3006", "mindurka.fun:3007", "mindurka.fun:3008", "mindurka.fun:3009", "mindurka.fun:3010", "mindurka.fun:3011"] + "address": [ + "mindurka.fun", + "mindurka.fun:3001", + "mindurka.fun:3002", + "mindurka.fun:3003", + "mindurka.fun:3004", + "mindurka.fun:3005", + "mindurka.fun:3006", + "mindurka.fun:3007", + "mindurka.fun:3008", + "mindurka.fun:3009", + "mindurka.fun:3010", + "mindurka.fun:3011" + ] }, { "name": "Chaotic Neutral", - "address": ["37.187.73.180:7011", "37.187.73.180:7012", "37.187.73.180:7013", "37.187.73.180:7014", "37.187.73.180:7015", "37.187.73.180:7016", "37.187.73.180:7017"] + "address": [ + "37.187.73.180:7011", + "37.187.73.180:7013", + "37.187.73.180:7014", + "37.187.73.180:7015", + "37.187.73.180:7016", + "37.187.73.180:7017" + ] }, { "name": "io", - "address": ["148.251.184.58", "148.251.184.58:1000", "148.251.184.58:2000", "148.251.184.58:3000", "148.251.184.58:4000"] - }, - { - "name": "Korea", - "address": ["mindustry.kr"] - }, - { - "name": "LatamDustry", - "address": ["45.158.9.23:5532", "45.158.9.23:5422", "45.158.9.23:5463", "45.158.9.23:5520"] - }, - { - "name": "Pandorum", - "address": ["pandorum.su:5018", "pandorum.su:5019", "pandorum.su:5020"] + "address": [ + "148.251.184.58", + "148.251.184.58:1000", + "148.251.184.58:2000", + "148.251.184.58:3000", + "148.251.184.58:4000" + ] }, { "name": "Tinylake", - "address": ["cn.mindustry.top", "g.mindustry.top", "cn.mindustry.top:40003", "cn.mindustry.top:40500"] + "address": [ + "cn.mindustry.top" + ] }, { "name": "Fish", - "address": ["162.248.101.95", "162.248.100.98", "162.248.100.133", "162.248.102.204", "162.248.101.53", "37.187.73.180:7012"] + "address": [ + "162.248.101.95", + "162.248.100.98", + "162.248.100.133", + "162.248.101.53" + ] }, { "name": "OmniCorp Classic", - "address": ["omnidustry.ru:6567", "omnidustry.ru:6568", "omnidustry.ru:6569", "omnidustry.ru:6570", "omnidustry.ru:6571", "omnidustry.ru:6572", "omnidustry.ru:6573", "omnidustry.ru:6574"] + "address": [ + "omnidustry.ru:6567", + "omnidustry.ru:6568", + "omnidustry.ru:6569", + "omnidustry.ru:6570", + "omnidustry.ru:6571", + "omnidustry.ru:6572", + "omnidustry.ru:6573", + "omnidustry.ru:6574" + ] }, { "name": "The Devil", - "address": ["xem8k5.mindustry.top:8169", "test.xem8k5.top:8920", "other.xem8k5.top:10936", "n2.akiracloud.net:10404", "new.xem8k5.top"] + "address": [ + "new.xem8k5.top" + ] }, { "name": "Eradication Mindustry", - "address": ["140.238.246.78:7000", "140.238.246.78:7001", "140.238.246.78:7002", "140.238.246.78:7003", "130.61.22.183:7000", "130.61.22.183:7001", "130.61.22.183:7002", "130.61.22.183:7003", "62.30.47.116:7000", "62.30.47.116:7001", "62.30.47.116:7002", "62.30.47.116:7003", "144.24.196.119:7000", "144.24.196.119:7001", "144.24.196.119:7002", "144.24.196.119:7003"] + "address": [ + "130.61.22.183:7000", + "130.61.22.183:7001", + "144.24.196.119:7001" + ] }, { "name": "Conservatory", - "address": ["165.232.137.170:6567", "165.232.137.170:6568"] + "address": [ + "165.232.137.170:6567", + "165.232.137.170:6568" + ] }, { "name": "mindustry.ddns.net", - "address": ["mindustry.ddns.net", "mindustry.ddns.net:1000", "mindustry.ddns.net:2000", "mindustry.ddns.net:3000", "mindustry.ddns.net:4000", "mindustry.ddns.net:5000"] - }, - { - "name": "EasyPlay.su", - "address": ["easyplay.su", "s.easyplay.su:6577", "s.easyplay.su:6686", "s.easyplay.su:6567"] + "address": [ + "mindustry.ddns.net", + "mindustry.ddns.net:1000", + "mindustry.ddns.net:2000", + "mindustry.ddns.net:3000", + "mindustry.ddns.net:4000", + "mindustry.ddns.net:5000" + ] }, { "name": "Sectorized", - "address": ["sectorized.freeddns.org"] + "address": [ + "sectorized.freeddns.org" + ] }, { "name": "Apricot Alliance", - "address": ["apricotalliance.org"] + "address": [ + "apricotalliance.org" + ] }, { - "name": "Sakura", - "address": ["160.16.207.141:20527", "160.16.207.141:21527", "160.16.207.141:22527", "160.16.207.141:23527", "160.16.207.141:24527", "160.16.207.141:25527", "160.16.207.141:26527", "160.16.207.141:27527", "160.16.207.141:28527", "160.16.207.141:29527", "162.43.36.78:20527", "162.43.36.78:21527", "162.43.36.78:22527", "162.43.36.78:23527", "162.43.36.78:24527", "162.43.36.78:25527", "162.43.36.78:26527", "162.43.36.78:27527", "162.43.36.78:28527", "162.43.36.78:29527", "sakura-mindustry.jp:20527"] - }, - { - "name": "|RussianServers|[]", - "address": ["02calm.ru:6567", "02calm.ru:6568", "02calm.ru:6569", "02calm.ru:6570", "02calm.ru:6571", "02calm.ru:6572", "02calm.ru:6573"] - }, - { - "name": "Hungarian", - "address": ["play.hudustry.tk"] - }, - { - "name": "SubZero", - "address": ["mintyserver.net"] + "name": "Sakura", + "address": [ + "162.43.36.78:22527", + "162.43.36.78:24527", + "162.43.36.78:25527", + "162.43.36.78:27527", + "162.43.36.78:28527" + ] }, { "name": "Router Pi", - "address": ["a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6568", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6569", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6570", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6571", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6572", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6573", "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6574"] + "address": [ + "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6569", + "a55c81b7c4d6e6d604651a93f8af5cd83.asuscomm.com:6570" + ] }, { - "name": "Anana", - "address": ["mdt.mdtleague.top","mdt2.mdtleague.top"] - }, - { - "name": "Vortex", - "address": ["vortex.org.ru", "vortex.org.ru:6568", "vortex.org.ru:6569", "vortex.org.ru:6570", "vortex.org.ru:6571"] - }, - { - "name": "Botipont", - "address": ["213.181.206.126:6567", "213.181.206.126:6568", "213.181.206.126:6569"] + "name": "Anana", + "address": [ + "mdt.mdtleague.top" + ] }, { "name": "Exploding Cowards", - "address": ["45.43.163.225:25538"] + "address": [ + "45.43.163.225:25538" + ] }, { "name": "Realm of Serene Lime", - "address": ["mindustry.icu", "sx.mindustry.icu", "mod.mindustry.icu"] - }, - { - "name": "CreateDustry", - "address": ["95.216.68.161:55639"] - }, - { - "name": "Official Mindustry Events", - "address": ["event.baseduser.eu.org"], - "prioritized": true - }, - { - "name": "LifeTime", - "address": ["srv3.godlike.club:28561", "srv3.godlike.club:26508"] + "address": [ + "mindustry.icu", + "sx.mindustry.icu" + ] }, { "name": "Cyandustry", - "address": ["45.88.109.9:7000","45.88.109.9:7001", "45.88.109.9:7002", "45.88.109.9:7003", "45.88.109.9:7004", "45.88.109.9:7005", "45.88.109.9:7006", "45.88.109.9:7007", "45.88.109.9:7008"] - }, - { - "name": "Four Family", - "address": ["118.127.8.162:25503"] - }, - { - "name": "ToxoFlame", - "address": ["193.233.133.223", "193.233.133.223:6568", "193.233.133.223:6569"] + "address": [ + "45.88.109.9:7000", + "45.88.109.9:7001", + "45.88.109.9:7003", + "45.88.109.9:7004", + "45.88.109.9:7006", + "45.88.109.9:7008" + ] }, { "name": "MeowIsland", - "address": ["meowisland.ru:5000", "meowisland.ru:5001", "meowisland.ru:5002", "meowisland.ru:5003", "meowisland.ru:5004"] + "address": [ + "meowisland.ru:5000", + "meowisland.ru:5001", + "meowisland.ru:5003", + "meowisland.ru:5004" + ] }, { "name": "Exdustry", - "address": ["exd.noxia.cloud:6001", "exd.noxia.cloud:6002", "exd.noxia.cloud:6003", "exd.noxia.cloud:6004", "exd.noxia.cloud:6005", "exd.noxia.cloud:6006", "exd.noxia.cloud:6007", "exd.noxia.cloud:6008", "exd.noxia.cloud:6009", "exd.noxia.cloud:6010"] - }, - { - "name": "abcxyz remaster", - "address": ["144.76.57.59:25978", "23.88.73.88:13612", "144.76.57.59:11999", "144.76.57.59:16491", "144.76.57.59:28740"] + "address": [ + "exd.noxia.cloud:6001", + "exd.noxia.cloud:6002", + "exd.noxia.cloud:6003", + "exd.noxia.cloud:6004", + "exd.noxia.cloud:6006" + ] }, { "name": "CroCraft Network", - "address": ["193.122.53.98:6567", "193.122.53.98:20130"] - }, - { - "name": "Extra Utilities", - "address": ["kub.2k12.win:6567", "203.135.99.65:15142", "203.135.99.65:15143", "203.135.99.71:15142", "203.135.99.71:15143"] + "address": [ + "193.122.53.98:6567" + ] }, { "name": "Alex Multiverse", - "address": ["alexmindustryv7.servegame.com:25588", "172.234.80.96:6768", "139.162.41.78:6767", "172.245.187.143:6868", "172.245.187.143:6869", "92.119.127.171:6888", "181.215.58.41:1106", "181.215.58.41:1105", "181.215.58.9:1027", "23.95.107.12"] - }, - { - "name": "Open PVP", - "address": ["162.55.42.21:5555", "188.225.56.29:6567"] + "address": [ + "alexmindustryv7.servegame.com:25588", + "172.234.80.96:6768", + "139.162.41.78:6767", + "172.245.187.143:6868", + "172.245.187.143:6869", + "92.119.127.171:6888", + "23.95.107.12" + ] }, { "name": "XuwenHost", - "address": ["mdt.xuwenblock.cn:6567","mdt.nekopark.cloud:6567"] - }, - { - "name": "Gadgetroch's Server", - "address": ["mindustry.gadgetroch.com", "mindustry.gadgetroch.com:6568", "mindustry.gadgetroch.com:6569"] - }, - { - "name": "Duel.Server", - "address":["160.251.41.148:6567","160.251.41.148:6568","160.251.41.148:6569","160.251.41.148:6570"] - }, - { - "name": "AZDustry", - "address": ["148.251.77.197:2012"] + "address": [ + "mdt.nekopark.cloud:6567" + ] }, { "name": "Erepulo", - "address": ["95.84.198.97:5401", "95.84.198.97:5402", "95.84.198.97:5403", "95.84.198.97:5404", "95.84.198.97:5500", "199.83.103.251", "frost-heaven.ru", "frost-heaven.ru:6568", "frost-heaven.ru:6569", "91.200.150.116"] + "address": [ + "95.84.198.97:5401", + "95.84.198.97:5402", + "95.84.198.97:5403", + "frost-heaven.ru", + "frost-heaven.ru:6568", + "91.200.150.116" + ] }, { "name": "FrostHeaven", - "address": ["95.84.198.97:2357", "frost-heaven.ru", "frost-heaven.ru:6568", "frost-heaven.ru:6569", "91.200.150.116", "frost-heaven.ru:6570", "frost-heaven.ru:6571", "frost-heaven.ru:6572"] - }, - { - "name": "MineCore", - "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] - }, - { - "name": "Mindus•VN", - "address": ["167.71.199.155:25550"] - }, - { - "name": "Impact", - "address": ["impactmindustry.ddns.net"] - }, - { - "name": "2D2R", - "address": ["45.137.205.185:1045", "51.89.173.50:1432", "45.137.205.185:1052", "45.137.205.185:1040"] - }, - { - "name": "TRFACT", - "address": ["213.142.156.83:25565"] + "address": [ + "frost-heaven.ru", + "frost-heaven.ru:6568", + "91.200.150.116", + "frost-heaven.ru:6570" + ] }, { "name": "ArmyOFUkraine", - "address": ["194.247.42.131:27715", "194.247.42.131:27512", "194.247.42.130:27505"] - }, - { - "name": "Erbium", - "address": ["hp5.nexcord.com:12066", "hp5.nexcord.com:11999", "hp5.nexcord.com:12067"] - }, - { - "name": "Vndustry", - "address": ["vndustry.ddns.net"] - }, - { - "name": "ChillOut", - "address": ["87.228.8.133", "87.228.8.133:6568"] + "address": [ + "194.247.42.131:27715", + "194.247.42.131:27512", + "194.247.42.130:27505" + ] }, { "name": "VNM", - "address": ["server.mindustry-tool.com", "server.mindustry-tool.com:6568", "server.mindustry-tool.com:6569", "server.mindustry-tool.com:6760", "server.mindustry-tool.com:6761", "server.mindustry-tool.com:6762", "server.mindustry-tool.com:6763", "server.mindustry-tool.com:6764", "server.mindustry-tool.com:6765", "server.mindustry-tool.com:6766", "server.mindustry-tool.com:6767", "server.mindustry-tool.com:6768", "server.mindustry-tool.com:6769", "server.mindustry-tool.com:6770", "server.mindustry-tool.com:6771", "server.mindustry-tool.com:6772", "server.mindustry-tool.com:6773", "server.mindustry-tool.com:6774", "server.mindustry-tool.com:6775", "server.mindustry-tool.com:6776", "server.mindustry-tool.com:6777", "server.mindustry-tool.com:6778", "server.mindustry-tool.com:6779", "server.mindustry-tool.com:6780"] - }, - { - "name": "LibreDUSTRY", - "address": ["46.4.114.111"] + "address": [ + "server.mindustry-tool.com", + "server.mindustry-tool.com:6568" + ] } -] +] \ No newline at end of file