diff --git a/build.gradle b/build.gradle index b7ea2a18a3..f999865927 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { gdxVersion = '1.9.8' roboVMVersion = '2.3.0' aiVersion = '1.8.1' - uCoreVersion = 'ea792ea' + uCoreVersion = '8a2faf0' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index ea9b396a04..905228f90b 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.content.fx.Fx; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.Player; import io.anuke.mindustry.entities.Unit; -import io.anuke.mindustry.entities.effect.BelowLiquidEffect; +import io.anuke.mindustry.entities.traits.BelowLiquidTrait; import io.anuke.mindustry.entities.effect.GroundEffectEntity; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.units.BaseUnit; @@ -204,9 +204,9 @@ public class Renderer extends RendererModule{ blocks.drawFloor(); - EntityDraw.draw(groundEffectGroup, e -> e instanceof BelowLiquidEffect); + EntityDraw.draw(groundEffectGroup, e -> e instanceof BelowLiquidTrait); EntityDraw.draw(puddleGroup); - EntityDraw.draw(groundEffectGroup, e -> !(e instanceof BelowLiquidEffect)); + EntityDraw.draw(groundEffectGroup, e -> !(e instanceof BelowLiquidTrait)); blocks.processBlocks(); blocks.drawBlocks(Layer.block); diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java index b7771e2796..3ff45e55f9 100644 --- a/core/src/io/anuke/mindustry/entities/Player.java +++ b/core/src/io/anuke/mindustry/entities/Player.java @@ -166,6 +166,7 @@ public class Player extends Unit implements BuilderTrait { public void set(float x, float y){ this.x = x; this.y = y; + if(isFlying() && isLocal){ Core.camera.position.set(x, y, 0f); } diff --git a/core/src/io/anuke/mindustry/entities/effect/BelowLiquidEffect.java b/core/src/io/anuke/mindustry/entities/effect/BelowLiquidEffect.java deleted file mode 100644 index 9fdb754c87..0000000000 --- a/core/src/io/anuke/mindustry/entities/effect/BelowLiquidEffect.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.anuke.mindustry.entities.effect; - -/**A flag interface for marking an effect as appearing below liquids.*/ -public interface BelowLiquidEffect { -} diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 8ab2714f9a..4cf1772e04 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.Pools; import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.type.Item; import io.anuke.ucore.entities.EntityGroup; +import io.anuke.ucore.entities.component.DrawTrait; import io.anuke.ucore.entities.impl.TimedEntity; import io.anuke.ucore.function.Callable; import io.anuke.ucore.graphics.Draw; @@ -16,7 +17,7 @@ import io.anuke.ucore.util.Position; import static io.anuke.mindustry.Vars.effectGroup; -public class ItemTransfer extends TimedEntity{ +public class ItemTransfer extends TimedEntity implements DrawTrait{ private Vector2 from = new Vector2(); private Vector2 current = new Vector2(); private Vector2 tovec = new Vector2(); diff --git a/core/src/io/anuke/mindustry/entities/effect/Rubble.java b/core/src/io/anuke/mindustry/entities/effect/Rubble.java index 1d788dd448..a90f2f5bb6 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Rubble.java +++ b/core/src/io/anuke/mindustry/entities/effect/Rubble.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.entities.effect; import com.badlogic.gdx.graphics.Color; +import io.anuke.mindustry.entities.traits.BelowLiquidTrait; import io.anuke.ucore.entities.EntityGroup; import io.anuke.ucore.entities.impl.TimedEntity; import io.anuke.ucore.graphics.Draw; @@ -9,7 +10,7 @@ import io.anuke.ucore.util.Mathf; import static io.anuke.mindustry.Vars.groundEffectGroup; /**Class for creating block rubble on the ground.*/ -public class Rubble extends TimedEntity implements BelowLiquidEffect{ +public class Rubble extends TimedEntity implements BelowLiquidTrait { private static final Color color = Color.valueOf("52504e"); private int size; diff --git a/core/src/io/anuke/mindustry/entities/traits/BelowLiquidTrait.java b/core/src/io/anuke/mindustry/entities/traits/BelowLiquidTrait.java new file mode 100644 index 0000000000..37ee664fcb --- /dev/null +++ b/core/src/io/anuke/mindustry/entities/traits/BelowLiquidTrait.java @@ -0,0 +1,5 @@ +package io.anuke.mindustry.entities.traits; + +/**A flag interface for marking an effect as appearing below liquids.*/ +public interface BelowLiquidTrait { +} diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index 2a7c84ecbb..e5f42230ba 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -14,7 +14,6 @@ import io.anuke.mindustry.io.SaveIO; import io.anuke.mindustry.io.Version; import io.anuke.mindustry.net.*; import io.anuke.mindustry.net.Administration.PlayerInfo; -import io.anuke.mindustry.net.Packets.ChatPacket; import io.anuke.mindustry.net.Packets.KickReason; import io.anuke.mindustry.ui.fragments.DebugFragment; import io.anuke.mindustry.world.Tile; @@ -50,11 +49,6 @@ public class ServerControl extends Module { Effects.setEffectProvider((a, b, c, d, e, f) -> {}); Sounds.setHeadless(true); - //override default handling of chat packets - Net.handle(ChatPacket.class, (packet) -> { - info("&y" + (packet.name == null ? "" : packet.name) + ": &lb{0}", packet.text); - }); - //don't do anything at all for GDX logging: don't want controller info and such Gdx.app.setApplicationLogger(new ApplicationLogger() { @Override public void log(String tag, String message) { } @@ -735,7 +729,7 @@ public class ServerControl extends Module { return; } - netServer.admins.rollbackWorld(rollbackTimes); + //netServer.admins.rollbackWorld(rollbackTimes); info("Rollback done!"); }); }