From e5cf2161d456ba730eb94c6c34ae2ac7c4161ac6 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 22 Sep 2019 01:37:50 -0400 Subject: [PATCH] spaghetti eradicated --- core/src/io/anuke/mindustry/core/Renderer.java | 2 +- .../src/io/anuke/mindustry/entities/type/Player.java | 12 +++++++----- core/src/io/anuke/mindustry/graphics/Pixelator.java | 2 +- .../src/io/anuke/mindustry/desktop/steam/SNet.java | 9 ++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index b15b71bd1c..c6652e3327 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -295,7 +295,7 @@ public class Renderer implements ApplicationListener{ overlays.drawTop(); - playerGroup.draw(p -> !p.isDead() && !p.isLocal, Player::drawName); + playerGroup.draw(p -> !p.isDead(), Player::drawName); drawLanding(); diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index e0fb4c325d..2a515d5987 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -383,12 +383,14 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{ font.setUseIntegerPositions(false); font.getData().setScale(0.25f / Scl.scl(1f)); layout.setText(font, name); - Draw.color(0f, 0f, 0f, 0.3f); - Fill.rect(x, y + nameHeight - layout.height / 2, layout.width + 2, layout.height + 3); - Draw.color(); - font.setColor(color); - font.draw(name, x, y + nameHeight, 0, Align.center, false); + if(!isLocal){ + Draw.color(0f, 0f, 0f, 0.3f); + Fill.rect(x, y + nameHeight - layout.height / 2, layout.width + 2, layout.height + 3); + Draw.color(); + font.setColor(color); + font.draw(name, x, y + nameHeight, 0, Align.center, false); + } if(isAdmin){ float s = 3f; diff --git a/core/src/io/anuke/mindustry/graphics/Pixelator.java b/core/src/io/anuke/mindustry/graphics/Pixelator.java index 448e35bffe..587ce3077a 100644 --- a/core/src/io/anuke/mindustry/graphics/Pixelator.java +++ b/core/src/io/anuke/mindustry/graphics/Pixelator.java @@ -55,7 +55,7 @@ public class Pixelator implements Disposable{ Draw.rect(Draw.wrap(buffer.getTexture()), Core.camera.position.x, Core.camera.position.y, Core.camera.width, -Core.camera.height); Draw.blend(); - playerGroup.draw(p -> !p.isDead() && !p.isLocal, Player::drawName); + playerGroup.draw(p -> !p.isDead(), Player::drawName); Core.camera.position.set(px, py); Core.settings.put("animatedwater", hadWater); diff --git a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java index e57fe37efe..5c0a2d591b 100644 --- a/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java +++ b/desktop/src/io/anuke/mindustry/desktop/steam/SNet.java @@ -7,6 +7,7 @@ import com.codedisaster.steamworks.SteamNetworking.*; import io.anuke.arc.*; import io.anuke.arc.collection.*; import io.anuke.arc.function.*; +import io.anuke.arc.input.*; import io.anuke.arc.util.*; import io.anuke.arc.util.pooling.*; import io.anuke.mindustry.game.EventType.*; @@ -35,7 +36,6 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, final ByteBuffer readBuffer = ByteBuffer.allocateDirect(1024 * 4); final CopyOnWriteArrayList connections = new CopyOnWriteArrayList<>(); - final CopyOnWriteArrayList connectionsOut = new CopyOnWriteArrayList<>(); final IntMap steamConnections = new IntMap<>(); //maps steam ID -> valid net connection SteamID currentLobby, currentServer; @@ -64,11 +64,11 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, try{ //accept users on request if(con == null){ - con = new SteamConnection(from); + con = new SteamConnection(SteamID.createFromNativeHandle(SteamNativeHandle.getNativeHandle(from))); Connect c = new Connect(); c.addressTCP = "steam:" + from.getAccountID(); - Log.info("&bRecieved connection: {0}", c.addressTCP); + Log.info("&bRecieved STEAM connection: {0}", c.addressTCP); steamConnections.put(from.getAccountID(), con); connections.add(con); @@ -208,8 +208,7 @@ public class SNet implements SteamNetworkingCallback, SteamMatchmakingCallback, @Override public Iterable getConnections(){ //merge provider connections - connectionsOut.clear(); - connectionsOut.addAll(connections); + CopyOnWriteArrayList connectionsOut = new CopyOnWriteArrayList<>(connections); for(NetConnection c : provider.getConnections()) connectionsOut.add(c); return connectionsOut; }