From 93353ff90084478aa62c59c633de79ef11dc6b30 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 21 May 2018 11:05:10 -0400
Subject: [PATCH] Removed action-based item transfer animation

---
 .../build/libs/annotations-release.jar        | Bin 10793 -> 10793 bytes
 core/src/io/anuke/mindustry/core/UI.java      |   2 +-
 .../ui/fragments/BlockInventoryFragment.java  |  40 +++---------------
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/annotations/build/libs/annotations-release.jar b/annotations/build/libs/annotations-release.jar
index f6457dfeb481894f1bfe105e1a9420ce0de66f38..73c6ad517fd9d4bcd63147296de062950384ea9d 100644
GIT binary patch
delta 283
zcmZ1(vND7>z?+$ci-CcIgF!uF>qK5PW)NlOrKS?G)rSEHm_P&&FavRBzCJSpLIY6A
z#ARyCAnLpkh}z7;7|jS~Br$!L1T$h}wljelV)CUBsXhg9Moy6FujejF7nsbiY_$1-
zq8dbwQ#lsG$W#dgGbZm<)daa{@=H|{Fs-0w4>E3YlA0cveyJ)wd7T>AuF0p=9Kd3{
p>M>wCM?DfupHPnm(`p)lV7dxQpVNo~^Yt|$^aRatF#naNJpe;jRK@@R

delta 283
zcmZ1(vND7>z?+$ci-CcIgTb<Y%S2u^=AUg_CYpJvz3<!N!vF+KAOZ-OfjBc?pP2!n
z0jOl+GBsw9zVk*PYBLLCG$WXi#PnSf%!rZM&ID$N$(KT;`V_<&If06OUe8^UE-;y2
z*=X|vMKy>Vr*bTWk*N~M$P6@p@?KR<koL(hRZT!Ho2;N_4;D{S(*x5lRi!7dQv=&I
w`IMRiSS_!544BSQj|9^v)T6<)nnoa)u7c9%G~&Q~eN6~GK{Fg|<||Em0DL84ng9R*

diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index f0457f85be..b8f24ef2f2 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -106,7 +106,7 @@ public class UI extends SceneModule{
 		Colors.put("interact", Color.ORANGE);
 		Colors.put("accent", Color.valueOf("f4ba6e"));
 		Colors.put("place", Color.valueOf("6335f8"));
-		Colors.put("break", Color.valueOf("fb6363"));
+		Colors.put("break", Color.valueOf("e55454"));
 		Colors.put("placeRotate", Color.ORANGE);
 		Colors.put("breakStart", Color.YELLOW);
 		Colors.put("breakInvalid", Color.SCARLET);
diff --git a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
index b314fbc282..2bdabcc7c8 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/BlockInventoryFragment.java
@@ -1,34 +1,30 @@
 package io.anuke.mindustry.ui.fragments;
 
 import com.badlogic.gdx.graphics.Color;
-import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Align;
 import com.badlogic.gdx.utils.IntSet;
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.entities.ItemTransfer;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.input.InputHandler;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.ui.ItemImage;
 import io.anuke.mindustry.world.Tile;
-import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Graphics;
 import io.anuke.ucore.core.Inputs;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.function.BooleanProvider;
 import io.anuke.ucore.function.Callable;
 import io.anuke.ucore.scene.Group;
-import io.anuke.ucore.scene.actions.Actions;
 import io.anuke.ucore.scene.event.HandCursorListener;
 import io.anuke.ucore.scene.event.Touchable;
-import io.anuke.ucore.scene.ui.Image;
 import io.anuke.ucore.scene.ui.layout.Table;
-import io.anuke.ucore.util.Angles;
 import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.Strings;
 
-import static io.anuke.mindustry.Vars.*;
+import static io.anuke.mindustry.Vars.state;
+import static io.anuke.mindustry.Vars.tilesize;
 
 public class BlockInventoryFragment implements Fragment {
     private Table table;
@@ -129,10 +125,10 @@ public class BlockInventoryFragment implements Fragment {
                         Vector2 v = image.localToStageCoordinates(new Vector2(image.getWidth() / 2f, image.getHeight() / 2f));
                         for(int j = 0; j < sent; j ++){
                             boolean all = j == sent-1;
-                            Timers.run(j*5, () -> move(item.region, v, () -> {
+                            Timers.run(j*5, () -> move(item, tile, () -> {
                                 player.inventory.addItem(item, all ? soFar[0] : per);
                                 soFar[0] -= per;
-                            }, Color.WHITE));
+                            }));
                         }
                     }
                 });
@@ -149,30 +145,8 @@ public class BlockInventoryFragment implements Fragment {
         updateTablePosition();
     }
 
-    private void move(TextureRegion region, Vector2 v, Callable c, Color color){
-        Player player = input.player;
-
-        Vector2 tv = Graphics.screen(player.x + Angles.trnsx(player.rotation + 180f, 5f), player.y + Angles.trnsy(player.rotation + 180f, 5f));
-        float tx = tv.x, ty = tv.y;
-        float dur = 40f / 60f;
-
-        Image mover = new Image(region);
-        mover.setColor(color);
-        mover.setSize(32f, 32f);
-        mover.setOrigin(Align.center);
-        mover.setPosition(v.x, v.y, Align.center);
-        mover.setTouchable(Touchable.disabled);
-        mover.actions(
-            Actions.parallel(
-                Actions.moveToAligned(tx, ty, Align.center, dur, Interpolation.fade),
-                Actions.scaleTo(0.7f, 0.7f, dur, Interpolation.fade),
-                Actions.rotateTo(player.rotation, dur, Interpolation.fade)
-            ),
-            Actions.call(c),
-            Actions.removeActor()
-        );
-
-        Core.scene.add(mover);
+    private void move(Item item, Tile tile, Callable c){
+        ItemTransfer.create(item, tile.drawx(), tile.drawy(), input.player.x, input.player.y, c);
     }
 
     private String round(float f){