diff --git a/core/src/mindustry/core/NetClient.java b/core/src/mindustry/core/NetClient.java index da52f23269..6d01275325 100644 --- a/core/src/mindustry/core/NetClient.java +++ b/core/src/mindustry/core/NetClient.java @@ -1,6 +1,7 @@ package mindustry.core; import arc.*; +import arc.audio.*; import arc.func.*; import arc.graphics.*; import arc.math.*; @@ -159,8 +160,6 @@ public class NetClient implements ApplicationListener{ clientPacketReliable(type, contents); } - //TODO enable in build 129 - /* @Remote(variants = Variant.both, unreliable = true) public static void sound(Sound sound, float volume, float pitch, float pan){ if(sound == null) return; @@ -173,7 +172,7 @@ public class NetClient implements ApplicationListener{ if(sound == null) return; sound.at(x, y, pitch, volume); - }*/ + } @Remote(variants = Variant.both, unreliable = true) public static void effect(Effect effect, float x, float y, float rotation, Color color){ diff --git a/core/src/mindustry/world/blocks/power/PowerGenerator.java b/core/src/mindustry/world/blocks/power/PowerGenerator.java index 5a2bd12f0d..fe86c5fd15 100644 --- a/core/src/mindustry/world/blocks/power/PowerGenerator.java +++ b/core/src/mindustry/world/blocks/power/PowerGenerator.java @@ -61,16 +61,25 @@ public class PowerGenerator extends PowerDistributor{ return powerProduction * productionEfficiency; } + @Override + public byte version(){ + return 1; + } + @Override public void write(Writes write){ super.write(write); write.f(productionEfficiency); + write.f(generateTime); } @Override public void read(Reads read, byte revision){ super.read(read, revision); productionEfficiency = read.f(); + if(revision >= 1){ + generateTime = read.f(); + } } } }