diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java index bfa89526e2..2a5e9aba4b 100644 --- a/android/src/mindustry/android/AndroidLauncher.java +++ b/android/src/mindustry/android/AndroidLauncher.java @@ -64,24 +64,6 @@ public class AndroidLauncher extends AndroidApplication{ moveTaskToBack(true); } - @Override - public String getUUID(){ - try{ - String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID); - int len = s.length(); - byte[] data = new byte[len / 2]; - for(int i = 0; i < len; i += 2){ - data[i / 2] = (byte)((Character.digit(s.charAt(i), 16) << 4) - + Character.digit(s.charAt(i + 1), 16)); - } - String result = new String(Base64Coder.encode(data)); - if(result.equals("AAAAAAAAAOA=")) throw new RuntimeException("Bad UUID."); - return result; - }catch(Exception e){ - return super.getUUID(); - } - } - @Override public rhino.Context getScriptContext(){ return AndroidRhinoContext.enter(getContext().getCacheDir()); diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat deleted file mode 100644 index eb42302979..0000000000 Binary files a/core/assets/planets/TODO.dat and /dev/null differ diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index a1b07c52f6..5708a470c7 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -687,6 +687,7 @@ public class NetServer implements ApplicationListener{ logic.skipWave(); }else if(action == AdminAction.ban){ netServer.admins.banPlayerIP(other.con.address); + netServer.admins.banPlayerID(other.con.uuid); other.kick(KickReason.banned); Log.info("&lc@ has banned @.", player.name, other.name); }else if(action == AdminAction.kick){ diff --git a/core/src/mindustry/game/SectorInfo.java b/core/src/mindustry/game/SectorInfo.java index 0460344f22..2ad9d24640 100644 --- a/core/src/mindustry/game/SectorInfo.java +++ b/core/src/mindustry/game/SectorInfo.java @@ -79,6 +79,8 @@ public class SectorInfo{ //update sector's internal time spent counter1 state.rules.sector.setTimeSpent(internalTimeSpent); + + Log.info(production); } /** Update averages of various stats, updates some special sector logic. @@ -160,5 +162,9 @@ public class SectorInfo{ /** mean in terms of items produced per refresh rate (currently, per second) */ public float mean; + + public String toString(){ + return mean + ""; + } } } diff --git a/core/src/mindustry/io/SaveMeta.java b/core/src/mindustry/io/SaveMeta.java index 0a3730d8e1..4aeb7d2f99 100644 --- a/core/src/mindustry/io/SaveMeta.java +++ b/core/src/mindustry/io/SaveMeta.java @@ -31,6 +31,6 @@ public class SaveMeta{ this.mods = JsonIO.read(String[].class, tags.get("mods", "[]")); this.secinfo = secinfo; - secinfo.exportRates().each(e -> hasProduction |= e.value > 0.001f); + secinfo.production.each((e, amount) -> hasProduction |= amount.mean > 0.001f); } } diff --git a/core/src/mindustry/net/Packets.java b/core/src/mindustry/net/Packets.java index afe4016091..91d5557e52 100644 --- a/core/src/mindustry/net/Packets.java +++ b/core/src/mindustry/net/Packets.java @@ -171,9 +171,10 @@ public class Packets{ TypeIO.writeString(buffer, name); TypeIO.writeString(buffer, usid); - buffer.put(Base64Coder.decode(uuid)); + byte[] b = Base64Coder.decode(uuid); + buffer.put(b); CRC32 crc = new CRC32(); - crc.update(Base64Coder.decode(uuid)); + crc.update(Base64Coder.decode(uuid), 0, b.length); buffer.putLong(crc.getValue()); buffer.put(mobile ? (byte)1 : 0); diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java index ec1f9b9b8a..66933a81b2 100644 --- a/core/src/mindustry/ui/dialogs/PlanetDialog.java +++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java @@ -44,6 +44,8 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{ public PlanetDialog(){ super("", Styles.fullDialog); + shouldPause = true; + getCell(buttons).padBottom(-4); buttons.background(Styles.black).defaults().growX().height(64f).pad(0); diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java index cb0a3a9b84..a2f6db7d56 100644 --- a/desktop/src/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/mindustry/desktop/DesktopLauncher.java @@ -16,14 +16,12 @@ import mindustry.*; import mindustry.core.*; import mindustry.desktop.steam.*; import mindustry.game.EventType.*; +import mindustry.gen.*; import mindustry.net.*; import mindustry.net.Net.*; import mindustry.type.*; -import mindustry.gen.*; import java.io.*; -import java.net.*; -import java.util.*; import static mindustry.Vars.*; @@ -307,23 +305,7 @@ public class DesktopLauncher extends ClientLauncher{ } } - try{ - Enumeration e = NetworkInterface.getNetworkInterfaces(); - NetworkInterface out; - for(out = e.nextElement(); (out.getHardwareAddress() == null || out.isVirtual() || !validAddress(out.getHardwareAddress())) && e.hasMoreElements(); out = e.nextElement()); - - byte[] bytes = out.getHardwareAddress(); - byte[] result = new byte[8]; - System.arraycopy(bytes, 0, result, 0, bytes.length); - - String str = new String(Base64Coder.encode(result)); - - if(str.equals("AAAAAAAAAOA=") || str.equals("AAAAAAAAAAA=")) throw new RuntimeException("Bad UUID."); - - return str; - }catch(Exception e){ - return super.getUUID(); - } + return super.getUUID(); } private static void message(String message){