diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png index 24f7d495cf..ea22f87439 100644 Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 28def7b3e2..ff154e28d9 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/net/NetEvents.java b/core/src/io/anuke/mindustry/net/NetEvents.java index 01dbfe5b90..8e52472cca 100644 --- a/core/src/io/anuke/mindustry/net/NetEvents.java +++ b/core/src/io/anuke/mindustry/net/NetEvents.java @@ -5,6 +5,7 @@ import io.anuke.annotations.Annotations.Remote; import io.anuke.annotations.Annotations.Variant; import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.Player; +import io.anuke.ucore.util.Log; import static io.anuke.mindustry.Vars.maxTextLength; import static io.anuke.mindustry.Vars.playerGroup; @@ -17,6 +18,8 @@ public class NetEvents{ throw new ValidateException(player, "Player has sent a message above the text limit."); } + Log.info("&y{0}: &lb{1}", (player.name == null ? "" : player.name), message); + if(Vars.ui != null){ Vars.ui.chatfrag.addMessage(message, player == null ? null : colorizeName(player.id, player.name)); } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java index 3a4c21877e..743deb3d11 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechFactory.java @@ -17,6 +17,7 @@ import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.consumers.ConsumePowerExact; import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.ucore.core.Effects; import io.anuke.ucore.core.Graphics; @@ -48,7 +49,7 @@ public class MechFactory extends Block{ @Override public void init(){ - consumes.power(powerCapacity * 0.8f); + consumes.add(new ConsumePowerExact(powerCapacity * 0.8f)); super.init(); } diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java index 82bd1e56e0..005765ffd8 100644 --- a/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumePower.java @@ -9,7 +9,7 @@ import io.anuke.ucore.core.Timers; import io.anuke.ucore.scene.ui.layout.Table; public class ConsumePower extends Consume{ - private final float use; + protected final float use; public ConsumePower(float use){ this.use = use; @@ -40,7 +40,7 @@ public class ConsumePower extends Consume{ stats.add(BlockStat.powerUse, use * 60f, StatUnit.powerSecond); } - float use(Block block){ + protected float use(Block block){ return Math.min(use * Timers.delta(), block.powerCapacity); } } diff --git a/core/src/io/anuke/mindustry/world/consumers/ConsumePowerExact.java b/core/src/io/anuke/mindustry/world/consumers/ConsumePowerExact.java new file mode 100644 index 0000000000..efc95d39d3 --- /dev/null +++ b/core/src/io/anuke/mindustry/world/consumers/ConsumePowerExact.java @@ -0,0 +1,14 @@ +package io.anuke.mindustry.world.consumers; + +import io.anuke.mindustry.world.Block; + +public class ConsumePowerExact extends ConsumePower{ + + public ConsumePowerExact(float use){ + super(use); + } + + protected float use(Block block){ + return this.use; + } +}