From eabdc3d27d6b1e172834f6ae44c2a81bdee31af1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 8 Aug 2017 12:20:26 -0400
Subject: [PATCH] Added loading dialogs for saving

---
 core/src/io/anuke/mindustry/UI.java           |  23 +++++++++-----
 .../anuke/mindustry/input/AndroidInput.java   |   4 +++
 core/src/io/anuke/mindustry/input/Input.java  |   4 +++
 .../src/io/anuke/mindustry/ui/LoadDialog.java |  22 +++++++++++---
 .../src/io/anuke/mindustry/ui/MenuDialog.java |   2 +-
 .../src/io/anuke/mindustry/ui/SaveDialog.java |  28 +++++++++++++-----
 core/src/io/anuke/mindustry/world/Block.java  |   3 ++
 .../anuke/mindustry/world/blocks/Blocks.java  |   4 +++
 desktop/mindustry-saves/0.mins                | Bin 1169 -> 1215 bytes
 desktop/mindustry-saves/1.mins                | Bin 0 -> 1241 bytes
 10 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 desktop/mindustry-saves/1.mins

diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java
index 9226b492a8..124d8554af 100644
--- a/core/src/io/anuke/mindustry/UI.java
+++ b/core/src/io/anuke/mindustry/UI.java
@@ -391,39 +391,40 @@ public class UI extends SceneModule{
 	
 		//menu table
 		new table(){{
-			float w = Unit.dp.inPixels(200);
 			
 			new table("button"){{
+				defaults().size(Unit.dp.inPixels(220), Unit.dp.inPixels(50));
+				
 				new button("Play", () -> {
 					levels.show();
-				}).width(w);
+				});
 
 				row();
 
 				new button("Settings", () -> {
 					prefs.show(scene);
-				}).width(w);
+				});
 
 				row();
 				
 				if(!android){
 					new button("Controls", () -> {
 						keys.show(scene);
-					}).width(w);
+					});
 					
 					row();
 				}
 
 				new button("About", () -> {
 					about.show(scene);
-				}).width(w);
+				});
 				
 				row();
 				
 				if(Gdx.app.getType() != ApplicationType.WebGL)
 				new button("Exit", () -> {
 					Gdx.app.exit();
-				}).width(w);
+				});
 				
 				get().pad(Unit.dp.inPixels(20));
 			}};
