From 8e89b24e5b93cbbc7856925784af0168e7c985ba Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:02:52 -0800 Subject: [PATCH 01/15] unprivate countOre (#6410) --- core/src/mindustry/world/blocks/production/Drill.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index d31a130f96..2b25a41067 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -169,7 +169,7 @@ public class Drill extends Block{ return new TextureRegion[]{region, rotatorRegion, topRegion}; } - void countOre(Tile tile){ + protected void countOre(Tile tile){ returnItem = null; returnCount = 0; From b70c08c2ecf38ee738d69955ea8f2d1e70f0338d Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:03:11 -0800 Subject: [PATCH 02/15] Removes -> Destroys (#6409) * Removes -> Destroys * inputed * bad language design TM english sucks --- core/assets/bundles/bundle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 56b938a3e2..2c15b6b123 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1468,9 +1468,9 @@ block.incinerator.description = Vaporizes any item or liquid it receives. block.power-void.description = Voids all power inputted. Sandbox only. block.power-source.description = Infinitely outputs power. Sandbox only. block.item-source.description = Infinitely outputs items. Sandbox only. -block.item-void.description = Destroys any items. Sandbox only. +block.item-void.description = Destroys inputted items. Sandbox only. block.liquid-source.description = Infinitely outputs liquids. Sandbox only. -block.liquid-void.description = Removes any liquids. Sandbox only. +block.liquid-void.description = Destroys inputted liquids. Sandbox only. block.payload-source.description = Infinitely outputs payloads. Sandbox only. block.payload-void.description = Destroys any payloads. Sandbox only. block.copper-wall.description = Protects structures from enemy projectiles. From 3a91460e2487b76b21609a15f24115d4da8b9313 Mon Sep 17 00:00:00 2001 From: Darkness#3729 <79508138+Darkness6030@users.noreply.github.com> Date: Wed, 8 Dec 2021 18:01:02 +0300 Subject: [PATCH 03/15] Fix (#6414) --- core/src/mindustry/ui/dialogs/LanguageDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java index 6504bbe60c..ca46c177f5 100644 --- a/core/src/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -41,6 +41,7 @@ public class LanguageDialog extends BaseDialog{ "be", "Беларуская", "bg", "Български", "ru", "Русский", + "sr", "Српски", "uk_UA", "Українська (Україна)", "th", "ไทย", "zh_CN", "简体中文", From f4c7637071a310d6ac2572b6db4c28d7c9138f57 Mon Sep 17 00:00:00 2001 From: Volas171 <60143910+Volas171@users.noreply.github.com> Date: Thu, 9 Dec 2021 09:49:11 -0500 Subject: [PATCH 04/15] Update Omega v7 and v6 ips (serverlist) (#6420) * update omega ip * omega v7 ip change * i forgo :skull: --- servers_v6.json | 2 +- servers_v7.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/servers_v6.json b/servers_v6.json index f549b49a9e..72046425cb 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -53,7 +53,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me:2004","185.86.230.61:25570"] + "address": ["n5.mindustry.me:4001","n4.mindustry.me:4001"] }, { "name": "Obvilion Network", diff --git a/servers_v7.json b/servers_v7.json index 8f9812946d..271b0c861d 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -17,7 +17,7 @@ }, { "name": "Omega", - "address": ["yeeth.mindustry.me", "yeeth.mindustry.me:2006", "yeeth.mindustry.me:2003","yeeth.mindustry.me:2002", "yeeth.mindustry.me:2001", "yeeth.mindustry.me:2007", "yeeth.mindustry.me:2005"] + "address": ["n4.mindustry.me", "n5.mindustry.me:4002", "n5.mindustry.me:4003","n5.mindustry.me:4004", "n5.mindustry.me:4005", "n5.mindustry.me:4006", "n5.mindustry.me:4007"] }, { "name": "MeowLand", From a3100980dca13be38b8e79cb79074a1c3637dfdd Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Sat, 11 Dec 2021 17:26:38 +0300 Subject: [PATCH 05/15] Fixed 2R2T (#6426) --- servers_v6.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v6.json b/servers_v6.json index 72046425cb..14f1771ee6 100644 --- a/servers_v6.json +++ b/servers_v6.json @@ -53,7 +53,7 @@ }, { "name": "Omega", - "address": ["n5.mindustry.me:4001","n4.mindustry.me:4001"] + "address": ["yeeth.mindustry.me:6568"] }, { "name": "Obvilion Network", From 192588d37327976394b1c08d27da290e4adc8d5e Mon Sep 17 00:00:00 2001 From: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com> Date: Mon, 13 Dec 2021 02:15:26 +0300 Subject: [PATCH 06/15] Update LanguageDialog.java (#6431) --- core/src/mindustry/ui/dialogs/LanguageDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/ui/dialogs/LanguageDialog.java b/core/src/mindustry/ui/dialogs/LanguageDialog.java index ca46c177f5..a124c3896f 100644 --- a/core/src/mindustry/ui/dialogs/LanguageDialog.java +++ b/core/src/mindustry/ui/dialogs/LanguageDialog.java @@ -42,7 +42,7 @@ public class LanguageDialog extends BaseDialog{ "bg", "Български", "ru", "Русский", "sr", "Српски", - "uk_UA", "Українська (Україна)", + "uk_UA", "Українська", "th", "ไทย", "zh_CN", "简体中文", "zh_TW", "正體中文", From 6c26edbd84f47260bb5b14a613ccb4f528489895 Mon Sep 17 00:00:00 2001 From: RebornTrack970 <62565267+RebornTrack970@users.noreply.github.com> Date: Mon, 13 Dec 2021 19:18:53 +0300 Subject: [PATCH 07/15] Fixed Omega Servers on V7 (#6432) * Fixed Omega Servers * Update servers_v7.json --- servers_v7.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers_v7.json b/servers_v7.json index 271b0c861d..9a2b23ef00 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -17,7 +17,7 @@ }, { "name": "Omega", - "address": ["n4.mindustry.me", "n5.mindustry.me:4002", "n5.mindustry.me:4003","n5.mindustry.me:4004", "n5.mindustry.me:4005", "n5.mindustry.me:4006", "n5.mindustry.me:4007"] + "address": ["yeeth.mindustry.me:5002", "yeeth.mindustry.me:5003", "yeeth.mindustry.me:5004","yeeth.mindustry.me:5005", "yeeth.mindustry.me:5006", "yeeth.mindustry.me:5007", "yeeth.mindustry.me", "yeeth.mindustry.me:4006"] }, { "name": "MeowLand", From b5c1972040a94afe0eb4ed810c137a245d059b73 Mon Sep 17 00:00:00 2001 From: Fancy2209 <64917206+Fancy2209@users.noreply.github.com> Date: Mon, 13 Dec 2021 17:20:30 -0100 Subject: [PATCH 08/15] Update bundle_pt_PT.properties so that the portuguese word for settings is right (#6433) * Update bundle_pt_PT.properties * Fix the other 2 words with -/ I didn't notice --- core/assets/bundles/bundle_pt_PT.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties index 606ebca6f4..cfd53b825d 100644 --- a/core/assets/bundles/bundle_pt_PT.properties +++ b/core/assets/bundles/bundle_pt_PT.properties @@ -96,7 +96,7 @@ database.button = Database savegame = Gravar Jogo loadgame = Carregar Jogo joingame = Entrar no Jogo -customgame = Jogo Customi-/nzado +customgame = Jogo Customizado newgame = Novo Jogo none = none.found = [lightgray] @@ -519,7 +519,7 @@ width = Largura: height = Altura: menu = Menu play = Jogar -campaign = Campa-/nnha +campaign = Campannha load = Carregar save = Gravar fps = FPS: {0} @@ -528,7 +528,7 @@ tps = TPS: {0} memory = Mem: {0}mb memory2 = Mem:\n {0}mb +\n {1}mb language.restart = Por favor, reinicie seu jogo para a tradução tomar efeito. -settings = Configu-/nrações +settings = Configurações tutorial = Tutorial tutorial.retake = Refazer Tutorial editor = Editor From 052b47fbe439154f318b9d7183b2ec172756e6d9 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:44:10 -0800 Subject: [PATCH 09/15] remove space from perSecond and perMinute (#6435) --- core/src/mindustry/world/meta/StatUnit.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/world/meta/StatUnit.java b/core/src/mindustry/world/meta/StatUnit.java index e35ce74402..e7d4288bd3 100644 --- a/core/src/mindustry/world/meta/StatUnit.java +++ b/core/src/mindustry/world/meta/StatUnit.java @@ -19,8 +19,8 @@ public enum StatUnit{ degrees, seconds, minutes, - perSecond, - perMinute, + perSecond(false), + perMinute(false), perShot(false), timesSpeed(false), percent(false), From 339d87ad789b80ca20ba4e595a2ab182e57e4723 Mon Sep 17 00:00:00 2001 From: "Matthew (or Maya) Peng" <54301439+MEEPofFaith@users.noreply.github.com> Date: Mon, 13 Dec 2021 18:44:54 -0800 Subject: [PATCH 10/15] Check the status, not the bullet (#6434) --- core/src/mindustry/world/meta/StatValues.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index ba07d8e19d..04f02af137 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -330,7 +330,7 @@ public class StatValues{ } if(type.status != StatusEffects.none){ - sep(bt, (type.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName); + sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName); } if(type.fragBullet != null){ From 4b6541ae4ebd8fd3321d09ddb1afe2271d50a84e Mon Sep 17 00:00:00 2001 From: KuhnChris Date: Tue, 14 Dec 2021 18:52:26 +0100 Subject: [PATCH 11/15] Update missing "core launch animation skip" in german translation file (bundle_de) (#6430) * Update settings file (bundle_de) * Update bundle_de.properties --- core/assets/bundles/bundle_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 1e86cdd66d..ffabec8ed2 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -860,7 +860,7 @@ category.items = Materialien category.crafting = Erzeugung category.function = Funktion category.optional = Optionale Zusätze -setting.skipcoreanimation.name = Skip Core Launch/Land Animation +setting.skipcoreanimation.name = Kern Start- und Lande-Animation überspringen setting.landscape.name = Landschaft sperren setting.shadows.name = Schatten setting.blockreplace.name = Automatische Blockvorschläge From 7880135824b6dce61bf2411ce2d6dac0a1600b8d Mon Sep 17 00:00:00 2001 From: L0615T1C5-216AC-9437 <60281819+L0615T1C5-216AC-9437@users.noreply.github.com> Date: Fri, 17 Dec 2021 17:13:49 -0500 Subject: [PATCH 12/15] Allow setting to be reset through the use of `config key default` (#6442) --- server/src/mindustry/server/ServerControl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 230180772d..2a4026d792 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -576,7 +576,9 @@ public class ServerControl implements ApplicationListener{ if(arg.length == 1){ info("'@' is currently @.", c.name(), c.get()); }else{ - if(c.isBool()){ + if (arg[1].equals("default")){ + c.set(c.defaultValue); + }else if(c.isBool()){ c.set(arg[1].equals("on") || arg[1].equals("true")); }else if(c.isNum()){ try{ From 24d3054bac5daf9c41a4331982a1903bf9ca6ba7 Mon Sep 17 00:00:00 2001 From: Valeriy Date: Sat, 18 Dec 2021 23:35:58 +1000 Subject: [PATCH 13/15] End of this nightmare (#6444) SMoA/Skaarj was end of existing --- servers_v7.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/servers_v7.json b/servers_v7.json index 9a2b23ef00..befb1d1637 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -3,10 +3,6 @@ "name": "mindustry.pl", "address": ["0.baseduser.eu.org:6000", "0.baseduser.eu.org:6666", "0.baseduser.eu.org:6966"] }, - { - "name": "SkaarjDustry", - "address": ["skaarjproject.duckdns.org"] - }, { "name": "C.A.M.S.", "address": ["baseduser.eu.org:6569", "v7.thedimas.pp.ua", "yeeth.mindustry.me:7000", "yeeth.mindustry.me:4000", "yeeth.mindustry.me:2000", "yeeth.mindustry.me:3000"] From 24420c4371333a2729f1dff02d0e47621b8ea929 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 21 Dec 2021 10:25:47 -0500 Subject: [PATCH 14/15] Added temporary client debug status methods --- core/src/mindustry/core/NetServer.java | 28 ++++++++++++++++++++++++++ gradle.properties | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 8c8498c03f..6c39803bf1 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -568,6 +568,34 @@ public class NetServer implements ApplicationListener{ player.con.hasDisconnected = true; } + //these functions are for debugging only, and will be removed! + + @Remote(targets = Loc.client, variants = Variant.one) + public static void requestDebugStatus(Player player){ + int flags = + (player.con.hasDisconnected ? 1 : 0) | + (player.con.hasConnected ? 2 : 0) | + (player.isAdded() ? 4 : 0) | + (player.con.hasBegunConnecting ? 8 : 0); + + Call.debugStatusClient(player.con, flags); + Call.debugStatusClientUnreliable(player.con, flags); + } + + @Remote(variants = Variant.both, priority = PacketPriority.high) + public static void debugStatusClient(int value){ + Log.info("[RELIABLE] Debug status received. disconnected = @, connected = @, added = @, begunConnecting = @", + (value & 1) != 0, (value & 2) != 0, (value & 4) != 0, (value & 8) != 0 + ); + } + + @Remote(variants = Variant.both, priority = PacketPriority.high, unreliable = true) + public static void debugStatusClientUnreliable(int value){ + Log.info("[UNRELIABLE] Debug status received. disconnected = @, connected = @, added = @, begunConnecting = @", + (value & 1) != 0, (value & 2) != 0, (value & 4) != 0, (value & 8) != 0 + ); + } + @Remote(targets = Loc.client) public static void serverPacketReliable(Player player, String type, String contents){ if(netServer.customPacketHandlers.containsKey(type)){ diff --git a/gradle.properties b/gradle.properties index 611d472faa..c72da51d2f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,4 +24,4 @@ android.useAndroidX=true #used for slow jitpack builds; TODO see if this actually works org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 -archash=00d1f312 +archash=0370ef92e5 From 2dfa238ff39dfe66696767551da33aeeb33c6969 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 21 Dec 2021 10:33:09 -0500 Subject: [PATCH 15/15] More debug stats --- core/src/mindustry/core/NetServer.java | 23 ++++++++++++++--------- core/src/mindustry/net/NetConnection.java | 2 ++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 6c39803bf1..2a5e73b1a3 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -578,21 +578,25 @@ public class NetServer implements ApplicationListener{ (player.isAdded() ? 4 : 0) | (player.con.hasBegunConnecting ? 8 : 0); - Call.debugStatusClient(player.con, flags); - Call.debugStatusClientUnreliable(player.con, flags); + Call.debugStatusClient(player.con, flags, player.con.lastReceivedClientSnapshot, player.con.snapshotsSent); + Call.debugStatusClientUnreliable(player.con, flags, player.con.lastReceivedClientSnapshot, player.con.snapshotsSent); } @Remote(variants = Variant.both, priority = PacketPriority.high) - public static void debugStatusClient(int value){ - Log.info("[RELIABLE] Debug status received. disconnected = @, connected = @, added = @, begunConnecting = @", - (value & 1) != 0, (value & 2) != 0, (value & 4) != 0, (value & 8) != 0 - ); + public static void debugStatusClient(int value, int lastClientSnapshot, int snapshotsSent){ + logClientStatus(true, value, lastClientSnapshot, snapshotsSent); } @Remote(variants = Variant.both, priority = PacketPriority.high, unreliable = true) - public static void debugStatusClientUnreliable(int value){ - Log.info("[UNRELIABLE] Debug status received. disconnected = @, connected = @, added = @, begunConnecting = @", - (value & 1) != 0, (value & 2) != 0, (value & 4) != 0, (value & 8) != 0 + public static void debugStatusClientUnreliable(int value, int lastClientSnapshot, int snapshotsSent){ + logClientStatus(false, value, lastClientSnapshot, snapshotsSent); + } + + static void logClientStatus(boolean reliable, int value, int lastClientSnapshot, int snapshotsSent){ + Log.info("@ Debug status received. disconnected = @, connected = @, added = @, begunConnecting = @ lastClientSnapshot = @, snapshotsSent = @", + reliable ? "[RELIABLE]" : "[UNRELIABLE]", + (value & 1) != 0, (value & 2) != 0, (value & 4) != 0, (value & 8) != 0, + lastClientSnapshot, snapshotsSent ); } @@ -959,6 +963,7 @@ public class NetServer implements ApplicationListener{ Call.entitySnapshot(player.con, (short)sent, syncStream.toByteArray()); } + player.con.snapshotsSent ++; } String fixName(String name){ diff --git a/core/src/mindustry/net/NetConnection.java b/core/src/mindustry/net/NetConnection.java index 3d9ac3e5ee..09929ec27f 100644 --- a/core/src/mindustry/net/NetConnection.java +++ b/core/src/mindustry/net/NetConnection.java @@ -22,6 +22,8 @@ public abstract class NetConnection{ public long connectTime = Time.millis(); /** ID of last received client snapshot. */ public int lastReceivedClientSnapshot = -1; + /** Count of snapshots sent from server. */ + public int snapshotsSent; /** Timestamp of last received snapshot. */ public long lastReceivedClientTime; /** Build requests that have been recently rejected. This is cleared every snapshot. */