Changed uranium to thorium, fixed faulty vault transfer issues

core/src/io/anuke/mindustry/io/BlockLoader.java

@@ -19,7 +19,7 @@ public class BlockLoader {
             "iron", 8,
             "coal", 9,
             "titanium", 10,
-            "uranium", 11,
+            "thorium", 11,
             "dirt", 12,
             "sand", 13,
             "ice", 14,
@@ -81,7 +81,7 @@ public class BlockLoader {
             "stonedrill", 70,
             "irondrill", 71,
             "coaldrill", 72,
-            "uraniumdrill", 73,
+            "thoriumdrill", 73,
             "titaniumdrill", 74,
             "omnidrill", 75,
             "coalgenerator", 76,

core/src/io/anuke/mindustry/resource/Item.java

@@ -26,10 +26,9 @@ public class Item implements Comparable<Item>{
 	},
 	steel = new Item("steel"),
 	titanium = new Item("titanium"),
-	uranium = new Item("uranium"){
+	thorium = new Item("thorium"){
 		{
 			explosiveness = 0.1f;
-			material = false;
 		}
 	},
 	silicon = new Item("silicon"),

core/src/io/anuke/mindustry/resource/Recipes.java

@@ -32,6 +32,7 @@ public class Recipes {
 		new Recipe(distribution, DistributionBlocks.sorter, stack(Item.steel, 2)),
 		new Recipe(distribution, DistributionBlocks.splitter, stack(Item.steel, 1)),
 		new Recipe(distribution, DistributionBlocks.vault, stack(Item.steel, 50)),
+		new Recipe(distribution, ProductionBlocks.core, stack(Item.steel, 50)),
 		new Recipe(distribution, DistributionBlocks.unloader, stack(Item.steel, 5)),
 		new Recipe(distribution, DistributionBlocks.sortedunloader, stack(Item.steel, 5)),
 
@@ -65,7 +66,7 @@ public class Recipes {
 		new Recipe(production, ProductionBlocks.leaddrill, stack(Item.iron, 25)),
 		new Recipe(production, ProductionBlocks.coaldrill, stack(Item.iron, 25), stack(Item.iron, 40)),
 		new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)),
-		new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
+		new Recipe(production, ProductionBlocks.thoriumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
 		new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.densealloy, 40)),
 		new Recipe(production, ProductionBlocks.cultivator, stack(Item.titanium, 40), stack(Item.densealloy, 40)),
 		new Recipe(production, ProductionBlocks.laserdrill, stack(Item.titanium, 40), stack(Item.densealloy, 40)),

core/src/io/anuke/mindustry/world/ColorMapper.java

@@ -36,7 +36,7 @@ public class ColorMapper{
 		"c3a490", pair(Blocks.iron),
 		"161616", pair(Blocks.coal),
 		"6277bc", pair(Blocks.titanium),
-		"83bc58", pair(Blocks.uranium)
+		"83bc58", pair(Blocks.thorium)
 	);
 	
 	public static BlockPair get(int color){

core/src/io/anuke/mindustry/world/blocks/Blocks.java

@@ -86,9 +86,9 @@ public class Blocks{
 	titanium = new Ore("titanium"){{
 		drops = new ItemStack(Item.titanium, 1);
 	}},
-	
-	uranium = new Ore("uranium"){{
-		drops = new ItemStack(Item.uranium, 1);
+
+	thorium = new Ore("thorium"){{
+		drops = new ItemStack(Item.thorium, 1);
 	}},
 	
 	dirt = new Floor("dirt"){},

core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java

@@ -184,10 +184,10 @@ public class ProductionBlocks{
 		}
 	},
 	
-	uraniumdrill = new Drill("uraniumdrill"){
+	thoriumdrill = new Drill("thoriumdrill"){
 		{
-			resource = Blocks.uranium;
-			result = Item.uranium;
+			resource = Blocks.thorium;
+			result = Item.thorium;
 			drillTime = 600;
 		}
 	},
@@ -298,7 +298,7 @@ public class ProductionBlocks{
 	},
 	rtgenerator = new ItemPowerGenerator("rtgenerator"){
 		{
-			generateItem = Item.uranium;
+			generateItem = Item.thorium;
 			powerCapacity = 40f;
 			powerOutput = 0.03f;
 			itemDuration = 240f;

core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java

@@ -155,7 +155,7 @@ public class WeaponBlocks{
 			range = 80f;
 			reload = 8f;
 			bullet = BulletType.chain;
-			ammo = Item.uranium;
+			ammo = Item.thorium;
 			health = 430;
 			size = 2;
 			shootCone = 9f;
@@ -188,7 +188,7 @@ public class WeaponBlocks{
 			range = 120f;
 			reload = 23f;
 			bullet = BulletType.titanshell;
-			ammo = Item.uranium;
+			ammo = Item.thorium;
 			health = 800;
 			ammoMultiplier = 4;
 			size = 3;
@@ -205,7 +205,7 @@ public class WeaponBlocks{
 			range = 120f;
 			reload = 23f;
 			bullet = BulletType.titanshell;
-			ammo = Item.uranium;
+			ammo = Item.thorium;
 			health = 800;
 			ammoMultiplier = 4;
 			size = 3;
@@ -221,7 +221,7 @@ public class WeaponBlocks{
 			range = 120f;
 			reload = 23f;
 			bullet = BulletType.titanshell;
-			ammo = Item.uranium;
+			ammo = Item.thorium;
 			health = 800;
 			ammoMultiplier = 4;
 			size = 2;

core/src/io/anuke/mindustry/world/blocks/types/generation/NuclearReactor.java

@@ -41,7 +41,7 @@ public class NuclearReactor extends LiquidPowerGenerator{
 
 	public NuclearReactor(String name) {
 		super(name);
-		generateItem = Item.uranium;
+		generateItem = Item.thorium;
 		generateLiquid = Liquid.water;
 		itemCapacity = 30;
 		liquidCapacity = 50;

core/src/io/anuke/mindustry/world/blocks/types/storage/Vault.java

@@ -37,6 +37,14 @@ public class Vault extends StorageBlock {
 
     @Override
     public boolean canDump(Tile tile, Tile to, Item item){
-        return to.target().block() instanceof StorageBlock;
+        to = to.target();
+        if(!(to.block() instanceof StorageBlock)) return false;
+
+        if(to.block() instanceof Vault){
+            return (float)to.entity.inventory.totalItems() / to.block().itemCapacity <
+                    (float)tile.entity.inventory.totalItems() / itemCapacity;
+        }
+
+        return true;
     }
 }