@@ -452,7 +453,9 @@ public class UI extends SceneModule{
 		
 		loadingtable = new table("loadDim"){{
 			new table("button"){{
-				new label("[yellow]Loading...").scale(1).pad(10);
+				new label("[yellow]Loading..."){{
+					get().setName("namelabel");
+				}}.scale(1).pad(10);
 			}}.end();
 		}}.end().get();
 		
@@ -520,7 +523,13 @@ public class UI extends SceneModule{
 	}
 	
 	public void showLoading(){
+		showLoading("[yellow]Loading..");
+	}
+	
+	public void showLoading(String text){
+		loadingtable.<Label>find("namelabel").setText(text);
 		loadingtable.setVisible(true);
+		loadingtable.toFront();
 	}
 	
 	public void hideLoading(){
diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java
index 6199cd9028..3c43fe08bf 100644
--- a/core/src/io/anuke/mindustry/input/AndroidInput.java
+++ b/core/src/io/anuke/mindustry/input/AndroidInput.java
@@ -53,6 +53,10 @@ public class AndroidInput extends InputAdapter{
 		Tile tile = selected();
 		player.breaktime += Mathf.delta();
 		if(player.breaktime >= tile.block().breaktime){
+			if(tile.block().drops != null){
+				Inventory.addItem(tile.block().drops.item, tile.block().drops.amount);
+			}
+			
 			Effects.effect("break", tile.worldx(), tile.worldy());
 			Effects.shake(3f, 1f);
 			tile.setBlock(Blocks.air);
diff --git a/core/src/io/anuke/mindustry/input/Input.java b/core/src/io/anuke/mindustry/input/Input.java
index d95dd7927c..08ea557245 100644
--- a/core/src/io/anuke/mindustry/input/Input.java
+++ b/core/src/io/anuke/mindustry/input/Input.java
@@ -86,6 +86,10 @@ public class Input{
 			Tile tile = cursor;
 			player.breaktime += Mathf.delta();
 			if(player.breaktime >= tile.block().breaktime){
+				if(tile.block().drops != null){
+					Inventory.addItem(tile.block().drops.item, tile.block().drops.amount);
+				}
+				
 				Effects.effect("break", tile.worldx(), tile.worldy());
 				Effects.shake(3f, 1f);
 				tile.setBlock(Blocks.air);
diff --git a/core/src/io/anuke/mindustry/ui/LoadDialog.java b/core/src/io/anuke/mindustry/ui/LoadDialog.java
index 5f12f36dfc..360c45a7e9 100644
--- a/core/src/io/anuke/mindustry/ui/LoadDialog.java
+++ b/core/src/io/anuke/mindustry/ui/LoadDialog.java
@@ -1,5 +1,10 @@
 package io.anuke.mindustry.ui;
 
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+
+import io.anuke.mindustry.GameState;
+import io.anuke.mindustry.GameState.State;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.ucore.scene.ui.Dialog;
@@ -18,7 +23,7 @@ public class LoadDialog extends Dialog{
 		
 		getButtonTable().addButton("Back", ()->{
 			hide();
-		}).pad(8).size(180, 60);
+		}).pad(8).size(180, 50);
 	}
 	
 	private void setup(){
@@ -40,12 +45,21 @@ public class LoadDialog extends Dialog{
 			
 			button.clicked(()->{
 				if(!button.isDisabled()){
-					SaveIO.loadFromSlot(slot);
-					hide();
+					Vars.ui.showLoading();
+					
+					Timer.schedule(new Task(){
+						public void run(){
+							SaveIO.loadFromSlot(slot);
+							Vars.ui.hideLoading();
+							hide();
+							Vars.ui.hideMenu();
+							GameState.set(State.playing);
+						}
+					}, 2f/60f);
 				}
 			});
 			
-			content().add(button).size(400, 100).units(Unit.dp).pad(10);
+			content().add(button).size(400, 90).units(Unit.dp).pad(10);
 			content().row();
 		}
 		
diff --git a/core/src/io/anuke/mindustry/ui/MenuDialog.java b/core/src/io/anuke/mindustry/ui/MenuDialog.java
index 580095924b..2fb758cec0 100644
--- a/core/src/io/anuke/mindustry/ui/MenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/MenuDialog.java
@@ -19,7 +19,7 @@ public class MenuDialog extends Dialog{
 	}
 	
 	void setup(){
-		content().defaults().width(200).units(Unit.dp);
+		content().defaults().width(220).height(50).units(Unit.dp);
 		
 		content().addButton("Back", ()->{
 			hide();
diff --git a/core/src/io/anuke/mindustry/ui/SaveDialog.java b/core/src/io/anuke/mindustry/ui/SaveDialog.java
index d27289e954..ec6d8fcab5 100644
--- a/core/src/io/anuke/mindustry/ui/SaveDialog.java
+++ b/core/src/io/anuke/mindustry/ui/SaveDialog.java
@@ -1,5 +1,8 @@
 package io.anuke.mindustry.ui;
 
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
+
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.ucore.scene.ui.ConfirmDialog;
@@ -20,7 +23,7 @@ public class SaveDialog extends Dialog{
 		
 		getButtonTable().addButton("Back", ()->{
 			hide();
-		}).pad(8).size(180, 60);
+		}).pad(8).size(180, 50);
 	}
 	
 	private void setup(){
@@ -36,28 +39,39 @@ public class SaveDialog extends Dialog{
 			button.getLabelCell().top().left().growX();
 			button.row();
 			button.pad(12);
-			button.add("[gray]" + (!SaveIO.isSaveValid(i) ? "<empty>" : "Last Saved: " + SaveIO.getTimeString(i)));
+			button.add((!SaveIO.isSaveValid(i) ? "[gray]<empty>" : "[LIGHT_GRAY]Last Saved: " + SaveIO.getTimeString(i)));
 			button.getLabel().setFontScale(1f);
 			
 			button.clicked(()->{
 				if(SaveIO.isSaveValid(slot)){
 					new ConfirmDialog("Overwrite", "Are you sure you want to overwrite\nthis save slot?", ()->{
-						SaveIO.saveToSlot(slot);
-						hide();
+						save(slot);
 					}){{
 						content().pad(16);
 						for(Cell<?> cell : getButtonTable().getCells())
 							cell.size(110, 45).pad(4);
 					}}.show();
 				}else{
-					SaveIO.saveToSlot(slot);
-					hide();
+					save(slot);
 				}
 			});
 			
-			content().add(button).size(400, 100).units(Unit.dp).pad(10);
+			content().add(button).size(400, 90).units(Unit.dp).pad(8);
 			content().row();
 		}
 	}
+	
+	void save(int slot){
+		Vars.ui.showLoading("[yellow]Saving...");
+		
+		Timer.schedule(new Task(){
+			@Override
+			public void run(){
+				SaveIO.saveToSlot(slot);
+				hide();
+				Vars.ui.hideLoading();
+			}
+		}, 2f/60f);
+	}
 
 }
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 4b3b6afb92..ea60db2182 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.World;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.resource.Item;
+import io.anuke.mindustry.resource.ItemStack;
 import io.anuke.ucore.core.Draw;
 import io.anuke.ucore.graphics.Caches;
 import io.anuke.ucore.util.Mathf;
@@ -30,6 +31,8 @@ public class Block{
 	public String edge = "stone";
 	//whether to have 3 variants
 	public boolean vary = true;
+	//stuff that drops when broken
+	public ItemStack drops = null;
 
 	public Block(String name) {
 		blocks.add(this);
diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java
index 72f3ed02d2..855ee87774 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java
@@ -1,5 +1,7 @@
 package io.anuke.mindustry.world.blocks;
 
+import io.anuke.mindustry.resource.Item;
+import io.anuke.mindustry.resource.ItemStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 
@@ -65,12 +67,14 @@ public class Blocks{
 		shadow = "rockshadow";
 		breakable = true;
 		breaktime = 15;
+		drops = new ItemStack(Item.stone, 3);
 	}},
 			
 	rock2 = new Block("rock2"){{
 		shadow = "rock2shadow";
 		breakable = true;
 		breaktime = 15;
+		drops = new ItemStack(Item.stone, 3);
 	}},
 	
 	dirtblock = new Block("dirtblock"){{
diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins
index 87ca26375dfe8776d455221c11cf79805b874b16..0cce5841dda57581e3291682e299e2f483be6336 100644
GIT binary patch
literal 1215
zcmZPo1IE}xbG$Y)FfcH>@abQ4VQZFjdUfCj0|P?}10zU*4v1i2VECcSz`#(&z+gHR
zB*4eOU?2%)D9wU0Y+wviX_&}tC__O8#1LR$P=+z|zzjYH27Wn^6dwbF;e05=49pN<
zU@(^li3l(-7%c=b_!t<J7eN^ci$M$l1_r?;AO;@;gVa(e!w|-hQHP0WLKzaPpbU+*
zAO=4JgOnbK!N<U$vkt@%U|`S%i|{ir@NWQ#@G&q5!Wd#OhJhhSN`Qeu(g?)hV_=Zp
z1Z5b3MFbca<hDaaly^WGe3l>vKLdlpP7s5Sfk9>$lp(tZ!~p5CfijH1BK!;t61Gqg
zSr~)I4kW_Qz@P|Y$k{_h)WHk^1_tQ^AQ1ru2G)Zh20sIX$RSXCf?`I4fq_BP3B(g)
zU|<0Az;d97&;SX8bSOB1NPY$ey+a@dC=$R7eg*~|XOIX#1B37pkZPEbA}$~v%t#Ti
z9E>N5A}0!#6J=mv1f?z|7m#rR3=AqqpbT{w!vMxGg{jd$3RNR=3}hS3Zc#T74{jS+
z4#hiCZcu&F$Dj;Ln25-6sED{bh{4amAPr^+Ffho&q!hp+pwIv_1Q-~UPJk4Hf(6D9
z^#qCVGcX8vK^bDFKnwu}1~Y#UgP(yxG62L7U|^650x>{o;Sz`;z`$S$X7DpG@CJiK
zK#DIz8B#D2i4c&800V<SD2Tz&z#w=H#1LR$Fbo4R_!$^Xz#{w%3_>?RB76)CVi6z)
z$kHefgP(yx{uYQKz`$Sw76E0WSda)m1B2K-D1-k#lpzOZ@G&r`B!NWu7#PH#fEWS{
z44hA)3>h$kkAXoc4I~1}&Cfs#0R{%{bSQ%d%;0BWFb6Y0`8xw71xisbK@0%~2K`r1
Y21hQG!TA=-Fb9k9Gca(x2Z`_l0LIv2#Q*>R

literal 1169
zcmZPo1IE}xJvYo47#J8`MHYN=;b35JUICU!VPFK&8X$s!fidV00|P@D1B1CRNI-yr
zL30*}!N<U017}D>MRa7K3{x;efPq1NE=Yu*fx%c7#NcCKFatCA85lI=pdzL)hTa0G
zh=l@(!Oy^8un@%HV_*<cf-)?XK@0%~1_@OVgO7nh2F4Iu1{E<@gEEZNp$t{9Zv+?^
z48eZnV_=Zg0!i^RFbJ;(F+k?P7-DOnB09Pt20sIX^g0lOkAXoR#?S^c_!$`F^`TO_
zU<N+}gU$w!hyVkF9+(00#b&4oKPbEz1Q-~2&7mSnJ3$OS1_otIC_~x`$`IKNV(>FC
zaN2<wATRHOGE`s;wf!IwQ1IG=7y=9o!VXY|)<Gyk<Pa!6K~V$>1W_jtPmF<q0n7u-
zfx;ieV|RvX5j+fK2p<8dhUpb?0r6mZMZj_}o+yf(C|FLEfq_v6WYZC-an>+~q$@~-
zpMk;jD2O4zz+eGm2pofoh#Uji2D4k#4a9@n29|@lTh<M#MHZ%4{5VL2pMgOV#*p^_
zi3l(-=$wEuguI{(1sH?R8zjQdz@Xp*Vt`zA2Ffr!2V(FuF!1|B8K&o<48DsXh5!Qt
zKa3$13=-jIU=Rp_GNfP(9T>v|#;^_psS#jckhuY3@G~%2M}Qat3=Be%AO<Lnf*E`a
z3}R6r5dj7UsasHn0+_+iz`%D0Dk69n%Fv4iG58r6bnk%}0t^hg2_ObP1A|&3h{4Ce
zz@G$S2rw{+z!-wbAQ65B2Gz$P1}L9{ML=qvf<y!u7>vOTeg+1MXCM)N1_tHlAO;@;
jgI+p_0ZQT-P=*4S!N<U$k_i$4sd)op2rw{k7JwN5QuAA5

diff --git a/desktop/mindustry-saves/1.mins b/desktop/mindustry-saves/1.mins
new file mode 100644
index 0000000000000000000000000000000000000000..3e02882e4476cb8982387615a24c42bd01c5383f
GIT binary patch
literal 1241
zcmZPo1IE}xvoEADFfcH>OzeB<!ok4cyaFtd!oUckH9!Od1H%tp1_p*Y1_slqAOSuG
z1_MbbLunS2VFP2BO2b5ELm3J(Acg<~gEEYv2WIdwF!0NPr1%&Z4Cg}`W?+T@1B1Cd
zNJM~v!Du0f!N<U$ya>urSPWtaFfa%%0WtU(7^Id$8HO;1j5<t26UvZS1!ZWg1u^&;
z7^L(-3_b=1opm6F00V<AScIQ}fqw%?gpYwi5XKOLF$@erQUVMNl13l~9|ME*CMd%Q
zEF!?bAh#VVqPzpj;IjlV_!$@!c7hmu3=A^6pbXhPAO=X64U}O77U5@L5VVDgNWd7f
zFb0nuNQ$3<K>*AUU|>)LGx!-8g!V(F<m{mgbudGKfkFBJNJM~vf%PDW!Oy@TatIXF
zphyG7wx|<`C&s|Q0Oo<^Kyd`(DL6s3=p6zvKv4r`@G~&*9R`W;Gcf2lLm9$HKnB5#
z6>$OaV8)7o<zPHf6gg3_oG1eWqYeWDgOUr#H~|I*l_OAwI*efeW0=C!=pTiu5jh63
z4Q98f8;A$D4J-%ql9U@%i}W!l!xAPUavUlm?haz`GcZVl83GIp@-Qg{un0c`gC3Y6
zz`&q%0;CueG%$v!CrAVoPhL=l*eMW0fPulxAH?8iV2}&|F$5SGWP(5pP%60uVhAuW
zSb`b+3=F)%AQ6z_%TR_COhh6CBqG4TAP@>-fYQx15JP~0!7vQO;Adbk0gHeV#|@AO
z9|MC}1c(8$Gz!GvXJC-O1!4#=FxY@aKp89+B*M?YAa)PR;J*)L$blJr3=AqsAQ3(W
z2Jt5#h5!Qt=Tj&{2F&1NU{Fc}iGcF?GY~_7fq^?6%HRPr_!$_?!3<E&&j3k*64Of%
eLx6!n{}q(Mkqc#TzJ)T(!6N(&3>@!4BK!dROk>;t

literal 0
HcmV?d00001