hhhhhhh

core/src/io/anuke/mindustry/content/Mechs.java

@@ -207,10 +207,10 @@ public class Mechs implements ContentList{
                 Shaders.build.region = armorRegion;
                 Shaders.build.time = Time.time() / 10f;
                 Shaders.build.color.set(Palette.accent).a = player.shootHeat;
-                Graphics.shader(Shaders.build);
+                Draw.shader(Shaders.build);
                 Draw.alpha(1f);
                 Draw.rect(armorRegion, player.snappedX(), player.snappedY(), player.rotation);
-                Graphics.shader(Shaders.mix);
+                Draw.shader(Shaders.mix);
                 Draw.color(1f, 1f, 1f, alpha);
             }
         };
@@ -269,13 +269,13 @@ public class Mechs implements ContentList{
                 float scl = scld(player);
                 if(scl < 0.01f) return;
                 float alpha = Core.batch.getColor().a;
-                Graphics.shader();
+                Draw.shader();
                 Graphics.setAdditiveBlending();
                 Draw.color(Palette.lancerLaser);
                 Draw.alpha(scl/2f);
                 Draw.rect(shield, player.snappedX() + Mathf.range(scl/2f), player.snappedY() + Mathf.range(scl/2f), player.rotation - 90);
                 Graphics.setNormalBlending();
-                Graphics.shader(Shaders.mix);
+                Draw.shader(Shaders.mix);
                 Draw.color();
                 Draw.alpha(alpha);
             }

core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java

@@ -10,7 +10,7 @@ import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.defense.turrets.*;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 
 public class TurretBlocks extends BlockList implements ContentList{

core/src/io/anuke/mindustry/content/bullets/TurretBullets.java

@@ -21,7 +21,7 @@ import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
 import io.anuke.arc.entities.Effects;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.graphics.*;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 
 import static io.anuke.mindustry.Vars.content;

core/src/io/anuke/mindustry/content/fx/BlockFx.java

@@ -6,10 +6,9 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.Fill;
-import io.anuke.arc.graphics.Hue;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.util.Tmp;
 

core/src/io/anuke/mindustry/content/fx/BulletFx.java

@@ -5,9 +5,9 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.Fill;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 
 public class BulletFx extends FxList implements ContentList{

core/src/io/anuke/mindustry/content/fx/ExplosionFx.java

@@ -5,9 +5,9 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.Fill;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 
 public class ExplosionFx extends FxList implements ContentList{

core/src/io/anuke/mindustry/content/fx/Fx.java

@@ -5,9 +5,9 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.Fill;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 
 import static io.anuke.mindustry.Vars.tilesize;
 

core/src/io/anuke/mindustry/content/fx/ShootFx.java

@@ -6,10 +6,10 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.Fill;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
 import io.anuke.arc.graphics.Shapes;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 
 public class ShootFx extends FxList implements ContentList{

core/src/io/anuke/mindustry/content/fx/UnitFx.java

@@ -5,9 +5,9 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.arc.entities.Effects.Effect;
 import io.anuke.arc.graphics.g2d.Draw;
-import io.anuke.arc.graphics.Fill;
+import io.anuke.arc.graphics.g2d.Fill;
 import io.anuke.arc.graphics.g2d.Lines;
-import io.anuke.arc.util.Angles;
+import io.anuke.arc.math.Angles;
 import io.anuke.arc.math.Mathf;
 
 public class UnitFx extends FxList implements ContentList{